From b454c637d4381f42b35f142eeb2e1c33b40ff977 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 09:15:07 +0200
Subject: [PATCH 01/21] Rename

---
 .run/Run Demo.run.xml                |  4 ++--
 CONTRIBUTING.md                      |  4 ++--
 README.md                            | 12 ++++++------
 SECURITY.md                          |  2 +-
 pom.xml                              |  6 +++---
 standard-maven-template-demo/pom.xml |  4 ++--
 standard-maven-template/pom.xml      | 12 ++++++------
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml
index 764b3b9..b12efb7 100644
--- a/.run/Run Demo.run.xml	
+++ b/.run/Run Demo.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Demo" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
-    <module name="standard-maven-template-demo" />
+    <module name="dynamicreports-core-for-grid-exporter-demo" />
     <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
       <pattern>
@@ -13,4 +13,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 79c7cf2..32be5c5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,10 +34,10 @@ You should have the following things installed:
   * Ensure that the JDK/Java-Version is correct
 
 
-## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/release.yml?branch=master)](https://github.com/xdev-software/standard-maven-template/actions/workflows/release.yml)
+## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/dynamicreports-core-for-grid-exporter/release.yml?branch=master)](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/actions/workflows/release.yml)
 
 Before releasing:
-* Consider doing a [test-deployment](https://github.com/xdev-software/standard-maven-template/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+* Consider doing a [test-deployment](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
 * Check the [changelog](CHANGELOG.md)
 
 If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
diff --git a/README.md b/README.md
index e288929..0d57401 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/standard-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/standard-maven-template)
-[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/checkBuild.yml?branch=develop)](https://github.com/xdev-software/standard-maven-template/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_standard-maven-template&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_standard-maven-template)
+[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/dynamicreports-core-for-grid-exporter?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/dynamicreports-core-for-grid-exporter)
+[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/dynamicreports-core-for-grid-exporter/checkBuild.yml?branch=develop)](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_dynamicreports-core-for-grid-exporter&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_dynamicreports-core-for-grid-exporter)
 
-# standard-maven-template
+# dynamicreports-core-for-grid-exporter
 
 
 ## Installation
-[Installation guide for the latest release](https://github.com/xdev-software/standard-maven-template/releases/latest#Installation)
+[Installation guide for the latest release](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/releases/latest#Installation)
 
 
 ## Support
@@ -16,4 +16,4 @@ If you need support as soon as possible and you can't wait for any pull request,
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
 
 ## Dependencies and Licenses
-View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/standard-maven-template/dependencies/)
+View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/dynamicreports-core-for-grid-exporter/dependencies/)
diff --git a/SECURITY.md b/SECURITY.md
index 92188f3..81520f8 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,4 +2,4 @@
 
 ## Reporting a Vulnerability
 
-Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/standard-maven-template/security/advisories/new).
+Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/security/advisories/new).
diff --git a/pom.xml b/pom.xml
index ada9282..a4d4034 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.xdev-software</groupId>
-	<artifactId>standard-maven-template-root</artifactId>
+	<artifactId>dynamicreports-core-for-grid-exporter-root</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
@@ -15,8 +15,8 @@
 	</organization>
 
 	<modules>
-		<module>standard-maven-template</module>
-		<module>standard-maven-template-demo</module>
+		<module>dynamicreports-core-for-grid-exporter</module>
+		<module>dynamicreports-core-for-grid-exporter-demo</module>
 	</modules>
 
 	<licenses>
diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml
index 10d5305..e87f35e 100644
--- a/standard-maven-template-demo/pom.xml
+++ b/standard-maven-template-demo/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.xdev-software</groupId>
-	<artifactId>standard-maven-template-demo</artifactId>
+	<artifactId>dynamicreports-core-for-grid-exporter-demo</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -38,7 +38,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.xdev-software</groupId>
-			<artifactId>standard-maven-template</artifactId>
+			<artifactId>dynamicreports-core-for-grid-exporter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml
index 9f74dbf..b7476e3 100644
--- a/standard-maven-template/pom.xml
+++ b/standard-maven-template/pom.xml
@@ -5,17 +5,17 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.xdev-software</groupId>
-	<artifactId>standard-maven-template</artifactId>
+	<artifactId>dynamicreports-core-for-grid-exporter</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>standard-maven-template</name>
-	<description>standard-maven-template</description>
-	<url>https://github.com/xdev-software/standard-maven-template</url>
+	<name>dynamicreports-core-for-grid-exporter</name>
+	<description>dynamicreports-core-for-grid-exporter</description>
+	<url>https://github.com/xdev-software/dynamicreports-core-for-grid-exporter</url>
 
 	<scm>
-		<url>https://github.com/xdev-software/standard-maven-template</url>
-		<connection>https://github.com/xdev-software/standard-maven-template.git</connection>
+		<url>https://github.com/xdev-software/dynamicreports-core-for-grid-exporter</url>
+		<connection>https://github.com/xdev-software/dynamicreports-core-for-grid-exporter.git</connection>
 	</scm>
 
 	<inceptionYear>2023</inceptionYear>

From 6b8c80b25a09039feac95248576869fd7b078478 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 09:15:24 +0200
Subject: [PATCH 02/21] Rename

---
 .../pom.xml                                                       | 0
 .../pom.xml                                                       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {standard-maven-template-demo => dynamicreports-core-for-grid-exporter-demo}/pom.xml (100%)
 rename {standard-maven-template => dynamicreports-core-for-grid-exporter}/pom.xml (100%)

diff --git a/standard-maven-template-demo/pom.xml b/dynamicreports-core-for-grid-exporter-demo/pom.xml
similarity index 100%
rename from standard-maven-template-demo/pom.xml
rename to dynamicreports-core-for-grid-exporter-demo/pom.xml
diff --git a/standard-maven-template/pom.xml b/dynamicreports-core-for-grid-exporter/pom.xml
similarity index 100%
rename from standard-maven-template/pom.xml
rename to dynamicreports-core-for-grid-exporter/pom.xml

From 1c37f6da5f2fd2deeced3fdc8f34a5e54f6781f4 Mon Sep 17 00:00:00 2001
From: Alex B <45384811+AB-xdev@users.noreply.github.com>
Date: Tue, 6 Jun 2023 09:37:58 +0200
Subject: [PATCH 03/21] Removed unused property

---
 standard-maven-template-demo/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml
index 10d5305..a441c85 100644
--- a/standard-maven-template-demo/pom.xml
+++ b/standard-maven-template-demo/pom.xml
@@ -24,8 +24,6 @@
 	</licenses>
 
 	<properties>
-		<license.licenseName>apache_v2</license.licenseName>
-
 		<javaVersion>17</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 

From e07b6c1c67fdcbeb62554dd6af1c39b5e34bde6b Mon Sep 17 00:00:00 2001
From: Alex B <45384811+AB-xdev@users.noreply.github.com>
Date: Tue, 6 Jun 2023 09:40:03 +0200
Subject: [PATCH 04/21] Removed license from demo

* Demo is never distributed via Maven
* Demo license is always the same as the parent license
---
 standard-maven-template-demo/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml
index a441c85..f2df5ec 100644
--- a/standard-maven-template-demo/pom.xml
+++ b/standard-maven-template-demo/pom.xml
@@ -16,13 +16,6 @@
 		<url>https://xdev.software</url>
 	</organization>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-
 	<properties>
 		<javaVersion>17</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>

From 45d9b5f2b8e34a3c661a7e52e5d1ba15f6c09743 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 09:41:16 +0200
Subject: [PATCH 05/21] Change license to LGPL 3 as dynamicreports requires us
 to do so

---
 LICENSE                                       | 366 ++++++++----------
 dynamicreports-core-for-grid-exporter/pom.xml |   6 +-
 pom.xml                                       |   4 +-
 3 files changed, 170 insertions(+), 206 deletions(-)

diff --git a/LICENSE b/LICENSE
index 2316c75..0a04128 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,201 +1,165 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2023 XDEV Software 
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/dynamicreports-core-for-grid-exporter/pom.xml b/dynamicreports-core-for-grid-exporter/pom.xml
index b7476e3..e08dc36 100644
--- a/dynamicreports-core-for-grid-exporter/pom.xml
+++ b/dynamicreports-core-for-grid-exporter/pom.xml
@@ -35,8 +35,8 @@
 
 	<licenses>
 		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<name>GNU Lesser General Public License version 3</name>
+			<url>https://www.gnu.org/licenses/lgpl-3.0.en.html</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@@ -96,7 +96,7 @@
 					</properties>
 					<licenseSets>
 						<licenseSet>
-							<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
+							<header>com/mycila/maven/plugin/license/templates/LGPL-3.txt</header>
 							<includes>
 								<include>src/main/java/**</include>
 								<include>src/test/java/**</include>
diff --git a/pom.xml b/pom.xml
index a4d4034..bfd3cc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
 
 	<licenses>
 		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<name>GNU Lesser General Public License version 3</name>
+			<url>https://www.gnu.org/licenses/lgpl-3.0.en.html</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>

From ac16395465d423a4c9ff235a0a3ef3c3fc4c296f Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 10:53:31 +0200
Subject: [PATCH 06/21] Added sources

---
 CHANGELOG.md                                  |   17 +
 dynamicreports-core-for-grid-exporter/pom.xml |   67 +
 .../design/base/DRDesignBand.java             |  151 +
 .../design/base/DRDesignDataset.java          |  177 +
 .../design/base/DRDesignField.java            |  103 +
 .../design/base/DRDesignGroup.java            |  264 ++
 .../design/base/DRDesignHyperLink.java        |  130 +
 .../design/base/DRDesignMargin.java           |   96 +
 .../design/base/DRDesignPage.java             |  145 +
 .../design/base/DRDesignParameter.java        |   96 +
 .../design/base/DRDesignQuery.java            |   64 +
 .../design/base/DRDesignReport.java           |  530 +++
 .../design/base/DRDesignSort.java             |   67 +
 .../base/DRDesignTableOfContentsHeading.java  |   50 +
 .../design/base/DRDesignTemplateDesign.java   |  104 +
 .../design/base/DRDesignVariable.java         |  145 +
 .../design/base/component/DRDesignBreak.java  |   56 +
 .../base/component/DRDesignComponent.java     |  308 ++
 .../base/component/DRDesignEllipse.java       |   56 +
 .../design/base/component/DRDesignFiller.java |   38 +
 .../component/DRDesignGenericElement.java     |  132 +
 .../component/DRDesignHyperlinkComponent.java |   91 +
 .../design/base/component/DRDesignImage.java  |  123 +
 .../design/base/component/DRDesignLine.java   |   73 +
 .../design/base/component/DRDesignList.java   |  247 ++
 .../base/component/DRDesignListCell.java      |  181 +
 .../design/base/component/DRDesignMap.java    |  122 +
 .../base/component/DRDesignRectangle.java     |   72 +
 .../base/component/DRDesignSubreport.java     |  120 +
 .../base/component/DRDesignTextField.java     |  209 +
 .../base/crosstab/DRDesignCrosstab.java       |  247 ++
 .../base/crosstab/DRDesignCrosstabCell.java   |   96 +
 .../crosstab/DRDesignCrosstabCellContent.java |  118 +
 .../crosstab/DRDesignCrosstabColumnGroup.java |   48 +
 .../crosstab/DRDesignCrosstabDataset.java     |   99 +
 .../base/crosstab/DRDesignCrosstabGroup.java  |  163 +
 .../crosstab/DRDesignCrosstabMeasure.java     |  109 +
 .../crosstab/DRDesignCrosstabRowGroup.java    |   48 +
 .../AbstractDesignComplexExpression.java      |   92 +
 .../AbstractDesignSimpleExpression.java       |   62 +
 .../expression/DRDesignComplexExpression.java |   72 +
 .../expression/DRDesignJasperExpression.java  |   61 +
 .../DRDesignParameterExpression.java          |   65 +
 .../DRDesignPropertyExpression.java           |   65 +
 .../expression/DRDesignSimpleExpression.java  |   70 +
 .../expression/DRDesignSystemExpression.java  |   55 +
 .../expression/DRDesignValueFormatter.java    |   61 +
 .../design/base/style/DRDesignBaseStyle.java  |  332 ++
 .../design/base/style/DRDesignBorder.java     |  115 +
 .../base/style/DRDesignConditionalStyle.java  |   78 +
 .../design/base/style/DRDesignFont.java       |  203 +
 .../design/base/style/DRDesignPadding.java    |  115 +
 .../design/base/style/DRDesignParagraph.java  |  207 +
 .../design/base/style/DRDesignPen.java        |  102 +
 .../design/base/style/DRDesignStyle.java      |  117 +
 .../design/base/style/DRDesignTabStop.java    |   84 +
 .../design/constant/ComponentGroupType.java   |   28 +
 .../design/constant/DefaultStyleType.java     |   28 +
 .../design/constant/EvaluationTime.java       |   28 +
 .../design/constant/ResetType.java            |   28 +
 .../design/definition/DRIDesignBand.java      |   76 +
 .../design/definition/DRIDesignDataset.java   |  120 +
 .../design/definition/DRIDesignField.java     |   43 +
 .../design/definition/DRIDesignGroup.java     |  117 +
 .../design/definition/DRIDesignHyperLink.java |   73 +
 .../design/definition/DRIDesignMargin.java    |   57 +
 .../design/definition/DRIDesignPage.java      |   80 +
 .../design/definition/DRIDesignParameter.java |   57 +
 .../design/definition/DRIDesignQuery.java     |   43 +
 .../design/definition/DRIDesignReport.java    |  364 ++
 .../design/definition/DRIDesignSort.java      |   46 +
 .../DRIDesignTableOfContentsHeading.java      |   39 +
 .../definition/DRIDesignTemplateDesign.java   |  102 +
 .../design/definition/DRIDesignVariable.java  |   66 +
 .../definition/component/DRIDesignBreak.java  |   37 +
 .../component/DRIDesignComponent.java         |  149 +
 .../component/DRIDesignEllipse.java           |   37 +
 .../definition/component/DRIDesignFiller.java |   28 +
 .../component/DRIDesignGenericElement.java    |   69 +
 .../DRIDesignHyperLinkComponent.java          |   51 +
 .../definition/component/DRIDesignImage.java  |   66 +
 .../definition/component/DRIDesignLine.java   |   45 +
 .../definition/component/DRIDesignList.java   |   60 +
 .../definition/component/DRIDesignMap.java    |   66 +
 .../component/DRIDesignRectangle.java         |   44 +
 .../component/DRIDesignSubreport.java         |   64 +
 .../component/DRIDesignTextField.java         |  104 +
 .../crosstab/DRIDesignCrosstab.java           |  116 +
 .../crosstab/DRIDesignCrosstabCell.java       |   57 +
 .../DRIDesignCrosstabCellContent.java         |   60 +
 .../DRIDesignCrosstabColumnGroup.java         |   34 +
 .../crosstab/DRIDesignCrosstabDataset.java    |   61 +
 .../crosstab/DRIDesignCrosstabGroup.java      |   89 +
 .../crosstab/DRIDesignCrosstabMeasure.java    |   68 +
 .../crosstab/DRIDesignCrosstabRowGroup.java   |   34 +
 .../DRIDesignComplexExpression.java           |   54 +
 .../expression/DRIDesignExpression.java       |   43 +
 .../expression/DRIDesignJasperExpression.java |   34 +
 .../DRIDesignParameterExpression.java         |   43 +
 .../DRIDesignPropertyExpression.java          |   43 +
 .../expression/DRIDesignSimpleExpression.java |   44 +
 .../expression/DRIDesignSystemExpression.java |   27 +
 .../definition/style/DRIDesignBaseStyle.java  |  151 +
 .../definition/style/DRIDesignBorder.java     |   57 +
 .../style/DRIDesignConditionalStyle.java      |   44 +
 .../definition/style/DRIDesignFont.java       |   92 +
 .../definition/style/DRIDesignPadding.java    |   57 +
 .../definition/style/DRIDesignParagraph.java  |   95 +
 .../design/definition/style/DRIDesignPen.java |   53 +
 .../definition/style/DRIDesignStyle.java      |   50 +
 .../definition/style/DRIDesignTabStop.java    |   45 +
 .../exception/DRDesignReportException.java    |   49 +
 .../AbstractExpressionTransform.java          |  459 +++
 .../BandComponentsTransform.java              |  454 +++
 .../design/transformation/BandTransform.java  |  381 ++
 .../design/transformation/ColumnGrid.java     |  121 +
 .../transformation/ColumnGridTransform.java   |  273 ++
 .../transformation/ColumnTransform.java       |  272 ++
 .../transformation/ComponentPosition.java     |  836 ++++
 .../transformation/ComponentTransform.java    |  929 +++++
 .../transformation/ConstantTransform.java     |  264 ++
 .../transformation/CrosstabTransform.java     |  665 +++
 .../transformation/CustomBatikRenderer.java   |   61 +
 .../DatasetExpressionTransform.java           |   78 +
 .../transformation/DatasetTransform.java      |  119 +
 .../DesignTransformAccessor.java              |  194 +
 .../design/transformation/GroupTransform.java |  331 ++
 .../MainDatasetExpressionTransform.java       |   98 +
 .../design/transformation/PageTransform.java  |   97 +
 .../transformation/ReportTransform.java       |  157 +
 .../design/transformation/StyleResolver.java  |  502 +++
 .../design/transformation/StyleTransform.java |  440 ++
 .../transformation/SubtotalTransform.java     |  327 ++
 .../TableOfContentsTransform.java             |  143 +
 .../transformation/TemplateTransform.java     | 3572 +++++++++++++++++
 .../expressions/BooleanImageExpression.java   |  113 +
 .../BooleanTextValueFormatter.java            |   66 +
 .../expressions/CrosstabExpression.java       |   90 +
 .../CrosstabMeasureExpression.java            |   54 +
 .../expressions/CrosstabPrintInEvenRow.java   |   38 +
 .../expressions/CrosstabPrintInOddRow.java    |   38 +
 .../expressions/CrosstabRowCount.java         |   40 +
 .../expressions/CrosstabRowCounter.java       |   62 +
 .../expressions/CurrentDateExpression.java    |   69 +
 .../GroupByDataTypeExpression.java            |   53 +
 .../MultiPageListDataSourceExpression.java    |   57 +
 .../MultiPageListSubreportExpression.java     |   90 +
 .../expressions/PageNumberExpression.java     |   54 +
 .../expressions/PageXofYNumberExpression.java |   69 +
 .../expressions/SerieValueExpression.java     |  114 +
 .../expressions/TocPrintWhenExpression.java   |   58 +
 .../expressions/TocReferenceExpression.java   |   86 +
 .../TocReferenceLinkExpression.java           |   64 +
 .../jasper/base/CustomScriptlet.java          |  121 +
 .../base/DefaultJasperScriptletManager.java   |   42 +
 .../jasper/base/JasperCustomValues.java       |  363 ++
 .../jasper/base/JasperReportDesign.java       |  143 +
 .../jasper/base/JasperReportParameters.java   |  280 ++
 .../jasper/base/JasperScriptlet.java          |  211 +
 .../jasper/base/JasperScriptletManager.java   |   46 +
 ...erSystemFontExtensionsRegistryFactory.java |   65 +
 .../base/JasperTemplateStyleLoader.java       |  426 ++
 .../jasper/base/StartPageNumberScriptlet.java |   50 +
 .../ThreadSafeJasperScriptletManager.java     |   44 +
 .../export/AbstractJasperExcelExporter.java   |  679 ++++
 .../base/export/AbstractJasperExporter.java   |  203 +
 .../jasper/base/export/JasperCsvExporter.java |   64 +
 .../base/export/JasperDocxExporter.java       |   81 +
 .../base/export/JasperHtmlExporter.java       |  322 ++
 .../base/export/JasperImageExporter.java      |   83 +
 .../jasper/base/export/JasperOdsExporter.java |   49 +
 .../jasper/base/export/JasperOdtExporter.java |   64 +
 .../jasper/base/export/JasperPdfExporter.java |  488 +++
 .../base/export/JasperPptxExporter.java       |   49 +
 .../jasper/base/export/JasperRtfExporter.java |   48 +
 .../base/export/JasperTextExporter.java       |  145 +
 .../jasper/base/export/JasperXlsExporter.java |   31 +
 .../base/export/JasperXlsxExporter.java       |   49 +
 .../jasper/base/export/JasperXmlExporter.java |   48 +
 .../AbstractPrintListHandler.java             |   74 +
 .../JasperPrintListFileHandler.java           |  249 ++
 .../reporthandler/JasperPrintListHandler.java |   53 +
 .../JasperReportBuilderHandler.java           |   78 +
 .../tableofcontents/JasperTocHeading.java     |  129 +
 .../base/tableofcontents/JasperTocReport.java |  151 +
 .../JasperEmptyTemplateDesign.java            |   40 +
 .../templatedesign/JasperTemplateDesign.java  |  336 ++
 .../JasperConcatenatedReportBuilder.java      |  508 +++
 .../jasper/builder/JasperReportBuilder.java   |  937 +++++
 .../AbstractJasperExcelExporterBuilder.java   |  489 +++
 .../export/AbstractJasperExporterBuilder.java |  165 +
 .../builder/export/ExporterBuilders.java      |  572 +++
 .../jasper/builder/export/Exporters.java      |  572 +++
 .../export/JasperCsvExporterBuilder.java      |   60 +
 .../export/JasperDocxExporterBuilder.java     |   71 +
 .../export/JasperHtmlExporterBuilder.java     |  241 ++
 .../export/JasperImageExporterBuilder.java    |   84 +
 .../export/JasperOdsExporterBuilder.java      |   50 +
 .../export/JasperOdtExporterBuilder.java      |   60 +
 .../export/JasperPdfExporterBuilder.java      |  354 ++
 .../export/JasperPptxExporterBuilder.java     |   49 +
 .../export/JasperRtfExporterBuilder.java      |   49 +
 .../export/JasperTextExporterBuilder.java     |  164 +
 .../export/JasperXlsExporterBuilder.java      |   38 +
 .../export/JasperXlsxExporterBuilder.java     |   50 +
 .../export/JasperXmlExporterBuilder.java      |   49 +
 .../jasper/constant/ImageType.java            |   28 +
 .../jasper/constant/JasperProperty.java       |  487 +++
 .../jasper/constant/PdfPermission.java        |   28 +
 .../jasper/constant/PdfVersion.java           |   28 +
 .../jasper/constant/SizeUnit.java             |   28 +
 .../jasper/constant/ValueType.java            |   28 +
 .../definition/JasperReportHandler.java       |   55 +
 .../definition/export/JasperICsvExporter.java |   41 +
 .../export/JasperIDocxExporter.java           |   48 +
 .../export/JasperIExcelExporter.java          |  306 ++
 .../definition/export/JasperIExporter.java    |  103 +
 .../export/JasperIHtmlExporter.java           |  155 +
 .../export/JasperIImageExporter.java          |   50 +
 .../definition/export/JasperIOdsExporter.java |   34 +
 .../definition/export/JasperIOdtExporter.java |   41 +
 .../definition/export/JasperIPdfExporter.java |  223 +
 .../export/JasperIPptxExporter.java           |   35 +
 .../definition/export/JasperIRtfExporter.java |   34 +
 .../export/JasperITextExporter.java           |   76 +
 .../definition/export/JasperIXlsExporter.java |   27 +
 .../export/JasperIXlsxExporter.java           |   34 +
 .../definition/export/JasperIXmlExporter.java |   34 +
 .../exception/JasperDesignException.java      |   49 +
 .../AbstractExpressionTransform.java          |  429 ++
 .../jasper/transformation/BandTransform.java  |  144 +
 .../transformation/ComponentTransform.java    |  462 +++
 .../transformation/ConstantTransform.java     | 1241 ++++++
 .../transformation/CrosstabTransform.java     |  289 ++
 .../DatasetExpressionTransform.java           |  126 +
 .../transformation/DatasetTransform.java      |  154 +
 .../transformation/ExporterTransform.java     |  746 ++++
 .../jasper/transformation/GroupTransform.java |   98 +
 .../transformation/JasperTransform.java       |  198 +
 .../JasperTransformAccessor.java              |  153 +
 .../MainDatasetExpressionTransform.java       |  126 +
 .../transformation/ReportTransform.java       |  294 ++
 .../jasper/transformation/StyleTransform.java |  238 ++
 .../CrosstabParametersExpression.java         |   63 +
 .../DatasetParametersExpression.java          |   63 +
 .../JasperSubreportParametersExpression.java  |   71 +
 .../expression/SubreportExpression.java       |  133 +
 .../SubreportParametersExpression.java        |   77 +
 .../expression/SubreportWidthExpression.java  |   59 +
 .../sf/dynamicreports/report/ReportUtils.java |  132 +
 .../report/base/AbstractScriptlet.java        |  106 +
 .../report/base/AbstractTemplateDesign.java   |  207 +
 .../sf/dynamicreports/report/base/DRBand.java |   92 +
 .../dynamicreports/report/base/DRDataset.java |  199 +
 .../dynamicreports/report/base/DRField.java   |   93 +
 .../dynamicreports/report/base/DRGroup.java   |  386 ++
 .../report/base/DRHyperLink.java              |  129 +
 .../dynamicreports/report/base/DRMargin.java  |  120 +
 .../sf/dynamicreports/report/base/DRPage.java |  203 +
 .../report/base/DRParameter.java              |   82 +
 .../dynamicreports/report/base/DRQuery.java   |   60 +
 .../dynamicreports/report/base/DRReport.java  | 1362 +++++++
 .../report/base/DRReportTemplate.java         | 2497 ++++++++++++
 .../sf/dynamicreports/report/base/DRSort.java |   67 +
 .../report/base/DRSubtotal.java               |  204 +
 .../report/base/DRTableOfContentsHeading.java |   82 +
 .../report/base/DRVariable.java               |  139 +
 .../report/base/column/DRBooleanColumn.java   |   54 +
 .../report/base/column/DRColumn.java          |  225 ++
 .../report/base/column/DRValueColumn.java     |   71 +
 .../report/base/component/DRBooleanField.java |  156 +
 .../report/base/component/DRBreak.java        |   49 +
 .../report/base/component/DRComponent.java    |  145 +
 .../report/base/component/DRCurrentDate.java  |   48 +
 .../base/component/DRDimensionComponent.java  |  187 +
 .../report/base/component/DREllipse.java      |   49 +
 .../report/base/component/DRFiller.java       |   31 +
 .../report/base/component/DRFormatField.java  |   68 +
 .../base/component/DRGenericElement.java      |  117 +
 .../base/component/DRHyperLinkComponent.java  |   82 +
 .../report/base/component/DRImage.java        |  117 +
 .../report/base/component/DRLine.java         |   66 +
 .../report/base/component/DRList.java         |  152 +
 .../report/base/component/DRListCell.java     |   97 +
 .../report/base/component/DRMap.java          |   81 +
 .../base/component/DRMultiPageList.java       |   86 +
 .../report/base/component/DRPageNumber.java   |   32 +
 .../report/base/component/DRPageXofY.java     |   98 +
 .../report/base/component/DRRectangle.java    |   65 +
 .../report/base/component/DRSubreport.java    |  118 +
 .../report/base/component/DRTextField.java    |  285 ++
 .../report/base/component/DRTotalPages.java   |   32 +
 .../report/base/component/DRXyList.java       |   72 +
 .../report/base/component/DRXyListCell.java   |   88 +
 .../report/base/crosstab/DRCrosstab.java      |  403 ++
 .../base/crosstab/DRCrosstabCellContent.java  |   75 +
 .../base/crosstab/DRCrosstabCellStyle.java    |  105 +
 .../base/crosstab/DRCrosstabColumnGroup.java  |   64 +
 .../base/crosstab/DRCrosstabDataset.java      |   65 +
 .../report/base/crosstab/DRCrosstabGroup.java |  416 ++
 .../base/crosstab/DRCrosstabMeasure.java      |  262 ++
 .../base/crosstab/DRCrosstabRowGroup.java     |   64 +
 .../base/crosstab/DRCrosstabVariable.java     |   98 +
 .../base/datatype/AbstractDataType.java       |  104 +
 .../report/base/datatype/DRDataType.java      |  117 +
 .../expression/AbstractSimpleExpression.java  |   65 +
 .../expression/AbstractSystemExpression.java  |   58 +
 .../expression/AbstractValueFormatter.java    |   68 +
 .../report/base/grid/DRColumnGrid.java        |   66 +
 .../report/base/grid/DRColumnGridList.java    |  128 +
 .../base/grid/DRColumnGridListCell.java       |   98 +
 .../report/base/grid/DRColumnTitleGroup.java  |  291 ++
 .../report/base/style/DRBaseStyle.java        |  316 ++
 .../report/base/style/DRBorder.java           |  118 +
 .../report/base/style/DRConditionalStyle.java |   51 +
 .../report/base/style/DRFont.java             |  215 +
 .../report/base/style/DRPadding.java          |  130 +
 .../report/base/style/DRParagraph.java        |  188 +
 .../report/base/style/DRPen.java              |  104 +
 .../report/base/style/DRSimpleStyle.java      |   32 +
 .../report/base/style/DRStyle.java            |  104 +
 .../report/base/style/DRTabStop.java          |   65 +
 .../report/base/style/DRTemplateStyle.java    |   49 +
 .../report/builder/AbstractBuilder.java       |   72 +
 .../report/builder/DatasetBuilder.java        |  292 ++
 .../report/builder/DynamicReports.java        |  549 +++
 .../report/builder/FieldBuilder.java          |   80 +
 .../report/builder/HyperLinkBuilder.java      |  228 ++
 .../report/builder/MarginBuilder.java         |  100 +
 .../report/builder/ParameterBuilder.java      |   60 +
 .../report/builder/QueryBuilder.java          |   50 +
 .../report/builder/ReportBuilder.java         | 2198 ++++++++++
 .../report/builder/ReportTemplateBuilder.java | 1910 +++++++++
 .../report/builder/SortBuilder.java           |   89 +
 .../dynamicreports/report/builder/Units.java  |   64 +
 .../report/builder/VariableBuilder.java       |  160 +
 .../builder/column/BooleanColumnBuilder.java  |  248 ++
 .../report/builder/column/ColumnBuilder.java  |  269 ++
 .../report/builder/column/ColumnBuilders.java |  380 ++
 .../report/builder/column/Columns.java        |  408 ++
 .../column/ComponentColumnBuilder.java        |  135 +
 .../column/PercentageColumnBuilder.java       |  133 +
 .../builder/column/TextColumnBuilder.java     |  199 +
 .../builder/column/ValueColumnBuilder.java    |  454 +++
 .../component/AbstractFormatFieldBuilder.java |   95 +
 .../component/BooleanFieldBuilder.java        |  177 +
 .../builder/component/BreakBuilder.java       |   50 +
 .../builder/component/ComponentBuilder.java   |  162 +
 .../builder/component/ComponentBuilders.java  |  641 +++
 .../report/builder/component/Components.java  |  668 +++
 .../builder/component/CurrentDateBuilder.java |   59 +
 .../component/DimensionComponentBuilder.java  |  278 ++
 .../builder/component/EllipseBuilder.java     |   54 +
 .../builder/component/FillerBuilder.java      |   38 +
 .../component/GenericElementBuilder.java      |   80 +
 .../component/HorizontalFlowListBuilder.java  |   42 +
 .../component/HorizontalListBuilder.java      |  257 ++
 .../component/HorizontalListCellBuilder.java  |  126 +
 .../component/HyperLinkComponentBuilder.java  |   92 +
 .../builder/component/ImageBuilder.java       |  168 +
 .../report/builder/component/LineBuilder.java |   66 +
 .../report/builder/component/MapBuilder.java  |  106 +
 .../component/MultiPageListBuilder.java       |   90 +
 .../builder/component/PageNumberBuilder.java  |   48 +
 .../builder/component/PageXofYBuilder.java    |  131 +
 .../builder/component/PageXslashYBuilder.java |  131 +
 .../builder/component/RectangleBuilder.java   |   65 +
 .../builder/component/SubreportBuilder.java   |  164 +
 .../builder/component/TextFieldBuilder.java   |  352 ++
 .../builder/component/TotalPagesBuilder.java  |   48 +
 .../component/VerticalListBuilder.java        |  133 +
 .../component/VerticalListCellBuilder.java    |  126 +
 .../builder/component/XyListBuilder.java      |  101 +
 .../builder/component/XyListCellBuilder.java  |   69 +
 .../AbstractBetweenValueExpression.java       |   81 +
 .../condition/AbstractValueExpression.java    |   75 +
 .../condition/AbstractValuesExpression.java   |   75 +
 .../condition/BetweenValueExpression.java     |   48 +
 .../builder/condition/ConditionBuilders.java  |  147 +
 .../report/builder/condition/Conditions.java  |  147 +
 .../builder/condition/EqualExpression.java    |   70 +
 .../condition/EqualValueExpression.java       |   52 +
 .../GreaterOrEqualsValueExpression.java       |   47 +
 .../condition/GreaterValueExpression.java     |   47 +
 .../condition/NotBetweenValueExpression.java  |   48 +
 .../SmallerOrEqualsValueExpression.java       |   47 +
 .../condition/SmallerValueExpression.java     |   47 +
 .../builder/condition/UnEqualExpression.java  |   70 +
 .../condition/UnEqualValueExpression.java     |   52 +
 .../AbstractCrosstabGroupBuilder.java         |  423 ++
 .../builder/crosstab/CrosstabBuilder.java     |  471 +++
 .../builder/crosstab/CrosstabBuilders.java    |  313 ++
 .../crosstab/CrosstabColumnGroupBuilder.java  |   83 +
 .../crosstab/CrosstabMeasureBuilder.java      |  373 ++
 .../crosstab/CrosstabRowGroupBuilder.java     |   83 +
 .../crosstab/CrosstabVariableBuilder.java     |   85 +
 .../report/builder/crosstab/Crosstabs.java    |  323 ++
 .../builder/datatype/BigDecimalType.java      |   52 +
 .../builder/datatype/BigIntegerType.java      |   52 +
 .../report/builder/datatype/BooleanType.java  |   54 +
 .../report/builder/datatype/ByteType.java     |   50 +
 .../builder/datatype/CharacterType.java       |   58 +
 .../builder/datatype/DataTypeBuilders.java    |  278 ++
 .../report/builder/datatype/DataTypes.java    |  389 ++
 .../report/builder/datatype/DateDayType.java  |   44 +
 .../builder/datatype/DateMonthType.java       |   44 +
 .../report/builder/datatype/DateType.java     |   73 +
 .../datatype/DateYearToFractionType.java      |   44 +
 .../builder/datatype/DateYearToHourType.java  |   44 +
 .../datatype/DateYearToMinuteType.java        |   44 +
 .../builder/datatype/DateYearToMonthType.java |   44 +
 .../datatype/DateYearToSecondType.java        |   44 +
 .../report/builder/datatype/DateYearType.java |   44 +
 .../report/builder/datatype/DoubleType.java   |   50 +
 .../report/builder/datatype/FloatType.java    |   50 +
 .../report/builder/datatype/IntegerType.java  |   50 +
 .../report/builder/datatype/ListType.java     |   77 +
 .../report/builder/datatype/LongType.java     |   50 +
 .../report/builder/datatype/NumberType.java   |   75 +
 .../builder/datatype/PercentageType.java      |   44 +
 .../report/builder/datatype/ShortType.java    |   50 +
 .../report/builder/datatype/StringType.java   |   54 +
 .../datatype/TimeHourToFractionType.java      |   44 +
 .../datatype/TimeHourToMinuteType.java        |   44 +
 .../datatype/TimeHourToSecondType.java        |   44 +
 .../expression/AbstractComplexExpression.java |  149 +
 .../AbstractSubDatasourceExpression.java      |   87 +
 .../builder/expression/AddExpression.java     |   49 +
 .../BeanArraySubDatasourceExpression.java     |   57 +
 ...BeanCollectionSubDatasourceExpression.java |   59 +
 .../expression/CalculationExpression.java     |   76 +
 .../expression/ColumnNumberExpression.java    |   38 +
 .../expression/ColumnRowNumberExpression.java |   38 +
 .../expression/CrosstabValueExpression.java   |   74 +
 .../expression/DataSourceExpression.java      |   66 +
 .../builder/expression/DivideExpression.java  |   53 +
 .../expression/ExpressionBuilders.java        |  494 +++
 .../builder/expression/Expressions.java       |  512 +++
 .../expression/GroupRowNumberExpression.java  |   49 +
 .../builder/expression/JasperExpression.java  |   69 +
 .../MapArraySubDatasourceExpression.java      |   57 +
 .../MapCollectionSubDatasourceExpression.java |   60 +
 .../builder/expression/MessageExpression.java |   61 +
 .../expression/MultiplyExpression.java        |   49 +
 .../builder/expression/OrderByExpression.java |   50 +
 .../expression/PageNumberExpression.java      |   39 +
 .../expression/PageRowNumberExpression.java   |   38 +
 .../expression/ParameterExpression.java       |   79 +
 .../expression/PercentageExpression.java      |   51 +
 .../expression/PrintInEvenRowExpression.java  |   38 +
 .../PrintInFirstPageExpression.java           |   38 +
 .../expression/PrintInOddRowExpression.java   |   38 +
 .../PrintNotInFirstPageExpression.java        |   38 +
 ...tWhenGroupHasMoreThanOneRowExpression.java |   49 +
 .../expression/PropertyExpression.java        |   79 +
 .../expression/ReportRowNumberExpression.java |   38 +
 .../expression/SubtractExpression.java        |   49 +
 .../expression/SystemMessageExpression.java   |   51 +
 .../builder/expression/ValueExpression.java   |   73 +
 .../grid/ColumnGridComponentBuilder.java      |   36 +
 .../builder/grid/ColumnTitleGroupBuilder.java |  325 ++
 .../report/builder/grid/GridBuilders.java     |  172 +
 .../report/builder/grid/Grids.java            |  176 +
 .../grid/HorizontalColumnGridListBuilder.java |  136 +
 .../HorizontalColumnGridListCellBuilder.java  |  126 +
 .../HorizontalFlowColumnGridListBuilder.java  |   42 +
 .../grid/VerticalColumnGridListBuilder.java   |   91 +
 .../VerticalColumnGridListCellBuilder.java    |  126 +
 .../builder/group/ColumnGroupBuilder.java     |   91 +
 .../builder/group/CustomGroupBuilder.java     |  101 +
 .../report/builder/group/GroupBuilder.java    |  533 +++
 .../report/builder/group/GroupBuilders.java   |  121 +
 .../report/builder/group/Groups.java          |  122 +
 .../builder/style/BaseStyleBuilder.java       |  706 ++++
 .../report/builder/style/BorderBuilder.java   |  117 +
 .../style/ConditionalStyleBuilder.java        |   41 +
 .../report/builder/style/FontBuilder.java     |  208 +
 .../report/builder/style/PaddingBuilder.java  |  101 +
 .../report/builder/style/PenBuilder.java      |   94 +
 .../builder/style/ReportStyleBuilder.java     |   45 +
 .../builder/style/SimpleStyleBuilder.java     |   38 +
 .../report/builder/style/StyleBuilder.java    |   99 +
 .../report/builder/style/StyleBuilders.java   |  361 ++
 .../report/builder/style/Styles.java          |  364 ++
 .../builder/style/TemplateStyleBuilder.java   |   48 +
 .../builder/style/TemplateStylesBuilder.java  |  146 +
 .../subtotal/AggregationSubtotalBuilder.java  |  140 +
 .../builder/subtotal/BaseSubtotalBuilder.java |  397 ++
 .../subtotal/CustomSubtotalBuilder.java       |   50 +
 .../subtotal/PercentageSubtotalBuilder.java   |  150 +
 .../builder/subtotal/SubtotalBuilder.java     |   40 +
 .../builder/subtotal/SubtotalBuilders.java    |  230 ++
 .../report/builder/subtotal/Subtotals.java    |  239 ++
 .../TableOfContentsCustomizer.java            |  316 ++
 .../TableOfContentsCustomizerBuilder.java     |  127 +
 .../TableOfContentsHeadingBuilder.java        |  109 +
 .../component/CustomComponentTransform.java   |   66 +
 .../report/component/CustomComponents.java    |   48 +
 .../report/component/DRICustomComponent.java  |   30 +
 .../component/DRIDesignCustomComponent.java   |   30 +
 .../report/constant/AxisPosition.java         |   28 +
 .../report/constant/BooleanComponentType.java |   55 +
 .../report/constant/BreakType.java            |   28 +
 .../report/constant/Calculation.java          |   28 +
 .../constant/ComponentDimensionType.java      |   28 +
 .../constant/ComponentPositionType.java       |   28 +
 .../report/constant/Constants.java            |   36 +
 .../constant/CrosstabPercentageType.java      |   28 +
 .../constant/CrosstabTotalPosition.java       |   28 +
 .../report/constant/Evaluation.java           |   54 +
 .../report/constant/FontName.java             |   39 +
 .../report/constant/GroupFooterPosition.java  |   28 +
 .../report/constant/GroupHeaderLayout.java    |   28 +
 .../report/constant/HorizontalAlignment.java  |   29 +
 .../HorizontalCellComponentAlignment.java     |   86 +
 .../constant/HorizontalImageAlignment.java    |   28 +
 .../constant/HorizontalTextAlignment.java     |   28 +
 .../report/constant/HyperLinkTarget.java      |   28 +
 .../report/constant/HyperLinkType.java        |   28 +
 .../report/constant/ImageAnchorType.java      |   28 +
 .../report/constant/ImageScale.java           |   55 +
 .../report/constant/Language.java             |   39 +
 .../report/constant/LineDirection.java        |   28 +
 .../report/constant/LineSpacing.java          |   28 +
 .../report/constant/LineStyle.java            |   40 +
 .../report/constant/ListType.java             |   28 +
 .../report/constant/Markup.java               |   28 +
 .../report/constant/MeterShape.java           |   28 +
 .../report/constant/OrderType.java            |   28 +
 .../report/constant/Orientation.java          |   28 +
 .../report/constant/PageOrientation.java      |   36 +
 .../report/constant/PageType.java             |   57 +
 .../report/constant/PdfEncoding.java          |  111 +
 .../report/constant/PdfPrintScaling.java      |   28 +
 .../report/constant/PdfaConformance.java      |   28 +
 .../report/constant/PercentageTotalType.java  |   28 +
 .../report/constant/Position.java             |   28 +
 .../constant/QrCodeErrorCorrectionLevel.java  |   28 +
 .../report/constant/QueryLanguage.java        |   51 +
 .../report/constant/RectangleAnchor.java      |   28 +
 .../report/constant/Rotation.java             |   40 +
 .../report/constant/RunDirection.java         |   28 +
 .../report/constant/ScaleType.java            |   28 +
 .../report/constant/SpiderRotation.java       |   28 +
 .../report/constant/SplitType.java            |   37 +
 .../report/constant/StretchType.java          |   34 +
 .../report/constant/SubtotalPosition.java     |   28 +
 .../report/constant/SystemExpression.java     |   28 +
 .../report/constant/TabStopAlignment.java     |   28 +
 .../constant/TableOfContentsPosition.java     |   28 +
 .../report/constant/TableOrder.java           |   28 +
 .../report/constant/TextAdjust.java           |   27 +
 .../report/constant/TimePeriod.java           |   28 +
 .../report/constant/ValueLocation.java        |   28 +
 .../report/constant/VerticalAlignment.java    |   29 +
 .../VerticalCellComponentAlignment.java       |   82 +
 .../constant/VerticalImageAlignment.java      |   28 +
 .../constant/VerticalTextAlignment.java       |   28 +
 .../report/constant/WhenNoDataType.java       |   40 +
 .../constant/WhenResourceMissingType.java     |   46 +
 .../report/datasource/DRDataSource.java       |   93 +
 .../report/defaults/Default.java              | 2056 ++++++++++
 .../report/defaults/DefaultBinder.java        |  119 +
 .../report/defaults/Defaults.java             |   87 +
 .../report/definition/DRIBand.java            |   54 +
 .../report/definition/DRICrosstabValue.java   |   28 +
 .../report/definition/DRICustomValues.java    |   75 +
 .../report/definition/DRIDataset.java         |   82 +
 .../report/definition/DRIField.java           |   44 +
 .../report/definition/DRIGroup.java           |  189 +
 .../report/definition/DRIHyperLink.java       |   73 +
 .../report/definition/DRIMargin.java          |   57 +
 .../report/definition/DRIPage.java            |   80 +
 .../report/definition/DRIParameter.java       |   47 +
 .../report/definition/DRIQuery.java           |   43 +
 .../report/definition/DRIReport.java          |  474 +++
 .../report/definition/DRIReportTemplate.java  |  867 ++++
 .../report/definition/DRIScriptlet.java       |  106 +
 .../report/definition/DRISort.java            |   46 +
 .../report/definition/DRISubtotal.java        |   98 +
 .../DRITableOfContentsCustomizer.java         |   74 +
 .../definition/DRITableOfContentsHeading.java |   53 +
 .../report/definition/DRITemplateDesign.java  |  233 ++
 .../report/definition/DRIValue.java           |   34 +
 .../report/definition/DRIVariable.java        |   66 +
 .../report/definition/ReportParameters.java   |  182 +
 .../definition/column/DRIBooleanColumn.java   |   32 +
 .../report/definition/column/DRIColumn.java   |  109 +
 .../definition/column/DRIValueColumn.java     |   38 +
 .../definition/component/DRIBooleanField.java |   81 +
 .../report/definition/component/DRIBreak.java |   37 +
 .../definition/component/DRIComponent.java    |   70 +
 .../definition/component/DRICurrentDate.java  |   34 +
 .../component/DRIDimensionComponent.java      |   95 +
 .../definition/component/DRIEllipse.java      |   37 +
 .../definition/component/DRIFiller.java       |   27 +
 .../definition/component/DRIFormatField.java  |   44 +
 .../component/DRIGenericElement.java          |   53 +
 .../component/DRIHyperLinkComponent.java      |   51 +
 .../report/definition/component/DRIImage.java |   66 +
 .../report/definition/component/DRILine.java  |   45 +
 .../report/definition/component/DRIList.java  |   59 +
 .../definition/component/DRIListCell.java     |   53 +
 .../report/definition/component/DRIMap.java   |   51 +
 .../component/DRIMultiPageList.java           |   46 +
 .../definition/component/DRIPageNumber.java   |   28 +
 .../definition/component/DRIPageXofY.java     |   58 +
 .../definition/component/DRIRectangle.java    |   44 +
 .../definition/component/DRISubreport.java    |   67 +
 .../definition/component/DRITextField.java    |  136 +
 .../definition/component/DRITotalPages.java   |   28 +
 .../definition/component/DRIXyList.java       |   37 +
 .../definition/component/DRIXyListCell.java   |   50 +
 .../definition/crosstab/DRICrosstab.java      |  195 +
 .../crosstab/DRICrosstabCellContent.java      |   46 +
 .../crosstab/DRICrosstabCellStyle.java        |   52 +
 .../crosstab/DRICrosstabColumnGroup.java      |   41 +
 .../crosstab/DRICrosstabDataset.java          |   45 +
 .../definition/crosstab/DRICrosstabGroup.java |  188 +
 .../crosstab/DRICrosstabMeasure.java          |  131 +
 .../crosstab/DRICrosstabRowGroup.java         |   41 +
 .../crosstab/DRICrosstabVariable.java         |   58 +
 .../definition/datatype/DRIDataType.java      |  121 +
 .../expression/DRIComplexExpression.java      |   48 +
 .../definition/expression/DRIExpression.java  |   44 +
 .../expression/DRIJasperExpression.java       |   34 +
 .../expression/DRIParameterExpression.java    |   43 +
 .../expression/DRIPropertyExpression.java     |   43 +
 .../expression/DRISimpleExpression.java       |   38 +
 .../expression/DRISystemExpression.java       |   27 +
 .../expression/DRIValueFormatter.java         |   48 +
 .../report/definition/grid/DRIColumnGrid.java |   36 +
 .../grid/DRIColumnGridComponent.java          |   30 +
 .../definition/grid/DRIColumnGridList.java    |   52 +
 .../grid/DRIColumnGridListCell.java           |   53 +
 .../definition/grid/DRIColumnTitleGroup.java  |  121 +
 .../report/definition/style/DRIBaseStyle.java |  151 +
 .../report/definition/style/DRIBorder.java    |   57 +
 .../definition/style/DRIConditionalStyle.java |   36 +
 .../report/definition/style/DRIFont.java      |   92 +
 .../report/definition/style/DRIPadding.java   |   57 +
 .../report/definition/style/DRIParagraph.java |   95 +
 .../report/definition/style/DRIPen.java       |   53 +
 .../definition/style/DRIReportStyle.java      |   30 +
 .../definition/style/DRISimpleStyle.java      |   28 +
 .../report/definition/style/DRIStyle.java     |   50 +
 .../report/definition/style/DRITabStop.java   |   45 +
 .../definition/style/DRITemplateStyle.java    |   35 +
 .../report/exception/DRException.java         |   58 +
 .../report/exception/DRReportException.java   |   58 +
 .../dynamicreports-messages.properties        |   11 +
 .../src/main/resources/fonts.xml              |   23 +
 .../jasperreports_extension.properties        |    2 +
 .../report/defaults/schema/dynamicreports.xjb |   14 +
 .../report/defaults/schema/dynamicreports.xsd |   61 +
 .../report/images/ball_green.svg              |  161 +
 .../dynamicreports/report/images/ball_red.svg |  163 +
 .../report/images/boolean1_false.svg          |   87 +
 .../report/images/boolean1_true.svg           |  209 +
 .../report/images/boolean2_false.svg          |  161 +
 .../report/images/boolean2_true.svg           |   80 +
 .../report/images/boolean3_false.svg          |  146 +
 .../report/images/boolean3_true.svg           |  123 +
 .../report/images/boolean4_false.svg          |  184 +
 .../report/images/checkbox1_true.svg          |   65 +
 .../report/images/checkbox2_true.svg          |   66 +
 .../report/images/checkbox_false.svg          |   61 +
 667 files changed, 92596 insertions(+)
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignBand.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignDataset.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignHyperLink.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignMargin.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignPage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignParameter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignQuery.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignReport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignSort.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTableOfContentsHeading.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTemplateDesign.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignVariable.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignBreak.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignEllipse.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignFiller.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignGenericElement.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignImage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignLine.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignListCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignMap.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignRectangle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignSubreport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignTextField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstab.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignComplexExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignJasperExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignParameterExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignPropertyExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSimpleExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSystemExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignValueFormatter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBaseStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBorder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignConditionalStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignFont.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPadding.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignParagraph.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPen.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignTabStop.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ComponentGroupType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/DefaultStyleType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/EvaluationTime.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ResetType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignBand.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignDataset.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignHyperLink.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignMargin.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignPage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignParameter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignQuery.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignReport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignSort.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTemplateDesign.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignVariable.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignBreak.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignEllipse.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignFiller.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignGenericElement.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignImage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignLine.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignMap.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignRectangle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignSubreport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignTextField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBaseStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBorder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignFont.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPadding.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignParagraph.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPen.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignTabStop.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/exception/DRDesignReportException.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/AbstractExpressionTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandComponentsTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGrid.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGridTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentPosition.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ConstantTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CrosstabTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CustomBatikRenderer.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetExpressionTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DesignTransformAccessor.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/GroupTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/MainDatasetExpressionTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/PageTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ReportTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleResolver.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/SubtotalTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TableOfContentsTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TemplateTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanImageExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCount.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CurrentDateExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageNumberExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/SerieValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/CustomScriptlet.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/DefaultJasperScriptletManager.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperCustomValues.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportDesign.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportParameters.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptlet.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptletManager.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperTemplateStyleLoader.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/StartPageNumberScriptlet.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperCsvExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperDocxExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperHtmlExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperImageExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdsExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdtExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPdfExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPptxExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperRtfExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperTextExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsxExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXmlExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ImageType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/JasperProperty.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfPermission.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfVersion.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/SizeUnit.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ValueType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/JasperReportHandler.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperICsvExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIDocxExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExcelExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIImageExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdsExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdtExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPdfExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPptxExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIRtfExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperITextExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/exception/JasperDesignException.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/AbstractExpressionTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/BandTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ComponentTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ConstantTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/CrosstabTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetExpressionTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/GroupTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransformAccessor.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ReportTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/StyleTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/ReportUtils.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractScriptlet.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractTemplateDesign.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRBand.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRDataset.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRHyperLink.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRMargin.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRPage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRParameter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRQuery.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReportTemplate.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSort.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSubtotal.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRTableOfContentsHeading.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRVariable.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRBooleanColumn.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRColumn.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRValueColumn.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBooleanField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBreak.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRCurrentDate.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRDimensionComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DREllipse.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFiller.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFormatField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRGenericElement.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRHyperLinkComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRImage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRLine.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRListCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMap.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMultiPageList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageNumber.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageXofY.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRRectangle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRSubreport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTextField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTotalPages.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyListCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstab.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabDataset.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabVariable.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/AbstractDataType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/DRDataType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSimpleExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSystemExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractValueFormatter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGrid.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridListCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnTitleGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBaseStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBorder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRConditionalStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRFont.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPadding.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRParagraph.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPen.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRSimpleStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTabStop.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTemplateStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/AbstractBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DatasetBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DynamicReports.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/FieldBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/HyperLinkBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/MarginBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ParameterBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/QueryBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportTemplateBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/SortBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/Units.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/VariableBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/BooleanColumnBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/Columns.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ComponentColumnBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/PercentageColumnBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/TextColumnBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ValueColumnBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BooleanFieldBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BreakBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/Components.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/CurrentDateBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/DimensionComponentBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/EllipseBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/FillerBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/GenericElementBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListCellBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ImageBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/LineBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MapBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MultiPageListBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageNumberBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXofYBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXslashYBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/RectangleBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/SubreportBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TextFieldBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TotalPagesBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListCellBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListCellBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValuesExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/BetweenValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/ConditionBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/Conditions.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/NotBetweenValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/Crosstabs.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigDecimalType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigIntegerType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BooleanType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ByteType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/CharacterType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypeBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypes.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateDayType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateMonthType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToFractionType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToHourType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMinuteType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMonthType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToSecondType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DoubleType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/FloatType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/IntegerType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ListType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/LongType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/NumberType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/PercentageType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ShortType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/StringType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToFractionType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToSecondType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractComplexExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AddExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CalculationExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnNumberExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CrosstabValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DataSourceExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DivideExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ExpressionBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/Expressions.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/GroupRowNumberExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/JasperExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MessageExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MultiplyExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/OrderByExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageNumberExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageRowNumberExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ParameterExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PercentageExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInOddRowExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PropertyExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ReportRowNumberExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SubtractExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SystemMessageExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ValueExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/GridBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/Grids.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/ColumnGroupBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/CustomGroupBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/Groups.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BaseStyleBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BorderBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ConditionalStyleBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/FontBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PaddingBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PenBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ReportStyleBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/SimpleStyleBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/Styles.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStyleBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStylesBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilders.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/Subtotals.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponentTransform.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponents.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRICustomComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRIDesignCustomComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/AxisPosition.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BreakType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Calculation.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentDimensionType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentPositionType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Constants.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabPercentageType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabTotalPosition.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Evaluation.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/FontName.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupFooterPosition.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupHeaderLayout.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalCellComponentAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalImageAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalTextAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkTarget.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageAnchorType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageScale.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Language.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineDirection.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineSpacing.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ListType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Markup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/MeterShape.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/OrderType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Orientation.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageOrientation.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfEncoding.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfPrintScaling.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfaConformance.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PercentageTotalType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Position.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QueryLanguage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RectangleAnchor.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Rotation.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RunDirection.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ScaleType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SpiderRotation.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SplitType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/StretchType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SubtotalPosition.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SystemExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TabStopAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOfContentsPosition.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOrder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TextAdjust.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TimePeriod.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ValueLocation.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalCellComponentAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalImageAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalTextAlignment.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenNoDataType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenResourceMissingType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/datasource/DRDataSource.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Default.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/DefaultBinder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Defaults.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIBand.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICrosstabValue.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICustomValues.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIDataset.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIHyperLink.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIMargin.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIPage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIParameter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIQuery.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReportTemplate.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIScriptlet.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISort.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISubtotal.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsCustomizer.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsHeading.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITemplateDesign.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIValue.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIVariable.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/ReportParameters.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIBooleanColumn.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIColumn.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIValueColumn.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBooleanField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBreak.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRICurrentDate.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIDimensionComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIEllipse.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFiller.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFormatField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIGenericElement.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIHyperLinkComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIImage.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRILine.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIListCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMap.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMultiPageList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageNumber.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageXofY.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIRectangle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRISubreport.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITextField.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITotalPages.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyListCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstab.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/datatype/DRIDataType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIComplexExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIJasperExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIParameterExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIPropertyExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISimpleExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISystemExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIValueFormatter.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGrid.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridComponent.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridList.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridListCell.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBaseStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBorder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIConditionalStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIFont.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPadding.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIParagraph.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPen.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIReportStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRISimpleStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITabStop.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITemplateStyle.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRException.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRReportException.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/dynamicreports-messages.properties
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/fonts.xml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/jasperreports_extension.properties
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xjb
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xsd
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_green.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_red.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_false.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_true.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_false.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_true.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_false.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_true.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean4_false.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox1_true.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox2_true.svg
 create mode 100644 dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox_false.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29..b47c85d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,17 @@
+# 1.0.0
+
+Initial release of the fork
+
+## Differences to [dynamicreports/dynamicreports-core](https://github.com/dynamicreports/dynamicreports/tree/f7d73961462f3f13cbc27c91df90d4cc3ccc669e/dynamicreports-core)
+* Changed from ``javax`` to ``jakarta``
+  * Added ``jakarta.xml.bind-api``
+  * Replaced ``maven-jaxb2-plugin`` with ``jaxb40-maven-plugin``
+* Dependency shedding
+  * Removed barcode subsystem
+    * Barbecue
+    * ``net.sf.barcode4j:barcode4j``
+    * ``com.google.zxing:core``
+  * Removed charts subsystem
+  * Removed ``org.apache.commons:commons-text`` as it was only used on a single unused line of code
+* Update dependencies to lastest versions
+* Fixed compile errors
diff --git a/dynamicreports-core-for-grid-exporter/pom.xml b/dynamicreports-core-for-grid-exporter/pom.xml
index e08dc36..cf697e2 100644
--- a/dynamicreports-core-for-grid-exporter/pom.xml
+++ b/dynamicreports-core-for-grid-exporter/pom.xml
@@ -84,6 +84,25 @@
 		</repository>
 	</distributionManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.sf.jasperreports</groupId>
+			<artifactId>jasperreports</artifactId>
+			<version>6.20.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.12.0</version>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -158,6 +177,54 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<!-- Original plugin can't handle Jakarta - as of June 2023 -->
+			<!-- https://github.com/highsource/maven-jaxb2-plugin/issues/253 -->
+			<!-- Switched to fork -->
+			<plugin>
+				<groupId>com.helger.maven</groupId>
+				<artifactId>jaxb40-maven-plugin</artifactId>
+				<version>0.16.1</version>
+				<configuration>
+					<schemaIncludes>
+						<schemaInclude>**/dynamicreports.xsd</schemaInclude>
+					</schemaIncludes>
+					<bindingIncludes>
+						<bindingInclude>**/dynamicreports.xjb</bindingInclude>
+					</bindingIncludes>
+					<removeOldOutput>true</removeOldOutput>
+				</configuration>
+				<executions>
+					<execution>
+						<id>jaxb</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.4.0</version>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>${basedir}/target/generated-sources/xjc</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 		</plugins>
 	</build>
 	<profiles>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignBand.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignBand.java
new file mode 100644
index 0000000..049dd10
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignBand.java
@@ -0,0 +1,151 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.definition.DRIDesignBand;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.SplitType;
+
+/**
+ * <p>DRDesignBand class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignBand implements DRIDesignBand {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private SplitType splitType;
+    private DRDesignList list;
+    private DRDesignComponent bandComponent;
+    private Integer height;
+    private DRIDesignExpression printWhenExpression;
+
+    /**
+     * <p>Constructor for DRDesignBand.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public DRDesignBand(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public SplitType getSplitType() {
+        return splitType;
+    }
+
+    /**
+     * <p>Setter for the field <code>splitType</code>.</p>
+     *
+     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public void setSplitType(SplitType splitType) {
+        this.splitType = splitType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignList getList() {
+        return list;
+    }
+
+    /**
+     * <p>Setter for the field <code>list</code>.</p>
+     *
+     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    public void setList(DRDesignList list) {
+        this.list = list;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void addComponent(DRDesignComponent component) {
+        list.addComponent(component);
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param index     a int.
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void addComponent(int index, DRDesignComponent component) {
+        list.addComponent(index, component);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignComponent getBandComponent() {
+        return bandComponent;
+    }
+
+    /**
+     * <p>Setter for the field <code>bandComponent</code>.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void setBandComponent(DRDesignComponent component) {
+        this.bandComponent = component;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getHeight() {
+        return height;
+    }
+
+    /**
+     * <p>Setter for the field <code>height</code>.</p>
+     *
+     * @param height a {@link java.lang.Integer} object.
+     */
+    public void setHeight(Integer height) {
+        this.height = height;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getPrintWhenExpression() {
+        return printWhenExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>printWhenExpression</code>.</p>
+     *
+     * @param printWhenExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setPrintWhenExpression(DRIDesignExpression printWhenExpression) {
+        this.printWhenExpression = printWhenExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignDataset.java
new file mode 100644
index 0000000..ffa2968
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignDataset.java
@@ -0,0 +1,177 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.DRIDesignField;
+import net.sf.dynamicreports.design.definition.DRIDesignSort;
+import net.sf.dynamicreports.design.definition.DRIDesignVariable;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.design.transformation.DatasetExpressionTransform;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+
+import java.util.Collection;
+
+/**
+ * <p>DRDesignDataset class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignDataset implements DRIDesignDataset {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DatasetExpressionTransform datasetExpressionTransform;
+    private DRDesignQuery query;
+    private DRIDesignExpression connectionExpression;
+    private DRIDesignExpression dataSourceExpression;
+    private DRIDesignExpression filterExpression;
+
+    /**
+     * <p>Constructor for DRDesignDataset.</p>
+     *
+     * @param datasetExpressionTransform a {@link net.sf.dynamicreports.design.transformation.DatasetExpressionTransform} object.
+     */
+    public DRDesignDataset(DatasetExpressionTransform datasetExpressionTransform) {
+        this.datasetExpressionTransform = datasetExpressionTransform;
+        this.name = ReportUtils.generateUniqueName("dataset");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Getter for the field <code>datasetExpressionTransform</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.DatasetExpressionTransform} object.
+     */
+    public DatasetExpressionTransform getDatasetExpressionTransform() {
+        return datasetExpressionTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignField> getFields() {
+        return datasetExpressionTransform.getFields();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignVariable> getVariables() {
+        return datasetExpressionTransform.getVariables();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignSystemExpression> getSystemExpressions() {
+        return datasetExpressionTransform.getSystemExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignJasperExpression> getJasperExpressions() {
+        return datasetExpressionTransform.getJasperExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignSimpleExpression> getSimpleExpressions() {
+        return datasetExpressionTransform.getSimpleExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignComplexExpression> getComplexExpressions() {
+        return datasetExpressionTransform.getComplexExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignSort> getSorts() {
+        return datasetExpressionTransform.getSorts();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignQuery getQuery() {
+        return query;
+    }
+
+    /**
+     * <p>Setter for the field <code>query</code>.</p>
+     *
+     * @param query a {@link net.sf.dynamicreports.design.base.DRDesignQuery} object.
+     */
+    public void setQuery(DRDesignQuery query) {
+        this.query = query;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getConnectionExpression() {
+        return connectionExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>connectionExpression</code>.</p>
+     *
+     * @param connectionExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setConnectionExpression(DRIDesignExpression connectionExpression) {
+        this.connectionExpression = connectionExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getDataSourceExpression() {
+        return dataSourceExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataSourceExpression</code>.</p>
+     *
+     * @param dataSourceExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setDataSourceExpression(DRIDesignExpression dataSourceExpression) {
+        this.dataSourceExpression = dataSourceExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getFilterExpression() {
+        return filterExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>filterExpression</code>.</p>
+     *
+     * @param filterExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setFilterExpression(DRIDesignExpression filterExpression) {
+        this.filterExpression = filterExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignField.java
new file mode 100644
index 0000000..7d24b9e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignField.java
@@ -0,0 +1,103 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignField;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignField class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignField implements DRIDesignField {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private Class<?> valueClass;
+    private boolean external;
+    private String description;
+
+    /**
+     * <p>Constructor for DRDesignField.</p>
+     */
+    public DRDesignField() {
+        this.external = false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return valueClass;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueClass</code>.</p>
+     *
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    public void setValueClass(Class<?> valueClass) {
+        this.valueClass = valueClass;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isExternal() {
+        return external;
+    }
+
+    /**
+     * <p>Setter for the field <code>external</code>.</p>
+     *
+     * @param external a boolean.
+     */
+    public void setExternal(boolean external) {
+        this.external = external;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * <p>Setter for the field <code>description</code>.</p>
+     *
+     * @param description a {@link java.lang.String} object.
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignGroup.java
new file mode 100644
index 0000000..ba46ba9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignGroup.java
@@ -0,0 +1,264 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRDesignGroup class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignGroup implements DRIDesignGroup {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIDesignExpression groupExpression;
+    private List<DRDesignBand> headerBands;
+    private List<DRDesignBand> footerBands;
+    private boolean startInNewPage;
+    private boolean startInNewColumn;
+    private boolean reprintHeaderOnEachPage;
+    private boolean resetPageNumber;
+    private Integer minHeightToStartNewPage;
+    private GroupFooterPosition footerPosition;
+    private boolean keepTogether;
+    private boolean headerWithSubtotal;
+
+    /**
+     * <p>Constructor for DRDesignGroup.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public DRDesignGroup(String name) {
+        this.name = name;
+        init();
+    }
+
+    private void init() {
+        headerBands = new ArrayList<DRDesignBand>();
+        footerBands = new ArrayList<DRDesignBand>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getGroupExpression() {
+        return groupExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>groupExpression</code>.</p>
+     *
+     * @param groupExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setGroupExpression(DRIDesignExpression groupExpression) {
+        this.groupExpression = groupExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRDesignBand> getHeaderBands() {
+        return headerBands;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerBands</code>.</p>
+     *
+     * @param headerBands a {@link java.util.List} object.
+     */
+    public void setHeaderBands(List<DRDesignBand> headerBands) {
+        this.headerBands = headerBands;
+    }
+
+    /**
+     * <p>addHeaderBand.</p>
+     *
+     * @param headerBand a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public void addHeaderBand(DRDesignBand headerBand) {
+        this.headerBands.add(headerBand);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRDesignBand> getFooterBands() {
+        return footerBands;
+    }
+
+    /**
+     * <p>Setter for the field <code>footerBands</code>.</p>
+     *
+     * @param footerBands a {@link java.util.List} object.
+     */
+    public void setFooterBands(List<DRDesignBand> footerBands) {
+        this.footerBands = footerBands;
+    }
+
+    /**
+     * <p>addFooterBand.</p>
+     *
+     * @param footerBand a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public void addFooterBand(DRDesignBand footerBand) {
+        this.footerBands.add(footerBand);
+    }
+
+    /**
+     * <p>addFooterBand.</p>
+     *
+     * @param index      a int.
+     * @param footerBand a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public void addFooterBand(int index, DRDesignBand footerBand) {
+        this.footerBands.add(index, footerBand);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isStartInNewPage() {
+        return startInNewPage;
+    }
+
+    /**
+     * <p>Setter for the field <code>startInNewPage</code>.</p>
+     *
+     * @param startInNewPage a boolean.
+     */
+    public void setStartInNewPage(boolean startInNewPage) {
+        this.startInNewPage = startInNewPage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isStartInNewColumn() {
+        return startInNewColumn;
+    }
+
+    /**
+     * <p>Setter for the field <code>startInNewColumn</code>.</p>
+     *
+     * @param startInNewColumn a boolean.
+     */
+    public void setStartInNewColumn(boolean startInNewColumn) {
+        this.startInNewColumn = startInNewColumn;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isReprintHeaderOnEachPage() {
+        return reprintHeaderOnEachPage;
+    }
+
+    /**
+     * <p>Setter for the field <code>reprintHeaderOnEachPage</code>.</p>
+     *
+     * @param reprintHeaderOnEachPage a boolean.
+     */
+    public void setReprintHeaderOnEachPage(boolean reprintHeaderOnEachPage) {
+        this.reprintHeaderOnEachPage = reprintHeaderOnEachPage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isResetPageNumber() {
+        return resetPageNumber;
+    }
+
+    /**
+     * <p>Setter for the field <code>resetPageNumber</code>.</p>
+     *
+     * @param resetPageNumber a boolean.
+     */
+    public void setResetPageNumber(boolean resetPageNumber) {
+        this.resetPageNumber = resetPageNumber;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getMinHeightToStartNewPage() {
+        return minHeightToStartNewPage;
+    }
+
+    /**
+     * <p>Setter for the field <code>minHeightToStartNewPage</code>.</p>
+     *
+     * @param minHeightToStartNewPage a {@link java.lang.Integer} object.
+     */
+    public void setMinHeightToStartNewPage(Integer minHeightToStartNewPage) {
+        this.minHeightToStartNewPage = minHeightToStartNewPage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public GroupFooterPosition getFooterPosition() {
+        return footerPosition;
+    }
+
+    /**
+     * <p>Setter for the field <code>footerPosition</code>.</p>
+     *
+     * @param footerPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     */
+    public void setFooterPosition(GroupFooterPosition footerPosition) {
+        this.footerPosition = footerPosition;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isKeepTogether() {
+        return keepTogether;
+    }
+
+    /**
+     * <p>Setter for the field <code>keepTogether</code>.</p>
+     *
+     * @param keepTogether a boolean.
+     */
+    public void setKeepTogether(boolean keepTogether) {
+        this.keepTogether = keepTogether;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isHeaderWithSubtotal() {
+        return headerWithSubtotal;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerWithSubtotal</code>.</p>
+     *
+     * @param headerWithSubtotal a boolean.
+     */
+    public void setHeaderWithSubtotal(boolean headerWithSubtotal) {
+        this.headerWithSubtotal = headerWithSubtotal;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignHyperLink.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignHyperLink.java
new file mode 100644
index 0000000..a1485cf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignHyperLink.java
@@ -0,0 +1,130 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignHyperLink;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignHyperLink class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignHyperLink implements DRIDesignHyperLink {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIDesignExpression anchorExpression;
+    private DRIDesignExpression pageExpression;
+    private DRIDesignExpression referenceExpression;
+    private DRIDesignExpression tooltipExpression;
+    private String hyperLinkType;
+    private String hyperLinkTarget;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getAnchorExpression() {
+        return anchorExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>anchorExpression</code>.</p>
+     *
+     * @param anchorExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setAnchorExpression(DRIDesignExpression anchorExpression) {
+        this.anchorExpression = anchorExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getPageExpression() {
+        return pageExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageExpression</code>.</p>
+     *
+     * @param pageExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setPageExpression(DRIDesignExpression pageExpression) {
+        this.pageExpression = pageExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getReferenceExpression() {
+        return referenceExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>referenceExpression</code>.</p>
+     *
+     * @param referenceExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setReferenceExpression(DRIDesignExpression referenceExpression) {
+        this.referenceExpression = referenceExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getTooltipExpression() {
+        return tooltipExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>tooltipExpression</code>.</p>
+     *
+     * @param tooltipExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setTooltipExpression(DRIDesignExpression tooltipExpression) {
+        this.tooltipExpression = tooltipExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getType() {
+        return hyperLinkType;
+    }
+
+    /**
+     * <p>setType.</p>
+     *
+     * @param hyperLinkType a {@link java.lang.String} object.
+     */
+    public void setType(String hyperLinkType) {
+        this.hyperLinkType = hyperLinkType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTarget() {
+        return hyperLinkTarget;
+    }
+
+    /**
+     * <p>setTarget.</p>
+     *
+     * @param hyperLinkTarget a {@link java.lang.String} object.
+     */
+    public void setTarget(String hyperLinkTarget) {
+        this.hyperLinkTarget = hyperLinkTarget;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignMargin.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignMargin.java
new file mode 100644
index 0000000..b987582
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignMargin.java
@@ -0,0 +1,96 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignMargin;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignMargin class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignMargin implements DRIDesignMargin {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int top;
+    private int left;
+    private int bottom;
+    private int right;
+
+    /** {@inheritDoc} */
+    @Override
+    public int getTop() {
+        return top;
+    }
+
+    /**
+     * <p>Setter for the field <code>top</code>.</p>
+     *
+     * @param top a int.
+     */
+    public void setTop(int top) {
+        this.top = top;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getLeft() {
+        return left;
+    }
+
+    /**
+     * <p>Setter for the field <code>left</code>.</p>
+     *
+     * @param left a int.
+     */
+    public void setLeft(int left) {
+        this.left = left;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getBottom() {
+        return bottom;
+    }
+
+    /**
+     * <p>Setter for the field <code>bottom</code>.</p>
+     *
+     * @param bottom a int.
+     */
+    public void setBottom(int bottom) {
+        this.bottom = bottom;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getRight() {
+        return right;
+    }
+
+    /**
+     * <p>Setter for the field <code>right</code>.</p>
+     *
+     * @param right a int.
+     */
+    public void setRight(int right) {
+        this.right = right;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignPage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignPage.java
new file mode 100644
index 0000000..7d9f932
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignPage.java
@@ -0,0 +1,145 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignPage;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+
+/**
+ * <p>DRDesignPage class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignPage implements DRIDesignPage {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int width;
+    private int height;
+    private PageOrientation orientation;
+    private DRDesignMargin margin;
+    private int columnsPerPage;
+    private int columnSpace;
+    private int columnWidth;
+
+    /** {@inheritDoc} */
+    @Override
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * <p>Setter for the field <code>width</code>.</p>
+     *
+     * @param width a int.
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * <p>Setter for the field <code>height</code>.</p>
+     *
+     * @param height a int.
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PageOrientation getOrientation() {
+        return orientation;
+    }
+
+    /**
+     * <p>Setter for the field <code>orientation</code>.</p>
+     *
+     * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     */
+    public void setOrientation(PageOrientation orientation) {
+        this.orientation = orientation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignMargin getMargin() {
+        return margin;
+    }
+
+    /**
+     * <p>Setter for the field <code>margin</code>.</p>
+     *
+     * @param margin a {@link net.sf.dynamicreports.design.base.DRDesignMargin} object.
+     */
+    public void setMargin(DRDesignMargin margin) {
+        this.margin = margin;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnsPerPage() {
+        return columnsPerPage;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnsPerPage</code>.</p>
+     *
+     * @param columnsPerPage a int.
+     */
+    public void setColumnsPerPage(int columnsPerPage) {
+        this.columnsPerPage = columnsPerPage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnSpace() {
+        return columnSpace;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnSpace</code>.</p>
+     *
+     * @param columnSpace a int.
+     */
+    public void setColumnSpace(int columnSpace) {
+        this.columnSpace = columnSpace;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnWidth() {
+        return columnWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnWidth</code>.</p>
+     *
+     * @param columnWidth a int.
+     */
+    public void setColumnWidth(int columnWidth) {
+        this.columnWidth = columnWidth;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignParameter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignParameter.java
new file mode 100644
index 0000000..7ec0c46
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignParameter.java
@@ -0,0 +1,96 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignParameter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignParameter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignParameter implements DRIDesignParameter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private Class<?> valueClass;
+    private Object value;
+    private boolean external;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return valueClass;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueClass</code>.</p>
+     *
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    public void setValueClass(Class<?> valueClass) {
+        this.valueClass = valueClass;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object getValue() {
+        return value;
+    }
+
+    /**
+     * <p>Setter for the field <code>value</code>.</p>
+     *
+     * @param value a {@link java.lang.Object} object.
+     */
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isExternal() {
+        return external;
+    }
+
+    /**
+     * <p>Setter for the field <code>external</code>.</p>
+     *
+     * @param external a boolean.
+     */
+    public void setExternal(boolean external) {
+        this.external = external;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignQuery.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignQuery.java
new file mode 100644
index 0000000..87c635a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignQuery.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignQuery;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignQuery class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignQuery implements DRIDesignQuery {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String text;
+    private String language;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * <p>Setter for the field <code>text</code>.</p>
+     *
+     * @param text a {@link java.lang.String} object.
+     */
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getLanguage() {
+        return language;
+    }
+
+    /**
+     * <p>Setter for the field <code>language</code>.</p>
+     *
+     * @param language a {@link java.lang.String} object.
+     */
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignReport.java
new file mode 100644
index 0000000..939bc1e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignReport.java
@@ -0,0 +1,530 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.DRIDesignField;
+import net.sf.dynamicreports.design.definition.DRIDesignParameter;
+import net.sf.dynamicreports.design.definition.DRIDesignReport;
+import net.sf.dynamicreports.design.definition.DRIDesignSort;
+import net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign;
+import net.sf.dynamicreports.design.definition.DRIDesignVariable;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.design.transformation.AbstractExpressionTransform;
+import net.sf.dynamicreports.design.transformation.BandTransform;
+import net.sf.dynamicreports.design.transformation.ColumnGridTransform;
+import net.sf.dynamicreports.design.transformation.ColumnTransform;
+import net.sf.dynamicreports.design.transformation.ComponentTransform;
+import net.sf.dynamicreports.design.transformation.CrosstabTransform;
+import net.sf.dynamicreports.design.transformation.DatasetTransform;
+import net.sf.dynamicreports.design.transformation.DesignTransformAccessor;
+import net.sf.dynamicreports.design.transformation.GroupTransform;
+import net.sf.dynamicreports.design.transformation.MainDatasetExpressionTransform;
+import net.sf.dynamicreports.design.transformation.PageTransform;
+import net.sf.dynamicreports.design.transformation.ReportTransform;
+import net.sf.dynamicreports.design.transformation.StyleTransform;
+import net.sf.dynamicreports.design.transformation.SubtotalTransform;
+import net.sf.dynamicreports.design.transformation.TableOfContentsTransform;
+import net.sf.dynamicreports.design.transformation.TemplateTransform;
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRIDataset;
+import net.sf.dynamicreports.report.definition.DRIReport;
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * <p>DRDesignReport class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignReport implements DesignTransformAccessor, DRIDesignReport {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private final DRIReport report;
+    private final Integer pageWidth;
+    private final Map<String, JasperTocHeading> tocHeadings;
+    private ReportTransform reportTransform;
+    private TemplateTransform templateTransform;
+    private PageTransform pageTransform;
+    private MainDatasetExpressionTransform mainDatasetExpressionTransform;
+    private BandTransform bandTransform;
+    private ComponentTransform componentTransform;
+    private GroupTransform groupTransform;
+    private ColumnGridTransform columnGridTransform;
+    private ColumnTransform columnTransform;
+    private SubtotalTransform subtotalTransform;
+    private StyleTransform styleTransform;
+    private CrosstabTransform crosstabTransform;
+    private DatasetTransform datasetTransform;
+    private TableOfContentsTransform tableOfContentsTransform;
+    private AbstractExpressionTransform expressionTransform;
+
+    /**
+     * <p>Constructor for DRDesignReport.</p>
+     *
+     * @param report a {@link net.sf.dynamicreports.report.definition.DRIReport} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public DRDesignReport(final DRIReport report) throws DRException {
+        this(report, null, null);
+    }
+
+    /**
+     * <p>Constructor for DRDesignReport.</p>
+     *
+     * @param report      a {@link net.sf.dynamicreports.report.definition.DRIReport} object.
+     * @param pageWidth   a {@link java.lang.Integer} object.
+     * @param tocHeadings a {@link java.util.Map} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public DRDesignReport(final DRIReport report, final Integer pageWidth, final Map<String, JasperTocHeading> tocHeadings) throws DRException {
+        this.report = report;
+        this.pageWidth = pageWidth;
+        this.tocHeadings = tocHeadings;
+        this.init();
+        this.transform();
+    }
+
+    private void init() {
+        this.reportTransform = new ReportTransform(this);
+        this.templateTransform = new TemplateTransform(this);
+        this.pageTransform = new PageTransform(this);
+        this.mainDatasetExpressionTransform = new MainDatasetExpressionTransform(this);
+        this.groupTransform = new GroupTransform(this);
+        this.bandTransform = new BandTransform(this);
+        this.componentTransform = new ComponentTransform(this);
+        this.columnGridTransform = new ColumnGridTransform(this);
+        this.columnTransform = new ColumnTransform(this);
+        this.subtotalTransform = new SubtotalTransform(this);
+        this.styleTransform = new StyleTransform(this);
+        this.crosstabTransform = new CrosstabTransform(this);
+        this.datasetTransform = new DatasetTransform(this);
+        this.tableOfContentsTransform = new TableOfContentsTransform(this);
+        this.transformToMainDataset();
+    }
+
+    private void transform() throws DRException {
+        this.reportTransform.transform();
+        this.pageTransform.transform();
+        this.groupTransform.transform();
+        this.mainDatasetExpressionTransform.transform();
+        this.bandTransform.transform();
+        this.columnGridTransform.transform();
+        this.columnTransform.transform();
+        this.groupTransform.transformHeaderAndFooter();
+        this.pageTransform.transformPageWidth();
+        this.subtotalTransform.transform();
+        this.bandTransform.prepareBands();
+        this.styleTransform.transformTemplateStyles();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReport getReport() {
+        return this.report;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageWidth() {
+        return this.pageWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ReportTransform getReportTransform() {
+        return this.reportTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TemplateTransform getTemplateTransform() {
+        return this.templateTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PageTransform getPageTransform() {
+        return this.pageTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void transformToMainDataset() {
+        this.transformToDataset(null);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void transformToDataset(final DRIDataset dataset) {
+        if (dataset != null) {
+            this.expressionTransform = this.datasetTransform.getDatasetExpressionTransform(dataset);
+        } else {
+            this.expressionTransform = this.mainDatasetExpressionTransform;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public AbstractExpressionTransform getExpressionTransform() {
+        return this.expressionTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public BandTransform getBandTransform() {
+        return this.bandTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentTransform getComponentTransform() {
+        return this.componentTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public GroupTransform getGroupTransform() {
+        return this.groupTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ColumnTransform getColumnTransform() {
+        return this.columnTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ColumnGridTransform getColumnGridTransform() {
+        return this.columnGridTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public StyleTransform getStyleTransform() {
+        return this.styleTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CrosstabTransform getCrosstabTransform() {
+        return this.crosstabTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DatasetTransform getDatasetTransform() {
+        return this.datasetTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TableOfContentsTransform getTableOfContentsTransform() {
+        return this.tableOfContentsTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignTemplateDesign getTemplateDesign() {
+        return this.reportTransform.getTemplateDesign();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getReportName() {
+        return this.templateTransform.getReportName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Locale getLocale() {
+        return this.templateTransform.getLocale();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ResourceBundle getResourceBundle() {
+        return this.report.getResourceBundle();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getResourceBundleName() {
+        return this.templateTransform.getResourceBundleName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isIgnorePagination() {
+        return this.templateTransform.isIgnorePagination();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Properties getProperties() {
+        return this.report.getProperties();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignQuery getQuery() {
+        return this.reportTransform.getQuery();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPage getPage() {
+        return this.pageTransform.getPage();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public WhenNoDataType getWhenNoDataType() {
+        return this.templateTransform.getWhenNoDataType(this.getDetailBands().isEmpty(), this.getNoDataBand());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public WhenResourceMissingType getWhenResourceMissingType() {
+        return this.templateTransform.getWhenResourceMissingType();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isTitleOnANewPage() {
+        return this.templateTransform.isTitleOnANewPage();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isSummaryOnANewPage() {
+        return this.templateTransform.isSummaryOnANewPage();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isSummaryWithPageHeaderAndFooter() {
+        return this.templateTransform.isSummaryWithPageHeaderAndFooter();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isFloatColumnFooter() {
+        return this.templateTransform.isFloatColumnFooter();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Orientation getPrintOrder() {
+        return this.templateTransform.getPrintOrder();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public RunDirection getColumnDirection() {
+        return this.templateTransform.getColumnDirection();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getLanguage() {
+        return this.templateTransform.getLanguage();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isTableOfContents() {
+        return this.templateTransform.isTableOfContents(this.tocHeadings);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<String, JasperTocHeading> getTableOfContentsHeadings() {
+        return this.tocHeadings;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRITableOfContentsCustomizer getTableOfContentsCustomizer() {
+        return this.templateTransform.getTableOfContentsCustomizer();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getFilterExpression() {
+        return this.reportTransform.getFilterExpression();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignParameter> getParameters() {
+        return this.reportTransform.getParameters();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<String, Object> getParameterValues() {
+        return this.report.getParameterValues();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIScriptlet> getScriptlets() {
+        return this.report.getScriptlets();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignField> getFields() {
+        return this.mainDatasetExpressionTransform.getFields();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignSystemExpression> getSystemExpressions() {
+        return this.mainDatasetExpressionTransform.getSystemExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignJasperExpression> getJasperExpressions() {
+        return this.mainDatasetExpressionTransform.getJasperExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignSimpleExpression> getSimpleExpressions() {
+        return this.mainDatasetExpressionTransform.getSimpleExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignStyle> getStyles() {
+        return this.styleTransform.getStyles();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRDesignGroup> getGroups() {
+        return this.groupTransform.getGroups();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignVariable> getVariables() {
+        return this.mainDatasetExpressionTransform.getVariables();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignComplexExpression> getComplexExpressions() {
+        return this.mainDatasetExpressionTransform.getComplexExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignSort> getSorts() {
+        return this.mainDatasetExpressionTransform.getSorts();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<DRIDesignDataset> getDatasets() {
+        return this.datasetTransform.getDatasets();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getTitleBand() {
+        return this.bandTransform.getTitleBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getPageHeaderBand() {
+        return this.bandTransform.getPageHeaderBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getPageFooterBand() {
+        return this.bandTransform.getPageFooterBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getColumnHeaderBand() {
+        return this.bandTransform.getColumnHeaderBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getColumnFooterBand() {
+        return this.bandTransform.getColumnFooterBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRDesignBand> getDetailBands() {
+        return this.bandTransform.getDetailBands();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getLastPageFooterBand() {
+        return this.bandTransform.getLastPageFooterBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getSummaryBand() {
+        return this.bandTransform.getSummaryBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getNoDataBand() {
+        return this.bandTransform.getNoDataBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBand getBackgroundBand() {
+        return this.bandTransform.getBackgroundBand();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignSort.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignSort.java
new file mode 100644
index 0000000..c107b64
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignSort.java
@@ -0,0 +1,67 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignSort;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.OrderType;
+
+/**
+ * <p>DRDesignSort class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignSort implements DRIDesignSort {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIDesignExpression expression;
+    private OrderType orderType;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getExpression() {
+        return expression;
+    }
+
+    /**
+     * <p>Setter for the field <code>expression</code>.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setExpression(DRIDesignExpression expression) {
+        this.expression = expression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public OrderType getOrderType() {
+        return orderType;
+    }
+
+    /**
+     * <p>Setter for the field <code>orderType</code>.</p>
+     *
+     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     */
+    public void setOrderType(OrderType orderType) {
+        this.orderType = orderType;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTableOfContentsHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTableOfContentsHeading.java
new file mode 100644
index 0000000..a098b94
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTableOfContentsHeading.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignTableOfContentsHeading class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignTableOfContentsHeading implements DRIDesignTableOfContentsHeading {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRDesignTextField referenceField;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignTextField getReferenceField() {
+        return referenceField;
+    }
+
+    /**
+     * <p>Setter for the field <code>referenceField</code>.</p>
+     *
+     * @param referenceField a {@link net.sf.dynamicreports.design.base.component.DRDesignTextField} object.
+     */
+    public void setReferenceField(DRDesignTextField referenceField) {
+        this.referenceField = referenceField;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTemplateDesign.java
new file mode 100644
index 0000000..96827da
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTemplateDesign.java
@@ -0,0 +1,104 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRITemplateDesign;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * <p>DRDesignTemplateDesign class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignTemplateDesign implements DRIDesignTemplateDesign {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRITemplateDesign<?> templateDesign;
+
+    /**
+     * <p>Constructor for DRDesignTemplateDesign.</p>
+     *
+     * @param templateDesign a {@link net.sf.dynamicreports.report.definition.DRITemplateDesign} object.
+     */
+    public DRDesignTemplateDesign(DRITemplateDesign<?> templateDesign) {
+        this.templateDesign = templateDesign;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getTitleComponentsCount() {
+        return templateDesign.getTitleComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPageHeaderComponentsCount() {
+        return templateDesign.getPageHeaderComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPageFooterComponentsCount() {
+        return templateDesign.getPageFooterComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnHeaderComponentsCount() {
+        return templateDesign.getColumnHeaderComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnFooterComponentsCount() {
+        return templateDesign.getColumnFooterComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getLastPageFooterComponentsCount() {
+        return templateDesign.getLastPageFooterComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getSummaryComponentsCount() {
+        return templateDesign.getSummaryComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getNoDataComponentsCount() {
+        return templateDesign.getNoDataComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getBackgroundComponentsCount() {
+        return templateDesign.getBackgroundComponentsCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object getDesign() throws DRException {
+        return templateDesign.getDesign();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignVariable.java
new file mode 100644
index 0000000..732b912
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignVariable.java
@@ -0,0 +1,145 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base;
+
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.DRIDesignVariable;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignVariable class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignVariable implements DRIDesignVariable {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIDesignExpression valueExpression;
+    private DRIDesignExpression initialValueExpression;
+    private Calculation calculation;
+    private ResetType resetType;
+    private DRDesignGroup resetGroup;
+
+    /**
+     * <p>Constructor for DRDesignVariable.</p>
+     */
+    public DRDesignVariable() {
+        this.name = ReportUtils.generateUniqueName("variable");
+    }
+
+    /**
+     * <p>Constructor for DRDesignVariable.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public DRDesignVariable(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setValueExpression(DRIDesignExpression valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getInitialValueExpression() {
+        return initialValueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>initialValueExpression</code>.</p>
+     *
+     * @param initialValueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setInitialValueExpression(DRIDesignExpression initialValueExpression) {
+        this.initialValueExpression = initialValueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Calculation getCalculation() {
+        return calculation;
+    }
+
+    /**
+     * <p>Setter for the field <code>calculation</code>.</p>
+     *
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public void setCalculation(Calculation calculation) {
+        this.calculation = calculation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ResetType getResetType() {
+        return resetType;
+    }
+
+    /**
+     * <p>Setter for the field <code>resetType</code>.</p>
+     *
+     * @param resetType a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     */
+    public void setResetType(ResetType resetType) {
+        this.resetType = resetType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignGroup getResetGroup() {
+        return resetGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>resetGroup</code>.</p>
+     *
+     * @param resetGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     */
+    public void setResetGroup(DRDesignGroup resetGroup) {
+        this.resetGroup = resetGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return ReportUtils.getVariableValueClass(calculation, valueExpression.getValueClass());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignBreak.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignBreak.java
new file mode 100644
index 0000000..01d6493
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignBreak.java
@@ -0,0 +1,56 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.definition.component.DRIDesignBreak;
+import net.sf.dynamicreports.report.constant.BreakType;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignBreak class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignBreak extends DRDesignComponent implements DRIDesignBreak {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private BreakType breakType;
+
+    /**
+     * <p>Constructor for DRDesignBreak.</p>
+     */
+    public DRDesignBreak() {
+        super("break");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public BreakType getType() {
+        return breakType;
+    }
+
+    /**
+     * <p>setType.</p>
+     *
+     * @param breakType a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     */
+    public void setType(BreakType breakType) {
+        this.breakType = breakType;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignComponent.java
new file mode 100644
index 0000000..e3cd547
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignComponent.java
@@ -0,0 +1,308 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading;
+import net.sf.dynamicreports.design.base.style.DRDesignStyle;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.StretchType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>Abstract DRDesignComponent class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRDesignComponent implements DRIDesignComponent {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private String uniqueName;
+    private DRDesignStyle style;
+    private Integer x;
+    private Integer y;
+    private Integer width;
+    private Integer height;
+    private DRIDesignExpression printWhenExpression;
+    private boolean isRemoveLineWhenBlank;
+    private List<DRIDesignPropertyExpression> propertyExpressions;
+    private ComponentPositionType positionType;
+    private StretchType stretchType;
+    private boolean printInFirstWholeBand;
+    private boolean printWhenDetailOverflows;
+    private DRIDesignGroup printWhenGroupChanges;
+    private DRDesignTableOfContentsHeading tableOfContentsHeading;
+
+    /**
+     * <p>Constructor for DRDesignComponent.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    protected DRDesignComponent(String name) {
+        this.name = name;
+        this.uniqueName = name;
+        init();
+    }
+
+    /**
+     * <p>init.</p>
+     */
+    protected void init() {
+        propertyExpressions = new ArrayList<DRIDesignPropertyExpression>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getUniqueName() {
+        return uniqueName;
+    }
+
+    /**
+     * <p>Setter for the field <code>uniqueName</code>.</p>
+     *
+     * @param uniqueName a {@link java.lang.String} object.
+     */
+    public void setUniqueName(String uniqueName) {
+        this.uniqueName = uniqueName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <p>Setter for the field <code>style</code>.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     */
+    public void setStyle(DRDesignStyle style) {
+        this.style = style;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getX() {
+        return x;
+    }
+
+    /**
+     * <p>Setter for the field <code>x</code>.</p>
+     *
+     * @param x a {@link java.lang.Integer} object.
+     */
+    public void setX(Integer x) {
+        this.x = x;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getY() {
+        return y;
+    }
+
+    /**
+     * <p>Setter for the field <code>y</code>.</p>
+     *
+     * @param y a {@link java.lang.Integer} object.
+     */
+    public void setY(Integer y) {
+        this.y = y;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getWidth() {
+        return width;
+    }
+
+    /**
+     * <p>Setter for the field <code>width</code>.</p>
+     *
+     * @param width a {@link java.lang.Integer} object.
+     */
+    public void setWidth(Integer width) {
+        this.width = width;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getHeight() {
+        return height;
+    }
+
+    /**
+     * <p>Setter for the field <code>height</code>.</p>
+     *
+     * @param height a {@link java.lang.Integer} object.
+     */
+    public void setHeight(Integer height) {
+        this.height = height;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getPrintWhenExpression() {
+        return printWhenExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>printWhenExpression</code>.</p>
+     *
+     * @param printWhenExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setPrintWhenExpression(DRIDesignExpression printWhenExpression) {
+        this.printWhenExpression = printWhenExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isRemoveLineWhenBlank() {
+        return isRemoveLineWhenBlank;
+    }
+
+    /**
+     * <p>setRemoveLineWhenBlank.</p>
+     *
+     * @param isRemoveLineWhenBlank a boolean.
+     */
+    public void setRemoveLineWhenBlank(boolean isRemoveLineWhenBlank) {
+        this.isRemoveLineWhenBlank = isRemoveLineWhenBlank;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIDesignPropertyExpression> getPropertyExpressions() {
+        return propertyExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>propertyExpressions</code>.</p>
+     *
+     * @param propertyExpressions a {@link java.util.List} object.
+     */
+    public void setPropertyExpressions(List<DRIDesignPropertyExpression> propertyExpressions) {
+        this.propertyExpressions = propertyExpressions;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentPositionType getPositionType() {
+        return positionType;
+    }
+
+    /**
+     * <p>Setter for the field <code>positionType</code>.</p>
+     *
+     * @param positionType a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     */
+    public void setPositionType(ComponentPositionType positionType) {
+        this.positionType = positionType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public StretchType getStretchType() {
+        return stretchType;
+    }
+
+    /**
+     * <p>Setter for the field <code>stretchType</code>.</p>
+     *
+     * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     */
+    public void setStretchType(StretchType stretchType) {
+        this.stretchType = stretchType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isPrintInFirstWholeBand() {
+        return printInFirstWholeBand;
+    }
+
+    /**
+     * <p>Setter for the field <code>printInFirstWholeBand</code>.</p>
+     *
+     * @param printInFirstWholeBand a boolean.
+     */
+    public void setPrintInFirstWholeBand(boolean printInFirstWholeBand) {
+        this.printInFirstWholeBand = printInFirstWholeBand;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isPrintWhenDetailOverflows() {
+        return printWhenDetailOverflows;
+    }
+
+    /**
+     * <p>Setter for the field <code>printWhenDetailOverflows</code>.</p>
+     *
+     * @param printWhenDetailOverflows a boolean.
+     */
+    public void setPrintWhenDetailOverflows(boolean printWhenDetailOverflows) {
+        this.printWhenDetailOverflows = printWhenDetailOverflows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignGroup getPrintWhenGroupChanges() {
+        return printWhenGroupChanges;
+    }
+
+    /**
+     * <p>Setter for the field <code>printWhenGroupChanges</code>.</p>
+     *
+     * @param printWhenGroupChanges a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     */
+    public void setPrintWhenGroupChanges(DRIDesignGroup printWhenGroupChanges) {
+        this.printWhenGroupChanges = printWhenGroupChanges;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignTableOfContentsHeading getTableOfContentsHeading() {
+        return tableOfContentsHeading;
+    }
+
+    /**
+     * <p>Setter for the field <code>tableOfContentsHeading</code>.</p>
+     *
+     * @param tableOfContentsHeading a {@link net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
+     */
+    public void setTableOfContentsHeading(DRDesignTableOfContentsHeading tableOfContentsHeading) {
+        this.tableOfContentsHeading = tableOfContentsHeading;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignEllipse.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignEllipse.java
new file mode 100644
index 0000000..092f2c5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignEllipse.java
@@ -0,0 +1,56 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.base.style.DRDesignPen;
+import net.sf.dynamicreports.design.definition.component.DRIDesignEllipse;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignEllipse class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignEllipse extends DRDesignComponent implements DRIDesignEllipse {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRDesignPen pen;
+
+    /**
+     * <p>Constructor for DRDesignEllipse.</p>
+     */
+    public DRDesignEllipse() {
+        super("ellipse");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPen getPen() {
+        return pen;
+    }
+
+    /**
+     * <p>Setter for the field <code>pen</code>.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     */
+    public void setPen(DRDesignPen pen) {
+        this.pen = pen;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignFiller.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignFiller.java
new file mode 100644
index 0000000..287b03b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignFiller.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.definition.component.DRIDesignFiller;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignFiller class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignFiller extends DRDesignComponent implements DRIDesignFiller {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for DRDesignFiller.</p>
+     */
+    public DRDesignFiller() {
+        super("filler");
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignGenericElement.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignGenericElement.java
new file mode 100644
index 0000000..01b980b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignGenericElement.java
@@ -0,0 +1,132 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.definition.component.DRIDesignGenericElement;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRDesignGenericElement class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignGenericElement extends DRDesignComponent implements DRIDesignGenericElement {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String genericElementNamespace;
+    private String genericElementName;
+    private EvaluationTime evaluationTime;
+    private DRDesignGroup evaluationGroup;
+    private List<DRIDesignParameterExpression> parameterExpressions;
+
+    /**
+     * <p>Constructor for DRDesignGenericElement.</p>
+     */
+    public DRDesignGenericElement() {
+        super("genericElement");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        super.init();
+        parameterExpressions = new ArrayList<DRIDesignParameterExpression>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getGenericElementNamespace() {
+        return genericElementNamespace;
+    }
+
+    /**
+     * <p>Setter for the field <code>genericElementNamespace</code>.</p>
+     *
+     * @param genericElementNamespace a {@link java.lang.String} object.
+     */
+    public void setGenericElementNamespace(String genericElementNamespace) {
+        this.genericElementNamespace = genericElementNamespace;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getGenericElementName() {
+        return genericElementName;
+    }
+
+    /**
+     * <p>Setter for the field <code>genericElementName</code>.</p>
+     *
+     * @param genericElementName a {@link java.lang.String} object.
+     */
+    public void setGenericElementName(String genericElementName) {
+        this.genericElementName = genericElementName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public EvaluationTime getEvaluationTime() {
+        return evaluationTime;
+    }
+
+    /**
+     * <p>Setter for the field <code>evaluationTime</code>.</p>
+     *
+     * @param evaluationTime a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    public void setEvaluationTime(EvaluationTime evaluationTime) {
+        this.evaluationTime = evaluationTime;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignGroup getEvaluationGroup() {
+        return evaluationGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>evaluationGroup</code>.</p>
+     *
+     * @param evaluationGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     */
+    public void setEvaluationGroup(DRDesignGroup evaluationGroup) {
+        this.evaluationGroup = evaluationGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIDesignParameterExpression> getParameterExpressions() {
+        return parameterExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>parameterExpressions</code>.</p>
+     *
+     * @param parameterExpressions a {@link java.util.List} object.
+     */
+    public void setParameterExpressions(List<DRIDesignParameterExpression> parameterExpressions) {
+        this.parameterExpressions = parameterExpressions;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java
new file mode 100644
index 0000000..2b524b2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java
@@ -0,0 +1,91 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.base.DRDesignHyperLink;
+import net.sf.dynamicreports.design.definition.component.DRIDesignHyperLinkComponent;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>Abstract DRDesignHyperlinkComponent class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRDesignHyperlinkComponent extends DRDesignComponent implements DRIDesignHyperLinkComponent {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIDesignExpression anchorNameExpression;
+    private Integer bookmarkLevel;
+    private DRDesignHyperLink hyperLink;
+
+    /**
+     * <p>Constructor for DRDesignHyperlinkComponent.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public DRDesignHyperlinkComponent(String name) {
+        super(name);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getAnchorNameExpression() {
+        return anchorNameExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>anchorNameExpression</code>.</p>
+     *
+     * @param anchorNameExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setAnchorNameExpression(DRIDesignExpression anchorNameExpression) {
+        this.anchorNameExpression = anchorNameExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getBookmarkLevel() {
+        return bookmarkLevel;
+    }
+
+    /**
+     * <p>Setter for the field <code>bookmarkLevel</code>.</p>
+     *
+     * @param bookmarkLevel a {@link java.lang.Integer} object.
+     */
+    public void setBookmarkLevel(Integer bookmarkLevel) {
+        this.bookmarkLevel = bookmarkLevel;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignHyperLink getHyperLink() {
+        return hyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>hyperLink</code>.</p>
+     *
+     * @param hyperLink a {@link net.sf.dynamicreports.design.base.DRDesignHyperLink} object.
+     */
+    public void setHyperLink(DRDesignHyperLink hyperLink) {
+        this.hyperLink = hyperLink;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignImage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignImage.java
new file mode 100644
index 0000000..32d1932
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignImage.java
@@ -0,0 +1,123 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.definition.component.DRIDesignImage;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+
+/**
+ * <p>DRDesignImage class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignImage extends DRDesignHyperlinkComponent implements DRIDesignImage {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private ImageScale imageScale;
+    private DRIDesignExpression imageExpression;
+    private Boolean usingCache;
+    private Boolean lazy;
+    private HorizontalImageAlignment horizontalImageAlignment;
+
+    /**
+     * <p>Constructor for DRDesignImage.</p>
+     */
+    public DRDesignImage() {
+        super("image");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getImageExpression() {
+        return imageExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageExpression</code>.</p>
+     *
+     * @param imageExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setImageExpression(DRIDesignExpression imageExpression) {
+        this.imageExpression = imageExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ImageScale getImageScale() {
+        return imageScale;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageScale</code>.</p>
+     *
+     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     */
+    public void setImageScale(ImageScale imageScale) {
+        this.imageScale = imageScale;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getUsingCache() {
+        return usingCache;
+    }
+
+    /**
+     * <p>Setter for the field <code>usingCache</code>.</p>
+     *
+     * @param usingCache a {@link java.lang.Boolean} object.
+     */
+    public void setUsingCache(Boolean usingCache) {
+        this.usingCache = usingCache;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getLazy() {
+        return lazy;
+    }
+
+    /**
+     * <p>Setter for the field <code>lazy</code>.</p>
+     *
+     * @param lazy a {@link java.lang.Boolean} object.
+     */
+    public void setLazy(Boolean lazy) {
+        this.lazy = lazy;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalImageAlignment getHorizontalImageAlignment() {
+        return horizontalImageAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        this.horizontalImageAlignment = horizontalImageAlignment;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignLine.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignLine.java
new file mode 100644
index 0000000..4fbbd0c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignLine.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.base.style.DRDesignPen;
+import net.sf.dynamicreports.design.definition.component.DRIDesignLine;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.LineDirection;
+
+/**
+ * <p>DRDesignLine class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignLine extends DRDesignComponent implements DRIDesignLine {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private LineDirection direction;
+    private DRDesignPen pen;
+
+    /**
+     * <p>Constructor for DRDesignLine.</p>
+     */
+    public DRDesignLine() {
+        super("line");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public LineDirection getDirection() {
+        return direction;
+    }
+
+    /**
+     * <p>Setter for the field <code>direction</code>.</p>
+     *
+     * @param direction a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     */
+    public void setDirection(LineDirection direction) {
+        this.direction = direction;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPen getPen() {
+        return pen;
+    }
+
+    /**
+     * <p>Setter for the field <code>pen</code>.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     */
+    public void setPen(DRDesignPen pen) {
+        this.pen = pen;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignList.java
new file mode 100644
index 0000000..6ba15b5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignList.java
@@ -0,0 +1,247 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.constant.ComponentGroupType;
+import net.sf.dynamicreports.design.definition.component.DRIDesignList;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRDesignList class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignList extends DRDesignComponent implements DRIDesignList {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private List<DRDesignListCell> listCells;
+    private List<DRDesignComponent> components;
+    private ListType type;
+    private ComponentGroupType componentGroupType;
+    private int gap;
+    private boolean calculateComponents;
+    private Boolean removable;
+    private DRDesignComponent backgroundComponent;
+
+    /**
+     * <p>Constructor for DRDesignList.</p>
+     */
+    public DRDesignList() {
+        this(ListType.HORIZONTAL);
+    }
+
+    /**
+     * <p>Constructor for DRDesignList.</p>
+     *
+     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public DRDesignList(ListType type) {
+        super("list");
+        this.type = type;
+        this.calculateComponents = true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        super.init();
+        this.listCells = new ArrayList<DRDesignListCell>();
+        this.components = new ArrayList<DRDesignComponent>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRDesignComponent> getComponents() {
+        return components;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void addComponent(DRDesignComponent component) {
+        components.add(component);
+        listCells.add(new DRDesignListCell(component));
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param index     a int.
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void addComponent(int index, DRDesignComponent component) {
+        components.add(index, component);
+        listCells.add(index, new DRDesignListCell(component));
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param index               a int.
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void addComponent(int index, HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRDesignComponent component) {
+        components.add(index, component);
+        listCells.add(index, new DRDesignListCell(horizontalAlignment, verticalAlignment, component));
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void addComponent(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRDesignComponent component) {
+        components.add(component);
+        listCells.add(new DRDesignListCell(horizontalAlignment, verticalAlignment, component));
+    }
+
+    /**
+     * <p>Getter for the field <code>listCells</code>.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRDesignListCell> getListCells() {
+        return listCells;
+    }
+
+    /**
+     * <p>isEmpty.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isEmpty() {
+        return components.isEmpty();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ListType getType() {
+        return type;
+    }
+
+    /**
+     * <p>Setter for the field <code>type</code>.</p>
+     *
+     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public void setType(ListType type) {
+        this.type = type;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentGroupType getComponentGroupType() {
+        return componentGroupType;
+    }
+
+    /**
+     * <p>Setter for the field <code>componentGroupType</code>.</p>
+     *
+     * @param componentGroupType a {@link net.sf.dynamicreports.design.constant.ComponentGroupType} object.
+     */
+    public void setComponentGroupType(ComponentGroupType componentGroupType) {
+        this.componentGroupType = componentGroupType;
+    }
+
+    /**
+     * <p>Getter for the field <code>gap</code>.</p>
+     *
+     * @return a int.
+     */
+    public int getGap() {
+        return gap;
+    }
+
+    /**
+     * <p>Setter for the field <code>gap</code>.</p>
+     *
+     * @param gap a int.
+     */
+    public void setGap(int gap) {
+        this.gap = gap;
+    }
+
+    /**
+     * <p>isCalculateComponents.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isCalculateComponents() {
+        return calculateComponents;
+    }
+
+    /**
+     * <p>Setter for the field <code>calculateComponents</code>.</p>
+     *
+     * @param calculateComponents a boolean.
+     */
+    public void setCalculateComponents(boolean calculateComponents) {
+        this.calculateComponents = calculateComponents;
+    }
+
+    /**
+     * <p>isRemovable.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isRemovable() {
+        if (removable != null) {
+            return removable;
+        } else {
+            return ListType.VERTICAL.equals(type);
+        }
+    }
+
+    /**
+     * <p>Setter for the field <code>removable</code>.</p>
+     *
+     * @param removable a {@link java.lang.Boolean} object.
+     */
+    public void setRemovable(Boolean removable) {
+        this.removable = removable;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignComponent getBackgroundComponent() {
+        return backgroundComponent;
+    }
+
+    /**
+     * <p>Setter for the field <code>backgroundComponent</code>.</p>
+     *
+     * @param backgroundComponent a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void setBackgroundComponent(DRDesignComponent backgroundComponent) {
+        this.backgroundComponent = backgroundComponent;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignListCell.java
new file mode 100644
index 0000000..d1049f6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignListCell.java
@@ -0,0 +1,181 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRDesignListCell class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignListCell implements Serializable {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private HorizontalCellComponentAlignment horizontalAlignment;
+    private VerticalCellComponentAlignment verticalAlignment;
+    private DRDesignComponent component;
+    private Integer x;
+    private Integer y;
+    private Integer width;
+    private Integer height;
+
+    /**
+     * <p>Constructor for DRDesignListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    protected DRDesignListCell(DRDesignComponent component) {
+        this(null, null, component);
+    }
+
+    /**
+     * <p>Constructor for DRDesignListCell.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    protected DRDesignListCell(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRDesignComponent component) {
+        this.horizontalAlignment = horizontalAlignment;
+        this.verticalAlignment = verticalAlignment;
+        this.component = component;
+    }
+
+    /**
+     * <p>Getter for the field <code>horizontalAlignment</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     */
+    public HorizontalCellComponentAlignment getHorizontalAlignment() {
+        return horizontalAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalAlignment</code>.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     */
+    public void setHorizontalAlignment(HorizontalCellComponentAlignment horizontalAlignment) {
+        this.horizontalAlignment = horizontalAlignment;
+    }
+
+    /**
+     * <p>Getter for the field <code>verticalAlignment</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     */
+    public VerticalCellComponentAlignment getVerticalAlignment() {
+        return verticalAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>verticalAlignment</code>.</p>
+     *
+     * @param verticalAlignment a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     */
+    public void setVerticalAlignment(VerticalCellComponentAlignment verticalAlignment) {
+        this.verticalAlignment = verticalAlignment;
+    }
+
+    /**
+     * <p>Getter for the field <code>component</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public DRDesignComponent getComponent() {
+        return component;
+    }
+
+    /**
+     * <p>Getter for the field <code>x</code>.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getX() {
+        return x;
+    }
+
+    /**
+     * <p>Setter for the field <code>x</code>.</p>
+     *
+     * @param x a {@link java.lang.Integer} object.
+     */
+    public void setX(Integer x) {
+        this.x = x;
+    }
+
+    /**
+     * <p>Getter for the field <code>y</code>.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getY() {
+        return y;
+    }
+
+    /**
+     * <p>Setter for the field <code>y</code>.</p>
+     *
+     * @param y a {@link java.lang.Integer} object.
+     */
+    public void setY(Integer y) {
+        this.y = y;
+    }
+
+    /**
+     * <p>Getter for the field <code>width</code>.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getWidth() {
+        return width;
+    }
+
+    /**
+     * <p>Setter for the field <code>width</code>.</p>
+     *
+     * @param width a {@link java.lang.Integer} object.
+     */
+    public void setWidth(Integer width) {
+        this.width = width;
+    }
+
+    /**
+     * <p>Getter for the field <code>height</code>.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getHeight() {
+        return height;
+    }
+
+    /**
+     * <p>Setter for the field <code>height</code>.</p>
+     *
+     * @param height a {@link java.lang.Integer} object.
+     */
+    public void setHeight(Integer height) {
+        this.height = height;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignMap.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignMap.java
new file mode 100644
index 0000000..e7f436a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignMap.java
@@ -0,0 +1,122 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.definition.component.DRIDesignMap;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignMap class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignMap extends DRDesignComponent implements DRIDesignMap {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private EvaluationTime evaluationTime;
+    private DRDesignGroup evaluationGroup;
+    private DRIDesignExpression latitudeExpression;
+    private DRIDesignExpression longitudeExpression;
+    private DRIDesignExpression zoomExpression;
+
+    /**
+     * <p>Constructor for DRDesignMap.</p>
+     */
+    public DRDesignMap() {
+        super("map");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public EvaluationTime getEvaluationTime() {
+        return evaluationTime;
+    }
+
+    /**
+     * <p>Setter for the field <code>evaluationTime</code>.</p>
+     *
+     * @param evaluationTime a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    public void setEvaluationTime(EvaluationTime evaluationTime) {
+        this.evaluationTime = evaluationTime;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignGroup getEvaluationGroup() {
+        return evaluationGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>evaluationGroup</code>.</p>
+     *
+     * @param evaluationGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     */
+    public void setEvaluationGroup(DRDesignGroup evaluationGroup) {
+        this.evaluationGroup = evaluationGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getLatitudeExpression() {
+        return latitudeExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>latitudeExpression</code>.</p>
+     *
+     * @param latitudeExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setLatitudeExpression(DRIDesignExpression latitudeExpression) {
+        this.latitudeExpression = latitudeExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getLongitudeExpression() {
+        return longitudeExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>longitudeExpression</code>.</p>
+     *
+     * @param longitudeExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setLongitudeExpression(DRIDesignExpression longitudeExpression) {
+        this.longitudeExpression = longitudeExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getZoomExpression() {
+        return zoomExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>zoomExpression</code>.</p>
+     *
+     * @param zoomExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setZoomExpression(DRIDesignExpression zoomExpression) {
+        this.zoomExpression = zoomExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignRectangle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignRectangle.java
new file mode 100644
index 0000000..840487d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignRectangle.java
@@ -0,0 +1,72 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.base.style.DRDesignPen;
+import net.sf.dynamicreports.design.definition.component.DRIDesignRectangle;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignRectangle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignRectangle extends DRDesignComponent implements DRIDesignRectangle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer radius;
+    private DRDesignPen pen;
+
+    /**
+     * <p>Constructor for DRDesignRectangle.</p>
+     */
+    public DRDesignRectangle() {
+        super("rectangle");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getRadius() {
+        return radius;
+    }
+
+    /**
+     * <p>Setter for the field <code>radius</code>.</p>
+     *
+     * @param radius a {@link java.lang.Integer} object.
+     */
+    public void setRadius(Integer radius) {
+        this.radius = radius;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPen getPen() {
+        return pen;
+    }
+
+    /**
+     * <p>Setter for the field <code>pen</code>.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     */
+    public void setPen(DRDesignPen pen) {
+        this.pen = pen;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignSubreport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignSubreport.java
new file mode 100644
index 0000000..03e5b6d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignSubreport.java
@@ -0,0 +1,120 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.definition.component.DRIDesignSubreport;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignSubreport class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignSubreport extends DRDesignComponent implements DRIDesignSubreport {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIDesignExpression reportExpression;
+    private DRIDesignExpression parametersExpression;
+    private DRIDesignExpression connectionExpression;
+    private DRIDesignExpression dataSourceExpression;
+    private Boolean runToBottom;
+
+    /**
+     * <p>Constructor for DRDesignSubreport.</p>
+     */
+    public DRDesignSubreport() {
+        super("subreport");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getReportExpression() {
+        return reportExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>reportExpression</code>.</p>
+     *
+     * @param reportExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setReportExpression(DRIDesignExpression reportExpression) {
+        this.reportExpression = reportExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getParametersExpression() {
+        return parametersExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>parametersExpression</code>.</p>
+     *
+     * @param parametersExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setParametersExpression(DRIDesignExpression parametersExpression) {
+        this.parametersExpression = parametersExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getConnectionExpression() {
+        return connectionExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>connectionExpression</code>.</p>
+     *
+     * @param connectionExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setConnectionExpression(DRIDesignExpression connectionExpression) {
+        this.connectionExpression = connectionExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getDataSourceExpression() {
+        return dataSourceExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataSourceExpression</code>.</p>
+     *
+     * @param dataSourceExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setDataSourceExpression(DRIDesignExpression dataSourceExpression) {
+        this.dataSourceExpression = dataSourceExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getRunToBottom() {
+        return runToBottom;
+    }
+
+    /**
+     * <p>Setter for the field <code>runToBottom</code>.</p>
+     *
+     * @param runToBottom a {@link java.lang.Boolean} object.
+     */
+    public void setRunToBottom(Boolean runToBottom) {
+        this.runToBottom = runToBottom;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignTextField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignTextField.java
new file mode 100644
index 0000000..b3f1e7b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignTextField.java
@@ -0,0 +1,209 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.component;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.definition.component.DRIDesignTextField;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+
+/**
+ * <p>DRDesignTextField class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class DRDesignTextField extends DRDesignHyperlinkComponent implements DRIDesignTextField {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String pattern;
+    private DRIDesignExpression patternExpression;
+    private HorizontalTextAlignment horizontalTextAlignment;
+    private DRIDesignExpression valueExpression;
+    private boolean printRepeatedValues;
+    private EvaluationTime evaluationTime;
+    private DRDesignGroup evaluationGroup;
+    private Markup markup;
+    private boolean stretchWithOverflow;
+    private TextAdjust textAdjust;
+
+
+    /**
+     * <p>Constructor for DRDesignTextField.</p>
+     */
+    public DRDesignTextField() {
+        super("textField");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return pattern;
+    }
+
+    /**
+     * <p>Setter for the field <code>pattern</code>.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     */
+    public void setPattern(final String pattern) {
+        this.pattern = pattern;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getPatternExpression() {
+        return patternExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>patternExpression</code>.</p>
+     *
+     * @param patternExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setPatternExpression(final DRIDesignExpression patternExpression) {
+        this.patternExpression = patternExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return horizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setValueExpression(final DRIDesignExpression valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isPrintRepeatedValues() {
+        return printRepeatedValues;
+    }
+
+    /**
+     * <p>Setter for the field <code>printRepeatedValues</code>.</p>
+     *
+     * @param printRepeatedValues a boolean.
+     */
+    public void setPrintRepeatedValues(final boolean printRepeatedValues) {
+        this.printRepeatedValues = printRepeatedValues;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public EvaluationTime getEvaluationTime() {
+        return evaluationTime;
+    }
+
+    /**
+     * <p>Setter for the field <code>evaluationTime</code>.</p>
+     *
+     * @param evaluationTime a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    public void setEvaluationTime(final EvaluationTime evaluationTime) {
+        this.evaluationTime = evaluationTime;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignGroup getEvaluationGroup() {
+        return evaluationGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>evaluationGroup</code>.</p>
+     *
+     * @param evaluationGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     */
+    public void setEvaluationGroup(final DRDesignGroup evaluationGroup) {
+        this.evaluationGroup = evaluationGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Markup getMarkup() {
+        return markup;
+    }
+
+    /**
+     * <p>Setter for the field <code>markup</code>.</p>
+     *
+     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     */
+    public void setMarkup(final Markup markup) {
+        this.markup = markup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @Deprecated
+    public boolean isStretchWithOverflow() {
+        return stretchWithOverflow;
+    }
+
+    /**
+     * <p>Setter for the field <code>stretchWithOverflow</code>.</p>
+     *
+     * @param stretchWithOverflow a boolean.
+     * @deprecated Replaced by {@link #setTextAdjust(TextAdjust)}.
+     */
+    @Deprecated
+    public void setStretchWithOverflow(final boolean stretchWithOverflow) {
+        this.stretchWithOverflow = stretchWithOverflow;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TextAdjust getTextAdjust() {
+        return textAdjust;
+    }
+
+    /**
+     * <p>Setter for the field <code>textAdjust</code>.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    public void setTextAdjust(final TextAdjust textAdjust) {
+        this.textAdjust = textAdjust;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstab.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstab.java
new file mode 100644
index 0000000..929defb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstab.java
@@ -0,0 +1,247 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.crosstab;
+
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.RunDirection;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRDesignCrosstab class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignCrosstab extends DRDesignComponent implements DRIDesignCrosstab {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRDesignCrosstabDataset dataset;
+    private Boolean repeatColumnHeaders;
+    private Boolean repeatRowHeaders;
+    private Integer columnBreakOffset;
+    private Boolean ignoreWidth;
+    private RunDirection runDirection;
+    private DRDesignCrosstabCellContent whenNoDataCell;
+    private DRDesignCrosstabCellContent headerCell;
+    private List<DRDesignCrosstabColumnGroup> columnGroups;
+    private List<DRDesignCrosstabRowGroup> rowGroups;
+    private List<DRDesignCrosstabCell> cells;
+    private List<DRIDesignCrosstabMeasure> measures;
+
+    /**
+     * <p>Constructor for DRDesignCrosstab.</p>
+     */
+    public DRDesignCrosstab() {
+        super("crosstab");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        super.init();
+        columnGroups = new ArrayList<DRDesignCrosstabColumnGroup>();
+        rowGroups = new ArrayList<DRDesignCrosstabRowGroup>();
+        cells = new ArrayList<DRDesignCrosstabCell>();
+        measures = new ArrayList<DRIDesignCrosstabMeasure>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignCrosstabDataset getDataset() {
+        return dataset;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataset</code>.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabDataset} object.
+     */
+    public void setDataset(DRDesignCrosstabDataset dataset) {
+        this.dataset = dataset;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean isRepeatColumnHeaders() {
+        return repeatColumnHeaders;
+    }
+
+    /**
+     * <p>Setter for the field <code>repeatColumnHeaders</code>.</p>
+     *
+     * @param repeatColumnHeaders a {@link java.lang.Boolean} object.
+     */
+    public void setRepeatColumnHeaders(Boolean repeatColumnHeaders) {
+        this.repeatColumnHeaders = repeatColumnHeaders;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean isRepeatRowHeaders() {
+        return repeatRowHeaders;
+    }
+
+    /**
+     * <p>Setter for the field <code>repeatRowHeaders</code>.</p>
+     *
+     * @param repeatRowHeaders a {@link java.lang.Boolean} object.
+     */
+    public void setRepeatRowHeaders(Boolean repeatRowHeaders) {
+        this.repeatRowHeaders = repeatRowHeaders;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getColumnBreakOffset() {
+        return columnBreakOffset;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnBreakOffset</code>.</p>
+     *
+     * @param columnBreakOffset a {@link java.lang.Integer} object.
+     */
+    public void setColumnBreakOffset(Integer columnBreakOffset) {
+        this.columnBreakOffset = columnBreakOffset;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreWidth() {
+        return ignoreWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreWidth</code>.</p>
+     *
+     * @param ignoreWidth a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreWidth(Boolean ignoreWidth) {
+        this.ignoreWidth = ignoreWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public RunDirection getRunDirection() {
+        return runDirection;
+    }
+
+    /**
+     * <p>Setter for the field <code>runDirection</code>.</p>
+     *
+     * @param runDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public void setRunDirection(RunDirection runDirection) {
+        this.runDirection = runDirection;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignCrosstabCellContent getWhenNoDataCell() {
+        return whenNoDataCell;
+    }
+
+    /**
+     * <p>Setter for the field <code>whenNoDataCell</code>.</p>
+     *
+     * @param whenNoDataCell a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     */
+    public void setWhenNoDataCell(DRDesignCrosstabCellContent whenNoDataCell) {
+        this.whenNoDataCell = whenNoDataCell;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignCrosstabCellContent getHeaderCell() {
+        return headerCell;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerCell</code>.</p>
+     *
+     * @param headerCell a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     */
+    public void setHeaderCell(DRDesignCrosstabCellContent headerCell) {
+        this.headerCell = headerCell;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRDesignCrosstabColumnGroup> getColumnGroups() {
+        return columnGroups;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnGroups</code>.</p>
+     *
+     * @param columnGroups a {@link java.util.List} object.
+     */
+    public void setColumnGroups(List<DRDesignCrosstabColumnGroup> columnGroups) {
+        this.columnGroups = columnGroups;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRDesignCrosstabRowGroup> getRowGroups() {
+        return rowGroups;
+    }
+
+    /**
+     * <p>Setter for the field <code>rowGroups</code>.</p>
+     *
+     * @param rowGroups a {@link java.util.List} object.
+     */
+    public void setRowGroups(List<DRDesignCrosstabRowGroup> rowGroups) {
+        this.rowGroups = rowGroups;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRDesignCrosstabCell> getCells() {
+        return cells;
+    }
+
+    /**
+     * <p>Setter for the field <code>cells</code>.</p>
+     *
+     * @param cells a {@link java.util.List} object.
+     */
+    public void setCells(List<DRDesignCrosstabCell> cells) {
+        this.cells = cells;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIDesignCrosstabMeasure> getMeasures() {
+        return measures;
+    }
+
+    /**
+     * <p>Setter for the field <code>measures</code>.</p>
+     *
+     * @param measures a {@link java.util.List} object.
+     */
+    public void setMeasures(List<DRIDesignCrosstabMeasure> measures) {
+        this.measures = measures;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java
new file mode 100644
index 0000000..4c5ac91
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java
@@ -0,0 +1,96 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.crosstab;
+
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCell;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignCrosstabCell class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignCrosstabCell implements DRIDesignCrosstabCell {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private String rowTotalGroup;
+    private String columnTotalGroup;
+    private DRDesignCrosstabCellContent content;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getRowTotalGroup() {
+        return rowTotalGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>rowTotalGroup</code>.</p>
+     *
+     * @param rowTotalGroup a {@link java.lang.String} object.
+     */
+    public void setRowTotalGroup(String rowTotalGroup) {
+        this.rowTotalGroup = rowTotalGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getColumnTotalGroup() {
+        return columnTotalGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnTotalGroup</code>.</p>
+     *
+     * @param columnTotalGroup a {@link java.lang.String} object.
+     */
+    public void setColumnTotalGroup(String columnTotalGroup) {
+        this.columnTotalGroup = columnTotalGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignCrosstabCellContent getContent() {
+        return content;
+    }
+
+    /**
+     * <p>Setter for the field <code>content</code>.</p>
+     *
+     * @param content a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     */
+    public void setContent(DRDesignCrosstabCellContent content) {
+        this.content = content;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java
new file mode 100644
index 0000000..7d122ba
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java
@@ -0,0 +1,118 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.crosstab;
+
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignCrosstabCellContent class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignCrosstabCellContent implements DRIDesignCrosstabCellContent {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int width;
+    private int height;
+    private DRDesignList list;
+    private DRDesignComponent component;
+    private DRIDesignStyle style;
+
+    /** {@inheritDoc} */
+    @Override
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * <p>Setter for the field <code>width</code>.</p>
+     *
+     * @param width a int.
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * <p>Setter for the field <code>height</code>.</p>
+     *
+     * @param height a int.
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * <p>Getter for the field <code>list</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    public DRDesignList getList() {
+        return list;
+    }
+
+    /**
+     * <p>Setter for the field <code>list</code>.</p>
+     *
+     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    public void setList(DRDesignList list) {
+        this.list = list;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignComponent getComponent() {
+        return component;
+    }
+
+    /**
+     * <p>Setter for the field <code>component</code>.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void setComponent(DRDesignComponent component) {
+        this.component = component;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <p>Setter for the field <code>style</code>.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     */
+    public void setStyle(DRIDesignStyle style) {
+        this.style = style;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java
new file mode 100644
index 0000000..8f382eb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.crosstab;
+
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabColumnGroup;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignCrosstabColumnGroup class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignCrosstabColumnGroup extends DRDesignCrosstabGroup implements DRIDesignCrosstabColumnGroup {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int height;
+
+    /** {@inheritDoc} */
+    @Override
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * <p>Setter for the field <code>height</code>.</p>
+     *
+     * @param height a int.
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java
new file mode 100644
index 0000000..354d292
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java
@@ -0,0 +1,99 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.crosstab;
+
+import net.sf.dynamicreports.design.base.DRDesignDataset;
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignCrosstabDataset class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignCrosstabDataset implements DRIDesignCrosstabDataset {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRDesignDataset subDataset;
+    private Boolean dataPreSorted;
+    private ResetType resetType;
+    private DRDesignGroup resetGroup;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignDataset getSubDataset() {
+        return subDataset;
+    }
+
+    /**
+     * <p>Setter for the field <code>subDataset</code>.</p>
+     *
+     * @param subDataset a {@link net.sf.dynamicreports.design.base.DRDesignDataset} object.
+     */
+    public void setSubDataset(DRDesignDataset subDataset) {
+        this.subDataset = subDataset;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getDataPreSorted() {
+        return dataPreSorted;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataPreSorted</code>.</p>
+     *
+     * @param dataPreSorted a {@link java.lang.Boolean} object.
+     */
+    public void setDataPreSorted(Boolean dataPreSorted) {
+        this.dataPreSorted = dataPreSorted;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ResetType getResetType() {
+        return resetType;
+    }
+
+    /**
+     * <p>Setter for the field <code>resetType</code>.</p>
+     *
+     * @param resetType a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     */
+    public void setResetType(ResetType resetType) {
+        this.resetType = resetType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignGroup getResetGroup() {
+        return resetGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>resetGroup</code>.</p>
+     *
+     * @param resetGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     */
+    public void setResetGroup(DRDesignGroup resetGroup) {
+        this.resetGroup = resetGroup;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java
new file mode 100644
index 0000000..22a2154
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java
@@ -0,0 +1,163 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.crosstab;
+
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabGroup;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
+import net.sf.dynamicreports.report.constant.OrderType;
+
+/**
+ * <p>Abstract DRDesignCrosstabGroup class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRDesignCrosstabGroup implements DRIDesignCrosstabGroup {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private CrosstabTotalPosition totalPosition;
+    private OrderType orderType;
+    private DRIDesignExpression expression;
+    private DRIDesignExpression orderByExpression;
+    private DRIDesignExpression comparatorExpression;
+    private DRDesignCrosstabCellContent header;
+    private DRDesignCrosstabCellContent totalHeader;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CrosstabTotalPosition getTotalPosition() {
+        return totalPosition;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalPosition</code>.</p>
+     *
+     * @param totalPosition a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     */
+    public void setTotalPosition(CrosstabTotalPosition totalPosition) {
+        this.totalPosition = totalPosition;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public OrderType getOrderType() {
+        return orderType;
+    }
+
+    /**
+     * <p>Setter for the field <code>orderType</code>.</p>
+     *
+     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     */
+    public void setOrderType(OrderType orderType) {
+        this.orderType = orderType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getExpression() {
+        return expression;
+    }
+
+    /**
+     * <p>Setter for the field <code>expression</code>.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setExpression(DRIDesignExpression expression) {
+        this.expression = expression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getOrderByExpression() {
+        return orderByExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>orderByExpression</code>.</p>
+     *
+     * @param orderByExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setOrderByExpression(DRIDesignExpression orderByExpression) {
+        this.orderByExpression = orderByExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getComparatorExpression() {
+        return comparatorExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>comparatorExpression</code>.</p>
+     *
+     * @param comparatorExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setComparatorExpression(DRIDesignExpression comparatorExpression) {
+        this.comparatorExpression = comparatorExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignCrosstabCellContent getHeader() {
+        return header;
+    }
+
+    /**
+     * <p>Setter for the field <code>header</code>.</p>
+     *
+     * @param header a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     */
+    public void setHeader(DRDesignCrosstabCellContent header) {
+        this.header = header;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignCrosstabCellContent getTotalHeader() {
+        return totalHeader;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalHeader</code>.</p>
+     *
+     * @param totalHeader a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     */
+    public void setTotalHeader(DRDesignCrosstabCellContent totalHeader) {
+        this.totalHeader = totalHeader;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java
new file mode 100644
index 0000000..50e03a0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java
@@ -0,0 +1,109 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.crosstab;
+
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+
+/**
+ * <p>DRDesignCrosstabMeasure class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignCrosstabMeasure implements DRIDesignCrosstabMeasure {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIDesignExpression valueExpression;
+    private Calculation calculation;
+    private CrosstabPercentageType percentageType;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setValueExpression(DRIDesignExpression valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Calculation getCalculation() {
+        return calculation;
+    }
+
+    /**
+     * <p>Setter for the field <code>calculation</code>.</p>
+     *
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public void setCalculation(Calculation calculation) {
+        this.calculation = calculation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CrosstabPercentageType getPercentageType() {
+        return percentageType;
+    }
+
+    /**
+     * <p>Setter for the field <code>percentageType</code>.</p>
+     *
+     * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     */
+    public void setPercentageType(CrosstabPercentageType percentageType) {
+        this.percentageType = percentageType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        if (percentageType != null && percentageType.equals(CrosstabPercentageType.GRAND_TOTAL) && !calculation.equals(Calculation.COUNT) && !calculation.equals(Calculation.DISTINCT_COUNT)) {
+            return Double.class;
+        }
+        return ReportUtils.getVariableValueClass(calculation, valueExpression.getValueClass());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java
new file mode 100644
index 0000000..8c20e72
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.crosstab;
+
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabRowGroup;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignCrosstabRowGroup class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignCrosstabRowGroup extends DRDesignCrosstabGroup implements DRIDesignCrosstabRowGroup {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int width;
+
+    /** {@inheritDoc} */
+    @Override
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * <p>Setter for the field <code>width</code>.</p>
+     *
+     * @param width a int.
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java
new file mode 100644
index 0000000..582f0e8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java
@@ -0,0 +1,92 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>Abstract AbstractDesignComplexExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractDesignComplexExpression implements DRIDesignComplexExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private List<DRIDesignExpression> expressions;
+
+    /**
+     * <p>Constructor for AbstractDesignComplexExpression.</p>
+     */
+    protected AbstractDesignComplexExpression() {
+        this(ReportUtils.generateUniqueName("complexExpression"));
+    }
+
+    /**
+     * <p>Constructor for AbstractDesignComplexExpression.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    protected AbstractDesignComplexExpression(String name) {
+        this.name = name;
+        this.expressions = new ArrayList<DRIDesignExpression>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>addExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void addExpression(DRIDesignExpression expression) {
+        this.expressions.add(expression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIDesignExpression> getExpressions() {
+        return expressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>expressions</code>.</p>
+     *
+     * @param expressions a {@link java.util.List} object.
+     */
+    public void setExpressions(List<DRIDesignExpression> expressions) {
+        this.expressions = expressions;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getParameterName() {
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java
new file mode 100644
index 0000000..c1536a3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java
@@ -0,0 +1,62 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>Abstract AbstractDesignSimpleExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractDesignSimpleExpression implements DRIDesignSimpleExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+
+    /**
+     * <p>Constructor for AbstractDesignSimpleExpression.</p>
+     */
+    protected AbstractDesignSimpleExpression() {
+        this(ReportUtils.generateUniqueName("simpleExpression"));
+    }
+
+    /**
+     * <p>Constructor for AbstractDesignSimpleExpression.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    protected AbstractDesignSimpleExpression(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getParameterName() {
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignComplexExpression.java
new file mode 100644
index 0000000..e494aec
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignComplexExpression.java
@@ -0,0 +1,72 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIComplexExpression;
+
+import java.util.List;
+
+/**
+ * <p>DRDesignComplexExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignComplexExpression extends AbstractDesignComplexExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIComplexExpression<?> complexExpression;
+    private String parameterName;
+
+    /**
+     * <p>Constructor for DRDesignComplexExpression.</p>
+     *
+     * @param complexExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIComplexExpression} object.
+     * @param parameterName     a {@link java.lang.String} object.
+     */
+    public DRDesignComplexExpression(DRIComplexExpression<?> complexExpression, String parameterName) {
+        this.complexExpression = complexExpression;
+        this.parameterName = parameterName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object evaluate(List<?> values, ReportParameters reportParameters) {
+        return complexExpression.evaluate(values, reportParameters);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return complexExpression.getValueClass();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return complexExpression.getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getParameterName() {
+        return parameterName;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignJasperExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignJasperExpression.java
new file mode 100644
index 0000000..cf75b64
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignJasperExpression.java
@@ -0,0 +1,61 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
+
+/**
+ * <p>DRDesignJasperExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignJasperExpression implements DRIDesignJasperExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIJasperExpression<?> jasperExpression;
+
+    /**
+     * <p>Constructor for DRDesignJasperExpression.</p>
+     *
+     * @param jasperExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIJasperExpression} object.
+     */
+    public DRDesignJasperExpression(DRIJasperExpression<?> jasperExpression) {
+        this.jasperExpression = jasperExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getExpression() {
+        return jasperExpression.getExpression();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return jasperExpression.getValueClass();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return jasperExpression.getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignParameterExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignParameterExpression.java
new file mode 100644
index 0000000..10ce7ce
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignParameterExpression.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignParameterExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignParameterExpression implements DRIDesignParameterExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIDesignExpression valueExpression;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setValueExpression(DRIDesignExpression valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignPropertyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignPropertyExpression.java
new file mode 100644
index 0000000..99d0e4e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignPropertyExpression.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignPropertyExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignPropertyExpression implements DRIDesignPropertyExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIDesignExpression valueExpression;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setValueExpression(DRIDesignExpression valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSimpleExpression.java
new file mode 100644
index 0000000..4eb4d73
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSimpleExpression.java
@@ -0,0 +1,70 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+
+/**
+ * <p>DRDesignSimpleExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignSimpleExpression extends AbstractDesignSimpleExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRISimpleExpression<?> simpleExpression;
+    private String parameterName;
+
+    /**
+     * <p>Constructor for DRDesignSimpleExpression.</p>
+     *
+     * @param simpleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRISimpleExpression} object.
+     * @param parameterName    a {@link java.lang.String} object.
+     */
+    public DRDesignSimpleExpression(DRISimpleExpression<?> simpleExpression, String parameterName) {
+        this.simpleExpression = simpleExpression;
+        this.parameterName = parameterName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object evaluate(ReportParameters reportParameters) {
+        return simpleExpression.evaluate(reportParameters);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return simpleExpression.getValueClass();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return simpleExpression.getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getParameterName() {
+        return parameterName;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSystemExpression.java
new file mode 100644
index 0000000..ba335f3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSystemExpression.java
@@ -0,0 +1,55 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
+
+/**
+ * <p>DRDesignSystemExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignSystemExpression implements DRIDesignSystemExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRISystemExpression<?> systemExpression;
+
+    /**
+     * <p>Constructor for DRDesignSystemExpression.</p>
+     *
+     * @param systemExpression a {@link net.sf.dynamicreports.report.definition.expression.DRISystemExpression} object.
+     */
+    public DRDesignSystemExpression(DRISystemExpression<?> systemExpression) {
+        this.systemExpression = systemExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return systemExpression.getValueClass();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return systemExpression.getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignValueFormatter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignValueFormatter.java
new file mode 100644
index 0000000..3ef49a8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignValueFormatter.java
@@ -0,0 +1,61 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.expression;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+
+import java.util.List;
+
+/**
+ * <p>DRDesignValueFormatter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignValueFormatter extends AbstractDesignComplexExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIValueFormatter<?, Object> valueFormatter;
+
+    @SuppressWarnings("unchecked")
+    /**
+     * Constructor for DRDesignValueFormatter.
+     *
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRDesignValueFormatter(DRIValueFormatter<?, ?> valueFormatter, DRIDesignExpression valueExpression) {
+        this.valueFormatter = (DRIValueFormatter<?, Object>) valueFormatter;
+        addExpression(valueExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object evaluate(List<?> values, ReportParameters reportParameters) {
+        return valueFormatter.format(values.get(0), reportParameters);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return valueFormatter.getValueClass();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBaseStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBaseStyle.java
new file mode 100644
index 0000000..dd7a217
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBaseStyle.java
@@ -0,0 +1,332 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignBaseStyle;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.Rotation;
+import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
+import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+import java.awt.Color;
+
+/**
+ * <p>Abstract DRDesignBaseStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRDesignBaseStyle implements DRIDesignBaseStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Color foregroundColor;
+    private Color backgroundColor;
+    private Integer radius;
+    private ImageScale imageScale;
+    private HorizontalTextAlignment horizontalTextAlignment;
+    private VerticalTextAlignment verticalTextAlignment;
+    private HorizontalImageAlignment horizontalImageAlignment;
+    private VerticalImageAlignment verticalImageAlignment;
+    private DRDesignBorder border;
+    private DRDesignPadding padding;
+    private DRDesignFont font;
+    private Rotation rotation;
+    private String pattern;
+    private Markup markup;
+    private DRDesignParagraph paragraph;
+    private DRDesignPen linePen;
+
+    /** {@inheritDoc} */
+    @Override
+    public Color getForegroundColor() {
+        return foregroundColor;
+    }
+
+    /**
+     * <p>Setter for the field <code>foregroundColor</code>.</p>
+     *
+     * @param foregroundColor a {@link java.awt.Color} object.
+     */
+    public void setForegroundColor(Color foregroundColor) {
+        this.foregroundColor = foregroundColor;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Color getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    /**
+     * <p>Setter for the field <code>backgroundColor</code>.</p>
+     *
+     * @param backgroundColor a {@link java.awt.Color} object.
+     */
+    public void setBackgroundColor(Color backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getRadius() {
+        return radius;
+    }
+
+    /**
+     * <p>Setter for the field <code>radius</code>.</p>
+     *
+     * @param radius a {@link java.lang.Integer} object.
+     */
+    public void setRadius(Integer radius) {
+        this.radius = radius;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ImageScale getImageScale() {
+        return imageScale;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageScale</code>.</p>
+     *
+     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     */
+    public void setImageScale(ImageScale imageScale) {
+        this.imageScale = imageScale;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return horizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public VerticalTextAlignment getVerticalTextAlignment() {
+        return verticalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>verticalTextAlignment</code>.</p>
+     *
+     * @param verticalTextAlignment a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     */
+    public void setVerticalTextAlignment(VerticalTextAlignment verticalTextAlignment) {
+        this.verticalTextAlignment = verticalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalImageAlignment getHorizontalImageAlignment() {
+        return horizontalImageAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        this.horizontalImageAlignment = horizontalImageAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public VerticalImageAlignment getVerticalImageAlignment() {
+        return verticalImageAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>verticalImageAlignment</code>.</p>
+     *
+     * @param verticalImageAlignment a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     */
+    public void setVerticalImageAlignment(VerticalImageAlignment verticalImageAlignment) {
+        this.verticalImageAlignment = verticalImageAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignBorder getBorder() {
+        return border;
+    }
+
+    /**
+     * <p>Setter for the field <code>border</code>.</p>
+     *
+     * @param border a {@link net.sf.dynamicreports.design.base.style.DRDesignBorder} object.
+     */
+    public void setBorder(DRDesignBorder border) {
+        this.border = border;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPadding getPadding() {
+        return padding;
+    }
+
+    /**
+     * <p>Setter for the field <code>padding</code>.</p>
+     *
+     * @param padding a {@link net.sf.dynamicreports.design.base.style.DRDesignPadding} object.
+     */
+    public void setPadding(DRDesignPadding padding) {
+        this.padding = padding;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignFont getFont() {
+        return font;
+    }
+
+    /**
+     * <p>Setter for the field <code>font</code>.</p>
+     *
+     * @param font a {@link net.sf.dynamicreports.design.base.style.DRDesignFont} object.
+     */
+    public void setFont(DRDesignFont font) {
+        this.font = font;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Rotation getRotation() {
+        return rotation;
+    }
+
+    /**
+     * <p>Setter for the field <code>rotation</code>.</p>
+     *
+     * @param rotation a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     */
+    public void setRotation(Rotation rotation) {
+        this.rotation = rotation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return pattern;
+    }
+
+    /**
+     * <p>Setter for the field <code>pattern</code>.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     */
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Markup getMarkup() {
+        return markup;
+    }
+
+    /**
+     * <p>Setter for the field <code>markup</code>.</p>
+     *
+     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     */
+    public void setMarkup(Markup markup) {
+        this.markup = markup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignParagraph getParagraph() {
+        return paragraph;
+    }
+
+    /**
+     * <p>Setter for the field <code>paragraph</code>.</p>
+     *
+     * @param paragraph a {@link net.sf.dynamicreports.design.base.style.DRDesignParagraph} object.
+     */
+    public void setParagraph(DRDesignParagraph paragraph) {
+        this.paragraph = paragraph;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPen getLinePen() {
+        return linePen;
+    }
+
+    /**
+     * <p>Setter for the field <code>linePen</code>.</p>
+     *
+     * @param linePen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     */
+    public void setLinePen(DRDesignPen linePen) {
+        this.linePen = linePen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj.getClass() != getClass()) {
+            return false;
+        }
+
+        DRDesignBaseStyle o = (DRDesignBaseStyle) obj;
+        EqualsBuilder equalsBuilder = new EqualsBuilder().append(foregroundColor, o.foregroundColor)
+                                                         .append(backgroundColor, o.backgroundColor)
+                                                         .append(radius, o.radius)
+                                                         .append(imageScale, o.imageScale)
+                                                         .append(horizontalTextAlignment, o.horizontalTextAlignment)
+                                                         .append(verticalTextAlignment, o.verticalTextAlignment)
+                                                         .append(horizontalImageAlignment, o.horizontalImageAlignment)
+                                                         .append(verticalImageAlignment, o.verticalImageAlignment)
+                                                         .append(border, o.border)
+                                                         .append(padding, o.padding)
+                                                         .append(font, o.font)
+                                                         .append(rotation, o.rotation)
+                                                         .append(pattern, o.pattern)
+                                                         .append(markup, o.markup)
+                                                         .append(paragraph, o.paragraph)
+                                                         .append(linePen, o.linePen);
+        return equalsBuilder.isEquals();
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBorder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBorder.java
new file mode 100644
index 0000000..27de0e4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBorder.java
@@ -0,0 +1,115 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignBorder;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+/**
+ * <p>DRDesignBorder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignBorder implements DRIDesignBorder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRDesignPen topPen;
+    private DRDesignPen leftPen;
+    private DRDesignPen bottomPen;
+    private DRDesignPen rightPen;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPen getTopPen() {
+        return topPen;
+    }
+
+    /**
+     * <p>Setter for the field <code>topPen</code>.</p>
+     *
+     * @param topPen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     */
+    public void setTopPen(DRDesignPen topPen) {
+        this.topPen = topPen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPen getLeftPen() {
+        return leftPen;
+    }
+
+    /**
+     * <p>Setter for the field <code>leftPen</code>.</p>
+     *
+     * @param leftPen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     */
+    public void setLeftPen(DRDesignPen leftPen) {
+        this.leftPen = leftPen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPen getBottomPen() {
+        return bottomPen;
+    }
+
+    /**
+     * <p>Setter for the field <code>bottomPen</code>.</p>
+     *
+     * @param bottomPen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     */
+    public void setBottomPen(DRDesignPen bottomPen) {
+        this.bottomPen = bottomPen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignPen getRightPen() {
+        return rightPen;
+    }
+
+    /**
+     * <p>Setter for the field <code>rightPen</code>.</p>
+     *
+     * @param rightPen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     */
+    public void setRightPen(DRDesignPen rightPen) {
+        this.rightPen = rightPen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj.getClass() != getClass()) {
+            return false;
+        }
+
+        DRDesignBorder o = (DRDesignBorder) obj;
+        EqualsBuilder equalsBuilder = new EqualsBuilder().append(topPen, o.topPen).append(leftPen, o.leftPen).append(bottomPen, o.bottomPen).append(rightPen, o.rightPen);
+        return equalsBuilder.isEquals();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignConditionalStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignConditionalStyle.java
new file mode 100644
index 0000000..5e73959
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignConditionalStyle.java
@@ -0,0 +1,78 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.style.DRIDesignConditionalStyle;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+/**
+ * <p>DRDesignConditionalStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignConditionalStyle extends DRDesignBaseStyle implements DRIDesignConditionalStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIDesignExpression conditionExpression;
+    private DRIDesignDataset dataset;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignExpression getConditionExpression() {
+        return conditionExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>conditionExpression</code>.</p>
+     *
+     * @param conditionExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public void setConditionExpression(DRIDesignExpression conditionExpression) {
+        this.conditionExpression = conditionExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignDataset getDataset() {
+        return dataset;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataset</code>.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     */
+    public void setDataset(DRIDesignDataset dataset) {
+        this.dataset = dataset;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        EqualsBuilder equalsBuilder = new EqualsBuilder().appendSuper(super.equals(obj));
+        if (equalsBuilder.isEquals()) {
+            DRDesignConditionalStyle o = (DRDesignConditionalStyle) obj;
+            equalsBuilder.append(conditionExpression, o.conditionExpression).append(dataset, o.dataset);
+        }
+        return equalsBuilder.isEquals();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignFont.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignFont.java
new file mode 100644
index 0000000..911a243
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignFont.java
@@ -0,0 +1,203 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignFont;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+/**
+ * <p>DRDesignFont class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignFont implements DRIDesignFont {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String fontName;
+    private Integer fontSize;
+    private Boolean bold;
+    private Boolean italic;
+    private Boolean underline;
+    private Boolean strikeThrough;
+    private String pdfFontName;
+    private String pdfEncoding;
+    private Boolean pdfEmbedded;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getFontName() {
+        return fontName;
+    }
+
+    /**
+     * <p>Setter for the field <code>fontName</code>.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     */
+    public void setFontName(String fontName) {
+        this.fontName = fontName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getBold() {
+        return bold;
+    }
+
+    /**
+     * <p>Setter for the field <code>bold</code>.</p>
+     *
+     * @param bold a {@link java.lang.Boolean} object.
+     */
+    public void setBold(Boolean bold) {
+        this.bold = bold;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getItalic() {
+        return italic;
+    }
+
+    /**
+     * <p>Setter for the field <code>italic</code>.</p>
+     *
+     * @param italic a {@link java.lang.Boolean} object.
+     */
+    public void setItalic(Boolean italic) {
+        this.italic = italic;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getUnderline() {
+        return underline;
+    }
+
+    /**
+     * <p>Setter for the field <code>underline</code>.</p>
+     *
+     * @param underline a {@link java.lang.Boolean} object.
+     */
+    public void setUnderline(Boolean underline) {
+        this.underline = underline;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getStrikeThrough() {
+        return strikeThrough;
+    }
+
+    /**
+     * <p>Setter for the field <code>strikeThrough</code>.</p>
+     *
+     * @param strikeThrough a {@link java.lang.Boolean} object.
+     */
+    public void setStrikeThrough(Boolean strikeThrough) {
+        this.strikeThrough = strikeThrough;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getFontSize() {
+        return fontSize;
+    }
+
+    /**
+     * <p>Setter for the field <code>fontSize</code>.</p>
+     *
+     * @param fontSize a {@link java.lang.Integer} object.
+     */
+    public void setFontSize(Integer fontSize) {
+        this.fontSize = fontSize;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPdfFontName() {
+        return pdfFontName;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfFontName</code>.</p>
+     *
+     * @param pdfFontName a {@link java.lang.String} object.
+     */
+    public void setPdfFontName(String pdfFontName) {
+        this.pdfFontName = pdfFontName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPdfEncoding() {
+        return pdfEncoding;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfEncoding</code>.</p>
+     *
+     * @param pdfEncoding a {@link java.lang.String} object.
+     */
+    public void setPdfEncoding(String pdfEncoding) {
+        this.pdfEncoding = pdfEncoding;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getPdfEmbedded() {
+        return pdfEmbedded;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfEmbedded</code>.</p>
+     *
+     * @param pdfEmbedded a {@link java.lang.Boolean} object.
+     */
+    public void setPdfEmbedded(Boolean pdfEmbedded) {
+        this.pdfEmbedded = pdfEmbedded;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj.getClass() != getClass()) {
+            return false;
+        }
+
+        DRDesignFont o = (DRDesignFont) obj;
+        EqualsBuilder equalsBuilder = new EqualsBuilder().append(fontName, o.fontName)
+                                                         .append(fontSize, o.fontSize)
+                                                         .append(bold, o.bold)
+                                                         .append(italic, o.italic)
+                                                         .append(underline, o.underline)
+                                                         .append(strikeThrough, o.strikeThrough)
+                                                         .append(pdfFontName, o.pdfFontName)
+                                                         .append(pdfEncoding, o.pdfEncoding)
+                                                         .append(pdfEmbedded, o.pdfEmbedded);
+        return equalsBuilder.isEquals();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPadding.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPadding.java
new file mode 100644
index 0000000..445b403
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPadding.java
@@ -0,0 +1,115 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignPadding;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+/**
+ * <p>DRDesignPadding class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignPadding implements DRIDesignPadding {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer top;
+    private Integer left;
+    private Integer bottom;
+    private Integer right;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTop() {
+        return top;
+    }
+
+    /**
+     * <p>Setter for the field <code>top</code>.</p>
+     *
+     * @param top a {@link java.lang.Integer} object.
+     */
+    public void setTop(Integer top) {
+        this.top = top;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getLeft() {
+        return left;
+    }
+
+    /**
+     * <p>Setter for the field <code>left</code>.</p>
+     *
+     * @param left a {@link java.lang.Integer} object.
+     */
+    public void setLeft(Integer left) {
+        this.left = left;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getBottom() {
+        return bottom;
+    }
+
+    /**
+     * <p>Setter for the field <code>bottom</code>.</p>
+     *
+     * @param bottom a {@link java.lang.Integer} object.
+     */
+    public void setBottom(Integer bottom) {
+        this.bottom = bottom;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getRight() {
+        return right;
+    }
+
+    /**
+     * <p>Setter for the field <code>right</code>.</p>
+     *
+     * @param right a {@link java.lang.Integer} object.
+     */
+    public void setRight(Integer right) {
+        this.right = right;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj.getClass() != getClass()) {
+            return false;
+        }
+
+        DRDesignPadding o = (DRDesignPadding) obj;
+        EqualsBuilder equalsBuilder = new EqualsBuilder().append(top, o.top).append(left, o.left).append(bottom, o.bottom).append(right, o.right);
+        return equalsBuilder.isEquals();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignParagraph.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignParagraph.java
new file mode 100644
index 0000000..7d79889
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignParagraph.java
@@ -0,0 +1,207 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignParagraph;
+import net.sf.dynamicreports.design.definition.style.DRIDesignTabStop;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.LineSpacing;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+import java.util.List;
+
+/**
+ * <p>DRDesignParagraph class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignParagraph implements DRIDesignParagraph {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private LineSpacing lineSpacing;
+    private Float lineSpacingSize;
+    private Integer firstLineIndent;
+    private Integer leftIndent;
+    private Integer rightIndent;
+    private Integer spacingBefore;
+    private Integer spacingAfter;
+    private Integer tabStopWidth;
+    private List<DRIDesignTabStop> tabStops;
+
+    /** {@inheritDoc} */
+    @Override
+    public LineSpacing getLineSpacing() {
+        return lineSpacing;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineSpacing</code>.</p>
+     *
+     * @param lineSpacing a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     */
+    public void setLineSpacing(LineSpacing lineSpacing) {
+        this.lineSpacing = lineSpacing;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getLineSpacingSize() {
+        return lineSpacingSize;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineSpacingSize</code>.</p>
+     *
+     * @param lineSpacingSize a {@link java.lang.Float} object.
+     */
+    public void setLineSpacingSize(Float lineSpacingSize) {
+        this.lineSpacingSize = lineSpacingSize;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getFirstLineIndent() {
+        return firstLineIndent;
+    }
+
+    /**
+     * <p>Setter for the field <code>firstLineIndent</code>.</p>
+     *
+     * @param firstLineIndent a {@link java.lang.Integer} object.
+     */
+    public void setFirstLineIndent(Integer firstLineIndent) {
+        this.firstLineIndent = firstLineIndent;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getLeftIndent() {
+        return leftIndent;
+    }
+
+    /**
+     * <p>Setter for the field <code>leftIndent</code>.</p>
+     *
+     * @param leftIndent a {@link java.lang.Integer} object.
+     */
+    public void setLeftIndent(Integer leftIndent) {
+        this.leftIndent = leftIndent;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getRightIndent() {
+        return rightIndent;
+    }
+
+    /**
+     * <p>Setter for the field <code>rightIndent</code>.</p>
+     *
+     * @param rightIndent a {@link java.lang.Integer} object.
+     */
+    public void setRightIndent(Integer rightIndent) {
+        this.rightIndent = rightIndent;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getSpacingBefore() {
+        return spacingBefore;
+    }
+
+    /**
+     * <p>Setter for the field <code>spacingBefore</code>.</p>
+     *
+     * @param spacingBefore a {@link java.lang.Integer} object.
+     */
+    public void setSpacingBefore(Integer spacingBefore) {
+        this.spacingBefore = spacingBefore;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getSpacingAfter() {
+        return spacingAfter;
+    }
+
+    /**
+     * <p>Setter for the field <code>spacingAfter</code>.</p>
+     *
+     * @param spacingAfter a {@link java.lang.Integer} object.
+     */
+    public void setSpacingAfter(Integer spacingAfter) {
+        this.spacingAfter = spacingAfter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTabStopWidth() {
+        return tabStopWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>tabStopWidth</code>.</p>
+     *
+     * @param tabStopWidth a {@link java.lang.Integer} object.
+     */
+    public void setTabStopWidth(Integer tabStopWidth) {
+        this.tabStopWidth = tabStopWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIDesignTabStop> getTabStops() {
+        return tabStops;
+    }
+
+    /**
+     * <p>Setter for the field <code>tabStops</code>.</p>
+     *
+     * @param tabStops a {@link java.util.List} object.
+     */
+    public void setTabStops(List<DRIDesignTabStop> tabStops) {
+        this.tabStops = tabStops;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj.getClass() != getClass()) {
+            return false;
+        }
+
+        DRDesignParagraph o = (DRDesignParagraph) obj;
+        EqualsBuilder equalsBuilder = new EqualsBuilder().append(lineSpacing, o.lineSpacing)
+                                                         .append(lineSpacingSize, o.lineSpacingSize)
+                                                         .append(firstLineIndent, o.firstLineIndent)
+                                                         .append(leftIndent, o.leftIndent)
+                                                         .append(rightIndent, o.rightIndent)
+                                                         .append(spacingBefore, o.spacingBefore)
+                                                         .append(spacingAfter, o.spacingAfter)
+                                                         .append(tabStopWidth, o.tabStopWidth)
+                                                         .append(tabStops, o.tabStops);
+        return equalsBuilder.isEquals();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPen.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPen.java
new file mode 100644
index 0000000..922b42d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPen.java
@@ -0,0 +1,102 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.LineStyle;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+import java.awt.Color;
+
+/**
+ * <p>DRDesignPen class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignPen implements DRIDesignPen {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Float lineWidth;
+    private LineStyle lineStyle;
+    private Color lineColor;
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getLineWidth() {
+        return lineWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineWidth</code>.</p>
+     *
+     * @param lineWidth a {@link java.lang.Float} object.
+     */
+    public void setLineWidth(Float lineWidth) {
+        this.lineWidth = lineWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public LineStyle getLineStyle() {
+        return lineStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineStyle</code>.</p>
+     *
+     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     */
+    public void setLineStyle(LineStyle lineStyle) {
+        this.lineStyle = lineStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Color getLineColor() {
+        return lineColor;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineColor</code>.</p>
+     *
+     * @param lineColor a {@link java.awt.Color} object.
+     */
+    public void setLineColor(Color lineColor) {
+        this.lineColor = lineColor;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj.getClass() != getClass()) {
+            return false;
+        }
+
+        DRDesignPen o = (DRDesignPen) obj;
+        EqualsBuilder equalsBuilder = new EqualsBuilder().append(lineWidth, o.lineWidth).append(lineStyle, o.lineStyle).append(lineColor, o.lineColor);
+        return equalsBuilder.isEquals();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignStyle.java
new file mode 100644
index 0000000..6131af4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignStyle.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRDesignStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignStyle extends DRDesignBaseStyle implements DRIDesignStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRDesignStyle parentStyle;
+    private List<DRDesignConditionalStyle> conditionalStyles;
+
+    /**
+     * <p>Constructor for DRDesignStyle.</p>
+     */
+    public DRDesignStyle() {
+        this(ReportUtils.generateUniqueName("style"));
+    }
+
+    /**
+     * <p>Constructor for DRDesignStyle.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public DRDesignStyle(String name) {
+        this.name = Validate.notBlank(name);
+        this.conditionalStyles = new ArrayList<DRDesignConditionalStyle>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDesignStyle getParentStyle() {
+        return parentStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>parentStyle</code>.</p>
+     *
+     * @param parentStyle a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     */
+    public void setParentStyle(DRDesignStyle parentStyle) {
+        this.parentStyle = parentStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRDesignConditionalStyle> getConditionalStyles() {
+        return conditionalStyles;
+    }
+
+    /**
+     * <p>Setter for the field <code>conditionalStyles</code>.</p>
+     *
+     * @param conditionalStyles a {@link java.util.List} object.
+     */
+    public void setConditionalStyles(List<DRDesignConditionalStyle> conditionalStyles) {
+        this.conditionalStyles = conditionalStyles;
+    }
+
+    /**
+     * <p>addConditionalStyle.</p>
+     *
+     * @param conditionalStyle a {@link net.sf.dynamicreports.design.base.style.DRDesignConditionalStyle} object.
+     */
+    public void addConditionalStyle(DRDesignConditionalStyle conditionalStyle) {
+        this.conditionalStyles.add(conditionalStyle);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        EqualsBuilder equalsBuilder = new EqualsBuilder().appendSuper(super.equals(obj));
+        if (equalsBuilder.isEquals()) {
+            DRDesignStyle o = (DRDesignStyle) obj;
+            if (!(parentStyle == null ? o.getParentStyle() == null : parentStyle.getName().equals(o.getParentStyle().getName()))) {
+                return false;
+            }
+            equalsBuilder.append(name, o.name).append(conditionalStyles, o.conditionalStyles);
+        }
+        return equalsBuilder.isEquals();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignTabStop.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignTabStop.java
new file mode 100644
index 0000000..c819611
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignTabStop.java
@@ -0,0 +1,84 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.base.style;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignTabStop;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+/**
+ * <p>DRDesignTabStop class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignTabStop implements DRIDesignTabStop {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int position;
+    private TabStopAlignment alignment;
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPosition() {
+        return position;
+    }
+
+    /**
+     * <p>Setter for the field <code>position</code>.</p>
+     *
+     * @param position a int.
+     */
+    public void setPosition(int position) {
+        this.position = position;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TabStopAlignment getAlignment() {
+        return alignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>alignment</code>.</p>
+     *
+     * @param alignment a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     */
+    public void setAlignment(TabStopAlignment alignment) {
+        this.alignment = alignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj.getClass() != getClass()) {
+            return false;
+        }
+
+        DRDesignTabStop o = (DRDesignTabStop) obj;
+        EqualsBuilder equalsBuilder = new EqualsBuilder().append(position, o.position).append(alignment, o.alignment);
+        return equalsBuilder.isEquals();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ComponentGroupType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ComponentGroupType.java
new file mode 100644
index 0000000..0384504
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ComponentGroupType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.constant;
+
+/**
+ * <p>ComponentGroupType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ComponentGroupType {
+    FRAME, NONE
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/DefaultStyleType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/DefaultStyleType.java
new file mode 100644
index 0000000..50b6f80
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/DefaultStyleType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.constant;
+
+/**
+ * <p>DefaultStyleType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum DefaultStyleType {
+    NONE, TEXT, COLUMN, COLUMN_TITLE, GROUP, GROUP_TITLE, SUBTOTAL, IMAGE
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/EvaluationTime.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/EvaluationTime.java
new file mode 100644
index 0000000..eb6aa28
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/EvaluationTime.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.constant;
+
+/**
+ * <p>EvaluationTime class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum EvaluationTime {
+    NOW, REPORT, PAGE, COLUMN, GROUP, BAND, AUTO
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ResetType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ResetType.java
new file mode 100644
index 0000000..8858a2c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ResetType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.constant;
+
+/**
+ * <p>ResetType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ResetType {
+    NONE, REPORT, PAGE, COLUMN, GROUP
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignBand.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignBand.java
new file mode 100644
index 0000000..20b74fe
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignBand.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.SplitType;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignBand interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignBand extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getSplitType();
+
+    /**
+     * <p>getBandComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.component.DRIDesignComponent} object.
+     */
+    public DRIDesignComponent getBandComponent();
+
+    /**
+     * <p>getList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    public DRDesignList getList();
+
+    /**
+     * <p>getHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getHeight();
+
+    /**
+     * <p>getPrintWhenExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getPrintWhenExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignDataset.java
new file mode 100644
index 0000000..247c25f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignDataset.java
@@ -0,0 +1,120 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+/**
+ * <p>DRIDesignDataset interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignDataset extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getFields.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignField> getFields();
+
+    /**
+     * <p>getVariables.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignVariable> getVariables();
+
+    /**
+     * <p>getSystemExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSystemExpression> getSystemExpressions();
+
+    /**
+     * <p>getJasperExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignJasperExpression> getJasperExpressions();
+
+    /**
+     * <p>getSimpleExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSimpleExpression> getSimpleExpressions();
+
+    /**
+     * <p>getComplexExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignComplexExpression> getComplexExpressions();
+
+    /**
+     * <p>getSorts.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSort> getSorts();
+
+    /**
+     * <p>getQuery.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignQuery} object.
+     */
+    public DRIDesignQuery getQuery();
+
+    /**
+     * <p>getConnectionExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getConnectionExpression();
+
+    /**
+     * <p>getDataSourceExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getDataSourceExpression();
+
+    /**
+     * <p>getFilterExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getFilterExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignField.java
new file mode 100644
index 0000000..d6f60b0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignField.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+
+/**
+ * <p>DRIDesignField interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignField extends DRIDesignExpression {
+
+    /**
+     * <p>isExternal.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isExternal();
+
+    /**
+     * <p>getDescription.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getDescription();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignGroup.java
new file mode 100644
index 0000000..602c1c4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignGroup.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>DRIDesignGroup interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignGroup extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getGroupExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getGroupExpression();
+
+    /**
+     * <p>getHeaderBands.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIDesignBand> getHeaderBands();
+
+    /**
+     * <p>getFooterBands.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIDesignBand> getFooterBands();
+
+    /**
+     * <p>isStartInNewPage.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isStartInNewPage();
+
+    /**
+     * <p>isStartInNewColumn.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isStartInNewColumn();
+
+    /**
+     * <p>isReprintHeaderOnEachPage.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isReprintHeaderOnEachPage();
+
+    /**
+     * <p>isResetPageNumber.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isResetPageNumber();
+
+    /**
+     * <p>getMinHeightToStartNewPage.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getMinHeightToStartNewPage();
+
+    /**
+     * <p>getFooterPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     */
+    public GroupFooterPosition getFooterPosition();
+
+    /**
+     * <p>isKeepTogether.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isKeepTogether();
+
+    /**
+     * <p>isHeaderWithSubtotal.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isHeaderWithSubtotal();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignHyperLink.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignHyperLink.java
new file mode 100644
index 0000000..18ac736
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignHyperLink.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignHyperLink interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignHyperLink extends Serializable {
+
+    /**
+     * <p>getAnchorExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getAnchorExpression();
+
+    /**
+     * <p>getPageExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getPageExpression();
+
+    /**
+     * <p>getReferenceExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getReferenceExpression();
+
+    /**
+     * <p>getTooltipExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getTooltipExpression();
+
+    /**
+     * <p>getType.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getType();
+
+    /**
+     * <p>getTarget.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getTarget();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignMargin.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignMargin.java
new file mode 100644
index 0000000..4e2216c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignMargin.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignMargin interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignMargin extends Serializable {
+
+    /**
+     * <p>getTop.</p>
+     *
+     * @return a int.
+     */
+    public int getTop();
+
+    /**
+     * <p>getLeft.</p>
+     *
+     * @return a int.
+     */
+    public int getLeft();
+
+    /**
+     * <p>getBottom.</p>
+     *
+     * @return a int.
+     */
+    public int getBottom();
+
+    /**
+     * <p>getRight.</p>
+     *
+     * @return a int.
+     */
+    public int getRight();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignPage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignPage.java
new file mode 100644
index 0000000..d570d93
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignPage.java
@@ -0,0 +1,80 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.report.constant.PageOrientation;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignPage interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignPage extends Serializable {
+
+    /**
+     * <p>getWidth.</p>
+     *
+     * @return a int.
+     */
+    public int getWidth();
+
+    /**
+     * <p>getHeight.</p>
+     *
+     * @return a int.
+     */
+    public int getHeight();
+
+    /**
+     * <p>getOrientation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     */
+    public PageOrientation getOrientation();
+
+    /**
+     * <p>getMargin.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignMargin} object.
+     */
+    public DRIDesignMargin getMargin();
+
+    /**
+     * <p>getColumnsPerPage.</p>
+     *
+     * @return a int.
+     */
+    public int getColumnsPerPage();
+
+    /**
+     * <p>getColumnSpace.</p>
+     *
+     * @return a int.
+     */
+    public int getColumnSpace();
+
+    /**
+     * <p>getColumnWidth.</p>
+     *
+     * @return a int.
+     */
+    public int getColumnWidth();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignParameter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignParameter.java
new file mode 100644
index 0000000..0a53014
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignParameter.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignParameter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignParameter extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueClass.</p>
+     *
+     * @return a {@link java.lang.Class} object.
+     */
+    public Class<?> getValueClass();
+
+    /**
+     * <p>getValue.</p>
+     *
+     * @return a {@link java.lang.Object} object.
+     */
+    public Object getValue();
+
+    /**
+     * <p>isExternal.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isExternal();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignQuery.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignQuery.java
new file mode 100644
index 0000000..74286e2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignQuery.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignQuery interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignQuery extends Serializable {
+
+    /**
+     * <p>getText.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getText();
+
+    /**
+     * <p>getLanguage.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getLanguage();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignReport.java
new file mode 100644
index 0000000..18462e1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignReport.java
@@ -0,0 +1,364 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+/**
+ * <p>DRIDesignReport interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignReport extends Serializable {
+
+    /**
+     * <p>getTemplateDesign.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign} object.
+     */
+    public DRIDesignTemplateDesign getTemplateDesign();
+
+    /**
+     * <p>getReportName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getReportName();
+
+    /**
+     * <p>getLocale.</p>
+     *
+     * @return a {@link java.util.Locale} object.
+     */
+    public Locale getLocale();
+
+    /**
+     * <p>getResourceBundle.</p>
+     *
+     * @return a {@link java.util.ResourceBundle} object.
+     */
+    public ResourceBundle getResourceBundle();
+
+    /**
+     * <p>getResourceBundleName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getResourceBundleName();
+
+    /**
+     * <p>isIgnorePagination.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isIgnorePagination();
+
+    /**
+     * <p>getProperties.</p>
+     *
+     * @return a {@link java.util.Properties} object.
+     */
+    public Properties getProperties();
+
+    /**
+     * <p>getQuery.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignQuery} object.
+     */
+    public DRIDesignQuery getQuery();
+
+    /**
+     * <p>getPage.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignPage} object.
+     */
+    public DRIDesignPage getPage();
+
+    /**
+     * <p>getWhenNoDataType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+     */
+    public WhenNoDataType getWhenNoDataType();
+
+    /**
+     * <p>getWhenResourceMissingType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     */
+    public WhenResourceMissingType getWhenResourceMissingType();
+
+    /**
+     * <p>isTitleOnANewPage.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isTitleOnANewPage();
+
+    /**
+     * <p>isSummaryOnANewPage.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isSummaryOnANewPage();
+
+    /**
+     * <p>isSummaryWithPageHeaderAndFooter.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isSummaryWithPageHeaderAndFooter();
+
+    /**
+     * <p>isFloatColumnFooter.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isFloatColumnFooter();
+
+    /**
+     * <p>getPrintOrder.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+     */
+    public Orientation getPrintOrder();
+
+    /**
+     * <p>getColumnDirection.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public RunDirection getColumnDirection();
+
+    /**
+     * <p>getLanguage.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getLanguage();
+
+    /**
+     * <p>isTableOfContents.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isTableOfContents();
+
+    /**
+     * <p>getTableOfContentsHeadings.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     */
+    public Map<String, JasperTocHeading> getTableOfContentsHeadings();
+
+    /**
+     * <p>getTableOfContentsCustomizer.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+     */
+    public DRITableOfContentsCustomizer getTableOfContentsCustomizer();
+
+    /**
+     * <p>getFilterExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getFilterExpression();
+
+    /**
+     * <p>getParameters.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignParameter> getParameters();
+
+    /**
+     * <p>getParameterValues.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     */
+    public Map<String, Object> getParameterValues();
+
+    /**
+     * <p>getScriptlets.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIScriptlet> getScriptlets();
+
+    /**
+     * <p>getFields.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignField> getFields();
+
+    /**
+     * <p>getSystemExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSystemExpression> getSystemExpressions();
+
+    /**
+     * <p>getJasperExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignJasperExpression> getJasperExpressions();
+
+    /**
+     * <p>getSimpleExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSimpleExpression> getSimpleExpressions();
+
+    /**
+     * <p>getStyles.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignStyle> getStyles();
+
+    /**
+     * <p>getGroups.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<? extends DRIDesignGroup> getGroups();
+
+    /**
+     * <p>getVariables.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignVariable> getVariables();
+
+    /**
+     * <p>getComplexExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignComplexExpression> getComplexExpressions();
+
+    /**
+     * <p>getSorts.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSort> getSorts();
+
+    /**
+     * <p>getDatasets.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignDataset> getDatasets();
+
+    /**
+     * <p>getTitleBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getTitleBand();
+
+    /**
+     * <p>getPageHeaderBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getPageHeaderBand();
+
+    /**
+     * <p>getPageFooterBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getPageFooterBand();
+
+    /**
+     * <p>getColumnHeaderBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getColumnHeaderBand();
+
+    /**
+     * <p>getColumnFooterBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getColumnFooterBand();
+
+    /**
+     * <p>getDetailBands.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIDesignBand> getDetailBands();
+
+    /**
+     * <p>getLastPageFooterBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getLastPageFooterBand();
+
+    /**
+     * <p>getSummaryBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getSummaryBand();
+
+    /**
+     * <p>getNoDataBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getNoDataBand();
+
+    /**
+     * <p>getBackgroundBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     */
+    public DRIDesignBand getBackgroundBand();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignSort.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignSort.java
new file mode 100644
index 0000000..89944ea
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignSort.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.OrderType;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignSort interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignSort extends Serializable {
+
+    /**
+     * <p>getExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getExpression();
+
+    /**
+     * <p>getOrderType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     */
+    public OrderType getOrderType();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java
new file mode 100644
index 0000000..f726b05
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java
@@ -0,0 +1,39 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.definition.component.DRIDesignTextField;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignTableOfContentsHeading interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignTableOfContentsHeading extends Serializable {
+
+    /**
+     * <p>getReferenceField.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.component.DRIDesignTextField} object.
+     */
+    public DRIDesignTextField getReferenceField();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTemplateDesign.java
new file mode 100644
index 0000000..ed646f8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTemplateDesign.java
@@ -0,0 +1,102 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignTemplateDesign interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignTemplateDesign extends Serializable {
+
+    /**
+     * <p>getTitleComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getTitleComponentsCount();
+
+    /**
+     * <p>getPageHeaderComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getPageHeaderComponentsCount();
+
+    /**
+     * <p>getPageFooterComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getPageFooterComponentsCount();
+
+    /**
+     * <p>getColumnHeaderComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getColumnHeaderComponentsCount();
+
+    /**
+     * <p>getColumnFooterComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getColumnFooterComponentsCount();
+
+    /**
+     * <p>getLastPageFooterComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getLastPageFooterComponentsCount();
+
+    /**
+     * <p>getSummaryComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getSummaryComponentsCount();
+
+    /**
+     * <p>getNoDataComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getNoDataComponentsCount();
+
+    /**
+     * <p>getBackgroundComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getBackgroundComponentsCount();
+
+    /**
+     * <p>getDesign.</p>
+     *
+     * @return a {@link java.lang.Object} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public Object getDesign() throws DRException;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignVariable.java
new file mode 100644
index 0000000..eba69a5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignVariable.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition;
+
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Calculation;
+
+/**
+ * <p>DRIDesignVariable interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignVariable extends DRIDesignExpression {
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getValueExpression();
+
+    /**
+     * <p>getInitialValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getInitialValueExpression();
+
+    /**
+     * <p>getCalculation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public Calculation getCalculation();
+
+    /**
+     * <p>getResetType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     */
+    public ResetType getResetType();
+
+    /**
+     * <p>getResetGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     */
+    public DRIDesignGroup getResetGroup();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignBreak.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignBreak.java
new file mode 100644
index 0000000..fd0b34d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignBreak.java
@@ -0,0 +1,37 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.report.constant.BreakType;
+
+/**
+ * <p>DRIDesignBreak interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignBreak extends DRIDesignComponent {
+
+    /**
+     * <p>getType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     */
+    public BreakType getType();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignComponent.java
new file mode 100644
index 0000000..6c1c809
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignComponent.java
@@ -0,0 +1,149 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.StretchType;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>DRIDesignComponent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignComponent extends Serializable {
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getUniqueName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getUniqueName();
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     */
+    public DRIDesignStyle getStyle();
+
+    /**
+     * <p>getX.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getX();
+
+    /**
+     * <p>getY.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getY();
+
+    /**
+     * <p>getWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getWidth();
+
+    /**
+     * <p>getHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getHeight();
+
+    /**
+     * <p>getPrintWhenExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getPrintWhenExpression();
+
+    /**
+     * <p>isRemoveLineWhenBlank.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isRemoveLineWhenBlank();
+
+    /**
+     * <p>getPropertyExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIDesignPropertyExpression> getPropertyExpressions();
+
+    /**
+     * <p>getPositionType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     */
+    public ComponentPositionType getPositionType();
+
+    /**
+     * <p>getStretchType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     */
+    public StretchType getStretchType();
+
+    /**
+     * <p>isPrintInFirstWholeBand.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isPrintInFirstWholeBand();
+
+    /**
+     * <p>isPrintWhenDetailOverflows.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isPrintWhenDetailOverflows();
+
+    /**
+     * <p>getPrintWhenGroupChanges.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     */
+    public DRIDesignGroup getPrintWhenGroupChanges();
+
+    /**
+     * <p>getTableOfContentsHeading.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignTableOfContentsHeading} object.
+     */
+    public DRIDesignTableOfContentsHeading getTableOfContentsHeading();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignEllipse.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignEllipse.java
new file mode 100644
index 0000000..68948b8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignEllipse.java
@@ -0,0 +1,37 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
+
+/**
+ * <p>DRIDesignEllipse interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignEllipse extends DRIDesignComponent {
+
+    /**
+     * <p>getPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    public DRIDesignPen getPen();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignFiller.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignFiller.java
new file mode 100644
index 0000000..c061d08
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignFiller.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+/**
+ * <p>DRIDesignFiller interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignFiller extends DRIDesignComponent {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignGenericElement.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignGenericElement.java
new file mode 100644
index 0000000..8e2d6a3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignGenericElement.java
@@ -0,0 +1,69 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+
+import java.util.List;
+
+/**
+ * <p>DRIDesignGenericElement interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignGenericElement extends DRIDesignComponent {
+
+    /**
+     * <p>getGenericElementNamespace.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getGenericElementNamespace();
+
+    /**
+     * <p>getGenericElementName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getGenericElementName();
+
+    /**
+     * <p>getEvaluationTime.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    public EvaluationTime getEvaluationTime();
+
+    /**
+     * <p>getEvaluationGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     */
+    public DRIDesignGroup getEvaluationGroup();
+
+    /**
+     * <p>getParameterExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIDesignParameterExpression> getParameterExpressions();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java
new file mode 100644
index 0000000..89bf29e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java
@@ -0,0 +1,51 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.definition.DRIDesignHyperLink;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+
+/**
+ * <p>DRIDesignHyperLinkComponent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignHyperLinkComponent extends DRIDesignComponent {
+
+    /**
+     * <p>getAnchorNameExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getAnchorNameExpression();
+
+    /**
+     * <p>getBookmarkLevel.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getBookmarkLevel();
+
+    /**
+     * <p>getHyperLink.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignHyperLink} object.
+     */
+    public DRIDesignHyperLink getHyperLink();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignImage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignImage.java
new file mode 100644
index 0000000..02b235f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignImage.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+
+/**
+ * <p>DRIDesignImage interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignImage extends DRIDesignHyperLinkComponent {
+
+    /**
+     * <p>getImageExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getImageExpression();
+
+    /**
+     * <p>getImageScale.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     */
+    public ImageScale getImageScale();
+
+    /**
+     * <p>getUsingCache.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getUsingCache();
+
+    /**
+     * <p>getLazy.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getLazy();
+
+    /**
+     * <p>getHorizontalImageAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public HorizontalImageAlignment getHorizontalImageAlignment();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignLine.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignLine.java
new file mode 100644
index 0000000..ec0808d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignLine.java
@@ -0,0 +1,45 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
+import net.sf.dynamicreports.report.constant.LineDirection;
+
+/**
+ * <p>DRIDesignLine interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignLine extends DRIDesignComponent {
+
+    /**
+     * <p>getDirection.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     */
+    public LineDirection getDirection();
+
+    /**
+     * <p>getPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    public DRIDesignPen getPen();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignList.java
new file mode 100644
index 0000000..fd61417
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignList.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.constant.ComponentGroupType;
+import net.sf.dynamicreports.report.constant.ListType;
+
+import java.util.List;
+
+/**
+ * <p>DRIDesignList interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignList extends DRIDesignComponent {
+
+    /**
+     * <p>getComponents.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIDesignComponent> getComponents();
+
+    /**
+     * <p>getType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public ListType getType();
+
+    /**
+     * <p>getComponentGroupType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.constant.ComponentGroupType} object.
+     */
+    public ComponentGroupType getComponentGroupType();
+
+    /**
+     * <p>getBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.component.DRIDesignComponent} object.
+     */
+    public DRIDesignComponent getBackgroundComponent();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignMap.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignMap.java
new file mode 100644
index 0000000..20c4523
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignMap.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+
+/**
+ * <p>DRIDesignMap interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignMap extends DRIDesignComponent {
+
+    /**
+     * <p>getEvaluationTime.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    public EvaluationTime getEvaluationTime();
+
+    /**
+     * <p>getEvaluationGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     */
+    public DRIDesignGroup getEvaluationGroup();
+
+    /**
+     * <p>getLatitudeExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getLatitudeExpression();
+
+    /**
+     * <p>getLongitudeExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getLongitudeExpression();
+
+    /**
+     * <p>getZoomExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getZoomExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignRectangle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignRectangle.java
new file mode 100644
index 0000000..de26fd2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignRectangle.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
+
+/**
+ * <p>DRIDesignRectangle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignRectangle extends DRIDesignComponent {
+
+    /**
+     * <p>getRadius.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getRadius();
+
+    /**
+     * <p>getPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    public DRIDesignPen getPen();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignSubreport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignSubreport.java
new file mode 100644
index 0000000..4c9c0ac
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignSubreport.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+
+/**
+ * <p>DRIDesignSubreport interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignSubreport extends DRIDesignComponent {
+
+    /**
+     * <p>getReportExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getReportExpression();
+
+    /**
+     * <p>getParametersExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getParametersExpression();
+
+    /**
+     * <p>getConnectionExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getConnectionExpression();
+
+    /**
+     * <p>getDataSourceExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getDataSourceExpression();
+
+    /**
+     * <p>getRunToBottom.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getRunToBottom();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignTextField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignTextField.java
new file mode 100644
index 0000000..3adac56
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignTextField.java
@@ -0,0 +1,104 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.component;
+
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+
+/**
+ * <p>DRIDesignTextField interface.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ *
+ */
+public interface DRIDesignTextField extends DRIDesignHyperLinkComponent {
+
+    /**
+     * <p>getPattern.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    String getPattern();
+
+    /**
+     * <p>getPatternExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    DRIDesignExpression getPatternExpression();
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    HorizontalTextAlignment getHorizontalTextAlignment();
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    DRIDesignExpression getValueExpression();
+
+    /**
+     * <p>isPrintRepeatedValues.</p>
+     *
+     * @return a boolean.
+     */
+    boolean isPrintRepeatedValues();
+
+    /**
+     * <p>getEvaluationTime.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    EvaluationTime getEvaluationTime();
+
+    /**
+     * <p>getEvaluationGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     */
+    DRIDesignGroup getEvaluationGroup();
+
+    /**
+     * <p>getMarkup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     */
+    Markup getMarkup();
+
+    /**
+     * <p>isStretchWithOverflow.</p>
+     *
+     * @return a boolean.
+     * @deprecated Replaced by {@link #getTextAdjust()}.
+     */
+    @Deprecated
+    boolean isStretchWithOverflow();
+
+    /**
+     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    TextAdjust getTextAdjust();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java
new file mode 100644
index 0000000..9c35f2a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java
@@ -0,0 +1,116 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.crosstab;
+
+import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
+import net.sf.dynamicreports.report.constant.RunDirection;
+
+import java.util.List;
+
+/**
+ * <p>DRIDesignCrosstab interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCrosstab extends DRIDesignComponent {
+
+    /**
+     * <p>getDataset.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset} object.
+     */
+    public DRIDesignCrosstabDataset getDataset();
+
+    /**
+     * <p>isRepeatColumnHeaders.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean isRepeatColumnHeaders();
+
+    /**
+     * <p>isRepeatRowHeaders.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean isRepeatRowHeaders();
+
+    /**
+     * <p>getColumnBreakOffset.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getColumnBreakOffset();
+
+    /**
+     * <p>getIgnoreWidth.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreWidth();
+
+    /**
+     * <p>getRunDirection.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public RunDirection getRunDirection();
+
+    /**
+     * <p>getWhenNoDataCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     */
+    public DRIDesignCrosstabCellContent getWhenNoDataCell();
+
+    /**
+     * <p>getHeaderCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     */
+    public DRIDesignCrosstabCellContent getHeaderCell();
+
+    /**
+     * <p>getColumnGroups.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIDesignCrosstabColumnGroup> getColumnGroups();
+
+    /**
+     * <p>getRowGroups.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIDesignCrosstabRowGroup> getRowGroups();
+
+    /**
+     * <p>getCells.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIDesignCrosstabCell> getCells();
+
+    /**
+     * <p>getMeasures.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIDesignCrosstabMeasure> getMeasures();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java
new file mode 100644
index 0000000..fa820b0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.crosstab;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignCrosstabCell interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCrosstabCell extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getRowTotalGroup.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getRowTotalGroup();
+
+    /**
+     * <p>getColumnTotalGroup.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getColumnTotalGroup();
+
+    /**
+     * <p>getContent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     */
+    public DRIDesignCrosstabCellContent getContent();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java
new file mode 100644
index 0000000..c2b56c7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.crosstab;
+
+import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignCrosstabCellContent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCrosstabCellContent extends Serializable {
+
+    /**
+     * <p>getWidth.</p>
+     *
+     * @return a int.
+     */
+    public int getWidth();
+
+    /**
+     * <p>getHeight.</p>
+     *
+     * @return a int.
+     */
+    public int getHeight();
+
+    /**
+     * <p>getComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.component.DRIDesignComponent} object.
+     */
+    public DRIDesignComponent getComponent();
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     */
+    public DRIDesignStyle getStyle();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java
new file mode 100644
index 0000000..807ed05
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.crosstab;
+
+/**
+ * <p>DRIDesignCrosstabColumnGroup interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCrosstabColumnGroup extends DRIDesignCrosstabGroup {
+
+    /**
+     * <p>getHeight.</p>
+     *
+     * @return a int.
+     */
+    public int getHeight();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java
new file mode 100644
index 0000000..523a5aa
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java
@@ -0,0 +1,61 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.crosstab;
+
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignCrosstabDataset interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCrosstabDataset extends Serializable {
+
+    /**
+     * <p>getSubDataset.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     */
+    public DRIDesignDataset getSubDataset();
+
+    /**
+     * <p>getDataPreSorted.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getDataPreSorted();
+
+    /**
+     * <p>getResetType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     */
+    public ResetType getResetType();
+
+    /**
+     * <p>getResetGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     */
+    public DRIDesignGroup getResetGroup();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java
new file mode 100644
index 0000000..d438a41
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java
@@ -0,0 +1,89 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.crosstab;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
+import net.sf.dynamicreports.report.constant.OrderType;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignCrosstabGroup interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCrosstabGroup extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getTotalPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     */
+    public CrosstabTotalPosition getTotalPosition();
+
+    /**
+     * <p>getOrderType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     */
+    public OrderType getOrderType();
+
+    /**
+     * <p>getExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getExpression();
+
+    /**
+     * <p>getOrderByExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getOrderByExpression();
+
+    /**
+     * <p>getComparatorExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getComparatorExpression();
+
+    /**
+     * <p>getHeader.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     */
+    public DRIDesignCrosstabCellContent getHeader();
+
+    /**
+     * <p>getTotalHeader.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     */
+    public DRIDesignCrosstabCellContent getTotalHeader();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java
new file mode 100644
index 0000000..6fe585e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java
@@ -0,0 +1,68 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.crosstab;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignCrosstabMeasure interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCrosstabMeasure extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueClass.</p>
+     *
+     * @return a {@link java.lang.Class} object.
+     */
+    public Class<?> getValueClass();
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getValueExpression();
+
+    /**
+     * <p>getCalculation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public Calculation getCalculation();
+
+    /**
+     * <p>getPercentageType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     */
+    public CrosstabPercentageType getPercentageType();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java
new file mode 100644
index 0000000..40eef39
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.crosstab;
+
+/**
+ * <p>DRIDesignCrosstabRowGroup interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCrosstabRowGroup extends DRIDesignCrosstabGroup {
+
+    /**
+     * <p>getWidth.</p>
+     *
+     * @return a int.
+     */
+    public int getWidth();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java
new file mode 100644
index 0000000..ce3e6f8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.expression;
+
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.List;
+
+/**
+ * <p>DRIDesignComplexExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignComplexExpression extends DRIDesignExpression {
+
+    /**
+     * <p>getExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIDesignExpression> getExpressions();
+
+    /**
+     * <p>evaluate.</p>
+     *
+     * @param values           a {@link java.util.List} object.
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a {@link java.lang.Object} object.
+     */
+    public Object evaluate(List<?> values, ReportParameters reportParameters);
+
+    /**
+     * <p>getParameterName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getParameterName();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignExpression.java
new file mode 100644
index 0000000..d6fb653
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignExpression.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.expression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignExpression extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueClass.</p>
+     *
+     * @return a {@link java.lang.Class} object.
+     */
+    public Class<?> getValueClass();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java
new file mode 100644
index 0000000..8f8b161
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.expression;
+
+/**
+ * <p>DRIDesignJasperExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignJasperExpression extends DRIDesignExpression {
+
+    /**
+     * <p>getExpression.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java
new file mode 100644
index 0000000..d0fa3ea
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.expression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignParameterExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignParameterExpression extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getValueExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java
new file mode 100644
index 0000000..9ae6985
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.expression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignPropertyExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignPropertyExpression extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getValueExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java
new file mode 100644
index 0000000..5a668eb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.expression;
+
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>DRIDesignSimpleExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignSimpleExpression extends DRIDesignExpression {
+
+    /**
+     * <p>evaluate.</p>
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a {@link java.lang.Object} object.
+     */
+    public Object evaluate(ReportParameters reportParameters);
+
+    /**
+     * <p>getParameterName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getParameterName();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java
new file mode 100644
index 0000000..cd3c018
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java
@@ -0,0 +1,27 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.expression;
+
+/**
+ * <p>DRIDesignSystemExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignSystemExpression extends DRIDesignExpression {
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBaseStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBaseStyle.java
new file mode 100644
index 0000000..8a996da
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBaseStyle.java
@@ -0,0 +1,151 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.Rotation;
+import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
+import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignBaseStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignBaseStyle extends Serializable {
+
+    /**
+     * <p>getForegroundColor.</p>
+     *
+     * @return a {@link java.awt.Color} object.
+     */
+    public Color getForegroundColor();
+
+    /**
+     * <p>getBackgroundColor.</p>
+     *
+     * @return a {@link java.awt.Color} object.
+     */
+    public Color getBackgroundColor();
+
+    /**
+     * <p>getRadius.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getRadius();
+
+    /**
+     * <p>getImageScale.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     */
+    public ImageScale getImageScale();
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public HorizontalTextAlignment getHorizontalTextAlignment();
+
+    /**
+     * <p>getVerticalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     */
+    public VerticalTextAlignment getVerticalTextAlignment();
+
+    /**
+     * <p>getHorizontalImageAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public HorizontalImageAlignment getHorizontalImageAlignment();
+
+    /**
+     * <p>getVerticalImageAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     */
+    public VerticalImageAlignment getVerticalImageAlignment();
+
+    /**
+     * <p>getBorder.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignBorder} object.
+     */
+    public DRIDesignBorder getBorder();
+
+    /**
+     * <p>getPadding.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPadding} object.
+     */
+    public DRIDesignPadding getPadding();
+
+    /**
+     * <p>getFont.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignFont} object.
+     */
+    public DRIDesignFont getFont();
+
+    /**
+     * <p>getRotation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     */
+    public Rotation getRotation();
+
+    /**
+     * <p>getPattern.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPattern();
+
+    /**
+     * <p>getMarkup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     */
+    public Markup getMarkup();
+
+    /**
+     * <p>getParagraph.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignParagraph} object.
+     */
+    public DRIDesignParagraph getParagraph();
+
+    /**
+     * <p>getLinePen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    public DRIDesignPen getLinePen();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBorder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBorder.java
new file mode 100644
index 0000000..bdebce7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBorder.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignBorder interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignBorder extends Serializable {
+
+    /**
+     * <p>getTopPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    public DRIDesignPen getTopPen();
+
+    /**
+     * <p>getLeftPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    public DRIDesignPen getLeftPen();
+
+    /**
+     * <p>getBottomPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    public DRIDesignPen getBottomPen();
+
+    /**
+     * <p>getRightPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    public DRIDesignPen getRightPen();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java
new file mode 100644
index 0000000..e3b3a45
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+
+/**
+ * <p>DRIDesignConditionalStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignConditionalStyle extends DRIDesignBaseStyle {
+
+    /**
+     * <p>getConditionExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getConditionExpression();
+
+    /**
+     * <p>getDataset.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     */
+    public DRIDesignDataset getDataset();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignFont.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignFont.java
new file mode 100644
index 0000000..6360c32
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignFont.java
@@ -0,0 +1,92 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignFont interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignFont extends Serializable {
+
+    /**
+     * <p>getFontName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getFontName();
+
+    /**
+     * <p>getBold.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getBold();
+
+    /**
+     * <p>getItalic.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getItalic();
+
+    /**
+     * <p>getUnderline.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getUnderline();
+
+    /**
+     * <p>getStrikeThrough.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getStrikeThrough();
+
+    /**
+     * <p>getFontSize.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getFontSize();
+
+    /**
+     * <p>getPdfFontName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPdfFontName();
+
+    /**
+     * <p>getPdfEncoding.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPdfEncoding();
+
+    /**
+     * <p>getPdfEmbedded.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getPdfEmbedded();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPadding.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPadding.java
new file mode 100644
index 0000000..20e68de
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPadding.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignPadding interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignPadding extends Serializable {
+
+    /**
+     * <p>getTop.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getTop();
+
+    /**
+     * <p>getLeft.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getLeft();
+
+    /**
+     * <p>getBottom.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getBottom();
+
+    /**
+     * <p>getRight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getRight();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignParagraph.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignParagraph.java
new file mode 100644
index 0000000..e06cf16
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignParagraph.java
@@ -0,0 +1,95 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import net.sf.dynamicreports.report.constant.LineSpacing;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>DRIDesignParagraph interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignParagraph extends Serializable {
+
+    /**
+     * <p>getLineSpacing.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     */
+    public LineSpacing getLineSpacing();
+
+    /**
+     * <p>getLineSpacingSize.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getLineSpacingSize();
+
+    /**
+     * <p>getFirstLineIndent.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getFirstLineIndent();
+
+    /**
+     * <p>getLeftIndent.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getLeftIndent();
+
+    /**
+     * <p>getRightIndent.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getRightIndent();
+
+    /**
+     * <p>getSpacingBefore.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getSpacingBefore();
+
+    /**
+     * <p>getSpacingAfter.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getSpacingAfter();
+
+    /**
+     * <p>getTabStopWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getTabStopWidth();
+
+    /**
+     * <p>getTabStops.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIDesignTabStop> getTabStops();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPen.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPen.java
new file mode 100644
index 0000000..2352c31
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPen.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import net.sf.dynamicreports.report.constant.LineStyle;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignPen interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignPen extends Serializable {
+
+    /**
+     * <p>getLineWidth.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getLineWidth();
+
+    /**
+     * <p>getLineStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     */
+    public LineStyle getLineStyle();
+
+    /**
+     * <p>getLineColor.</p>
+     *
+     * @return a {@link java.awt.Color} object.
+     */
+    public Color getLineColor();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignStyle.java
new file mode 100644
index 0000000..f8d3707
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignStyle.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import java.util.List;
+
+/**
+ * <p>DRIDesignStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignStyle extends DRIDesignBaseStyle {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getParentStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     */
+    public DRIDesignStyle getParentStyle();
+
+    /**
+     * <p>getConditionalStyles.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIDesignConditionalStyle> getConditionalStyles();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignTabStop.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignTabStop.java
new file mode 100644
index 0000000..addc56f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignTabStop.java
@@ -0,0 +1,45 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.definition.style;
+
+import net.sf.dynamicreports.report.constant.TabStopAlignment;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIDesignTabStop interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignTabStop extends Serializable {
+
+    /**
+     * <p>getPosition.</p>
+     *
+     * @return a int.
+     */
+    public int getPosition();
+
+    /**
+     * <p>getAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     */
+    public TabStopAlignment getAlignment();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/exception/DRDesignReportException.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/exception/DRDesignReportException.java
new file mode 100644
index 0000000..a0777b0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/exception/DRDesignReportException.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.exception;
+
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRDesignReportException class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDesignReportException extends RuntimeException {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for DRDesignReportException.</p>
+     *
+     * @param message a {@link java.lang.String} object.
+     */
+    public DRDesignReportException(String message) {
+        super(message);
+    }
+
+    /**
+     * <p>Constructor for DRDesignReportException.</p>
+     *
+     * @param message a {@link java.lang.String} object.
+     * @param cause   a {@link java.lang.Throwable} object.
+     */
+    public DRDesignReportException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/AbstractExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/AbstractExpressionTransform.java
new file mode 100644
index 0000000..e1a1fa5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/AbstractExpressionTransform.java
@@ -0,0 +1,459 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignField;
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.base.DRDesignSort;
+import net.sf.dynamicreports.design.base.DRDesignVariable;
+import net.sf.dynamicreports.design.base.expression.DRDesignComplexExpression;
+import net.sf.dynamicreports.design.base.expression.DRDesignJasperExpression;
+import net.sf.dynamicreports.design.base.expression.DRDesignParameterExpression;
+import net.sf.dynamicreports.design.base.expression.DRDesignPropertyExpression;
+import net.sf.dynamicreports.design.base.expression.DRDesignSimpleExpression;
+import net.sf.dynamicreports.design.base.expression.DRDesignSystemExpression;
+import net.sf.dynamicreports.design.base.expression.DRDesignValueFormatter;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.DRIDesignField;
+import net.sf.dynamicreports.design.definition.DRIDesignSort;
+import net.sf.dynamicreports.design.definition.DRIDesignVariable;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.report.base.DRVariable;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.DRISort;
+import net.sf.dynamicreports.report.definition.DRISubtotal;
+import net.sf.dynamicreports.report.definition.DRIVariable;
+import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
+import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
+import net.sf.dynamicreports.report.definition.expression.DRIComplexExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>Abstract AbstractExpressionTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractExpressionTransform {
+    protected DesignTransformAccessor accessor;
+    private Map<String, DRIDesignField> fields;
+    private Map<String, DRIDesignVariable> variables;
+    private Map<String, DRIDesignSystemExpression> systemExpressions;
+    private Map<String, DRIDesignJasperExpression> jasperExpressions;
+    private Map<String, DRIDesignSimpleExpression> simpleExpressions;
+    private Map<String, DRIDesignComplexExpression> complexExpressions;
+    private Map<DRIExpression<?>, DRIDesignExpression> expressions;
+    private List<DRIDesignSort> sorts;
+
+    /**
+     * <p>Constructor for AbstractExpressionTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public AbstractExpressionTransform(DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+        init();
+    }
+
+    private void init() {
+        fields = new LinkedHashMap<String, DRIDesignField>();
+        variables = new LinkedHashMap<String, DRIDesignVariable>();
+        systemExpressions = new HashMap<String, DRIDesignSystemExpression>();
+        jasperExpressions = new HashMap<String, DRIDesignJasperExpression>();
+        simpleExpressions = new HashMap<String, DRIDesignSimpleExpression>();
+        complexExpressions = new HashMap<String, DRIDesignComplexExpression>();
+        expressions = new HashMap<DRIExpression<?>, DRIDesignExpression>();
+        sorts = new ArrayList<DRIDesignSort>();
+    }
+
+    /**
+     * <p>transform.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transform() throws DRException {
+        for (DRIField<?> field : transformFields()) {
+            transformExpression(field);
+        }
+        for (DRIVariable<?> variable : transformVariables()) {
+            transformExpression(variable);
+        }
+        for (DRISort sort : transformSorts()) {
+            transformSort(sort);
+        }
+    }
+
+    /**
+     * <p>transformExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public DRIDesignExpression transformExpression(DRIExpression<?> expression) throws DRException {
+        return transformExpression(expression, null, null);
+    }
+
+    /**
+     * <p>transformExpression.</p>
+     *
+     * @param expression    a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param parameterName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRIDesignExpression transformExpression(DRIExpression<?> expression, String parameterName) throws DRException {
+        return transformExpression(expression, null, parameterName);
+    }
+
+    /**
+     * <p>transformExpression.</p>
+     *
+     * @param expression     a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param parameterName  a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRIDesignExpression transformExpression(DRIExpression<?> expression, DRIValueFormatter<?, ?> valueFormatter, String parameterName) throws DRException {
+        if (expression == null) {
+            return null;
+        }
+
+        if (valueFormatter != null) {
+            return addExpression(new DRDesignValueFormatter(valueFormatter, transformExpression(expression)));
+        }
+        if (expressions.containsKey(expression)) {
+            return expressions.get(expression);
+        }
+
+        DRIDesignExpression express;
+        if (expression instanceof DRISystemExpression<?>) {
+            express = new DRDesignSystemExpression((DRISystemExpression<?>) expression);
+        } else if (expression instanceof DRIJasperExpression<?>) {
+            express = new DRDesignJasperExpression((DRIJasperExpression<?>) expression);
+        } else if (expression instanceof DRISimpleExpression<?>) {
+            express = new DRDesignSimpleExpression((DRISimpleExpression<?>) expression, parameterName);
+        } else if (expression instanceof DRIComplexExpression<?>) {
+            express = transformComplexExpression((DRIComplexExpression<?>) expression, parameterName);
+        } else if (expression instanceof DRIField<?>) {
+            express = transformField((DRIField<?>) expression);
+        } else if (expression instanceof DRIVariable<?>) {
+            express = transformVariable((DRIVariable<?>) expression);
+        } else if (expression instanceof DRIValueColumn<?>) {
+            express = transformExpression(((DRIValueColumn<?>) expression).getComponent().getValueExpression());
+        } else if (expression instanceof DRIBooleanColumn) {
+            express = transformExpression(((DRIBooleanColumn) expression).getComponent().getValueExpression());
+        } else if (expression instanceof DRISubtotal<?>) {
+            express = transformExpression(((DRISubtotal<?>) expression).getValueField().getValueExpression());
+        } else {
+            throw new DRDesignReportException("Expression " + expression.getClass().getName() + " not supported");
+        }
+        express = addExpression(express);
+        if (valueFormatter == null) {
+            expressions.put(expression, express);
+        }
+        return express;
+    }
+
+    private DRDesignField transformField(DRIField<?> field) {
+        DRDesignField designField = new DRDesignField();
+        designField.setName(field.getName());
+        designField.setValueClass(field.getValueClass());
+        designField.setDescription(accessor.getTemplateTransform().getFieldDescription(field));
+        return designField;
+    }
+
+    private DRIDesignExpression transformComplexExpression(DRIComplexExpression<?> complexExpression, String parameterName) throws DRException {
+        DRDesignComplexExpression designComplexExpression = new DRDesignComplexExpression(complexExpression, parameterName);
+        for (DRIExpression<?> expression : complexExpression.getExpressions()) {
+            designComplexExpression.addExpression(transformExpression(expression));
+        }
+        return designComplexExpression;
+    }
+
+    private DRIDesignExpression transformVariable(DRIVariable<?> variable) throws DRException {
+        DRDesignVariable designVariable = new DRDesignVariable(variable.getName());
+        designVariable.setValueExpression(transformExpression(variable.getValueExpression()));
+        designVariable.setInitialValueExpression(transformExpression(variable.getInitialValueExpression()));
+        designVariable.setCalculation(variable.getCalculation());
+        designVariable.setResetType(getVariableResetType(variable));
+        designVariable.setResetGroup(getVariableResetGroup(variable));
+        return designVariable;
+    }
+
+    /**
+     * <p>getVariableResetType.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.definition.DRIVariable} object.
+     * @return a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     */
+    protected ResetType getVariableResetType(DRIVariable<?> variable) {
+        return null;
+    }
+
+    /**
+     * <p>getVariableResetGroup.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.definition.DRIVariable} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignGroup getVariableResetGroup(DRIVariable<?> variable) throws DRException {
+        return null;
+    }
+
+    private void transformSort(DRISort sort) throws DRException {
+        DRIDesignExpression expression = transformExpression(sort.getExpression());
+        DRIDesignExpression sortExpression;
+        if (expression instanceof DRIDesignField || expression instanceof DRIDesignVariable) {
+            sortExpression = expression;
+        } else {
+            @SuppressWarnings( {"rawtypes", "unchecked"}) DRVariable variable = new DRVariable(sort.getExpression(), Calculation.NOTHING);
+            variable.setResetType(Evaluation.NONE);
+            sortExpression = transformExpression(variable);
+        }
+
+        DRDesignSort designSort = new DRDesignSort();
+        designSort.setExpression(sortExpression);
+        designSort.setOrderType(sort.getOrderType());
+
+        sorts.add(designSort);
+    }
+
+    /**
+     * <p>transformPropertyExpression.</p>
+     *
+     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRIDesignPropertyExpression transformPropertyExpression(DRIPropertyExpression propertyExpression) throws DRException {
+        DRDesignPropertyExpression designPropertyExpression = new DRDesignPropertyExpression();
+        designPropertyExpression.setName(propertyExpression.getName());
+        designPropertyExpression.setValueExpression(transformExpression(propertyExpression.getValueExpression()));
+        return designPropertyExpression;
+    }
+
+    /**
+     * <p>transformParameterExpression.</p>
+     *
+     * @param parameterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIParameterExpression} object.
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRIDesignParameterExpression transformParameterExpression(DRIParameterExpression parameterExpression) throws DRException {
+        DRDesignParameterExpression designParameterExpression = new DRDesignParameterExpression();
+        designParameterExpression.setName(parameterExpression.getName());
+        designParameterExpression.setValueExpression(transformExpression(parameterExpression.getValueExpression()));
+        return designParameterExpression;
+    }
+
+    private DRIDesignExpression addExpression(DRIDesignExpression expression) {
+        if (expression == null) {
+            return null;
+        }
+        if (expression instanceof DRIDesignField) {
+            return addField((DRIDesignField) expression);
+        } else if (expression instanceof DRIDesignVariable) {
+            addVariable((DRDesignVariable) expression);
+        } else if (expression instanceof DRIDesignSystemExpression) {
+            addSystemExpression((DRIDesignSystemExpression) expression);
+        } else if (expression instanceof DRIDesignJasperExpression) {
+            addJasperExpression((DRIDesignJasperExpression) expression);
+        } else if (expression instanceof DRIDesignSimpleExpression) {
+            addSimpleExpression((DRIDesignSimpleExpression) expression);
+        } else if (expression instanceof DRIDesignComplexExpression) {
+            addComplexExpression((DRIDesignComplexExpression) expression);
+        } else {
+            throw new DRDesignReportException("Expression " + expression.getClass().getName() + " not supported");
+        }
+        return expression;
+    }
+
+    private void addVariable(DRDesignVariable variable) {
+        if (variables.containsKey(variable.getName())) {
+            if (!variables.get(variable.getName()).equals(variable)) {
+                throw new DRDesignReportException("Duplicate declaration of variable \"" + variable.getName() + "\"");
+            }
+            return;
+        }
+        variables.put(variable.getName(), variable);
+    }
+
+    private DRIDesignField addField(DRIDesignField field) {
+        if (fields.containsKey(field.getName())) {
+            DRIDesignField fld = fields.get(field.getName());
+            if (!fld.getValueClass().equals(field.getValueClass())) {
+                throw new DRDesignReportException("Duplicate declaration of field \"" + field.getName() + "\"");
+            }
+            return fld;
+        }
+        fields.put(field.getName(), field);
+        return field;
+    }
+
+    private void addSystemExpression(DRIDesignSystemExpression systemExpression) {
+        if (systemExpressions.containsKey(systemExpression.getName())) {
+            return;
+        }
+        systemExpressions.put(systemExpression.getName(), systemExpression);
+    }
+
+    private void addJasperExpression(DRIDesignJasperExpression jasperExpression) {
+        if (jasperExpressions.containsKey(jasperExpression.getName())) {
+            return;
+        }
+        jasperExpressions.put(jasperExpression.getName(), jasperExpression);
+    }
+
+    private void addSimpleExpression(DRIDesignSimpleExpression simpleExpression) {
+        if (simpleExpressions.containsKey(simpleExpression.getName())) {
+            if (!simpleExpressions.get(simpleExpression.getName()).equals(simpleExpression)) {
+                throw new DRDesignReportException("Duplicate declaration of simple expression \"" + simpleExpression.getName() + "\"");
+            }
+            return;
+        }
+        simpleExpressions.put(simpleExpression.getName(), simpleExpression);
+    }
+
+    private void addComplexExpression(DRIDesignComplexExpression complexExpression) {
+        if (complexExpressions.containsKey(complexExpression.getName())) {
+            if (!complexExpressions.get(complexExpression.getName()).equals(complexExpression)) {
+                throw new DRDesignReportException("Duplicate declaration of complex expression \"" + complexExpression.getName() + "\"");
+            }
+            return;
+        }
+        complexExpressions.put(complexExpression.getName(), complexExpression);
+    }
+
+    /**
+     * <p>Getter for the field <code>fields</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignField> getFields() {
+        return fields.values();
+    }
+
+    /**
+     * <p>Getter for the field <code>variables</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignVariable> getVariables() {
+        return variables.values();
+    }
+
+    /**
+     * <p>Getter for the field <code>systemExpressions</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSystemExpression> getSystemExpressions() {
+        return systemExpressions.values();
+    }
+
+    /**
+     * <p>Getter for the field <code>jasperExpressions</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignJasperExpression> getJasperExpressions() {
+        return jasperExpressions.values();
+    }
+
+    /**
+     * <p>Getter for the field <code>simpleExpressions</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSimpleExpression> getSimpleExpressions() {
+        return simpleExpressions.values();
+    }
+
+    /**
+     * <p>Getter for the field <code>complexExpressions</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignComplexExpression> getComplexExpressions() {
+        return complexExpressions.values();
+    }
+
+    /**
+     * <p>Getter for the field <code>sorts</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignSort> getSorts() {
+        return sorts;
+    }
+
+    /**
+     * <p>transformFields.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    protected abstract List<? extends DRIField<?>> transformFields();
+
+    /**
+     * <p>transformVariables.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    protected abstract List<? extends DRIVariable<?>> transformVariables();
+
+    /**
+     * <p>transformSorts.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    protected abstract List<? extends DRISort> transformSorts();
+
+    /**
+     * <p>getDataset.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     */
+    protected abstract DRIDesignDataset getDataset();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandComponentsTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandComponentsTransform.java
new file mode 100644
index 0000000..166c70f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandComponentsTransform.java
@@ -0,0 +1,454 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignFiller;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
+import net.sf.dynamicreports.design.constant.ComponentGroupType;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Ricardo Mariaca
+ */
+class BandComponentsTransform {
+    private DesignTransformAccessor accessor;
+    private Map<String, Integer> componentNames;
+
+    /**
+     * <p>Constructor for BandComponentsTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public BandComponentsTransform(DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+        componentNames = new HashMap<String, Integer>();
+    }
+
+    /**
+     * <p>prepareBand.</p>
+     *
+     * @param band                     a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @param maxWidth                 a int.
+     * @param templateDesignComponents a int.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public DRDesignBand prepareBand(DRDesignBand band, int maxWidth, int templateDesignComponents) throws DRException {
+        if (band == null) {
+            return null;
+        }
+        if (band.getBandComponent() != null) {
+            return band;
+        }
+
+        DRDesignComponent component = prepareList(band.getName(), band.getList(), maxWidth);
+        if (component == null) {
+            if (band.getList() == null || band.getList().getHeight() == null || band.getList().getHeight() == 0) {
+                return null;
+            }
+        }
+        band.setHeight(band.getList().getHeight());
+        band.setBandComponent(component);
+
+        if (band.getBandComponent() != null && templateDesignComponents > 0) {
+            throw new DRException("Band " + band.getName() + " must not be defined at once in jrxml template design and in dynamic design");
+        }
+
+        prepareListBackgroundComponents(component);
+        prepareCrosstabs(component);
+
+        return band;
+    }
+
+    private DRDesignComponent prepareList(String name, DRDesignList list, int maxWidth) throws DRException {
+        return prepareList(name, list, maxWidth, -1);
+    }
+
+    private DRDesignComponent prepareList(String name, DRDesignList list, int maxWidth, int maxHeight) throws DRException {
+        if (list == null) {
+            return null;
+        }
+        if (list.isEmpty()) {
+            return null;
+        }
+
+        ComponentPosition.component(name, list, maxWidth, maxHeight);
+
+        DRDesignComponent component = removeEmptyComponents(list);
+        if (component == null) {
+            return null;
+        }
+        componentGroupType(component);
+
+        generateComponentNames(component, name);
+
+        return component;
+    }
+
+    private void generateComponentNames(DRDesignComponent component, String bandName) {
+        String componentName = bandName + "." + component.getUniqueName();
+        if (!componentNames.containsKey(componentName)) {
+            componentNames.put(componentName, 1);
+        } else {
+            componentNames.put(componentName, componentNames.get(componentName) + 1);
+        }
+        component.setUniqueName(componentName + componentNames.get(componentName));
+        if (component instanceof DRDesignList) {
+            DRDesignList list = (DRDesignList) component;
+            for (DRDesignComponent lComponent : list.getComponents()) {
+                generateComponentNames(lComponent, bandName);
+            }
+            if (list.getBackgroundComponent() != null) {
+                list.getBackgroundComponent().setUniqueName(component.getUniqueName() + ".background");
+            }
+        }
+    }
+
+    private DRDesignComponent removeEmptyComponents(DRDesignComponent component) {
+        if (component instanceof DRDesignList) {
+            DRDesignList list = (DRDesignList) component;
+            if (list.getComponents().isEmpty()) {
+                return null;
+            } else if (list.getComponents().size() == 1) {
+                DRDesignComponent lComponent = list.getComponents().get(0);
+                DRDesignComponent elm = removeEmptyComponents(lComponent);
+                if (elm == null) {
+                    if (list.getWidth() > 0 && list.getHeight() > 0 && (list.getStyle() != null || list.getBackgroundComponent() != null)) {
+                        list.getComponents().clear();
+                        return list;
+                    }
+                    return null;
+                }
+                if (lComponent != elm && (!(lComponent instanceof DRDesignList) || lComponent instanceof DRDesignList &&
+                    !(lComponent.getStyle() == null && lComponent.getPrintWhenExpression() == null && ((DRDesignList) lComponent).getBackgroundComponent() == null))) {
+                    elm.setX(lComponent.getX() + elm.getX());
+                    elm.setY(lComponent.getY() + elm.getY());
+                }
+
+                if (list.getStyle() == null && list.getPrintWhenExpression() == null && list.getBackgroundComponent() == null) {
+                    elm.setX(list.getX() + elm.getX());
+                    elm.setY(list.getY() + elm.getY());
+                    return elm;
+                } else {
+                    list.getComponents().clear();
+                    list.getComponents().add(elm);
+                    return list;
+                }
+            } else {
+                List<DRDesignComponent> components = new ArrayList<DRDesignComponent>();
+                for (DRDesignComponent listComponent : list.getComponents()) {
+                    DRDesignComponent comp = removeEmptyComponents(listComponent);
+                    if (comp != null) {
+                        components.add(comp);
+                    }
+                }
+                if (components.isEmpty()) {
+                    if (list.getWidth() > 0 && list.getHeight() > 0 && (list.getStyle() != null || list.getBackgroundComponent() != null)) {
+                        list.getComponents().clear();
+                        return list;
+                    }
+                    return null;
+                }
+                list.getComponents().clear();
+                list.getComponents().addAll(components);
+                return list;
+            }
+        } else if (component instanceof DRDesignFiller && component.getStyle() == null && component.getPrintWhenExpression() == null) {
+            return null;
+        }
+        return component;
+    }
+
+    private void componentGroupType(DRDesignComponent component) {
+        if (component instanceof DRDesignList) {
+            DRDesignList list = (DRDesignList) component;
+            if (list.isRemovable() && list.getStyle() == null && list.getPrintWhenExpression() == null && list.getBackgroundComponent() == null) {
+                list.setComponentGroupType(ComponentGroupType.NONE);
+                for (DRDesignComponent listComponent : list.getComponents()) {
+                    listComponent.setX(list.getX() + listComponent.getX());
+                    listComponent.setY(list.getY() + listComponent.getY());
+                }
+            } else {
+                list.setComponentGroupType(ComponentGroupType.FRAME);
+            }
+
+            for (DRDesignComponent listComponent : list.getComponents()) {
+                componentGroupType(listComponent);
+            }
+        }
+    }
+
+    private void prepareListBackgroundComponents(DRDesignComponent component) throws DRException {
+        if (component instanceof DRDesignList) {
+            DRDesignList list = (DRDesignList) component;
+            if (list.getBackgroundComponent() != null) {
+                DRDesignComponent backgroundComponent = list.getBackgroundComponent();
+                backgroundComponent.setX(0);
+                backgroundComponent.setY(0);
+                backgroundComponent.setWidth(list.getWidth() - StyleResolver.getHorizontalPadding(list.getStyle()));
+                backgroundComponent.setHeight(list.getHeight() - StyleResolver.getVerticalPadding(list.getStyle()));
+                backgroundComponent.setStretchType(StretchType.ELEMENT_GROUP_HEIGHT);
+                list.setBackgroundComponent(backgroundComponent);
+            }
+            for (DRDesignComponent listComponent : list.getComponents()) {
+                prepareListBackgroundComponents(listComponent);
+            }
+        }
+    }
+
+    private void prepareCrosstabs(DRDesignComponent component) throws DRException {
+        if (component instanceof DRDesignList) {
+            DRDesignList list = (DRDesignList) component;
+            for (DRDesignComponent listComponent : list.getComponents()) {
+                prepareCrosstabs(listComponent);
+            }
+        } else if (component instanceof DRDesignCrosstab) {
+            prepareCrosstab((DRDesignCrosstab) component);
+        }
+    }
+
+    private void prepareCrosstab(DRDesignCrosstab crosstab) throws DRException {
+        calculateCellDimensions(crosstab);
+
+        DRDesignCrosstabCellContent whenNoDataCell = crosstab.getWhenNoDataCell();
+
+        for (DRDesignCrosstabColumnGroup columnGroup : crosstab.getColumnGroups()) {
+            DRDesignCrosstabCellContent header = columnGroup.getHeader();
+            if (header != null) {
+                header.setComponent(prepareCrosstabCell(crosstab.getUniqueName(), header));
+            }
+            DRDesignCrosstabCellContent totalHeader = columnGroup.getTotalHeader();
+            if (totalHeader != null) {
+                totalHeader.setComponent(prepareCrosstabCell(crosstab.getUniqueName(), totalHeader));
+            }
+        }
+
+        for (DRDesignCrosstabRowGroup rowGroup : crosstab.getRowGroups()) {
+            DRDesignCrosstabCellContent header = rowGroup.getHeader();
+            if (header != null) {
+                header.setComponent(prepareCrosstabCell(crosstab.getUniqueName(), header));
+            }
+            DRDesignCrosstabCellContent totalHeader = rowGroup.getTotalHeader();
+            if (totalHeader != null) {
+                totalHeader.setComponent(prepareCrosstabCell(crosstab.getUniqueName(), totalHeader));
+            }
+        }
+
+        if (whenNoDataCell != null) {
+            whenNoDataCell.setComponent(prepareCrosstabCell(crosstab.getUniqueName() + ".whennodatacell", whenNoDataCell));
+        }
+
+        DRDesignCrosstabCellContent headerCell = crosstab.getHeaderCell();
+        if (headerCell != null) {
+            crosstab.getHeaderCell().setComponent(prepareCrosstabCell(crosstab.getUniqueName() + ".headercell", headerCell));
+        }
+
+        for (DRDesignCrosstabCell cell : crosstab.getCells()) {
+            DRDesignCrosstabCellContent content = cell.getContent();
+            if (content != null) {
+                content.setComponent(prepareCrosstabCell(crosstab.getUniqueName(), content));
+            }
+        }
+    }
+
+    private DRDesignComponent prepareCrosstabCell(String name, DRDesignCrosstabCellContent cell) throws DRException {
+        return prepareList(name, cell.getList(), cell.getWidth(), cell.getHeight());
+    }
+
+    private void calculateCellDimensions(DRDesignCrosstab designCrosstab) {
+        DRICrosstab crosstab = accessor.getCrosstabTransform().getCrosstab(designCrosstab);
+        int cellWidth = accessor.getTemplateTransform().getCrosstabCellWidth(crosstab, designCrosstab);
+        int cellHeight = accessor.getTemplateTransform().getCrosstabCellHeight(crosstab, designCrosstab);
+        Map<String, GroupCellDimension> columnGroups = new HashMap<String, GroupCellDimension>();
+        Map<String, GroupCellDimension> rowGroups = new HashMap<String, GroupCellDimension>();
+        int groupWidth = 0;
+        int groupHeight = 0;
+
+        GroupCellDimension previousCellDimension = null;
+        for (
+            int i = crosstab.getColumnGroups().size() - 1; i >= 0; i--) {
+            DRICrosstabColumnGroup<?> columnGroup = crosstab.getColumnGroups().get(i);
+            int headerWidth = 0;
+            int headerHeight = 0;
+            int totalHeaderWidth = 0;
+            int totalHeaderHeight = 0;
+
+            if (previousCellDimension == null) {
+                headerWidth = cellWidth;
+            } else {
+                headerWidth = previousCellDimension.getHeaderWidth() + previousCellDimension.getTotalHeaderWidth();
+            }
+            headerHeight = accessor.getTemplateTransform().getCrosstabColumnGroupHeaderHeight(columnGroup, designCrosstab, groupHeight);
+
+            if (accessor.getTemplateTransform().isCrosstabColumnGroupShowTotal(columnGroup)) {
+                totalHeaderWidth = accessor.getTemplateTransform().getCrosstabColumnGroupTotalHeaderWidth(columnGroup, crosstab.getCellWidth(), designCrosstab);
+            }
+            totalHeaderHeight = headerHeight;
+            if (previousCellDimension != null) {
+                totalHeaderHeight += previousCellDimension.getTotalHeaderHeight();
+            }
+
+            GroupCellDimension groupCellDimension = new GroupCellDimension();
+            groupCellDimension.setHeaderWidth(headerWidth);
+            groupCellDimension.setHeaderHeight(headerHeight);
+            groupCellDimension.setTotalHeaderWidth(totalHeaderWidth);
+            groupCellDimension.setTotalHeaderHeight(totalHeaderHeight);
+            columnGroups.put(columnGroup.getName(), groupCellDimension);
+            previousCellDimension = groupCellDimension;
+
+            groupHeight += groupCellDimension.getHeaderHeight();
+        }
+
+        previousCellDimension = null;
+        for (
+            int i = crosstab.getRowGroups().size() - 1; i >= 0; i--) {
+            DRICrosstabRowGroup<?> rowGroup = crosstab.getRowGroups().get(i);
+            int headerWidth = 0;
+            int headerHeight = 0;
+            int totalHeaderWidth = 0;
+            int totalHeaderHeight = 0;
+
+            headerWidth = accessor.getTemplateTransform().getCrosstabRowGroupHeaderWidth(rowGroup, designCrosstab);
+            if (previousCellDimension == null) {
+                headerHeight = cellHeight;
+            } else {
+                headerHeight = previousCellDimension.getHeaderHeight() + previousCellDimension.getTotalHeaderHeight();
+            }
+
+            totalHeaderWidth = headerWidth;
+            if (previousCellDimension != null) {
+                totalHeaderWidth += previousCellDimension.getTotalHeaderWidth();
+            }
+            if (accessor.getTemplateTransform().isCrosstabRowGroupShowTotal(rowGroup)) {
+                totalHeaderHeight = accessor.getTemplateTransform().getCrosstabRowGroupTotalHeaderHeight(rowGroup, crosstab.getCellHeight(), designCrosstab);
+            }
+
+            GroupCellDimension groupCellDimension = new GroupCellDimension();
+            groupCellDimension.setHeaderWidth(headerWidth);
+            groupCellDimension.setHeaderHeight(headerHeight);
+            groupCellDimension.setTotalHeaderWidth(totalHeaderWidth);
+            groupCellDimension.setTotalHeaderHeight(totalHeaderHeight);
+            rowGroups.put(rowGroup.getName(), groupCellDimension);
+            previousCellDimension = groupCellDimension;
+
+            groupWidth += groupCellDimension.getHeaderWidth();
+        }
+
+        designCrosstab.getWhenNoDataCell().setWidth(designCrosstab.getWidth());
+        designCrosstab.getWhenNoDataCell().setHeight(designCrosstab.getHeight());
+        designCrosstab.getHeaderCell().setWidth(groupWidth);
+        designCrosstab.getHeaderCell().setHeight(groupHeight);
+
+        for (DRDesignCrosstabColumnGroup designColumnGroup : designCrosstab.getColumnGroups()) {
+            GroupCellDimension groupCellDimension = columnGroups.get(designColumnGroup.getName());
+            designColumnGroup.setHeight(groupCellDimension.getHeaderHeight());
+            designColumnGroup.getHeader().setWidth(groupCellDimension.getHeaderWidth());
+            designColumnGroup.getHeader().setHeight(groupCellDimension.getHeaderHeight());
+            if (designColumnGroup.getTotalHeader() != null) {
+                designColumnGroup.getTotalHeader().setWidth(groupCellDimension.getTotalHeaderWidth());
+                designColumnGroup.getTotalHeader().setHeight(groupCellDimension.getTotalHeaderHeight());
+            }
+        }
+
+        for (DRDesignCrosstabRowGroup designRowGroup : designCrosstab.getRowGroups()) {
+            GroupCellDimension groupCellDimension = rowGroups.get(designRowGroup.getName());
+            designRowGroup.setWidth(groupCellDimension.getHeaderWidth());
+            designRowGroup.getHeader().setWidth(groupCellDimension.getHeaderWidth());
+            designRowGroup.getHeader().setHeight(groupCellDimension.getHeaderHeight());
+            if (designRowGroup.getTotalHeader() != null) {
+                designRowGroup.getTotalHeader().setWidth(groupCellDimension.getTotalHeaderWidth());
+                designRowGroup.getTotalHeader().setHeight(groupCellDimension.getTotalHeaderHeight());
+            }
+        }
+
+        for (DRDesignCrosstabCell designCell : designCrosstab.getCells()) {
+            if (designCell.getColumnTotalGroup() == null && designCell.getRowTotalGroup() == null) {
+                designCell.getContent().setWidth(cellWidth);
+                designCell.getContent().setHeight(cellHeight);
+            } else if (designCell.getColumnTotalGroup() != null && designCell.getRowTotalGroup() == null) {
+                GroupCellDimension groupCellDimension = columnGroups.get(designCell.getColumnTotalGroup());
+                designCell.getContent().setWidth(groupCellDimension.getTotalHeaderWidth());
+                designCell.getContent().setHeight(cellHeight);
+            } else if (designCell.getColumnTotalGroup() == null && designCell.getRowTotalGroup() != null) {
+                GroupCellDimension groupCellDimension = rowGroups.get(designCell.getRowTotalGroup());
+                designCell.getContent().setWidth(cellWidth);
+                designCell.getContent().setHeight(groupCellDimension.getTotalHeaderHeight());
+            } else {
+                GroupCellDimension groupCellDimension = columnGroups.get(designCell.getColumnTotalGroup());
+                designCell.getContent().setWidth(groupCellDimension.getTotalHeaderWidth());
+                groupCellDimension = rowGroups.get(designCell.getRowTotalGroup());
+                designCell.getContent().setHeight(groupCellDimension.getTotalHeaderHeight());
+            }
+        }
+    }
+
+    private class GroupCellDimension {
+        private int headerWidth;
+        private int headerHeight;
+        private int totalHeaderWidth;
+        private int totalHeaderHeight;
+
+        public int getHeaderWidth() {
+            return headerWidth;
+        }
+
+        public void setHeaderWidth(int headerWidth) {
+            this.headerWidth = headerWidth;
+        }
+
+        public int getHeaderHeight() {
+            return headerHeight;
+        }
+
+        public void setHeaderHeight(int headerHeight) {
+            this.headerHeight = headerHeight;
+        }
+
+        public int getTotalHeaderWidth() {
+            return totalHeaderWidth;
+        }
+
+        public void setTotalHeaderWidth(int totalHeaderWidth) {
+            this.totalHeaderWidth = totalHeaderWidth;
+        }
+
+        public int getTotalHeaderHeight() {
+            return totalHeaderHeight;
+        }
+
+        public void setTotalHeaderHeight(int totalHeaderHeight) {
+            this.totalHeaderHeight = totalHeaderHeight;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandTransform.java
new file mode 100644
index 0000000..9641ea2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandTransform.java
@@ -0,0 +1,381 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.base.component.DRDesignFiller;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.DRIDesignPage;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.definition.DRIBand;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.DRIReport;
+import net.sf.dynamicreports.report.definition.DRITemplateDesign;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>BandTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BandTransform {
+    private DesignTransformAccessor accessor;
+
+    private DRDesignBand titleBand;
+    private DRDesignBand pageHeaderBand;
+    private DRDesignBand pageFooterBand;
+    private DRDesignBand columnHeaderBand;
+    private DRDesignBand columnHeaderForGroupBand;
+    private DRDesignBand columnFooterBand;
+    private List<DRDesignBand> detailBands;
+    private DRDesignBand detailBand;
+    private DRDesignBand lastPageFooterBand;
+    private DRDesignBand summaryBand;
+    private DRDesignBand noDataBand;
+    private DRDesignBand backgroundBand;
+
+    /**
+     * <p>Constructor for BandTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public BandTransform(DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+        this.detailBands = new ArrayList<DRDesignBand>();
+    }
+
+    /**
+     * <p>transform.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transform() throws DRException {
+        TemplateTransform templateTransform = accessor.getTemplateTransform();
+
+        DRIReport report = accessor.getReport();
+
+        DRIBand band = report.getTitleBand();
+        titleBand = band("title", band, templateTransform.getTitleSplitType(band), templateTransform.getTitleStyle(band), templateTransform.getTitleBackgroundComponent(band), ResetType.REPORT, null);
+
+        band = report.getPageHeaderBand();
+        pageHeaderBand = band("pageHeader", band, templateTransform.getPageHeaderSplitType(band), templateTransform.getPageHeaderStyle(band), templateTransform.getPageHeaderBackgroundComponent(band),
+                              ResetType.PAGE, null);
+
+        band = report.getPageFooterBand();
+        pageFooterBand = band("pageFooter", band, templateTransform.getPageFooterSplitType(band), templateTransform.getPageFooterStyle(band), templateTransform.getPageFooterBackgroundComponent(band),
+                              ResetType.PAGE, null);
+
+        band = report.getColumnHeaderBand();
+        columnHeaderBand =
+            band("columnHeader", band, templateTransform.getColumnHeaderSplitType(band), templateTransform.getColumnHeaderStyle(band), templateTransform.getColumnHeaderBackgroundComponent(band),
+                 ResetType.COLUMN, null);
+
+        for (DRIGroup group : report.getGroups()) {
+            if (templateTransform.isGroupShowColumnHeaderAndFooter(group)) {
+                band = report.getColumnHeaderBand();
+                columnHeaderForGroupBand = band("columnHeaderForGroup", band, templateTransform.getColumnHeaderSplitType(band), templateTransform.getColumnHeaderStyle(band),
+                                                templateTransform.getColumnHeaderBackgroundComponent(band), ResetType.COLUMN, null);
+                break;
+            }
+        }
+
+        band = report.getColumnFooterBand();
+        columnFooterBand =
+            band("columnFooter", band, templateTransform.getColumnFooterSplitType(band), templateTransform.getColumnFooterStyle(band), templateTransform.getColumnFooterBackgroundComponent(band),
+                 ResetType.COLUMN, null);
+
+        band = report.getDetailHeaderBand();
+        detailBands.add(
+            band("detailHeader", band, templateTransform.getDetailHeaderSplitType(band), templateTransform.getDetailHeaderStyle(band), templateTransform.getDetailHeaderBackgroundComponent(band),
+                 ResetType.REPORT, null));
+
+        band = report.getDetailBand();
+        detailBand =
+            band("detail", band, templateTransform.getDetailSplitType(band), templateTransform.getDetailStyle(band), templateTransform.getDetailBackgroundComponent(band), ResetType.REPORT, null);
+        detailBands.add(detailBand);
+
+        band = report.getDetailFooterBand();
+        detailBands.add(
+            band("detailFooter", band, templateTransform.getDetailFooterSplitType(band), templateTransform.getDetailFooterStyle(band), templateTransform.getDetailFooterBackgroundComponent(band),
+                 ResetType.REPORT, null));
+
+        band = report.getLastPageFooterBand();
+        lastPageFooterBand = band("lastPageFooter", band, templateTransform.getLastPageFooterSplitType(band), templateTransform.getLastPageFooterStyle(band),
+                                  templateTransform.getLastPageFooterBackgroundComponent(band), ResetType.PAGE, null);
+
+        band = report.getSummaryBand();
+        summaryBand =
+            band("summary", band, templateTransform.getSummarySplitType(band), templateTransform.getSummaryStyle(band), templateTransform.getSummaryBackgroundComponent(band), ResetType.NONE, null);
+
+        band = report.getNoDataBand();
+        noDataBand =
+            band("noData", band, templateTransform.getNoDataSplitType(band), templateTransform.getNoDataStyle(band), templateTransform.getNoDataBackgroundComponent(band), ResetType.NONE, null);
+
+        band = report.getBackgroundBand();
+        backgroundBand = band("background", band, templateTransform.getBackgroundSplitType(band), templateTransform.getBackgroundStyle(band), templateTransform.getBackgroundBackgroundComponent(band),
+                              ResetType.NONE, null);
+    }
+
+    /**
+     * <p>prepareBands.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void prepareBands() throws DRException {
+        BandComponentsTransform bandComponents = new BandComponentsTransform(accessor);
+        DRITemplateDesign<?> templateDesign = accessor.getReport().getTemplateDesign();
+        int maxWidth = accessor.getPageTransform().getMaxBandWidth();
+        int maxColumnWidth = accessor.getPageTransform().getPage().getColumnWidth();
+
+        titleBand = bandComponents.prepareBand(titleBand, maxWidth, templateDesign.getTitleComponentsCount());
+        pageHeaderBand = bandComponents.prepareBand(pageHeaderBand, maxWidth, templateDesign.getPageHeaderComponentsCount());
+        pageFooterBand = bandComponents.prepareBand(pageFooterBand, maxWidth, templateDesign.getPageFooterComponentsCount());
+        columnHeaderBand = bandComponents.prepareBand(columnHeaderBand, maxColumnWidth, templateDesign.getColumnHeaderComponentsCount());
+        columnFooterBand = bandComponents.prepareBand(columnFooterBand, maxColumnWidth, templateDesign.getColumnFooterComponentsCount());
+        List<DRDesignBand> removeDetailBands = new ArrayList<DRDesignBand>();
+        for (DRDesignBand detailBand : detailBands) {
+            if (bandComponents.prepareBand(detailBand, maxColumnWidth, 0) == null) {
+                removeDetailBands.add(detailBand);
+            }
+        }
+        detailBands.removeAll(removeDetailBands);
+        lastPageFooterBand = bandComponents.prepareBand(lastPageFooterBand, maxWidth, templateDesign.getLastPageFooterComponentsCount());
+        summaryBand = bandComponents.prepareBand(summaryBand, maxWidth, templateDesign.getSummaryComponentsCount());
+        noDataBand = bandComponents.prepareBand(noDataBand, maxWidth, templateDesign.getNoDataComponentsCount());
+
+        if (backgroundBand.getList() != null && backgroundBand.getList().isEmpty() && (backgroundBand.getList().getStyle() != null || backgroundBand.getList().getBackgroundComponent() != null)) {
+            DRDesignFiller component = new DRDesignFiller();
+            component.setWidth(1);
+            component.setHeight(1);
+            backgroundBand.getList().addComponent(component);
+        }
+        backgroundBand = bandComponents.prepareBand(backgroundBand, maxWidth, templateDesign.getBackgroundComponentsCount());
+        if (backgroundBand != null && backgroundBand.getBandComponent() != null && backgroundBand.getList() != null &&
+            (backgroundBand.getList().getStyle() != null || backgroundBand.getList().getBackgroundComponent() != null)) {
+            DRIDesignPage page = accessor.getPage();
+            int height = page.getHeight() - page.getMargin().getTop() - page.getMargin().getBottom();
+            backgroundBand.getList().setHeight(height);
+            if (backgroundBand.getList().getBackgroundComponent() != null) {
+                backgroundBand.getList().getBackgroundComponent().setHeight(height);
+            }
+            backgroundBand.setHeight(height);
+        }
+
+        for (DRDesignGroup group : accessor.getGroupTransform().getGroups()) {
+            List<DRDesignBand> bands = new ArrayList<DRDesignBand>();
+            for (DRDesignBand band : group.getHeaderBands()) {
+                DRDesignBand newBand = bandComponents.prepareBand(band, maxColumnWidth, 0);
+                if (newBand != null) {
+                    bands.add(newBand);
+                }
+            }
+            group.setHeaderBands(bands);
+            bands = new ArrayList<DRDesignBand>();
+            for (DRDesignBand band : group.getFooterBands()) {
+                DRDesignBand newBand = bandComponents.prepareBand(band, maxColumnWidth, 0);
+                if (newBand != null) {
+                    bands.add(newBand);
+                }
+            }
+            group.setFooterBands(bands);
+        }
+    }
+
+    // band
+
+    /**
+     * <p>band.</p>
+     *
+     * @param bandName                   a {@link java.lang.String} object.
+     * @param bandName                   a {@link java.lang.String} object.
+     * @param band                       a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @param splitType                  a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @param defaultStyle               a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param defaultBackgroundComponent a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @param resetType                  a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup                 a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignBand band(String bandName, DRIBand band, SplitType splitType, DRIReportStyle defaultStyle, DRIComponent defaultBackgroundComponent, ResetType resetType, DRDesignGroup resetGroup)
+        throws DRException {
+        DRDesignBand designBand = new DRDesignBand(bandName);
+        designBand.setSplitType(splitType);
+        designBand.setList(accessor.getComponentTransform().list(band.getList(), DefaultStyleType.TEXT, resetType, resetGroup));
+        designBand.setPrintWhenExpression(accessor.getExpressionTransform().transformExpression(band.getPrintWhenExpression()));
+
+        if (designBand.getList().getStyle() == null && defaultStyle != null) {
+            designBand.getList().setStyle(accessor.getStyleTransform().transformStyle(defaultStyle, false, DefaultStyleType.NONE));
+        }
+        if (designBand.getList().getBackgroundComponent() == null && defaultBackgroundComponent != null) {
+            designBand.getList().setBackgroundComponent(accessor.getComponentTransform().listBackgroundComponent(defaultBackgroundComponent, DefaultStyleType.TEXT, resetType, resetGroup));
+        }
+
+        return designBand;
+    }
+
+    /**
+     * <p>band.</p>
+     *
+     * @param bandName                   a {@link java.lang.String} object.
+     * @param bandName                   a {@link java.lang.String} object.
+     * @param band                       a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @param splitType                  a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @param defaultStyle               a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param defaultBackgroundComponent a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignBand band(String bandName, DRIBand band, SplitType splitType, DRIReportStyle defaultStyle, DRIComponent defaultBackgroundComponent) throws DRException {
+        DRDesignBand designBand = new DRDesignBand(bandName);
+        designBand.setSplitType(splitType);
+        DRDesignList list = new DRDesignList();
+        list.setType(band.getList().getType());
+        list.setGap(accessor.getTemplateTransform().getListGap(band.getList()));
+        list.setStretchType(accessor.getTemplateTransform().getStretchType(band.getList()));
+        list.setPrintWhenExpression(accessor.getExpressionTransform().transformExpression(band.getList().getPrintWhenExpression()));
+        list.setStyle(accessor.getStyleTransform().transformStyle(band.getList().getStyle(), false, DefaultStyleType.NONE));
+        designBand.setList(list);
+
+        if (list.getStyle() == null && defaultStyle != null) {
+            list.setStyle(accessor.getStyleTransform().transformStyle(defaultStyle, false, DefaultStyleType.NONE));
+        }
+        if (designBand.getList().getBackgroundComponent() == null && defaultBackgroundComponent != null) {
+            designBand.getList().setBackgroundComponent(accessor.getComponentTransform().listBackgroundComponent(defaultBackgroundComponent, DefaultStyleType.TEXT, ResetType.NONE, null));
+        }
+
+        return designBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>titleBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getTitleBand() {
+        return titleBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>pageHeaderBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getPageHeaderBand() {
+        return pageHeaderBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>pageFooterBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getPageFooterBand() {
+        return pageFooterBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>columnHeaderBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getColumnHeaderBand() {
+        return columnHeaderBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>columnHeaderForGroupBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getColumnHeaderForGroupBand() {
+        return columnHeaderForGroupBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>columnFooterBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getColumnFooterBand() {
+        return columnFooterBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>detailBands</code>.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRDesignBand> getDetailBands() {
+        return detailBands;
+    }
+
+    /**
+     * <p>Getter for the field <code>detailBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getDetailBand() {
+        return detailBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>lastPageFooterBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getLastPageFooterBand() {
+        return lastPageFooterBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>summaryBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getSummaryBand() {
+        return summaryBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>noDataBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getNoDataBand() {
+        return noDataBand;
+    }
+
+    /**
+     * <p>Getter for the field <code>backgroundBand</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     */
+    public DRDesignBand getBackgroundBand() {
+        return backgroundBand;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGrid.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGrid.java
new file mode 100644
index 0000000..53ebb13
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGrid.java
@@ -0,0 +1,121 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.column.DRIColumn;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ColumnGrid {
+    private DRDesignList list;
+    private Map<DRIColumn<?>, DRDesignList> columnsLists;
+    private boolean isEmpty;
+
+    /**
+     * <p>Constructor for ColumnGrid.</p>
+     */
+    public ColumnGrid() {
+        columnsLists = new HashMap<DRIColumn<?>, DRDesignList>();
+        isEmpty = true;
+    }
+
+    /**
+     * <p>addList.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
+     * @param list   a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    public void addList(DRIColumn<?> column, DRDesignList list) {
+        columnsLists.put(column, list);
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param column    a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void addComponent(DRIColumn<?> column, DRDesignComponent component) {
+        if (columnsLists.containsKey(column)) {
+            columnsLists.get(column).addComponent(component);
+        }
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param column              a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     */
+    public void addComponent(DRIColumn<?> column, HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRDesignComponent component) {
+        if (columnsLists.containsKey(column)) {
+            columnsLists.get(column).addComponent(horizontalAlignment, verticalAlignment, component);
+        }
+    }
+
+    /**
+     * <p>Getter for the field <code>list</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    public DRDesignList getList() {
+        return list;
+    }
+
+    /**
+     * <p>Setter for the field <code>list</code>.</p>
+     *
+     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    public void setList(DRDesignList list) {
+        this.list = list;
+    }
+
+    /**
+     * <p>isEmpty.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isEmpty() {
+        for (DRDesignList list : columnsLists.values()) {
+            if (!list.isEmpty()) {
+                return false;
+            }
+        }
+        return isEmpty;
+    }
+
+    /**
+     * <p>setEmpty.</p>
+     *
+     * @param isEmpty a boolean.
+     */
+    public void setEmpty(boolean isEmpty) {
+        this.isEmpty = isEmpty;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGridTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGridTransform.java
new file mode 100644
index 0000000..b408141
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGridTransform.java
@@ -0,0 +1,273 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.component.DRDesignFiller;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignListCell;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.base.style.DRDesignStyle;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.base.grid.DRColumnGridList;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.DRIReport;
+import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
+import net.sf.dynamicreports.report.definition.column.DRIColumn;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGrid;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridList;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridListCell;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnTitleGroup;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * <p>ColumnGridTransform class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class ColumnGridTransform {
+    private final DesignTransformAccessor accessor;
+    private DRIColumnGridList columnGridList;
+
+    /**
+     * <p>Constructor for ColumnGridTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public ColumnGridTransform(final DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    /**
+     * <p>transform.</p>
+     */
+    public void transform() {
+        final DRIReport report = accessor.getReport();
+        final DRIColumnGrid columnGrid = report.getColumnGrid();
+        if (columnGrid != null && !columnGrid.getList().getListCells().isEmpty()) {
+            this.columnGridList = columnGrid.getList();
+            return;
+        }
+
+        final DRColumnGridList columnGridList = new DRColumnGridList();
+        if (columnGrid != null) {
+            columnGridList.setGap(columnGrid.getList().getGap());
+            columnGridList.setType(columnGrid.getList().getType());
+        }
+        addColumnsToGridList(columnGridList);
+        this.columnGridList = columnGridList;
+    }
+
+    private void addColumnsToGridList(final DRColumnGridList columnGridList) {
+        final DRIReport report = accessor.getReport();
+        for (final DRIColumn<?> column : report.getColumns()) {
+            if (!accessor.getGroupTransform().getHideGroupColumns().contains(column)) {
+                columnGridList.addComponent(column);
+            }
+        }
+    }
+
+    /**
+     * <p>createColumnGrid.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.ColumnGrid} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected ColumnGrid createColumnGrid() throws DRException {
+        return createColumnGrid(columnGridList, null, false);
+    }
+
+    /**
+     * <p>createColumnTitleGrid.</p>
+     *
+     * @param groupPaddingStyle a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link net.sf.dynamicreports.design.transformation.ColumnGrid} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected ColumnGrid createColumnTitleGrid(final DRDesignStyle groupPaddingStyle) throws DRException {
+        return createColumnGrid(columnGridList, groupPaddingStyle, true);
+    }
+
+    private ColumnGrid createColumnGrid(final DRIColumnGridList columnGridList, final DRDesignStyle groupPaddingStyle, final boolean titleGroup) throws DRException {
+        final ColumnGrid columnGrid = new ColumnGrid();
+        final DRDesignList list = list(columnGridList, columnGrid, titleGroup).getList();
+        final int groupPadding = accessor.getGroupTransform().getGroupPadding();
+        if (groupPadding > 0) {
+            final DRDesignFiller filler = new DRDesignFiller();
+            filler.setStyle(groupPaddingStyle);
+            filler.setWidth(groupPadding);
+            filler.setHeight(0);
+            list.addComponent(0, HorizontalCellComponentAlignment.CENTER, null, filler);
+        }
+        columnGrid.setList(list);
+        return columnGrid;
+    }
+
+    private GridList list(final DRIColumnGridComponent columnGridComponent, final ColumnGrid columnGrid, final boolean titleGroup) throws DRException {
+        if (columnGridComponent instanceof DRIColumn<?>) {
+            final DRDesignList list = new DRDesignList(ListType.VERTICAL);
+            final DRIColumn<?> column = (DRIColumn<?>) columnGridComponent;
+            list.setWidth(accessor.getTemplateTransform().getColumnWidth(column, accessor.getStyleTransform().getDefaultStyle(DefaultStyleType.COLUMN)));
+            columnGrid.addList(column, list);
+            return new GridList(list, null);
+        } else if (columnGridComponent instanceof DRIColumnGridList) {
+            return new GridList(columnGridList((DRIColumnGridList) columnGridComponent, columnGrid, titleGroup), null);
+        } else if (columnGridComponent instanceof DRIColumnTitleGroup) {
+            return columnGridTitleGroup((DRIColumnTitleGroup) columnGridComponent, columnGrid, titleGroup);
+        } else {
+            throw new DRDesignReportException("Column grid component " + columnGridComponent.getClass().getName() + " not supported");
+        }
+    }
+
+    private DRDesignList columnGridList(final DRIColumnGridList columnGridList, final ColumnGrid columnGrid, final boolean titleGroup) throws DRException {
+        final DRDesignList list = new DRDesignList();
+        list.setType(columnGridList.getType());
+        list.setGap(columnGridList.getGap());
+        for (final DRIColumnGridListCell cell : columnGridList.getListCells()) {
+            final DRIColumnGridComponent component = cell.getComponent();
+            HorizontalCellComponentAlignment horizontalAlignment = cell.getHorizontalAlignment();
+            VerticalCellComponentAlignment verticalAlignment = cell.getVerticalAlignment();
+            if (component instanceof DRIColumn<?>) {
+                final DRIColumn<?> column = (DRIColumn<?>) component;
+                if (column instanceof DRIBooleanColumn) {
+                    if (horizontalAlignment == null) {
+                        horizontalAlignment = ConstantTransform.toHorizontalCellComponentAlignment(((DRIBooleanColumn) column).getComponent().getWidthType());
+                    }
+                    if (verticalAlignment == null) {
+                        verticalAlignment = ConstantTransform.toVerticalCellComponentAlignment(((DRIBooleanColumn) column).getComponent().getHeightType());
+                    }
+                } else {
+                    final DRIComponent columnComponent = accessor.getColumnTransform().getColumnComponent(column);
+                    if (columnComponent instanceof DRIDimensionComponent) {
+                        if (horizontalAlignment == null) {
+                            horizontalAlignment = ConstantTransform.toHorizontalCellComponentAlignment(((DRIDimensionComponent) columnComponent).getWidthType());
+                        }
+                        if (verticalAlignment == null) {
+                            verticalAlignment = ConstantTransform.toVerticalCellComponentAlignment(((DRIDimensionComponent) columnComponent).getHeightType());
+                        }
+                    }
+                }
+            }
+            final GridList gridList = list(component, columnGrid, titleGroup);
+            if (gridList.getHorizontalCellAlignment() != null) {
+                list.addComponent(gridList.getHorizontalCellAlignment(), cell.getVerticalAlignment(), gridList.getList());
+            } else {
+                list.addComponent(horizontalAlignment, cell.getVerticalAlignment(), gridList.getList());
+            }
+        }
+        return list;
+    }
+
+    @SuppressWarnings("unchecked")
+    private GridList columnGridTitleGroup(final DRIColumnTitleGroup columnGridTitleGroup, final ColumnGrid columnGrid, final boolean titleGroup) throws DRException {
+        final DRDesignList columnList = list(columnGridTitleGroup.getList(), columnGrid, titleGroup).getList();
+
+        @SuppressWarnings("rawtypes") final DRTextField titleGroupField = new DRTextField();
+        titleGroupField.setValueExpression(columnGridTitleGroup.getTitleExpression());
+        titleGroupField.setStyle(columnGridTitleGroup.getTitleStyle());
+        titleGroupField.setHeight(columnGridTitleGroup.getTitleHeight());
+        titleGroupField.setHeightType(columnGridTitleGroup.getTitleHeightType());
+        titleGroupField.setRows(columnGridTitleGroup.getTitleRows());
+        titleGroupField.setStretchWithOverflow(columnGridTitleGroup.getTitleStretchWithOverflow());
+        titleGroupField.setTextAdjust(columnGridTitleGroup.getTitleTextAdjust());
+        titleGroupField.setPropertyExpressions(columnGridTitleGroup.getTitlePropertyExpressions());
+
+        HorizontalCellComponentAlignment hCellAlignment = null;
+        if (columnGridTitleGroup.getTitleWidth() == null && columnGridTitleGroup.getTitleColumns() == null) {
+            int totalWidth = 0;
+            for (final DRDesignListCell cell : columnList.getListCells()) {
+                final Integer width = cell.getComponent().getWidth();
+                final HorizontalCellComponentAlignment horizontalAlignment = cell.getHorizontalAlignment();
+                if (horizontalAlignment == null || horizontalAlignment.equals(HorizontalCellComponentAlignment.EXPAND) || horizontalAlignment.equals(HorizontalCellComponentAlignment.FLOAT)) {
+                    totalWidth = 0;
+                    break;
+                }
+                if (width != null) {
+                    totalWidth += width;
+                }
+            }
+            if (totalWidth > 0) {
+                titleGroupField.setWidth(totalWidth);
+                hCellAlignment = HorizontalCellComponentAlignment.LEFT;
+            }
+        } else {
+            if (columnGridTitleGroup.getTitleWidth() != null) {
+                titleGroupField.setWidth(columnGridTitleGroup.getTitleWidth());
+            }
+            if (columnGridTitleGroup.getTitleColumns() != null) {
+                titleGroupField.setColumns(columnGridTitleGroup.getTitleColumns());
+            }
+            hCellAlignment = ConstantTransform.toHorizontalCellComponentAlignment(columnGridTitleGroup.getTitleWidthType());
+        }
+
+        final DRDesignTextField designTitleGroupField = accessor.getComponentTransform().textField(titleGroupField, DefaultStyleType.COLUMN_TITLE);
+        designTitleGroupField.setUniqueName("columngroup.title");
+
+        if (!titleGroup || columnGridTitleGroup.getTitleExpression() == null) {
+            columnList.setRemovable(true);
+            if (hCellAlignment != null) {
+                final DRDesignList list = new DRDesignList();
+                list.setType(ListType.VERTICAL);
+                list.addComponent(columnList);
+                list.setWidth(designTitleGroupField.getWidth());
+                return new GridList(list, hCellAlignment);
+            }
+            return new GridList(columnList, null);
+        }
+
+        columnGrid.setEmpty(!titleGroup);
+
+        final DRDesignList list = new DRDesignList();
+        list.setType(ListType.VERTICAL);
+        if (hCellAlignment != null) {
+            list.addComponent(hCellAlignment, null, designTitleGroupField);
+            list.addComponent(columnList);
+            list.setWidth(designTitleGroupField.getWidth());
+            return new GridList(list, hCellAlignment);
+        } else {
+            list.addComponent(designTitleGroupField);
+            list.addComponent(columnList);
+            return new GridList(list, null);
+        }
+    }
+
+    private class GridList {
+        private final HorizontalCellComponentAlignment horizontalCellAlignment;
+        private final DRDesignList list;
+
+        private GridList(final DRDesignList list, final HorizontalCellComponentAlignment horizontalCellAlignment) {
+            this.list = list;
+            this.horizontalCellAlignment = horizontalCellAlignment;
+        }
+
+        public HorizontalCellComponentAlignment getHorizontalCellAlignment() {
+            return horizontalCellAlignment;
+        }
+
+        public DRDesignList getList() {
+            return list;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnTransform.java
new file mode 100644
index 0000000..9f36779
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnTransform.java
@@ -0,0 +1,272 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.base.style.DRDesignStyle;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.report.base.component.DRBooleanField;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
+import net.sf.dynamicreports.report.base.style.DRPadding;
+import net.sf.dynamicreports.report.base.style.DRStyle;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
+import net.sf.dynamicreports.report.definition.column.DRIColumn;
+import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * <p>ColumnTransform class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class ColumnTransform {
+    private final DesignTransformAccessor accessor;
+    private Map<DRIColumn<?>, DRIComponent> columnComponents;
+
+    /**
+     * <p>Constructor for ColumnTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public ColumnTransform(final DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    // columns
+
+    /**
+     * <p>transform.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transform() throws DRException {
+        columnComponents = getColumnComponents();
+        final boolean showColumnTitle = accessor.getTemplateTransform().isShowColumnTitle();
+        final boolean showColumnValues = accessor.getTemplateTransform().isShowColumnValues();
+        final boolean showColumnTitleForGroup = accessor.getBandTransform().getColumnHeaderForGroupBand() != null;
+
+        ColumnGrid columnTitle = null;
+        if (showColumnTitle) {
+            columnTitle = accessor.getColumnGridTransform().createColumnTitleGrid(accessor.getStyleTransform().getDefaultStyle(DefaultStyleType.COLUMN_TITLE));
+        }
+        ColumnGrid columnTitleForGroup = null;
+        if (showColumnTitleForGroup) {
+            columnTitleForGroup = accessor.getColumnGridTransform().createColumnTitleGrid(accessor.getStyleTransform().getDefaultStyle(DefaultStyleType.COLUMN_TITLE));
+        }
+        final ColumnGrid detail = accessor.getColumnGridTransform().createColumnGrid();
+
+        for (final DRIColumn<?> column : accessor.getReport().getColumns()) {
+            if (!accessor.getGroupTransform().getHideGroupColumns().contains(column)) {
+                if (column.getTitleExpression() != null) {
+                    if (showColumnTitle) {
+                        columnTitle.addComponent(column, titleComponent(column));
+                    }
+                    if (showColumnTitleForGroup) {
+                        columnTitleForGroup.addComponent(column, titleComponent(column));
+                    }
+                }
+                DRDesignComponent detailComponent = null;
+                if (column instanceof DRIValueColumn<?>) {
+                    detailComponent = detailValueComponent((DRIValueColumn<?>) column);
+                } else if (column instanceof DRIBooleanColumn) {
+                    detailComponent = detailBooleanComponent((DRIBooleanColumn) column);
+                } else {
+                    detailComponent = detailComponent(column);
+                }
+                detail.addComponent(column, detailComponent);
+            }
+        }
+
+        if (showColumnTitle && !columnTitle.isEmpty()) {
+            accessor.getBandTransform().getColumnHeaderBand().addComponent(0, columnTitle.getList());
+        }
+        if (showColumnTitleForGroup && !columnTitleForGroup.isEmpty()) {
+            accessor.getBandTransform().getColumnHeaderForGroupBand().addComponent(0, columnTitleForGroup.getList());
+        }
+        if (showColumnValues) {
+            accessor.getBandTransform().getDetailBand().addComponent(detail.getList());
+        }
+    }
+
+    private Map<DRIColumn<?>, DRIComponent> getColumnComponents() throws DRException {
+        final Map<DRIColumn<?>, DRIComponent> columnComponents = new HashMap<>();
+        for (final DRIColumn<?> column : accessor.getReport().getColumns()) {
+            if (!accessor.getGroupTransform().getHideGroupColumns().contains(column)) {
+                DRIComponent component = column.getComponent();
+                if (column instanceof DRIBooleanColumn) {
+                    component = createBooleanComponent((DRIBooleanColumn) column);
+                }
+                columnComponents.put(column, component);
+            }
+        }
+        return columnComponents;
+    }
+
+    private DRIComponent createBooleanComponent(final DRIBooleanColumn column) throws DRException {
+        final DRIReportStyle booleanColumnStyle = accessor.getTemplateTransform().getBooleanColumnStyle(column);
+        if (booleanColumnStyle == null) {
+            return column.getComponent();
+        }
+        final DRBooleanField booleanField = new DRBooleanField();
+        booleanField.setComponentType(column.getComponent().getComponentType());
+        booleanField.setEmptyWhenNullValue(column.getComponent().getEmptyWhenNullValue());
+        booleanField.setValueExpression(column.getComponent().getValueExpression());
+        booleanField.setWidth(column.getComponent().getWidth());
+        booleanField.setWidthType(column.getComponent().getWidthType());
+        booleanField.setHeight(column.getComponent().getHeight());
+        booleanField.setHeightType(column.getComponent().getHeightType());
+        booleanField.setImageWidth(column.getComponent().getImageWidth());
+        booleanField.setImageHeight(column.getComponent().getImageHeight());
+        booleanField.setHorizontalImageAlignment(column.getComponent().getHorizontalImageAlignment());
+        booleanField.setHorizontalTextAlignment(column.getComponent().getHorizontalTextAlignment());
+        booleanField.setStyle(booleanColumnStyle);
+        booleanField.setPrintWhenExpression(column.getComponent().getPrintWhenExpression());
+        return booleanField;
+    }
+
+    // title
+    @SuppressWarnings("unchecked")
+    private DRDesignComponent titleComponent(final DRIColumn<?> column) throws DRException {
+        @SuppressWarnings("rawtypes") final DRTextField titleField = new DRTextField();
+        titleField.setValueExpression(column.getTitleExpression());
+        titleField.setStyle(column.getTitleStyle());
+        titleField.setWidth(accessor.getTemplateTransform().getColumnWidth(column, accessor.getStyleTransform().getDefaultStyle(DefaultStyleType.COLUMN)));
+        titleField.setHeight(column.getTitleHeight());
+        titleField.setHeightType(column.getTitleHeightType());
+        titleField.setRows(column.getTitleRows());
+        titleField.setStretchWithOverflow(column.getTitleStretchWithOverflow());
+        titleField.setTextAdjust(column.getTitleTextAdjust());
+        titleField.setPropertyExpressions(column.getTitlePropertyExpressions());
+        final DRDesignTextField designTitleField = accessor.getComponentTransform().textField(titleField, DefaultStyleType.COLUMN_TITLE);
+        designTitleField.setUniqueName("column_" + column.getName() + ".title");
+        return designTitleField;
+    }
+
+    // detail
+    private DRDesignComponent detailValueComponent(final DRIValueColumn<?> column) throws DRException {
+        final DRDesignComponent detailComponent = detailComponent(column);
+        ((DRDesignTextField) detailComponent).setPrintRepeatedValues(accessor.getTemplateTransform().isColumnPrintRepeatedDetailValues(column));
+        return detailComponent;
+    }
+
+    private DRDesignComponent detailBooleanComponent(final DRIBooleanColumn column) throws DRException {
+        final DRDesignComponent detailComponent = detailComponent(column);
+
+        return detailComponent;
+    }
+
+    private DRDesignComponent detailComponent(final DRIColumn<?> column) throws DRException {
+        final DRDesignComponent designComponent = accessor.getComponentTransform().component(getColumnComponent(column), DefaultStyleType.COLUMN, null, null);
+        designComponent.setUniqueName("column_" + column.getName());
+
+        final List<DRIConditionalStyle> rowHighlighters = new ArrayList<>();
+        rowHighlighters.addAll(getDetailRowHighlighters());
+        final DRISimpleStyle detailOddRowStyle = accessor.getTemplateTransform().getDetailOddRowStyle();
+        if (detailOddRowStyle != null) {
+            rowHighlighters.add(detailRowConditionalStyle(detailOddRowStyle, Expressions.printInOddRow()));
+        }
+        final DRISimpleStyle detailEvenRowStyle = accessor.getTemplateTransform().getDetailEvenRowStyle();
+        if (detailEvenRowStyle != null) {
+            rowHighlighters.add(detailRowConditionalStyle(detailEvenRowStyle, Expressions.printInEvenRow()));
+        }
+        if (!rowHighlighters.isEmpty()) {
+            DRIReportStyle style = getColumnComponent(column).getStyle();
+            if (style == null) {
+                style = accessor.getTemplateTransform().getColumnStyle(column instanceof DRIValueColumn<?>);
+            }
+            final DRStyle newStyle = new DRStyle();
+            newStyle.setParentStyle(style);
+            if (!(column instanceof DRIValueColumn<?>)) {
+                newStyle.setPadding(new DRPadding(0));
+            }
+            final List<DRIConditionalStyle> conditionalStyles = new ArrayList<>();
+            if (style != null) {
+                final DRIStyle stl = accessor.getStyleTransform().getStyle(style);
+                for (final DRIConditionalStyle conditionalStyle : stl.getConditionalStyles()) {
+                    conditionalStyles.add(conditionalStyle);
+                }
+            }
+            for (final DRIConditionalStyle conditionalStyle : rowHighlighters) {
+                conditionalStyles.add(conditionalStyle);
+            }
+            final Color backgroundColor = StyleResolver.getBackgroundColor(style, accessor.getStyleTransform());
+            for (final DRIConditionalStyle conditionalStyle : conditionalStyles) {
+                if (backgroundColor != null && conditionalStyle.getBackgroundColor() != null) {
+                    final DRConditionalStyle newConditionalStyle = new DRConditionalStyle(conditionalStyle.getConditionExpression());
+                    accessor.getStyleTransform().copyStyle(newConditionalStyle, conditionalStyle);
+                    final Color mergedColor = StyleResolver.mergeColors(backgroundColor, conditionalStyle.getBackgroundColor(), 0.25f);
+                    newConditionalStyle.setBackgroundColor(mergedColor);
+                    newStyle.addConditionalStyle(newConditionalStyle);
+                } else {
+                    newStyle.addConditionalStyle((DRConditionalStyle) conditionalStyle);
+                }
+            }
+            designComponent.setStyle(accessor.getStyleTransform().transformStyle(newStyle, true, DefaultStyleType.COLUMN));
+        } else {
+            if (designComponent.getStyle() == null && !(column instanceof DRIValueColumn<?>)) {
+                final DRIReportStyle columnStyle = accessor.getTemplateTransform().getColumnStyle(false);
+                DRStyle newStyle = null;
+                if (columnStyle != null) {
+                    newStyle = new DRStyle();
+                    newStyle.setParentStyle(columnStyle);
+                    newStyle.setPadding(new DRPadding(0));
+                }
+                final DRDesignStyle designColumnStyle = accessor.getStyleTransform().transformStyle(newStyle, false, DefaultStyleType.NONE);
+                designComponent.setStyle(designColumnStyle);
+            }
+        }
+
+        return designComponent;
+    }
+
+    private List<? extends DRIConditionalStyle> getDetailRowHighlighters() {
+        return accessor.getReport().getDetailRowHighlighters();
+    }
+
+    private DRConditionalStyle detailRowConditionalStyle(final DRISimpleStyle style, final DRIExpression<Boolean> expression) {
+        final DRConditionalStyle conditionalStyle = new DRConditionalStyle(expression);
+        accessor.getStyleTransform().copyStyle(conditionalStyle, style);
+        return conditionalStyle;
+    }
+
+    /**
+     * <p>getColumnComponent.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getColumnComponent(final DRIColumn<?> column) {
+        return columnComponents.get(column);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentPosition.java
new file mode 100644
index 0000000..8db992c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentPosition.java
@@ -0,0 +1,836 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignListCell;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ComponentPosition {
+
+    /**
+     * <p>component.</p>
+     *
+     * @param name      a {@link java.lang.String} object.
+     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param maxWidth  a int.
+     * @param maxHeight a int.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected static void component(String name, DRDesignComponent component, int maxWidth, int maxHeight) throws DRException {
+        if (component instanceof DRDesignList) {
+            DRDesignList list = (DRDesignList) component;
+            list.setX(0);
+            list.setY(0);
+            list(name, list, maxWidth, maxHeight, true);
+            list(name, list);
+        } else {
+            throw new DRDesignReportException("Component " + component.getClass().getName() + " position not supported");
+        }
+    }
+
+    private static void list(String name, DRDesignList list, int maxWidth, int maxHeight, boolean stretch) throws DRException {
+        width(list);
+        alignment(list);
+        recalculateWidth(name, list, maxWidth - StyleResolver.getHorizontalPadding(list.getStyle()));
+        height(list);
+
+        int availableWidth = maxWidth - list.getWidth();
+        if (availableWidth < 0) {
+            throw new DRException(name + " components reaches outside available width, available width = " + maxWidth + ", components width = " + list.getWidth());
+        }
+        if (stretch) {
+            list.setWidth(list.getWidth() + availableWidth);
+        }
+
+        if (maxHeight > 0) {
+            int availableHeight = maxHeight - list.getHeight();
+            if (availableHeight < 0) {
+                throw new DRException(name + " components reaches outside available height, available height = " + maxHeight + ", components height = " + list.getHeight());
+            }
+            if (stretch) {
+                list.setHeight(list.getHeight() + availableHeight);
+            }
+        }
+
+        listCellWidth(list, availableWidth, list.getWidth() - StyleResolver.getHorizontalPadding(list.getStyle()));
+        listCellX(list);
+        listCellHeight(list, list.getHeight() - StyleResolver.getVerticalPadding(list.getStyle()));
+        listCellY(list);
+
+        componentX(list);
+        componentY(list);
+        componentWidth(list);
+        componentHeight(list);
+    }
+
+    private static void list(String name, DRDesignList list) throws DRException {
+        for (DRDesignComponent designComponent : list.getComponents()) {
+            if (designComponent instanceof DRDesignList) {
+                DRDesignList listComponent = (DRDesignList) designComponent;
+                if (!listComponent.isCalculateComponents()) {
+                    listComponent.setCalculateComponents(true);
+                    list(name, listComponent, listComponent.getWidth(), listComponent.getHeight(), false);
+                }
+                list(name, listComponent);
+            }
+        }
+    }
+
+    private static void alignment(DRDesignList list) {
+        for (DRDesignListCell listCell : list.getListCells()) {
+            if (listCell.getComponent() instanceof DRDesignList) {
+                DRDesignList comList = (DRDesignList) listCell.getComponent();
+                alignment(comList);
+                if (listCell.getHorizontalAlignment() == null) {
+                    listCell.setHorizontalAlignment(detectHorizontalCellComponentAlignment(comList));
+                }
+                if (listCell.getVerticalAlignment() == null) {
+                    listCell.setVerticalAlignment(detectVerticalCellComponentAlignment(comList));
+                }
+            }
+            if (listCell.getHorizontalAlignment() == null) {
+                listCell.setHorizontalAlignment(Defaults.getDefaults().getHorizontalCellComponentAlignment());
+            }
+            if (listCell.getVerticalAlignment() == null) {
+                listCell.setVerticalAlignment(Defaults.getDefaults().getVerticalCellComponentAlignment());
+            }
+        }
+    }
+
+    private static HorizontalCellComponentAlignment detectHorizontalCellComponentAlignment(DRDesignList list) {
+        ListType type = list.getType();
+
+        if (type == null) {
+            return null;
+        }
+
+        switch (type) {
+            case HORIZONTAL:
+            case HORIZONTAL_FLOW:
+                for (DRDesignListCell listCell : list.getListCells()) {
+                    switch (listCell.getHorizontalAlignment()) {
+                        case EXPAND:
+                        case FLOAT:
+                            return null;
+                        default:
+                            break;
+                    }
+                }
+                return HorizontalCellComponentAlignment.LEFT;
+            case VERTICAL:
+                HorizontalCellComponentAlignment alignment = null;
+                int maxWidth = 0;
+                for (DRDesignComponent designComponent : list.getComponents()) {
+                    if (designComponent.getWidth() > maxWidth) {
+                        maxWidth = designComponent.getWidth();
+                    }
+                }
+                for (DRDesignListCell listCell : list.getListCells()) {
+                    switch (listCell.getHorizontalAlignment()) {
+                        case EXPAND:
+                            return HorizontalCellComponentAlignment.EXPAND;
+                        case FLOAT:
+                            alignment = HorizontalCellComponentAlignment.FLOAT;
+                            break;
+                        default:
+                            if (alignment == null) {
+                                alignment = HorizontalCellComponentAlignment.LEFT;
+                            } else {
+                                if (alignment != HorizontalCellComponentAlignment.LEFT && maxWidth == listCell.getComponent().getWidth()) {
+                                    return HorizontalCellComponentAlignment.EXPAND;
+                                }
+                            }
+                            break;
+                    }
+                }
+                return alignment;
+            default:
+                throw new DRDesignReportException("List type " + type.name() + " not supported");
+        }
+    }
+
+    private static VerticalCellComponentAlignment detectVerticalCellComponentAlignment(DRDesignList list) {
+        ListType type = list.getType();
+
+        if (type == null) {
+            return null;
+        }
+
+        switch (type) {
+            case HORIZONTAL:
+            case HORIZONTAL_FLOW:
+                VerticalCellComponentAlignment alignment = null;
+                for (DRDesignListCell listCell : list.getListCells()) {
+                    switch (listCell.getVerticalAlignment()) {
+                        case EXPAND:
+                            return VerticalCellComponentAlignment.EXPAND;
+                        default:
+                            if (alignment == null) {
+                                alignment = VerticalCellComponentAlignment.TOP;
+                            }
+                            break;
+                    }
+                }
+                return alignment;
+            case VERTICAL:
+                return null;
+            default:
+                throw new DRDesignReportException("List type " + type.name() + " not supported");
+        }
+    }
+
+    /**
+     * <p>width.</p>
+     *
+     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    protected static void width(DRDesignList list) {
+        int maxWidth = 0;
+        ListType type = list.getType();
+
+        if (type != null) {
+            switch (type) {
+                case HORIZONTAL:
+                case HORIZONTAL_FLOW:
+                    for (DRDesignComponent component : list.getComponents()) {
+                        if (component instanceof DRDesignList) {
+                            width((DRDesignList) component);// , availableWidth - StyleResolver.getHorizontalPadding(component.getStyle()));
+                        }
+                        if (component.getWidth() == null) {
+                            throw new DRDesignReportException("Component has null width");
+                        }
+                        maxWidth += component.getWidth() + list.getGap();
+                    }
+                    if (!list.getComponents().isEmpty()) {
+                        maxWidth -= list.getGap();
+                    }
+                    break;
+                case VERTICAL:
+                    for (DRDesignComponent component : list.getComponents()) {
+                        if (component instanceof DRDesignList) {
+                            width((DRDesignList) component);// , availableWidth - StyleResolver.getHorizontalPadding(component.getStyle()));
+                        }
+                        if (component.getWidth() == null) {
+                            throw new DRDesignReportException("Component has null width");
+                        }
+                        if (component.getWidth() > maxWidth) {
+                            maxWidth = component.getWidth();
+                        }
+                    }
+                    break;
+                default:
+                    throw new DRDesignReportException("List type " + type.name() + " not supported");
+            }
+        } else {
+            for (DRDesignComponent component : list.getComponents()) {
+                if (component instanceof DRDesignList) {
+                    width((DRDesignList) component);// , availableWidth - StyleResolver.getHorizontalPadding(component.getStyle()));
+                }
+                if (component.getWidth() == null) {
+                    throw new DRDesignReportException("Component has null width");
+                }
+                if (component.getWidth() + component.getX() > maxWidth) {
+                    maxWidth = component.getWidth() + component.getX();
+                }
+            }
+        }
+
+        maxWidth += StyleResolver.getHorizontalPadding(list.getStyle());
+
+        if (list.getWidth() == null) {
+            list.setWidth(maxWidth);
+        }
+    }
+
+    private static void recalculateWidth(String name, DRDesignList list, int availableWidth) throws DRException {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+        if (list.getWidth() <= availableWidth) {
+            return;
+        }
+
+        int maxWidth = 0;
+        ListType type = list.getType();
+
+        if (type == null) {
+            return;
+        }
+
+        switch (type) {
+            case HORIZONTAL:
+                int floatCells = 0;
+                int floatCellsWidth = 0;
+                for (DRDesignListCell listCell : list.getListCells()) {
+                    if (listCell.getHorizontalAlignment().equals(HorizontalCellComponentAlignment.FLOAT)) {
+                        floatCellsWidth += listCell.getComponent().getWidth();
+                        floatCells++;
+                    }
+                }
+                if (list.getWidth() - floatCellsWidth >= availableWidth) {
+                    throw new DRException(name + " components reaches outside available width, available width = " + availableWidth + ", components width = " + list.getWidth());
+                }
+                availableWidth -= list.getWidth() - floatCellsWidth;
+                for (DRDesignListCell listCell : list.getListCells()) {
+                    DRDesignComponent component = listCell.getComponent();
+                    if (listCell.getHorizontalAlignment().equals(HorizontalCellComponentAlignment.FLOAT)) {
+                        int availableCellWidth = 0;
+                        if (floatCells > 1) {
+                            availableCellWidth = (int) ((double) availableWidth / floatCellsWidth * component.getWidth());
+                            floatCellsWidth -= component.getWidth();
+                            availableWidth -= availableCellWidth;
+                        } else if (floatCells == 1) {
+                            availableCellWidth = availableWidth;
+                            availableWidth = 0;
+                        }
+                        floatCells--;
+
+                        if (component instanceof DRDesignList) {
+                            recalculateWidth(name, (DRDesignList) component, availableCellWidth - StyleResolver.getHorizontalPadding(component.getStyle()));
+                        } else {
+                            component.setWidth(availableCellWidth);
+                        }
+                    }
+                    maxWidth += component.getWidth() + list.getGap();
+                }
+                if (!list.getComponents().isEmpty()) {
+                    maxWidth -= list.getGap();
+                }
+                break;
+            case HORIZONTAL_FLOW:
+                maxWidth = splitHorizontalListWhenOverflowWidth(name, list, availableWidth);
+                break;
+            case VERTICAL:
+                maxWidth = availableWidth;
+                for (DRDesignListCell listCell : list.getListCells()) {
+                    DRDesignComponent component = listCell.getComponent();
+                    if (component.getWidth() > availableWidth) {
+                        if (listCell.getHorizontalAlignment().equals(HorizontalCellComponentAlignment.FLOAT)) {
+                            if (component instanceof DRDesignList) {
+                                recalculateWidth(name, (DRDesignList) component, availableWidth - StyleResolver.getHorizontalPadding(component.getStyle()));
+                            } else {
+                                component.setWidth(availableWidth);
+                            }
+                        } else {
+                            throw new DRException(name + " components reaches outside available width, available width = " + availableWidth + ", components width = " + component.getWidth());
+                        }
+                    }
+                    if (component.getWidth() > maxWidth) {
+                        maxWidth = component.getWidth();
+                    }
+                }
+                break;
+            default:
+                throw new DRDesignReportException("List type " + type.name() + " not supported");
+        }
+        maxWidth += StyleResolver.getHorizontalPadding(list.getStyle());
+        list.setWidth(maxWidth);
+    }
+
+    private static int splitHorizontalListWhenOverflowWidth(String name, DRDesignList list, int availableWidth) throws DRException {
+        List<DRDesignListCell> listCells = new ArrayList<DRDesignListCell>(list.getListCells());
+        list.getListCells().clear();
+        list.getComponents().clear();
+
+        HorizontalCellComponentAlignment hAlignment = Defaults.getDefaults().getHorizontalCellComponentAlignment();
+        VerticalCellComponentAlignment vAlignment = Defaults.getDefaults().getVerticalCellComponentAlignment();
+
+        DRDesignList column = new DRDesignList(ListType.VERTICAL);
+        list.addComponent(hAlignment, vAlignment, column);
+        DRDesignList row = new DRDesignList(ListType.HORIZONTAL);
+        row.setGap(list.getGap());
+        column.addComponent(hAlignment, vAlignment, row);
+
+        int maxWidth = 0;
+        int rowMaxWidth = 0;
+        for (DRDesignListCell listCell : listCells) {
+            DRDesignComponent component = listCell.getComponent();
+            if (component.getWidth() > availableWidth) {
+                throw new DRException(name + " components reaches outside available width, available width = " + availableWidth + ", components width = " + component.getWidth());
+            }
+            if (rowMaxWidth + component.getWidth() > availableWidth) {
+                int width = rowMaxWidth - list.getGap();
+                if (width > maxWidth) {
+                    maxWidth = width;
+                }
+                row.setWidth(width);
+                row = new DRDesignList(ListType.HORIZONTAL);
+                row.setGap(list.getGap());
+                column.addComponent(hAlignment, vAlignment, row);
+                rowMaxWidth = 0;
+            }
+            row.addComponent(listCell.getHorizontalAlignment(), listCell.getVerticalAlignment(), component);
+            rowMaxWidth += component.getWidth() + list.getGap();
+        }
+        int width = rowMaxWidth - list.getGap();
+        if (width > maxWidth) {
+            maxWidth = width;
+        }
+        row.setWidth(width);
+        column.setWidth(maxWidth);
+
+        return maxWidth;
+    }
+
+    /**
+     * <p>height.</p>
+     *
+     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     */
+    protected static void height(DRDesignList list) {
+        int maxHeight = 0;
+        ListType type = list.getType();
+
+        if (type != null) {
+            switch (type) {
+                case HORIZONTAL:
+                case HORIZONTAL_FLOW:
+                    for (DRDesignComponent component : list.getComponents()) {
+                        if (component instanceof DRDesignList) {
+                            height((DRDesignList) component);
+                        }
+                        if (component.getHeight() == null) {
+                            throw new DRDesignReportException("Component has null height");
+                        }
+                        if (component.getHeight() > maxHeight) {
+                            maxHeight = component.getHeight();
+                        }
+                    }
+                    break;
+                case VERTICAL:
+                    for (DRDesignComponent component : list.getComponents()) {
+                        if (component instanceof DRDesignList) {
+                            height((DRDesignList) component);
+                        }
+                        if (component.getHeight() == null) {
+                            throw new DRDesignReportException("Component has null height");
+                        }
+                        maxHeight += component.getHeight() + list.getGap();
+
+                    }
+                    if (!list.getComponents().isEmpty()) {
+                        maxHeight -= list.getGap();
+                    }
+                    break;
+                default:
+                    throw new DRDesignReportException("List type " + type.name() + " not supported");
+            }
+        } else {
+            for (DRDesignComponent component : list.getComponents()) {
+                if (component instanceof DRDesignList) {
+                    height((DRDesignList) component);
+                }
+                if (component.getHeight() == null) {
+                    throw new DRDesignReportException("Component has null height");
+                }
+                if (component.getHeight() + component.getY() > maxHeight) {
+                    maxHeight = component.getHeight() + component.getY();
+                }
+            }
+        }
+
+        maxHeight += StyleResolver.getVerticalPadding(list.getStyle());
+
+        if (list.getHeight() == null) {
+            list.setHeight(maxHeight);
+        }
+    }
+
+    private static void listCellWidth(DRDesignList list, int availableWidth, int maxWidth) {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+
+        ListType type = list.getType();
+        if (type != null) {
+            switch (type) {
+                case HORIZONTAL:
+                case HORIZONTAL_FLOW:
+                    int expandCellsWidth = 0;
+                    int expandCells = 0;
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        switch (listCell.getHorizontalAlignment()) {
+                            case FLOAT:
+                            case EXPAND:
+                                expandCellsWidth += listCell.getComponent().getWidth();
+                                expandCells++;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        DRDesignComponent component = listCell.getComponent();
+                        switch (listCell.getHorizontalAlignment()) {
+                            case FLOAT:
+                            case EXPAND:
+                                int availableCellWidth = 0;
+                                if (expandCells > 1) {
+                                    availableCellWidth = (int) ((double) availableWidth / expandCellsWidth * component.getWidth());
+                                    expandCellsWidth -= component.getWidth();
+                                    availableWidth -= availableCellWidth;
+                                } else if (expandCells == 1) {
+                                    availableCellWidth = availableWidth;
+                                    availableWidth = 0;
+                                }
+                                expandCells--;
+
+                                listCell.setWidth(component.getWidth() + availableCellWidth);
+                                if (component instanceof DRDesignList) {
+                                    listCellWidth((DRDesignList) component, availableCellWidth, component.getWidth() + availableCellWidth - StyleResolver.getHorizontalPadding(component.getStyle()));
+                                }
+                                break;
+                            default:
+                                listCell.setWidth(component.getWidth());
+                                if (component instanceof DRDesignList) {
+                                    listCellWidth((DRDesignList) component, 0, component.getWidth() - StyleResolver.getHorizontalPadding(component.getStyle()));
+                                }
+                                break;
+                        }
+                    }
+                    break;
+                case VERTICAL:
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        DRDesignComponent component = listCell.getComponent();
+                        switch (listCell.getHorizontalAlignment()) {
+                            case FLOAT:
+                            case EXPAND:
+                                listCell.setWidth(maxWidth);
+                                if (component instanceof DRDesignList) {
+                                    listCellWidth((DRDesignList) component, maxWidth - component.getWidth(), maxWidth - StyleResolver.getHorizontalPadding(component.getStyle()));
+                                }
+                                break;
+                            default:
+                                listCell.setWidth(maxWidth);
+                                if (component instanceof DRDesignList) {
+                                    listCellWidth((DRDesignList) component, 0, component.getWidth() - StyleResolver.getHorizontalPadding(component.getStyle()));
+                                }
+                                break;
+                        }
+                    }
+                    break;
+                default:
+                    throw new DRDesignReportException("List type " + type.name() + " not supported");
+            }
+        } else {
+            for (DRDesignListCell listCell : list.getListCells()) {
+                DRDesignComponent component = listCell.getComponent();
+                listCell.setWidth(component.getWidth());
+                if (component instanceof DRDesignList) {
+                    listCellWidth((DRDesignList) component, 0, component.getWidth() - StyleResolver.getHorizontalPadding(component.getStyle()));
+                }
+            }
+        }
+    }
+
+    private static void listCellX(DRDesignList list) {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+
+        ListType type = list.getType();
+        if (type != null) {
+            switch (type) {
+                case HORIZONTAL:
+                case HORIZONTAL_FLOW:
+                    int x = 0;
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        listCell.setX(x);
+                        x += listCell.getWidth() + list.getGap();
+                        if (listCell.getComponent() instanceof DRDesignList) {
+                            listCellX((DRDesignList) listCell.getComponent());
+                        }
+                    }
+                    break;
+                case VERTICAL:
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        listCell.setX(0);
+                        if (listCell.getComponent() instanceof DRDesignList) {
+                            listCellX((DRDesignList) listCell.getComponent());
+                        }
+                    }
+                    break;
+                default:
+                    throw new DRDesignReportException("List type " + type.name() + " not supported");
+            }
+        } else {
+            for (DRDesignListCell listCell : list.getListCells()) {
+                listCell.setX(listCell.getComponent().getX());
+                if (listCell.getComponent() instanceof DRDesignList) {
+                    listCellX((DRDesignList) listCell.getComponent());
+                }
+            }
+        }
+    }
+
+    private static void listCellHeight(DRDesignList list, int availableHeight) {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+
+        ListType type = list.getType();
+        if (type != null) {
+            switch (type) {
+                case HORIZONTAL:
+                case HORIZONTAL_FLOW:
+                    int maxHeight = availableHeight;
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        if (listCell.getComponent().getHeight() > maxHeight) {
+                            maxHeight = listCell.getComponent().getHeight();
+                        }
+                    }
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        DRDesignComponent component = listCell.getComponent();
+                        switch (listCell.getVerticalAlignment()) {
+                            case EXPAND:
+                                listCell.setHeight(maxHeight);
+                                if (component instanceof DRDesignList) {
+                                    listCellHeight((DRDesignList) component, maxHeight - StyleResolver.getVerticalPadding(component.getStyle()));
+                                }
+                                break;
+                            default:
+                                listCell.setHeight(maxHeight);
+                                if (component instanceof DRDesignList) {
+                                    listCellHeight((DRDesignList) component, component.getHeight() - StyleResolver.getVerticalPadding(component.getStyle()));
+                                }
+                                break;
+                        }
+                    }
+                    break;
+                case VERTICAL:
+                    maxHeight = 0;
+                    int expandCellsHeight = 0;
+                    int expandCells = 0;
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        maxHeight += listCell.getComponent().getHeight();
+                        switch (listCell.getVerticalAlignment()) {
+                            case EXPAND:
+                                expandCellsHeight += listCell.getComponent().getHeight();
+                                expandCells++;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    availableHeight = availableHeight - maxHeight - list.getGap() * (list.getComponents().size() - 1);
+
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        DRDesignComponent component = listCell.getComponent();
+                        switch (listCell.getVerticalAlignment()) {
+                            case EXPAND:
+                                int availableCellHeight = 0;
+                                if (expandCells > 1) {
+                                    availableCellHeight = (int) ((double) availableHeight / expandCellsHeight * component.getHeight());
+                                    expandCellsHeight -= component.getHeight();
+                                    availableHeight -= availableCellHeight;
+                                } else if (expandCells == 1) {
+                                    availableCellHeight = availableHeight;
+                                    availableHeight = 0;
+                                }
+                                expandCells--;
+
+                                listCell.setHeight(component.getHeight() + availableCellHeight);
+                                if (component instanceof DRDesignList) {
+                                    listCellHeight((DRDesignList) component, listCell.getHeight() - StyleResolver.getVerticalPadding(component.getStyle()));
+                                }
+                                break;
+                            default:
+                                listCell.setHeight(component.getHeight());
+                                if (component instanceof DRDesignList) {
+                                    listCellHeight((DRDesignList) component, listCell.getHeight() - StyleResolver.getVerticalPadding(component.getStyle()));
+                                }
+                                break;
+                        }
+                    }
+                    break;
+                default:
+                    throw new DRDesignReportException("List type " + type.name() + " not supported");
+            }
+        } else {
+            for (DRDesignListCell listCell : list.getListCells()) {
+                DRDesignComponent component = listCell.getComponent();
+                listCell.setHeight(component.getHeight());
+                if (component instanceof DRDesignList) {
+                    listCellHeight((DRDesignList) component, listCell.getHeight() - StyleResolver.getVerticalPadding(component.getStyle()));
+                }
+            }
+        }
+    }
+
+    private static void listCellY(DRDesignList list) {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+
+        ListType type = list.getType();
+        if (type != null) {
+            switch (type) {
+                case HORIZONTAL:
+                case HORIZONTAL_FLOW:
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        listCell.setY(0);
+                        if (listCell.getComponent() instanceof DRDesignList) {
+                            listCellY((DRDesignList) listCell.getComponent());
+                        }
+                    }
+                    break;
+                case VERTICAL:
+                    int y = 0;
+                    for (DRDesignListCell listCell : list.getListCells()) {
+                        listCell.setY(y);
+                        y += listCell.getHeight() + list.getGap();
+                        if (listCell.getComponent() instanceof DRDesignList) {
+                            listCellY((DRDesignList) listCell.getComponent());
+                        }
+                    }
+                    break;
+                default:
+                    throw new DRDesignReportException("List type " + type.name() + " not supported");
+            }
+        } else {
+            for (DRDesignListCell listCell : list.getListCells()) {
+                listCell.setY(listCell.getComponent().getY());
+                if (listCell.getComponent() instanceof DRDesignList) {
+                    listCellY((DRDesignList) listCell.getComponent());
+                }
+            }
+        }
+    }
+
+    private static void componentX(DRDesignList list) {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+
+        for (DRDesignListCell listCell : list.getListCells()) {
+            DRDesignComponent component = listCell.getComponent();
+            HorizontalCellComponentAlignment alignment = listCell.getHorizontalAlignment();
+            switch (alignment) {
+                case FLOAT:
+                case EXPAND:
+                case LEFT:
+                    component.setX(listCell.getX());
+                    break;
+                case CENTER:
+                    component.setX(listCell.getX() + listCell.getWidth() / 2 - component.getWidth() / 2);
+                    break;
+                case RIGHT:
+                    component.setX(listCell.getX() + listCell.getWidth() - component.getWidth());
+                    break;
+                default:
+                    throw new DRDesignReportException("Component alignment " + alignment.name() + " not supported");
+            }
+            if (component instanceof DRDesignList) {
+                componentX((DRDesignList) component);
+            }
+        }
+    }
+
+    private static void componentY(DRDesignList list) {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+
+        for (DRDesignListCell listCell : list.getListCells()) {
+            DRDesignComponent component = listCell.getComponent();
+            VerticalCellComponentAlignment alignment = listCell.getVerticalAlignment();
+            switch (alignment) {
+                case EXPAND:
+                case TOP:
+                    component.setY(listCell.getY());
+                    break;
+                case MIDDLE:
+                    component.setY(listCell.getY() + listCell.getHeight() / 2 - component.getHeight() / 2);
+                    break;
+                case BOTTOM:
+                    component.setY(listCell.getY() + listCell.getHeight() - component.getHeight());
+                    break;
+                default:
+                    throw new DRDesignReportException("Component alignment " + alignment.name() + " not supported");
+            }
+            if (component instanceof DRDesignList) {
+                componentY((DRDesignList) component);
+            }
+        }
+    }
+
+    private static void componentWidth(DRDesignList list) {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+
+        for (DRDesignListCell listCell : list.getListCells()) {
+            DRDesignComponent component = listCell.getComponent();
+            HorizontalCellComponentAlignment alignment = listCell.getHorizontalAlignment();
+            switch (alignment) {
+                case FLOAT:
+                case EXPAND:
+                    component.setWidth(listCell.getWidth());
+                    break;
+                case LEFT:
+                case CENTER:
+                case RIGHT:
+                    break;
+                default:
+                    throw new DRDesignReportException("Component alignment " + alignment.name() + " not supported");
+            }
+            if (component instanceof DRDesignList) {
+                componentWidth((DRDesignList) component);
+            }
+        }
+    }
+
+    private static void componentHeight(DRDesignList list) {
+        if (!list.isCalculateComponents()) {
+            return;
+        }
+
+        for (DRDesignListCell listCell : list.getListCells()) {
+            DRDesignComponent component = listCell.getComponent();
+            VerticalCellComponentAlignment alignment = listCell.getVerticalAlignment();
+            switch (alignment) {
+                case EXPAND:
+                    component.setHeight(listCell.getHeight());
+                    break;
+                case TOP:
+                case MIDDLE:
+                case BOTTOM:
+                    break;
+                default:
+                    throw new DRDesignReportException("Component alignment " + alignment.name() + " not supported");
+            }
+            if (component instanceof DRDesignList) {
+                componentHeight((DRDesignList) component);
+            }
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java
new file mode 100644
index 0000000..4fba763
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java
@@ -0,0 +1,929 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.base.DRDesignHyperLink;
+import net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading;
+import net.sf.dynamicreports.design.base.DRDesignVariable;
+import net.sf.dynamicreports.design.base.component.DRDesignBreak;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignEllipse;
+import net.sf.dynamicreports.design.base.component.DRDesignFiller;
+import net.sf.dynamicreports.design.base.component.DRDesignGenericElement;
+import net.sf.dynamicreports.design.base.component.DRDesignHyperlinkComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignImage;
+import net.sf.dynamicreports.design.base.component.DRDesignLine;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignMap;
+import net.sf.dynamicreports.design.base.component.DRDesignRectangle;
+import net.sf.dynamicreports.design.base.component.DRDesignSubreport;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import net.sf.dynamicreports.design.base.style.DRDesignStyle;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.DRIDesignField;
+import net.sf.dynamicreports.design.definition.DRIDesignVariable;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.design.transformation.expressions.BooleanImageExpression;
+import net.sf.dynamicreports.design.transformation.expressions.BooleanTextValueFormatter;
+import net.sf.dynamicreports.design.transformation.expressions.CurrentDateExpression;
+import net.sf.dynamicreports.design.transformation.expressions.MultiPageListDataSourceExpression;
+import net.sf.dynamicreports.design.transformation.expressions.MultiPageListSubreportExpression;
+import net.sf.dynamicreports.design.transformation.expressions.PageNumberExpression;
+import net.sf.dynamicreports.design.transformation.expressions.PageXofYNumberExpression;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.DRGroup;
+import net.sf.dynamicreports.report.base.DRHyperLink;
+import net.sf.dynamicreports.report.base.component.DRHyperLinkComponent;
+import net.sf.dynamicreports.report.base.component.DRImage;
+import net.sf.dynamicreports.report.base.component.DRList;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.base.style.DRPen;
+import net.sf.dynamicreports.report.base.style.DRStyle;
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.component.Components;
+import net.sf.dynamicreports.report.builder.datatype.DataTypes;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.component.CustomComponentTransform;
+import net.sf.dynamicreports.report.component.CustomComponents;
+import net.sf.dynamicreports.report.component.DRICustomComponent;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.DRIHyperLink;
+import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
+import net.sf.dynamicreports.report.definition.component.DRIBreak;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.component.DRICurrentDate;
+import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+import net.sf.dynamicreports.report.definition.component.DRIEllipse;
+import net.sf.dynamicreports.report.definition.component.DRIFiller;
+import net.sf.dynamicreports.report.definition.component.DRIFormatField;
+import net.sf.dynamicreports.report.definition.component.DRIGenericElement;
+import net.sf.dynamicreports.report.definition.component.DRIHyperLinkComponent;
+import net.sf.dynamicreports.report.definition.component.DRIImage;
+import net.sf.dynamicreports.report.definition.component.DRILine;
+import net.sf.dynamicreports.report.definition.component.DRIList;
+import net.sf.dynamicreports.report.definition.component.DRIListCell;
+import net.sf.dynamicreports.report.definition.component.DRIMap;
+import net.sf.dynamicreports.report.definition.component.DRIMultiPageList;
+import net.sf.dynamicreports.report.definition.component.DRIPageNumber;
+import net.sf.dynamicreports.report.definition.component.DRIPageXofY;
+import net.sf.dynamicreports.report.definition.component.DRIRectangle;
+import net.sf.dynamicreports.report.definition.component.DRISubreport;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.component.DRITotalPages;
+import net.sf.dynamicreports.report.definition.component.DRIXyList;
+import net.sf.dynamicreports.report.definition.component.DRIXyListCell;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * <p>ComponentTransform class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class ComponentTransform {
+    private final DesignTransformAccessor accessor;
+
+    /**
+     * <p>Constructor for ComponentTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public ComponentTransform(final DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    // component
+
+    /**
+     * <p>component.</p>
+     *
+     * @param component        a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType        a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup       a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignComponent component(final DRIComponent component, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        if (component instanceof DRITextField<?>) {
+            return this.textField((DRITextField<?>) component, defaultStyleType);
+        }
+        if (component instanceof DRIList) {
+            return this.list((DRIList) component, defaultStyleType, resetType, resetGroup);
+        }
+        if (component instanceof DRIXyList) {
+            return this.xyList((DRIXyList) component, defaultStyleType, resetType, resetGroup);
+        }
+        if (component instanceof DRIMultiPageList) {
+            return this.multiPageList((DRIMultiPageList) component);
+        }
+        if (component instanceof DRIFiller) {
+            return this.filler((DRIFiller) component);
+        }
+        if (component instanceof DRIImage) {
+            return this.image((DRIImage) component);
+        }
+        if (component instanceof DRISubreport) {
+            return this.subreport((DRISubreport) component);
+        }
+        if (component instanceof DRIPageXofY) {
+            return this.pageXofY((DRIPageXofY) component, defaultStyleType);
+        }
+        if (component instanceof DRITotalPages) {
+            return this.totalPages((DRITotalPages) component, defaultStyleType);
+        }
+        if (component instanceof DRIPageNumber) {
+            return this.pageNumber((DRIPageNumber) component, defaultStyleType);
+        }
+        if (component instanceof DRICurrentDate) {
+            return this.currentDate((DRICurrentDate) component, defaultStyleType);
+        }
+        if (component instanceof DRILine) {
+            return this.line((DRILine) component);
+        }
+        if (component instanceof DRIEllipse) {
+            return this.ellipse((DRIEllipse) component);
+        }
+        if (component instanceof DRIRectangle) {
+            return this.rectangle((DRIRectangle) component);
+        }
+        if (component instanceof DRIBooleanField) {
+            return this.booleanField((DRIBooleanField) component, defaultStyleType, resetType, resetGroup);
+        }
+        if (component instanceof DRIBreak) {
+            return this.breakComponent((DRIBreak) component);
+        }
+        if (component instanceof DRIGenericElement) {
+            return this.genericElement((DRIGenericElement) component, resetType, resetGroup);
+        }
+        if (component instanceof DRICrosstab) {
+            return this.crosstab((DRICrosstab) component, resetType, resetGroup);
+        }
+        if (component instanceof DRIMap) {
+            return this.map((DRIMap) component, resetType, resetGroup);
+        }
+        if (component instanceof DRICustomComponent) {
+            return this.customComponent((DRICustomComponent) component, resetType, resetGroup);
+        }
+        throw new DRDesignReportException("Component " + component.getClass().getName() + " not supported");
+    }
+
+    private void component(final DRDesignComponent designComponent, final DRIComponent component, final DRIReportStyle style, final boolean textStyle, final DefaultStyleType defaultStyleType) throws DRException {
+        designComponent.setStyle(this.accessor.getStyleTransform().transformStyle(style, textStyle, defaultStyleType));
+        designComponent.setPrintWhenExpression(this.accessor.getExpressionTransform().transformExpression(component.getPrintWhenExpression()));
+        designComponent.setRemoveLineWhenBlank(this.accessor.getTemplateTransform().getRemoveLineWhenBlank(component));
+        designComponent.setPositionType(this.accessor.getTemplateTransform().getPositionType(component));
+        designComponent.setStretchType(this.accessor.getTemplateTransform().getStretchType(component));
+        designComponent.setPrintInFirstWholeBand(this.accessor.getTemplateTransform().getPrintInFirstWholeBand(component));
+        designComponent.setPrintWhenDetailOverflows(this.accessor.getTemplateTransform().getPrintWhenDetailOverflows(component));
+        designComponent.setPrintWhenGroupChanges(this.accessor.getTemplateTransform().getPrintWhenGroupChanges(component));
+        for (final DRIPropertyExpression propertyExpression : component.getPropertyExpressions()) {
+            designComponent.getPropertyExpressions().add(this.accessor.getExpressionTransform().transformPropertyExpression(propertyExpression));
+        }
+        final DRDesignTableOfContentsHeading designTocHeading =
+            this.accessor.getTableOfContentsTransform().componentHeading(component);
+        if (designTocHeading != null) {
+            designComponent.setTableOfContentsHeading(designTocHeading);
+            final DRIDesignExpression anchorNameExpression = designTocHeading.getReferenceField().getAnchorNameExpression();
+            final Integer bookmarkLevel = designTocHeading.getReferenceField().getBookmarkLevel();
+            final DRDesignHyperLink designHyperLink = designTocHeading.getReferenceField().getHyperLink();
+            if (designComponent instanceof DRDesignHyperlinkComponent) {
+                ((DRDesignHyperlinkComponent) designComponent).setAnchorNameExpression(anchorNameExpression);
+                ((DRDesignHyperlinkComponent) designComponent).setBookmarkLevel(bookmarkLevel);
+                ((DRDesignHyperlinkComponent) designComponent).setHyperLink(designHyperLink);
+            }
+        }
+    }
+
+    private void hyperlink(final DRDesignHyperlinkComponent designHyperlinkComponent, final DRIHyperLinkComponent hyperlinkComponent, final DRIReportStyle style, final boolean textStyle, final DefaultStyleType defaultStyleType)
+        throws DRException {
+        this.component(designHyperlinkComponent, hyperlinkComponent, style, textStyle, defaultStyleType);
+
+        if (hyperlinkComponent.getAnchorNameExpression() != null) {
+            designHyperlinkComponent.setAnchorNameExpression(this.accessor.getExpressionTransform().transformExpression(hyperlinkComponent.getAnchorNameExpression()));
+        }
+        if (hyperlinkComponent.getBookmarkLevel() != null) {
+            designHyperlinkComponent.setBookmarkLevel(hyperlinkComponent.getBookmarkLevel());
+        }
+
+        final DRIHyperLink hyperLink = hyperlinkComponent.getHyperLink();
+        final DRDesignHyperLink designHyperLink = this.accessor.getReportTransform().hyperlink(hyperLink);
+        if (designHyperLink != null) {
+            designHyperlinkComponent.setHyperLink(designHyperLink);
+        }
+    }
+
+    // list
+
+    /**
+     * <p>list.</p>
+     *
+     * @param list             a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType        a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup       a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignList list(final DRIList list, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignList designList = new DRDesignList();
+        this.component(designList, list, list.getStyle(), false, DefaultStyleType.NONE);
+        designList.setType(list.getType());
+        designList.setGap(this.accessor.getTemplateTransform().getListGap(list));
+        designList.setWidth(this.accessor.getTemplateTransform().getListWidth(list));
+        designList.setHeight(this.accessor.getTemplateTransform().getListHeight(list));
+        designList.setCalculateComponents(designList.getWidth() == null && designList.getHeight() == null);
+        for (final DRIListCell innerComponent : list.getListCells()) {
+            final DRIComponent component = innerComponent.getComponent();
+            HorizontalCellComponentAlignment horizontalAlignment = innerComponent.getHorizontalAlignment();
+            VerticalCellComponentAlignment verticalAlignment = innerComponent.getVerticalAlignment();
+            if (component instanceof DRIDimensionComponent) {
+                final DRIDimensionComponent dimComponent = (DRIDimensionComponent) component;
+                if (horizontalAlignment == null) {
+                    horizontalAlignment = ConstantTransform.toHorizontalCellComponentAlignment(dimComponent.getWidthType());
+                }
+                if (verticalAlignment == null) {
+                    verticalAlignment = ConstantTransform.toVerticalCellComponentAlignment(dimComponent.getHeightType());
+                }
+            }
+            designList.addComponent(horizontalAlignment, verticalAlignment,
+                this.component(component, defaultStyleType, resetType, resetGroup));
+        }
+        designList.setBackgroundComponent(this.listBackgroundComponent(list.getBackgroundComponent(), defaultStyleType, resetType, resetGroup));
+
+        return designList;
+    }
+
+    /**
+     * <p>xyList.</p>
+     *
+     * @param xyList           a {@link net.sf.dynamicreports.report.definition.component.DRIXyList} object.
+     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType        a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup       a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignList xyList(final DRIXyList xyList, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignList designList = new DRDesignList(null);
+        this.component(designList, xyList, xyList.getStyle(), false, DefaultStyleType.NONE);
+        designList.setWidth(this.accessor.getTemplateTransform().getXyListWidth(xyList));
+        designList.setHeight(this.accessor.getTemplateTransform().getXyListHeight(xyList));
+        designList.setCalculateComponents(designList.getWidth() == null && designList.getHeight() == null);
+        designList.setRemovable(true);
+        for (final DRIXyListCell innerComponent : xyList.getXyListCells()) {
+            final DRDesignComponent designComponent =
+                this.component(innerComponent.getComponent(), defaultStyleType, resetType, resetGroup);
+            designComponent.setX(innerComponent.getX());
+            designComponent.setY(innerComponent.getY());
+            designList.addComponent(HorizontalCellComponentAlignment.LEFT, VerticalCellComponentAlignment.TOP, designComponent);
+        }
+
+        return designList;
+    }
+
+    /**
+     * <p>listBackgroundComponent.</p>
+     *
+     * @param backgroundComponent a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @param defaultStyleType    a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType           a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup          a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignComponent listBackgroundComponent(final DRIComponent backgroundComponent, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        if (backgroundComponent != null) {
+            if (backgroundComponent instanceof DRIRectangle || backgroundComponent instanceof DRIImage || backgroundComponent instanceof DRITextField) {
+                return this.component(backgroundComponent, defaultStyleType, resetType, resetGroup);
+            } else {
+                throw new DRDesignReportException("List background component not supported. Only rectangle, image and textfield are supported");
+            }
+        }
+        return null;
+    }
+
+    // multi page list
+    private DRDesignSubreport multiPageList(final DRIMultiPageList multiPageList) throws DRException {
+        final DRDesignSubreport designSubreport = new DRDesignSubreport();
+        this.component(designSubreport, multiPageList, multiPageList.getStyle(), false, DefaultStyleType.NONE);
+        designSubreport.setWidth(this.accessor.getTemplateTransform().getMultiPageListWidth(multiPageList));
+        designSubreport.setHeight(this.accessor.getTemplateTransform().getMultiPageListHeight(multiPageList));
+        final JasperReportBuilder multiPageReport = DynamicReports.report();
+        final MultiPageListSubreportExpression subreportExpression =
+            new MultiPageListSubreportExpression(
+                this.accessor.getLocale(),
+                this.accessor.getResourceBundle(),
+                this.accessor.getResourceBundleName(),
+                this.accessor.getWhenResourceMissingType(),
+                                                 multiPageList.getComponents(),
+                this.accessor.getTemplateTransform().getTemplateStyles());
+        multiPageReport.detail(Components.subreport(subreportExpression));
+        multiPageReport.setDetailSplitType(multiPageList.getSplitType());
+        final DRIDesignExpression reportExpression =
+            this.accessor.getExpressionTransform().transformExpression(Expressions.value(multiPageReport));
+        final DRIDesignExpression dataSourceExpression = this.accessor.getExpressionTransform().transformExpression(new MultiPageListDataSourceExpression(multiPageList.getComponents().size()));
+        designSubreport.setReportExpression(reportExpression);
+        designSubreport.setDataSourceExpression(dataSourceExpression);
+        return designSubreport;
+    }
+
+    // text field
+
+    /**
+     * <p>textField.</p>
+     *
+     * @param textField        a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignTextField} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignTextField textField(final DRITextField<?> textField, final DefaultStyleType defaultStyleType) throws DRException {
+        final DRDesignTextField designTextField = new DRDesignTextField();
+        this.hyperlink(designTextField, textField, textField.getStyle(), true, defaultStyleType);
+        final TemplateTransform templateTransform = this.accessor.getTemplateTransform();
+        designTextField.setPrintRepeatedValues(templateTransform.isTextFieldPrintRepeatedValues(textField));
+        designTextField.setStretchWithOverflow(templateTransform.getTextFieldStretchWithOverflow(textField));
+        designTextField.setTextAdjust(templateTransform.getTextFieldTextAdjust(textField));
+        final DRDesignStyle style = designTextField.getStyle();
+        designTextField.setWidth(templateTransform.getTextFieldWidth(textField, style));
+        designTextField.setHeight(templateTransform.getTextFieldHeight(textField, style));
+        designTextField.setPattern(templateTransform.getTextFieldPattern(textField, style));
+        designTextField.setPatternExpression(this.accessor.getExpressionTransform().transformExpression(textField.getPatternExpression()));
+        designTextField.setHorizontalTextAlignment(templateTransform.getTextFieldHorizontalTextAlignment(textField, style));
+        designTextField.setValueExpression(this.accessor.getExpressionTransform().transformExpression(textField.getValueExpression(), templateTransform.getTextFieldValueFormatter(textField), null));
+        designTextField.setMarkup(textField.getMarkup());
+        if (textField.getEvaluationTime() != null) {
+            designTextField.setEvaluationTime(ConstantTransform.textFieldEvaluationTime(textField.getEvaluationTime(), textField.getEvaluationGroup(),
+                this.accessor));
+            designTextField.setEvaluationGroup(
+                this.accessor.getGroupTransform().getGroup(ConstantTransform.textFieldEvaluationGroup(textField.getEvaluationTime(), textField.getEvaluationGroup(),
+                    this.accessor)));
+        } else {
+            if (textField.getEvaluationGroup() != null) {
+                throw new DRException("Evaluation group for textField is required only for evaluation time BEFORE_GROUP or GROUP");
+            }
+            final EvaluationTime evaluationTime = this.detectEvaluationTime(designTextField.getValueExpression());
+            designTextField.setEvaluationTime(evaluationTime);
+            designTextField.setEvaluationGroup(this.detectEvaluationGroup(evaluationTime, designTextField.getValueExpression()));
+        }
+        return designTextField;
+    }
+
+    // filler
+
+    /**
+     * <p>filler.</p>
+     *
+     * @param filler a {@link net.sf.dynamicreports.report.definition.component.DRIFiller} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignFiller} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignFiller filler(final DRIFiller filler) throws DRException {
+        final DRDesignFiller designFiller = new DRDesignFiller();
+        this.component(designFiller, filler, filler.getStyle(), false, DefaultStyleType.NONE);
+        designFiller.setWidth(this.accessor.getTemplateTransform().getFillerWidth(filler));
+        designFiller.setHeight(this.accessor.getTemplateTransform().getFillerHeight(filler));
+        return designFiller;
+    }
+
+    // image
+    private DRDesignImage image(final DRIImage image) throws DRException {
+        return this.image(image, null, DefaultStyleType.IMAGE);
+    }
+
+    private DRDesignImage image(final DRIImage image, final Integer imageHeight, final DefaultStyleType defaultStyleType) throws DRException {
+        final DRDesignImage designImage = new DRDesignImage();
+        this.hyperlink(designImage, image, image.getStyle(), false, defaultStyleType);
+        designImage.setImageScale(image.getImageScale());
+        designImage.setImageExpression(this.accessor.getExpressionTransform().transformExpression(image.getImageExpression()));
+        designImage.setUsingCache(image.getUsingCache());
+        designImage.setLazy(image.getLazy());
+        designImage.setHorizontalImageAlignment(image.getHorizontalImageAlignment());
+        designImage.setWidth(this.accessor.getTemplateTransform().getImageWidth(image));
+        final DRDesignStyle style = designImage.getStyle();
+        designImage.setHeight(this.accessor.getTemplateTransform().getImageHeight(image, imageHeight, style));
+        return designImage;
+    }
+
+    
+    // subreport
+    private DRDesignSubreport subreport(final DRISubreport subreport) throws DRException {
+        final DRDesignSubreport designSubreport = new DRDesignSubreport();
+        this.component(designSubreport, subreport, subreport.getStyle(), false, DefaultStyleType.NONE);
+        designSubreport.setWidth(this.accessor.getTemplateTransform().getSubreportWidth(subreport));
+        designSubreport.setHeight(this.accessor.getTemplateTransform().getSubreportHeight(subreport));
+        designSubreport.setReportExpression(this.accessor.getExpressionTransform().transformExpression(subreport.getReportExpression()));
+        designSubreport.setParametersExpression(this.accessor.getExpressionTransform().transformExpression(subreport.getParametersExpression()));
+        designSubreport.setConnectionExpression(this.accessor.getExpressionTransform().transformExpression(subreport.getConnectionExpression()));
+        designSubreport.setDataSourceExpression(this.accessor.getExpressionTransform().transformExpression(subreport.getDataSourceExpression()));
+        designSubreport.setRunToBottom(subreport.getRunToBottom());
+        return designSubreport;
+    }
+
+    // page x of y
+    private DRDesignList pageXofY(final DRIPageXofY pageXofY, final DefaultStyleType defaultStyleType) throws DRException {
+        final TemplateTransform templateTransform = this.accessor.getTemplateTransform();
+        DRIReportStyle pageXofYStyle = pageXofY.getStyle();
+        if (pageXofYStyle == null) {
+            pageXofYStyle = this.accessor.getTemplateTransform().getTextStyle();
+        }
+        final DRDesignStyle style =
+            this.accessor.getStyleTransform().transformStyle(pageXofYStyle, true, defaultStyleType);
+        final Integer height = templateTransform.getPageXofYHeight(pageXofY, style);
+        final HorizontalTextAlignment horizontalTextAlignment = templateTransform.getPageXofYHorizontalTextAlignment(pageXofY, style);
+
+        final DRStyle newStylePageX = new DRStyle();
+        newStylePageX.setParentStyle(pageXofYStyle);
+        newStylePageX.getPadding().setRight(0);
+        final DRPen pen = new DRPen();
+        pen.setLineWidth(0f);
+        newStylePageX.getBorder().setRightPen(pen);
+        final DRStyle newStylePageY = new DRStyle();
+        newStylePageY.setParentStyle(pageXofYStyle);
+        newStylePageY.getPadding().setLeft(0);
+        newStylePageY.getBorder().setLeftPen(pen);
+
+        final DRTextField<String> pageXField = new DRTextField<>();
+        pageXField.setAnchorNameExpression(pageXofY.getAnchorNameExpression());
+        pageXField.setBookmarkLevel(pageXofY.getBookmarkLevel());
+        pageXField.setHyperLink((DRHyperLink) pageXofY.getHyperLink());
+        pageXField.setPrintWhenExpression(pageXofY.getPrintWhenExpression());
+        pageXField.setStyle(newStylePageX);
+        pageXField.setHeight(height);
+        pageXField.setHeightType(pageXofY.getHeightType());
+        pageXField.setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT);
+        pageXField.setValueExpression(new PageXofYNumberExpression(pageXofY.getFormatExpression(), 0));
+
+        final DRTextField<String> pageYField = new DRTextField<>();
+        pageYField.setAnchorNameExpression(pageXofY.getAnchorNameExpression());
+        pageYField.setBookmarkLevel(pageXofY.getBookmarkLevel());
+        pageYField.setHyperLink((DRHyperLink) pageXofY.getHyperLink());
+        pageYField.setPrintWhenExpression(pageXofY.getPrintWhenExpression());
+        pageYField.setStyle(newStylePageY);
+        pageYField.setHeight(height);
+        pageYField.setHeightType(pageXofY.getHeightType());
+        pageYField.setHorizontalTextAlignment(HorizontalTextAlignment.LEFT);
+        pageYField.setValueExpression(new PageXofYNumberExpression(pageXofY.getFormatExpression(), 1));
+        final DRIGroup pageYEvaluationGroup = this.accessor.getGroupTransform().getFirstResetPageNumberGroup();
+        if (pageYEvaluationGroup == null) {
+            pageYField.setEvaluationTime(Evaluation.REPORT);
+        } else {
+            pageYField.setEvaluationTime(Evaluation.GROUP);
+            pageYField.setEvaluationGroup((DRGroup) pageYEvaluationGroup);
+        }
+
+        final int pageXofYWidth = templateTransform.getPageXofYWidth(pageXofY);
+        switch (horizontalTextAlignment) {
+            case LEFT:
+                int pageXWidth = StyleResolver.getFontWidth(style, 4);
+                int pageYWidth = pageXofYWidth - pageXWidth;
+                if (pageYWidth <= 0) {
+                    pageYWidth = 10;
+                }
+                pageXField.setWidth(pageXWidth);
+                pageXField.setWidthType(ComponentDimensionType.FIXED);
+                pageYField.setWidth(pageYWidth);
+                pageYField.setWidthType(pageXofY.getWidthType());
+                break;
+            case RIGHT:
+                pageYWidth = StyleResolver.getFontWidth(style, 6);
+                pageXWidth = pageXofYWidth - pageYWidth;
+                if (pageXWidth <= 0) {
+                    pageXWidth = 10;
+                }
+                pageXField.setWidth(pageXWidth);
+                pageXField.setWidthType(pageXofY.getWidthType());
+                pageYField.setWidth(pageYWidth);
+                pageYField.setWidthType(ComponentDimensionType.FIXED);
+                break;
+            default:
+                pageXField.setWidth(pageXofYWidth / 2);
+                pageXField.setWidthType(pageXofY.getWidthType());
+                pageYField.setWidth(pageXofYWidth / 2);
+                pageYField.setWidthType(pageXofY.getWidthType());
+                break;
+        }
+
+        if (pageXofY.getPageXWidth() != null) {
+            pageXField.setWidth(pageXofY.getPageXWidth());
+        }
+        if (pageXofY.getPageXWidthType() != null) {
+            pageXField.setWidthType(pageXofY.getPageXWidthType());
+        }
+        if (pageXofY.getPageYWidth() != null) {
+            pageYField.setWidth(pageXofY.getPageYWidth());
+        }
+        if (pageXofY.getPageYWidthType() != null) {
+            pageYField.setWidthType(pageXofY.getPageYWidthType());
+        }
+
+        final DRList listPageXofY = new DRList();
+        listPageXofY.addComponent(pageXField);
+        listPageXofY.addComponent(pageYField);
+        return this.list(listPageXofY, DefaultStyleType.TEXT, null, null);
+    }
+
+    // total pages
+    private DRDesignTextField totalPages(final DRITotalPages totalPages, final DefaultStyleType defaultStyleType) throws DRException {
+        final PageNumberExpression expression = new PageNumberExpression(totalPages.getFormatExpression());
+        final DRTextField<String> totalPagesField = this.formatField(totalPages, expression);
+        final DRIGroup pageEvaluationGroup = this.accessor.getGroupTransform().getFirstResetPageNumberGroup();
+        if (pageEvaluationGroup == null) {
+            totalPagesField.setEvaluationTime(Evaluation.REPORT);
+        } else {
+            totalPagesField.setEvaluationTime(Evaluation.GROUP);
+            totalPagesField.setEvaluationGroup((DRGroup) pageEvaluationGroup);
+        }
+
+        return this.textField(totalPagesField, defaultStyleType);
+    }
+
+    // page number
+    private DRDesignTextField pageNumber(final DRIPageNumber pageNumber, final DefaultStyleType defaultStyleType) throws DRException {
+        final PageNumberExpression expression = new PageNumberExpression(pageNumber.getFormatExpression());
+        return this.textField(this.formatField(pageNumber, expression), defaultStyleType);
+    }
+
+    // current date
+    private DRDesignTextField currentDate(final DRICurrentDate currentDate, final DefaultStyleType defaultStyleType) throws DRException {
+        final CurrentDateExpression expression = new CurrentDateExpression(currentDate.getFormatExpression(), currentDate.getPattern());
+        return this.textField(this.formatField(currentDate, expression), defaultStyleType);
+    }
+
+    // format field
+    private DRTextField<String> formatField(final DRIFormatField formatField, final DRIExpression<String> expression) throws DRException {
+        final DRTextField<String> formatFieldTextField = new DRTextField<>();
+        formatFieldTextField.setAnchorNameExpression(formatField.getAnchorNameExpression());
+        formatFieldTextField.setBookmarkLevel(formatField.getBookmarkLevel());
+        formatFieldTextField.setHyperLink((DRHyperLink) formatField.getHyperLink());
+        formatFieldTextField.setPrintWhenExpression(formatField.getPrintWhenExpression());
+        formatFieldTextField.setStyle(formatField.getStyle());
+        formatFieldTextField.setWidth(formatField.getWidth());
+        formatFieldTextField.setWidthType(formatField.getWidthType());
+        formatFieldTextField.setHeight(formatField.getHeight());
+        formatFieldTextField.setHeightType(formatField.getHeightType());
+        formatFieldTextField.setHorizontalTextAlignment(formatField.getHorizontalTextAlignment());
+        formatFieldTextField.setValueExpression(expression);
+        return formatFieldTextField;
+    }
+
+    // line
+
+    /**
+     * <p>line.</p>
+     *
+     * @param line a {@link net.sf.dynamicreports.report.definition.component.DRILine} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignLine} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignLine line(final DRILine line) throws DRException {
+        final DRDesignLine designLine = new DRDesignLine();
+        this.component(designLine, line, line.getStyle(), false, DefaultStyleType.NONE);
+        designLine.setDirection(line.getDirection());
+        designLine.setPen(this.accessor.getStyleTransform().pen(line.getPen()));
+        designLine.setWidth(this.accessor.getTemplateTransform().getLineWidth(line));
+        designLine.setHeight(this.accessor.getTemplateTransform().getLineHeight(line));
+        return designLine;
+    }
+
+    // ellipse
+
+    /**
+     * <p>ellipse.</p>
+     *
+     * @param ellipse a {@link net.sf.dynamicreports.report.definition.component.DRIEllipse} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignEllipse} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignEllipse ellipse(final DRIEllipse ellipse) throws DRException {
+        final DRDesignEllipse designEllipse = new DRDesignEllipse();
+        this.component(designEllipse, ellipse, ellipse.getStyle(), false, DefaultStyleType.NONE);
+        designEllipse.setPen(this.accessor.getStyleTransform().pen(ellipse.getPen()));
+        designEllipse.setWidth(this.accessor.getTemplateTransform().getEllipseWidth(ellipse));
+        designEllipse.setHeight(this.accessor.getTemplateTransform().getEllipseHeight(ellipse));
+        return designEllipse;
+    }
+
+    // rectangle
+
+    /**
+     * <p>rectangle.</p>
+     *
+     * @param rectangle a {@link net.sf.dynamicreports.report.definition.component.DRIRectangle} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignRectangle} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignRectangle rectangle(final DRIRectangle rectangle) throws DRException {
+        final DRDesignRectangle designRectangle = new DRDesignRectangle();
+        this.component(designRectangle, rectangle, rectangle.getStyle(), false, DefaultStyleType.NONE);
+        designRectangle.setRadius(this.accessor.getTemplateTransform().getRectangleRadius(rectangle));
+        designRectangle.setPen(this.accessor.getStyleTransform().pen(rectangle.getPen()));
+        designRectangle.setWidth(this.accessor.getTemplateTransform().getRectangleWidth(rectangle));
+        designRectangle.setHeight(this.accessor.getTemplateTransform().getRectangleHeight(rectangle));
+        return designRectangle;
+    }
+
+    // boolean
+
+    /**
+     * <p>booleanField.</p>
+     *
+     * @param booleanField     a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType        a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup       a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignComponent booleanField(final DRIBooleanField booleanField, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final BooleanComponentType componentType =
+            this.accessor.getTemplateTransform().getBooleanComponentType(booleanField);
+        final boolean emptyWhenNullValue =
+            this.accessor.getTemplateTransform().getBooleanEmptyWhenNullValue(booleanField);
+
+        DRHyperLinkComponent component = null;
+
+        switch (componentType) {
+            case TEXT_TRUE_FALSE:
+            case TEXT_YES_NO:
+                final String keyTrue;
+                final String keyFalse;
+                if (componentType.equals(BooleanComponentType.TEXT_TRUE_FALSE)) {
+                    keyTrue = "true";
+                    keyFalse = "false";
+                } else {
+                    keyTrue = "yes";
+                    keyFalse = "no";
+                }
+                final DRTextField<Boolean> textField = new DRTextField<>();
+                textField.setValueExpression(booleanField.getValueExpression());
+                textField.setDataType(DataTypes.booleanType());
+                textField.setHorizontalTextAlignment(booleanField.getHorizontalTextAlignment());
+                textField.setValueFormatter(new BooleanTextValueFormatter(keyTrue, keyFalse, emptyWhenNullValue));
+                component = textField;
+                break;
+            case IMAGE_STYLE_1:
+            case IMAGE_STYLE_2:
+            case IMAGE_STYLE_3:
+            case IMAGE_STYLE_4:
+            case IMAGE_CHECKBOX_1:
+            case IMAGE_CHECKBOX_2:
+            case IMAGE_BALL:
+                final DRImage image = new DRImage();
+                image.setImageScale(ImageScale.CLIP);
+                final int width = this.accessor.getTemplateTransform().getBooleanImageWidth(booleanField);
+                final int height = this.accessor.getTemplateTransform().getBooleanImageHeight(booleanField);
+                image.setImageExpression(new BooleanImageExpression(booleanField, emptyWhenNullValue, width, height));
+                component = image;
+                break;
+            default:
+                throw new DRDesignReportException("Boolean component type " + componentType.name() + " not supported");
+        }
+
+        component.setWidth(booleanField.getWidth());
+        component.setWidthType(booleanField.getWidthType());
+        component.setHeight(booleanField.getHeight());
+        component.setHeightType(booleanField.getHeightType());
+        component.setAnchorNameExpression(booleanField.getAnchorNameExpression());
+        component.setBookmarkLevel(booleanField.getBookmarkLevel());
+        component.setHyperLink((DRHyperLink) booleanField.getHyperLink());
+        component.setStyle(booleanField.getStyle());
+        component.setPrintWhenExpression(booleanField.getPrintWhenExpression());
+        component.setPropertyExpressions(booleanField.getPropertyExpressions());
+
+        final DRDesignComponent designComponent;
+        if (component instanceof DRIImage) {
+            final int imageHeight = this.accessor.getTemplateTransform().getBooleanImageHeight(booleanField);
+            designComponent = this.image((DRIImage) component, imageHeight, defaultStyleType);
+            final TemplateTransform templateTransform = this.accessor.getTemplateTransform();
+            ((DRDesignImage) designComponent).setHorizontalImageAlignment(templateTransform.getBooleanHorizontalImageAlignment(booleanField, designComponent.getStyle()));
+        } else {
+            designComponent = this.component(component, defaultStyleType, resetType, resetGroup);
+        }
+        return designComponent;
+    }
+
+    // break
+
+    /**
+     * <p>breakComponent.</p>
+     *
+     * @param breakComponent a {@link net.sf.dynamicreports.report.definition.component.DRIBreak} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignBreak} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignBreak breakComponent(final DRIBreak breakComponent) throws DRException {
+        final DRDesignBreak designBreak = new DRDesignBreak();
+        this.component(designBreak, breakComponent, null, false, DefaultStyleType.NONE);
+        designBreak.setType(breakComponent.getType());
+        designBreak.setWidth(this.accessor.getTemplateTransform().getBreakWidth(breakComponent));
+        designBreak.setHeight(this.accessor.getTemplateTransform().getBreakHeight(breakComponent));
+        return designBreak;
+    }
+
+    // generic element
+
+    /**
+     * <p>genericElement.</p>
+     *
+     * @param genericElement a {@link net.sf.dynamicreports.report.definition.component.DRIGenericElement} object.
+     * @param resetType      a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup     a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignGenericElement} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignGenericElement genericElement(final DRIGenericElement genericElement, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignGenericElement designGenericElement = new DRDesignGenericElement();
+        this.component(designGenericElement, genericElement, genericElement.getStyle(), false, DefaultStyleType.NONE);
+        designGenericElement.setGenericElementNamespace(genericElement.getGenericElementNamespace());
+        designGenericElement.setGenericElementName(genericElement.getGenericElementName());
+        designGenericElement.setEvaluationTime(this.evaluationTimeFromResetType(resetType));
+        designGenericElement.setEvaluationGroup(resetGroup);
+        designGenericElement.setWidth(this.accessor.getTemplateTransform().getGenericElementWidth(genericElement));
+        designGenericElement.setHeight(this.accessor.getTemplateTransform().getGenericElementHeight(genericElement));
+        for (final DRIParameterExpression parameterExpression : genericElement.getParameterExpressions()) {
+            designGenericElement.getParameterExpressions().add(this.accessor.getExpressionTransform().transformParameterExpression(parameterExpression));
+        }
+        return designGenericElement;
+    }
+
+    // crosstab
+    private DRDesignCrosstab crosstab(final DRICrosstab crosstab, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignCrosstab designCrosstab =
+            this.accessor.getCrosstabTransform().transform(crosstab, resetType, resetGroup);
+        this.component(designCrosstab, crosstab, crosstab.getStyle(), false, DefaultStyleType.NONE);
+        return designCrosstab;
+    }
+
+    // map
+    private DRDesignMap map(final DRIMap map, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignMap designMap = new DRDesignMap();
+        this.component(designMap, map, map.getStyle(), false, DefaultStyleType.NONE);
+        designMap.setLatitudeExpression(this.accessor.getExpressionTransform().transformExpression(map.getLatitudeExpression()));
+        designMap.setLongitudeExpression(this.accessor.getExpressionTransform().transformExpression(map.getLongitudeExpression()));
+        designMap.setZoomExpression(this.accessor.getExpressionTransform().transformExpression(map.getZoomExpression()));
+        designMap.setWidth(this.accessor.getTemplateTransform().getMapWidth(map));
+        designMap.setHeight(this.accessor.getTemplateTransform().getMapHeight(map));
+        designMap.setEvaluationTime(this.evaluationTimeFromResetType(resetType));
+        designMap.setEvaluationGroup(resetGroup);
+        return designMap;
+    }
+
+    // custom component
+    private DRDesignComponent customComponent(final DRICustomComponent component, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        @SuppressWarnings("rawtypes") final CustomComponentTransform componentTransfom = CustomComponents.getComponentTransform(component);
+        if (componentTransfom == null) {
+            throw new DRDesignReportException("Component " + component.getClass().getName() + " not supported");
+        }
+        @SuppressWarnings("unchecked") final DRDesignComponent designComponent = (DRDesignComponent) componentTransfom.designComponent(
+            this.accessor, component, resetType, resetGroup);
+        this.component(designComponent, component, component.getStyle(), false, DefaultStyleType.NONE);
+        final DRIDimensionComponent dimensionComponent = component;
+        if (designComponent.getWidth() == null) {
+            designComponent.setWidth(this.accessor.getTemplateTransform().getCustomComponentWidth(dimensionComponent));
+        }
+        if (designComponent.getHeight() == null) {
+            designComponent.setHeight(this.accessor.getTemplateTransform().getCustomComponentHeight(dimensionComponent));
+        }
+        return designComponent;
+    }
+
+    /**
+     * <p>detectEvaluationTime.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    protected EvaluationTime detectEvaluationTime(final DRIDesignExpression expression) {
+        if (expression == null) {
+            return null;
+        }
+
+        if (expression instanceof DRIDesignField || expression instanceof DRIDesignSystemExpression || expression instanceof DRIDesignSimpleExpression ||
+            expression instanceof DRIDesignJasperExpression) {
+            return EvaluationTime.NOW;
+        }
+        if (expression instanceof DRIDesignVariable) {
+            return this.evaluationTimeFromResetType(((DRIDesignVariable) expression).getResetType());
+        }
+        if (expression instanceof DRIDesignComplexExpression) {
+            return this.detectComplexExpressionEvaluationTime((DRIDesignComplexExpression) expression);
+        }
+        throw new DRDesignReportException("Expression " + expression.getClass().getName() + " not supported");
+    }
+
+    /**
+     * <p>evaluationTimeFromResetType.</p>
+     *
+     * @param resetType a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    public EvaluationTime evaluationTimeFromResetType(final ResetType resetType) {
+        if (resetType == null) {
+            return null;
+        }
+
+        switch (resetType) {
+            case NONE:
+                return EvaluationTime.NOW;
+            case REPORT:
+                return EvaluationTime.REPORT;
+            case PAGE:
+                return EvaluationTime.PAGE;
+            case COLUMN:
+                return EvaluationTime.COLUMN;
+            case GROUP:
+                return EvaluationTime.GROUP;
+            default:
+                throw new DRDesignReportException("Reset type " + resetType.name() + " not supported");
+        }
+    }
+
+    private EvaluationTime detectComplexExpressionEvaluationTime(final DRIDesignComplexExpression complexExpression) {
+        EvaluationTime evaluationTime = null;
+        for (final DRIDesignExpression expression : complexExpression.getExpressions()) {
+            final EvaluationTime evalTime = this.detectEvaluationTime(expression);
+            if (evaluationTime == null) {
+                evaluationTime = evalTime;
+            } else if (evaluationTime != evalTime || evaluationTime.equals(EvaluationTime.GROUP) && evalTime.equals(EvaluationTime.GROUP)) {
+                return EvaluationTime.AUTO;
+            }
+        }
+        return evaluationTime;
+    }
+
+    private DRDesignGroup detectEvaluationGroup(final EvaluationTime evaluationTime, final DRIDesignExpression expression) {
+        if (expression != null && evaluationTime != null && evaluationTime.equals(EvaluationTime.GROUP)) {
+            final DRDesignGroup evaluationGroup = this.detectEvaluationGroup(expression);
+            if (evaluationGroup == null) {
+                throw new DRDesignReportException("Can not detect evaluation group");
+            }
+            return evaluationGroup;
+        }
+        return null;
+    }
+
+    private DRDesignGroup detectEvaluationGroup(final DRIDesignExpression expression) {
+        if (expression instanceof DRIDesignField || expression instanceof DRIDesignSimpleExpression) {
+            return null;
+        }
+        if (expression instanceof DRDesignVariable) {
+            return ((DRDesignVariable) expression).getResetGroup();
+        }
+        if (expression instanceof DRIDesignComplexExpression) {
+            return this.detectComplexExpressionEvaluationGroup((DRIDesignComplexExpression) expression);
+        }
+        throw new DRDesignReportException("Expression " + expression.getClass().getName() + " not supported");
+    }
+
+    private DRDesignGroup detectComplexExpressionEvaluationGroup(final DRIDesignComplexExpression complexExpression) {
+        DRDesignGroup evaluationGroup = null;
+        for (final DRIDesignExpression expression : complexExpression.getExpressions()) {
+            final DRDesignGroup group = this.detectEvaluationGroup(expression);
+            if (evaluationGroup == null) {
+                evaluationGroup = group;
+            } else if (evaluationGroup != group) {
+                throw new DRDesignReportException("Can not detect evaluation group");
+            }
+        }
+        return evaluationGroup;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ConstantTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ConstantTransform.java
new file mode 100644
index 0000000..7ea19de
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ConstantTransform.java
@@ -0,0 +1,264 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ConstantTransform {
+
+    /**
+     * <p>variableResetType.</p>
+     *
+     * @param resetType  a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @param resetGroup a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @param accessor   a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @return a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     */
+    public static ResetType variableResetType(Evaluation resetType, DRIGroup resetGroup, DesignTransformAccessor accessor) {
+        if (resetType == null) {
+            return ResetType.REPORT;
+        }
+
+        switch (resetType) {
+            case NONE:
+                return ResetType.NONE;
+            case REPORT:
+                return ResetType.REPORT;
+            case PAGE:
+                return ResetType.PAGE;
+            case COLUMN:
+                return ResetType.COLUMN;
+            case FIRST_GROUP:
+                if (accessor.getGroupTransform().getFirstGroup() == null) {
+                    return ResetType.REPORT;
+                }
+                return ResetType.GROUP;
+            case BEFORE_GROUP:
+                if (accessor.getGroupTransform().getBeforeGroup(resetGroup) == null) {
+                    return ResetType.REPORT;
+                }
+                return ResetType.GROUP;
+            case LAST_GROUP:
+                if (accessor.getGroupTransform().getLastGroup() == null) {
+                    return ResetType.REPORT;
+                }
+                return ResetType.GROUP;
+            case GROUP:
+                return ResetType.GROUP;
+            default:
+                throw new DRDesignReportException("Reset type " + resetType.name() + " not supported");
+        }
+    }
+
+    /**
+     * <p>variableResetGroup.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param resetType  a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @param resetGroup a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @param accessor   a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public static DRIGroup variableResetGroup(String name, Evaluation resetType, DRIGroup resetGroup, DesignTransformAccessor accessor) throws DRException {
+        if (resetType == null) {
+            return null;
+        }
+
+        switch (resetType) {
+            case NONE:
+            case REPORT:
+            case PAGE:
+            case COLUMN:
+                if (resetGroup != null) {
+                    throw new DRException("Reset group for variable " + name + " is required only for reset type BEFORE_GROUP or GROUP");
+                }
+                return null;
+            case FIRST_GROUP:
+                if (resetGroup != null) {
+                    throw new DRException("Reset group for variable " + name + " is required only for reset type BEFORE_GROUP or GROUP");
+                }
+                return accessor.getGroupTransform().getFirstGroup();
+            case BEFORE_GROUP:
+                if (resetGroup == null) {
+                    throw new DRException("Reset group missing for variable " + name);
+                }
+                return accessor.getGroupTransform().getBeforeGroup(resetGroup);
+            case LAST_GROUP:
+                if (resetGroup != null) {
+                    throw new DRException("Reset group for variable " + name + " is required only for reset type BEFORE_GROUP or GROUP");
+                }
+                return accessor.getGroupTransform().getLastGroup();
+            case GROUP:
+                if (resetGroup == null) {
+                    throw new DRException("Reset group missing for variable " + name);
+                }
+                return resetGroup;
+            default:
+                throw new DRDesignReportException("Reset group " + resetType.name() + " not supported");
+        }
+    }
+
+    /**
+     * <p>textFieldEvaluationTime.</p>
+     *
+     * @param evaluationTime  a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @param evaluationGroup a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @param accessor        a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     */
+    public static EvaluationTime textFieldEvaluationTime(Evaluation evaluationTime, DRIGroup evaluationGroup, DesignTransformAccessor accessor) {
+        if (evaluationTime == null) {
+            return EvaluationTime.NOW;
+        }
+
+        switch (evaluationTime) {
+            case NONE:
+                return EvaluationTime.NOW;
+            case REPORT:
+                return EvaluationTime.REPORT;
+            case PAGE:
+                return EvaluationTime.PAGE;
+            case COLUMN:
+                return EvaluationTime.COLUMN;
+            case FIRST_GROUP:
+                if (accessor.getGroupTransform().getFirstGroup() == null) {
+                    return EvaluationTime.REPORT;
+                }
+                return EvaluationTime.GROUP;
+            case BEFORE_GROUP:
+                if (accessor.getGroupTransform().getBeforeGroup(evaluationGroup) == null) {
+                    return EvaluationTime.REPORT;
+                }
+                return EvaluationTime.GROUP;
+            case LAST_GROUP:
+                if (accessor.getGroupTransform().getLastGroup() == null) {
+                    return EvaluationTime.REPORT;
+                }
+                return EvaluationTime.GROUP;
+            case GROUP:
+                return EvaluationTime.GROUP;
+            default:
+                throw new DRDesignReportException("Evaluation time " + evaluationTime.name() + " not supported");
+        }
+    }
+
+    /**
+     * <p>textFieldEvaluationGroup.</p>
+     *
+     * @param evaluationTime  a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @param evaluationGroup a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @param accessor        a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public static DRIGroup textFieldEvaluationGroup(Evaluation evaluationTime, DRIGroup evaluationGroup, DesignTransformAccessor accessor) throws DRException {
+        if (evaluationTime == null) {
+            return null;
+        }
+
+        switch (evaluationTime) {
+            case NONE:
+            case REPORT:
+            case PAGE:
+            case COLUMN:
+                if (evaluationGroup != null) {
+                    throw new DRException("Evaluation group for textField is required only for evaluation time BEFORE_GROUP or GROUP");
+                }
+                return null;
+            case FIRST_GROUP:
+                if (evaluationGroup != null) {
+                    throw new DRException("Evaluation group for textField is required only for evaluation time BEFORE_GROUP or GROUP");
+                }
+                return accessor.getGroupTransform().getFirstGroup();
+            case BEFORE_GROUP:
+                if (evaluationGroup == null) {
+                    throw new DRException("Evaluation group missing for textField");
+                }
+                return accessor.getGroupTransform().getBeforeGroup(evaluationGroup);
+            case LAST_GROUP:
+                if (evaluationGroup != null) {
+                    throw new DRException("Evaluation group for textField is required only for evaluation time BEFORE_GROUP or GROUP");
+                }
+                return accessor.getGroupTransform().getLastGroup();
+            case GROUP:
+                if (evaluationGroup == null) {
+                    throw new DRException("Evaluation group missing for textField");
+                }
+                return evaluationGroup;
+            default:
+                throw new DRDesignReportException("Evaluation group " + evaluationTime.name() + " not supported");
+        }
+    }
+
+    /**
+     * <p>toHorizontalCellComponentAlignment.</p>
+     *
+     * @param widthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     */
+    public static HorizontalCellComponentAlignment toHorizontalCellComponentAlignment(ComponentDimensionType widthType) {
+        if (widthType == null) {
+            return null;
+        }
+
+        switch (widthType) {
+            case FIXED:
+                return HorizontalCellComponentAlignment.LEFT;
+            case FLOAT:
+                return HorizontalCellComponentAlignment.FLOAT;
+            case EXPAND:
+                return HorizontalCellComponentAlignment.EXPAND;
+            default:
+                throw new DRDesignReportException("Component dimension type " + widthType.name() + " not supported");
+        }
+    }
+
+    /**
+     * <p>toVerticalCellComponentAlignment.</p>
+     *
+     * @param heightType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     */
+    public static VerticalCellComponentAlignment toVerticalCellComponentAlignment(ComponentDimensionType heightType) {
+        if (heightType == null) {
+            return null;
+        }
+
+        switch (heightType) {
+            case FIXED:
+                return VerticalCellComponentAlignment.TOP;
+            case FLOAT:
+            case EXPAND:
+                return VerticalCellComponentAlignment.EXPAND;
+            default:
+                throw new DRDesignReportException("Component dimension type " + heightType.name() + " not supported");
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CrosstabTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CrosstabTransform.java
new file mode 100644
index 0000000..c1549b2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CrosstabTransform.java
@@ -0,0 +1,665 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabDataset;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabGroup;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabMeasure;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.transformation.expressions.CrosstabExpression;
+import net.sf.dynamicreports.design.transformation.expressions.CrosstabMeasureExpression;
+import net.sf.dynamicreports.design.transformation.expressions.CrosstabPrintInEvenRow;
+import net.sf.dynamicreports.design.transformation.expressions.CrosstabPrintInOddRow;
+import net.sf.dynamicreports.design.transformation.expressions.CrosstabRowCount;
+import net.sf.dynamicreports.design.transformation.expressions.CrosstabRowCounter;
+import net.sf.dynamicreports.report.base.DRHyperLink;
+import net.sf.dynamicreports.report.base.component.DRFiller;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabCellContent;
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabCellStyle;
+import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
+import net.sf.dynamicreports.report.base.style.DRStyle;
+import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellContent;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabDataset;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
+import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * <p>CrosstabTransform class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class CrosstabTransform {
+    private final DesignTransformAccessor accessor;
+    private Map<DRDesignCrosstab, DRICrosstab> crosstabs;
+    private CrosstabRowCounter crosstabRowCounter;
+
+    /**
+     * <p>Constructor for CrosstabTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public CrosstabTransform(final DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+        init();
+    }
+
+    private void init() {
+        crosstabs = new HashMap<>();
+        crosstabRowCounter = new CrosstabRowCounter();
+    }
+
+    /**
+     * <p>transform.</p>
+     *
+     * @param crosstab   a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+     * @param resetType  a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignCrosstab transform(final DRICrosstab crosstab, ResetType resetType, DRDesignGroup resetGroup) throws DRException {
+        final DRDesignCrosstab designCrosstab = new DRDesignCrosstab();
+        designCrosstab.setDataset(dataset(crosstab.getDataset(), resetType, resetGroup));
+        accessor.transformToDataset(crosstab.getDataset().getSubDataset());
+        if (crosstab.getDataset() != null) {
+            resetType = null;
+            resetGroup = null;
+        }
+        final DRDesignCrosstabCellContent whenNoDataCell = cellContent(crosstab.getWhenNoDataCell(), resetType, resetGroup);
+        designCrosstab.setWidth(accessor.getTemplateTransform().getCrosstabWidth(crosstab));
+        designCrosstab.setHeight(accessor.getTemplateTransform().getCrosstabHeight(crosstab, whenNoDataCell));
+        designCrosstab.setRepeatColumnHeaders(crosstab.isRepeatColumnHeaders());
+        designCrosstab.setRepeatRowHeaders(crosstab.isRepeatRowHeaders());
+        designCrosstab.setColumnBreakOffset(crosstab.getColumnBreakOffset());
+        designCrosstab.setIgnoreWidth(crosstab.getIgnoreWidth());
+        designCrosstab.setRunDirection(crosstab.getRunDirection());
+        designCrosstab.setWhenNoDataCell(whenNoDataCell);
+        designCrosstab.setHeaderCell(cellContent(crosstab.getHeaderCell(), resetType, resetGroup));
+        for (final DRICrosstabColumnGroup<?> columnGroup : crosstab.getColumnGroups()) {
+            addColumnGroup(crosstab, designCrosstab, columnGroup, resetType, resetGroup);
+        }
+        for (final DRICrosstabRowGroup<?> rowGroup : crosstab.getRowGroups()) {
+            addRowGroup(crosstab, designCrosstab, rowGroup, resetType, resetGroup);
+        }
+        addCells(crosstab, designCrosstab, resetType, resetGroup);
+        for (final DRICrosstabVariable<?> variable : crosstab.getVariables()) {
+            addMeasure(designCrosstab, variable);
+        }
+        for (final DRICrosstabMeasure<?> measure : crosstab.getMeasures()) {
+            if (measure.getExpression() instanceof DRICrosstabVariable<?>) {
+                addMeasure(designCrosstab, (DRICrosstabVariable<?>) measure.getExpression());
+            }
+        }
+        accessor.getExpressionTransform().transformExpression(crosstabRowCounter);
+        addRowCountExpression(designCrosstab);
+        crosstabs.put(designCrosstab, crosstab);
+        accessor.transformToMainDataset();
+
+        return designCrosstab;
+    }
+
+    // dataset
+    private DRDesignCrosstabDataset dataset(final DRICrosstabDataset dataset, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignCrosstabDataset designDataset = new DRDesignCrosstabDataset();
+        designDataset.setSubDataset(accessor.getDatasetTransform().transform(dataset.getSubDataset()));
+        designDataset.setDataPreSorted(dataset.getDataPreSorted());
+        if (resetType != null && resetType.equals(ResetType.NONE)) {
+            designDataset.setResetType(ResetType.REPORT);
+        } else {
+            designDataset.setResetType(resetType);
+        }
+        designDataset.setResetGroup(resetGroup);
+        return designDataset;
+    }
+
+    private void addRowCountExpression(final DRDesignCrosstab designCrosstab) throws DRException {
+        final DRDesignCrosstabRowGroup lastRowGroup = getLastValue(designCrosstab.getRowGroups());
+        final DRFiller filler = new DRFiller();
+        final CrosstabRowCount rowCountExpression = new CrosstabRowCount();
+        filler.setPrintWhenExpression(rowCountExpression);
+        final DRDesignComponent designTextField = accessor.getComponentTransform().filler(filler);
+        lastRowGroup.getHeader().getList().addComponent(designTextField);
+    }
+
+    private DRDesignCrosstabCellContent cellContent(final DRICrosstabCellContent cellContent, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignCrosstabCellContent designCellContents = new DRDesignCrosstabCellContent();
+        designCellContents.setList(accessor.getComponentTransform().list(cellContent.getList(), DefaultStyleType.TEXT, resetType, resetGroup));
+        designCellContents.setStyle(accessor.getStyleTransform().transformStyle(cellContent.getStyle(), false, DefaultStyleType.NONE));
+        return designCellContents;
+    }
+
+    @SuppressWarnings( {"rawtypes", "unchecked"})
+    private void group(final DRDesignCrosstabGroup designGroup, final DRICrosstab crosstab, final DRICrosstabGroup group, final boolean showTotal, final ResetType resetType, final DRDesignGroup resetGroup,
+                       final DRDesignComponent designTitleComponent, final DRDesignComponent designTotalTitleComponent) throws DRException {
+        designGroup.setName(group.getName());
+        designGroup.setOrderType(group.getOrderType());
+
+        designGroup.setExpression(accessor.getExpressionTransform().transformExpression(group.getExpression()));
+        if (group.getOrderByExpression() != null) {
+            final DRIExpression orderByExpression = getCrosstabExpression(crosstab, group.getOrderByExpression());
+            designGroup.setOrderByExpression(accessor.getExpressionTransform().transformExpression(orderByExpression));
+        }
+        if (group.getComparatorExpression() != null) {
+            final DRIExpression comparatorExpression = getCrosstabExpression(crosstab, group.getComparatorExpression());
+            designGroup.setComparatorExpression(accessor.getExpressionTransform().transformExpression(comparatorExpression));
+        }
+
+        DRTextField textField = new DRTextField();
+        textField.setValueExpression(group);
+        textField.setPattern(group.getHeaderPattern());
+        textField.setHorizontalTextAlignment(group.getHeaderHorizontalTextAlignment());
+        textField.setValueFormatter(group.getHeaderValueFormatter());
+        textField.setDataType(group.getDataType());
+        textField.setStretchWithOverflow(group.getHeaderStretchWithOverflow());
+        textField.setTextAdjust(group.getHeaderTextAdjust());
+        textField.setHyperLink((DRHyperLink) group.getHeaderHyperLink());
+        textField.setPropertyExpressions(group.getHeaderPropertyExpressions());
+
+        boolean measureTitle = false;
+        for (final DRICrosstabMeasure<?> crosstabMeasure : crosstab.getMeasures()) {
+            if (crosstabMeasure.getTitleExpression() != null) {
+                measureTitle = true;
+                break;
+            }
+        }
+
+        if (group instanceof DRICrosstabRowGroup || group instanceof DRICrosstabColumnGroup && !measureTitle) {
+            textField.setStretchType(StretchType.CONTAINER_HEIGHT);
+        }
+        DRIReportStyle groupStyle = group.getHeaderStyle();
+        if (groupStyle == null) {
+            groupStyle = accessor.getTemplateTransform().getCrosstabGroupStyle(crosstab);
+        }
+        textField.setStyle(groupStyle);
+        final DRDesignCrosstabCellContent header = createCellContent(getCellStyle(groupStyle), resetType, resetGroup);
+        DRDesignTextField designTextField = accessor.getComponentTransform().textField(textField, DefaultStyleType.TEXT);
+        designTextField.setUniqueName("group_" + designGroup.getName() + ".header");
+        header.getList().addComponent(designTextField);
+        if (designTitleComponent != null) {
+            header.getList().addComponent(designTitleComponent);
+        }
+        designGroup.setHeader(header);
+        if (showTotal) {
+            DRIReportStyle totalStyle = group.getTotalHeaderStyle();
+            if (totalStyle == null) {
+                DRICrosstabGroup<?> firstGroup = null;
+                if (group instanceof DRICrosstabRowGroup) {
+                    firstGroup = getFirstValue(crosstab.getRowGroups());
+                } else {
+                    firstGroup = getFirstValue(crosstab.getColumnGroups());
+                }
+                if (firstGroup == group) {
+                    totalStyle = accessor.getTemplateTransform().getCrosstabGrandTotalStyle(crosstab);
+                } else {
+                    totalStyle = accessor.getTemplateTransform().getCrosstabGroupTotalStyle(crosstab);
+                }
+            }
+
+            textField = new DRTextField();
+            DRIExpression<?> totalHeaderExpression = group.getTotalHeaderExpression();
+            if (totalHeaderExpression == null) {
+                totalHeaderExpression = new SystemMessageExpression("total");
+            }
+            textField.setValueExpression(totalHeaderExpression);
+            textField.setStretchWithOverflow(group.getTotalHeaderStretchWithOverflow());
+            textField.setTextAdjust(group.getTotalHeaderTextAdjust());
+            textField.setPropertyExpressions(group.getTotalHeaderPropertyExpressions());
+            textField.setStyle(totalStyle);
+            if (group instanceof DRICrosstabRowGroup || group instanceof DRICrosstabColumnGroup && !measureTitle) {
+                textField.setStretchType(StretchType.CONTAINER_HEIGHT);
+            }
+
+            final DRDesignCrosstabCellContent totalHeader = createCellContent(getCellStyle(totalStyle), resetType, resetGroup);
+            designTextField = accessor.getComponentTransform().textField(textField, DefaultStyleType.TEXT);
+            designTextField.setUniqueName("group_" + designGroup.getName() + ".totalheader");
+            totalHeader.getList().addComponent(designTextField);
+            if (designTotalTitleComponent != null) {
+                totalHeader.getList().addComponent(designTotalTitleComponent);
+            }
+            designGroup.setTotalHeader(totalHeader);
+        }
+    }
+
+    private void addColumnGroup(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab, final DRICrosstabColumnGroup<?> columnGroup, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignCrosstabColumnGroup designColumnGroup = new DRDesignCrosstabColumnGroup();
+        final boolean showTotal = accessor.getTemplateTransform().isCrosstabColumnGroupShowTotal(columnGroup);
+
+        DRDesignComponent designTitleComponent = null;
+        DRDesignComponent designTotalTitleComponent = null;
+        final boolean lastColumn = columnGroup == getLastValue(crosstab.getColumnGroups());
+        if (showTotal || lastColumn) {
+            boolean showTitle = false;
+            for (final DRICrosstabMeasure<?> measure : crosstab.getMeasures()) {
+                if (measure.getTitleExpression() != null) {
+                    showTitle = true;
+                    break;
+                }
+            }
+
+            if (showTitle) {
+                if (lastColumn) {
+                    DRIReportStyle groupStyle = columnGroup.getHeaderStyle();
+                    if (groupStyle == null) {
+                        groupStyle = accessor.getTemplateTransform().getCrosstabGroupStyle(crosstab);
+                    }
+                    final String name = "group_" + columnGroup.getName() + ".titleheader";
+                    designTitleComponent = getMeasureTitleComponent(name, crosstab, groupStyle);
+                }
+                if (showTotal) {
+                    DRIReportStyle totalStyle = columnGroup.getTotalHeaderStyle();
+                    if (totalStyle == null) {
+                        final DRICrosstabGroup<?> firstGroup = getFirstValue(crosstab.getColumnGroups());
+                        if (firstGroup == columnGroup) {
+                            totalStyle = accessor.getTemplateTransform().getCrosstabGrandTotalStyle(crosstab);
+                        } else {
+                            totalStyle = accessor.getTemplateTransform().getCrosstabGroupTotalStyle(crosstab);
+                        }
+                    }
+                    final String name = "group_" + columnGroup.getName() + ".titletotalheader";
+                    designTotalTitleComponent = getMeasureTitleComponent(name, crosstab, totalStyle);
+                }
+            }
+        }
+
+        group(designColumnGroup, crosstab, columnGroup, showTotal, resetType, resetGroup, designTitleComponent, designTotalTitleComponent);
+        designColumnGroup.setTotalPosition(accessor.getTemplateTransform().getCrosstabColumnGroupTotalPosition(columnGroup));
+        designCrosstab.getColumnGroups().add(designColumnGroup);
+    }
+
+    @SuppressWarnings( {"rawtypes", "unchecked"})
+    private DRDesignComponent getMeasureTitleComponent(final String name, final DRICrosstab crosstab, final DRIReportStyle defaultStyle) throws DRException {
+        final DRDesignList titleComponent = new DRDesignList();
+        for (final DRICrosstabMeasure<?> measure : crosstab.getMeasures()) {
+            final DRTextField textField = new DRTextField();
+            if (measure.getTitleExpression() != null) {
+                textField.setValueExpression(measure.getTitleExpression());
+            }
+            DRIReportStyle titleStyle = accessor.getTemplateTransform().getCrosstabMeasureTitleStyle(crosstab, measure);
+            if (titleStyle == null) {
+                titleStyle = defaultStyle;
+            }
+            textField.setStyle(titleStyle);
+            final DRDesignTextField designTextField = accessor.getComponentTransform().textField(textField, DefaultStyleType.TEXT);
+            designTextField.setUniqueName(name + "." + measure.getName());
+            titleComponent.addComponent(designTextField);
+        }
+
+        return titleComponent;
+    }
+
+    private void addRowGroup(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab, final DRICrosstabRowGroup<?> rowGroup, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignCrosstabRowGroup designRowGroup = new DRDesignCrosstabRowGroup();
+        final boolean showTotal = accessor.getTemplateTransform().isCrosstabRowGroupShowTotal(rowGroup);
+        group(designRowGroup, crosstab, rowGroup, showTotal, resetType, resetGroup, null, null);
+        designRowGroup.setTotalPosition(accessor.getTemplateTransform().getCrosstabRowGroupTotalPosition(rowGroup));
+        designCrosstab.getRowGroups().add(designRowGroup);
+    }
+
+    private void addCells(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final MeasuresStyles measuresStyle = new MeasuresStyles(crosstab, designCrosstab);
+
+        DRIReportStyle groupTotalStyle = accessor.getTemplateTransform().getCrosstabGroupTotalStyle(crosstab);
+        groupTotalStyle = getCellStyle(groupTotalStyle);
+        DRIReportStyle grandTotalStyle = accessor.getTemplateTransform().getCrosstabGrandTotalStyle(crosstab);
+        grandTotalStyle = getCellStyle(grandTotalStyle);
+        DRIReportStyle cellStyle = accessor.getTemplateTransform().getCrosstabCellStyle(crosstab);
+        cellStyle = getCellStyle(cellStyle);
+
+        final DRICrosstabGroup<?> firstColumnGroup = getFirstValue(crosstab.getColumnGroups());
+        final DRICrosstabGroup<?> firstRowGroup = getFirstValue(crosstab.getRowGroups());
+
+        DRDesignCrosstabCell designCell = cell(crosstab, cellStyle, measuresStyle, null, null, resetType, resetGroup);
+        designCrosstab.getCells().add(designCell);
+
+        DRIReportStyle style = null;
+        for (final DRICrosstabColumnGroup<?> columnGroup : crosstab.getColumnGroups()) {
+            if (columnGroup == firstColumnGroup) {
+                style = grandTotalStyle;
+            } else {
+                style = groupTotalStyle;
+            }
+            if (accessor.getTemplateTransform().isCrosstabColumnGroupShowTotal(columnGroup)) {
+                designCell = cell(crosstab, style, measuresStyle, null, columnGroup, resetType, resetGroup);
+                designCrosstab.getCells().add(designCell);
+            }
+        }
+
+        for (final DRICrosstabRowGroup<?> rowGroup : crosstab.getRowGroups()) {
+            if (rowGroup == firstRowGroup) {
+                style = grandTotalStyle;
+            } else {
+                style = groupTotalStyle;
+            }
+            if (accessor.getTemplateTransform().isCrosstabRowGroupShowTotal(rowGroup)) {
+                designCell = cell(crosstab, style, measuresStyle, rowGroup, null, resetType, resetGroup);
+                designCrosstab.getCells().add(designCell);
+
+                for (final DRICrosstabColumnGroup<?> columnGroup : crosstab.getColumnGroups()) {
+                    if (accessor.getTemplateTransform().isCrosstabColumnGroupShowTotal(columnGroup)) {
+                        DRIReportStyle totalStyle = style;
+                        if (columnGroup == firstColumnGroup) {
+                            totalStyle = grandTotalStyle;
+                        }
+                        designCell = cell(crosstab, totalStyle, measuresStyle, rowGroup, columnGroup, resetType, resetGroup);
+                        designCrosstab.getCells().add(designCell);
+                    }
+                }
+            }
+        }
+    }
+
+    private <T> T getFirstValue(final List<T> values) {
+        if (!values.isEmpty()) {
+            return values.get(0);
+        }
+
+        return null;
+    }
+
+    private <T> T getLastValue(final List<T> values) {
+        if (!values.isEmpty()) {
+            return values.get(values.size() - 1);
+        }
+
+        return null;
+    }
+
+    private DRIReportStyle getCellStyle(final DRIReportStyle reportStyle) throws DRException {
+        final DRIStyle style = accessor.getStyleTransform().getStyle(reportStyle);
+        if (style == null || style.getBackgroundColor() == null) {
+            return null;
+        }
+
+        final DRStyle cellStyle = new DRStyle();
+        cellStyle.setBackgroundColor(style.getBackgroundColor());
+        return cellStyle;
+    }
+
+    private DRIReportStyle cellStyle(final DRICrosstab crosstab, final List<DRIConditionalStyle> rowHighlighters, final DRIReportStyle reportStyle) throws DRException {
+        final DRIStyle style = accessor.getStyleTransform().getStyle(reportStyle);
+        if (rowHighlighters != null && !rowHighlighters.isEmpty() || !style.getConditionalStyles().isEmpty()) {
+            final DRStyle newStyle = new DRStyle();
+            if (style != null) {
+                newStyle.setParentStyle(style);
+                for (final DRIConditionalStyle conditionalStyle : style.getConditionalStyles()) {
+                    final DRIExpression<Boolean> conditionalStyleExpression = getCrosstabExpression(crosstab, conditionalStyle.getConditionExpression());
+                    final DRConditionalStyle newConditionalStyle = new DRConditionalStyle(conditionalStyleExpression);
+                    accessor.getStyleTransform().copyStyle(newConditionalStyle, conditionalStyle);
+                    newStyle.addConditionalStyle(newConditionalStyle);
+                }
+            }
+            if (rowHighlighters != null && !rowHighlighters.isEmpty()) {
+                final Color backgroundColor = StyleResolver.getBackgroundColor(style, accessor.getStyleTransform());
+                for (final DRIConditionalStyle conditionalStyle : rowHighlighters) {
+                    if (backgroundColor != null && conditionalStyle.getBackgroundColor() != null) {
+                        final DRConditionalStyle newConditionalStyle = new DRConditionalStyle(conditionalStyle.getConditionExpression());
+                        accessor.getStyleTransform().copyStyle(newConditionalStyle, conditionalStyle);
+                        final Color mergedColor = StyleResolver.mergeColors(backgroundColor, conditionalStyle.getBackgroundColor(), 0.25f);
+                        newConditionalStyle.setBackgroundColor(mergedColor);
+                        newStyle.addConditionalStyle(newConditionalStyle);
+                    } else {
+                        newStyle.addConditionalStyle((DRConditionalStyle) conditionalStyle);
+                    }
+                }
+            }
+            return newStyle;
+        }
+
+        return style;
+    }
+
+    @SuppressWarnings( {"rawtypes", "unchecked"})
+    private DRDesignCrosstabCell cell(final DRICrosstab crosstab, final DRIReportStyle cellStyle, final MeasuresStyles measuresStyle, final DRICrosstabRowGroup<?> rowGroup, final DRICrosstabColumnGroup<?> columnGroup,
+                                      final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRDesignCrosstabCell designCell = new DRDesignCrosstabCell();
+        String rowTotalGroup = null;
+        String columnTotalGroup = null;
+        if (rowGroup != null) {
+            rowTotalGroup = rowGroup.getName();
+        }
+        if (columnGroup != null) {
+            columnTotalGroup = columnGroup.getName();
+        }
+        designCell.setRowTotalGroup(rowTotalGroup);
+        designCell.setColumnTotalGroup(columnTotalGroup);
+
+        final DRDesignList designList = new DRDesignList();
+        designList.setStretchType(StretchType.CONTAINER_HEIGHT);
+        for (final DRICrosstabMeasure<?> measure : crosstab.getMeasures()) {
+            final DRTextField textField = new DRTextField();
+
+            if (measure.getExpression() instanceof DRICrosstabVariable<?>) {
+                textField.setValueExpression(measure.getExpression());
+            } else {
+                final DRIExpression valueExpression = getCrosstabExpression(crosstab, measure.getExpression());
+                textField.setValueExpression(valueExpression);
+            }
+
+            textField.setPattern(measure.getPattern());
+            textField.setHorizontalTextAlignment(measure.getHorizontalTextAlignment());
+            textField.setValueFormatter(measure.getValueFormatter());
+            textField.setDataType(measure.getDataType());
+            textField.setStretchWithOverflow(measure.getStretchWithOverflow());
+            textField.setTextAdjust(measure.getTextAdjust());
+            textField.setStretchType(StretchType.CONTAINER_HEIGHT);
+            textField.setHyperLink((DRHyperLink) measure.getHyperLink());
+            textField.setPropertyExpressions(measure.getPropertyExpressions());
+            textField.setStyle(measuresStyle.getStyle(measure, rowGroup, columnGroup));
+            final DRDesignTextField designTextField = accessor.getComponentTransform().textField(textField, DefaultStyleType.TEXT);
+            String name = "cell_measure[" + measure.getName() + "]";
+            if (rowTotalGroup != null) {
+                name += "_rowgroup[" + rowTotalGroup + "]";
+            }
+            if (columnTotalGroup != null) {
+                name += "_columngroup[" + columnTotalGroup + "]";
+            }
+            designTextField.setUniqueName(name);
+            designList.addComponent(designTextField);
+        }
+
+        final DRDesignCrosstabCellContent content = createCellContent(cellStyle, resetType, resetGroup);
+        designCell.setContent(content);
+        content.getList().addComponent(designList);
+
+        return designCell;
+    }
+
+    private DRConditionalStyle detailRowConditionalStyle(final DRISimpleStyle style, final DRISimpleExpression<Boolean> expression) {
+        final DRConditionalStyle conditionalStyle = new DRConditionalStyle(expression);
+        accessor.getStyleTransform().copyStyle(conditionalStyle, style);
+        return conditionalStyle;
+    }
+
+    private boolean equalsGroup(final DRICrosstabGroup<?> group1, final DRICrosstabGroup<?> group2) {
+        if (group1 == null && group2 == null) {
+            return true;
+        }
+        if (group1 != null && group2 != null) {
+            return group1.equals(group2);
+        }
+        return false;
+    }
+
+    private DRDesignCrosstabCellContent createCellContent(final DRIReportStyle style, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
+        final DRCrosstabCellContent cellContent = new DRCrosstabCellContent();
+        cellContent.setStyle(style);
+        return cellContent(cellContent, resetType, resetGroup);
+    }
+
+    private void addMeasure(final DRDesignCrosstab designCrosstab, final DRICrosstabVariable<?> variable) throws DRException {
+        final DRDesignCrosstabMeasure designMeasure = new DRDesignCrosstabMeasure();
+        designMeasure.setName(variable.getName());
+        DRIExpression<?> expression;
+        if (variable.getPercentageType() != null && variable.getPercentageType().equals(CrosstabPercentageType.GRAND_TOTAL) && !variable.getCalculation().equals(Calculation.COUNT) &&
+            !variable.getCalculation().equals(Calculation.DISTINCT_COUNT)) {
+            expression = new CrosstabMeasureExpression(variable.getValueExpression());
+        } else {
+            expression = variable.getValueExpression();
+        }
+        designMeasure.setValueExpression(accessor.getExpressionTransform().transformExpression(expression));
+        designMeasure.setCalculation(variable.getCalculation());
+        designMeasure.setPercentageType(accessor.getTemplateTransform().getCrosstabPercentageType(variable));
+
+        designCrosstab.getMeasures().add(designMeasure);
+    }
+
+    /**
+     * <p>getCrosstab.</p>
+     *
+     * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+     */
+    protected DRICrosstab getCrosstab(final DRDesignCrosstab designCrosstab) {
+        return crosstabs.get(designCrosstab);
+    }
+
+    private <T> DRIExpression<T> getCrosstabExpression(final DRICrosstab crosstab, final DRIExpression<T> expression) throws DRException {
+        if (expression instanceof DRIJasperExpression) {
+            return expression;
+        }
+        accessor.getExpressionTransform().transformExpression(expression);
+        return new CrosstabExpression<>(crosstab, expression);
+    }
+
+    private class MeasuresStyles {
+        private final Map<DRICrosstabMeasure<?>, List<DRICrosstabCellStyle>> measuresStyle;
+        private DRIReportStyle defaultCellStyle;
+        private DRIReportStyle defaultGroupTotalStyle;
+        private DRIReportStyle defaultGrandTotalStyle;
+        private DRIReportStyle defaultRowGroupTotalStyle;
+        private DRIReportStyle defaultRowGrandTotalStyle;
+        private DRICrosstabGroup<?> firstColumnGroup;
+        private DRICrosstabGroup<?> firstRowGroup;
+
+        private MeasuresStyles(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab) throws DRException {
+            measuresStyle = new HashMap<>();
+            init(crosstab, designCrosstab);
+        }
+
+        private void init(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab) throws DRException {
+            final List<DRIConditionalStyle> rowHighlighters = new ArrayList<>();
+            final DRISimpleStyle detailOddRowStyle = accessor.getTemplateTransform().getCrosstabOddRowStyle(crosstab);
+            final DRISimpleStyle detailEvenRowStyle = accessor.getTemplateTransform().getCrosstabEvenRowStyle(crosstab);
+            if (detailOddRowStyle != null || detailEvenRowStyle != null) {
+                if (detailOddRowStyle != null) {
+                    rowHighlighters.add(detailRowConditionalStyle(detailOddRowStyle, new CrosstabPrintInOddRow()));
+                }
+                if (detailEvenRowStyle != null) {
+                    rowHighlighters.add(detailRowConditionalStyle(detailEvenRowStyle, new CrosstabPrintInEvenRow()));
+                }
+            }
+
+            for (final DRICrosstabMeasure<?> measure : crosstab.getMeasures()) {
+                final List<DRICrosstabCellStyle> styles = new ArrayList<>();
+                measuresStyle.put(measure, styles);
+
+                for (final DRICrosstabCellStyle cellStyle : measure.getStyles()) {
+                    final DRIReportStyle newStyle = cellStyle(crosstab, rowHighlighters, cellStyle.getStyle());
+                    styles.add(new DRCrosstabCellStyle(newStyle, cellStyle.getRowGroup(), cellStyle.getColumnGroup()));
+                }
+            }
+
+            DRIReportStyle groupTotalStyle = accessor.getTemplateTransform().getCrosstabGroupTotalStyle(crosstab);
+            DRIReportStyle grandTotalStyle = accessor.getTemplateTransform().getCrosstabGrandTotalStyle(crosstab);
+            final DRIReportStyle cellStyle = accessor.getTemplateTransform().getCrosstabCellStyle(crosstab);
+            if (groupTotalStyle == null) {
+                groupTotalStyle = cellStyle;
+            }
+            if (grandTotalStyle == null) {
+                grandTotalStyle = cellStyle;
+            }
+            defaultGroupTotalStyle = cellStyle(crosstab, rowHighlighters, groupTotalStyle);
+            defaultGrandTotalStyle = cellStyle(crosstab, rowHighlighters, grandTotalStyle);
+            if (StyleResolver.getBackgroundColor(groupTotalStyle, accessor.getStyleTransform()) != null) {
+                defaultRowGroupTotalStyle = cellStyle(crosstab, null, groupTotalStyle);
+            }
+            if (StyleResolver.getBackgroundColor(grandTotalStyle, accessor.getStyleTransform()) != null) {
+                defaultRowGrandTotalStyle = cellStyle(crosstab, null, grandTotalStyle);
+            }
+            defaultCellStyle = cellStyle(crosstab, rowHighlighters, cellStyle);
+            firstColumnGroup = getFirstValue(crosstab.getColumnGroups());
+            firstRowGroup = getFirstValue(crosstab.getRowGroups());
+        }
+
+        public DRIReportStyle getStyle(final DRICrosstabMeasure<?> measure, final DRICrosstabRowGroup<?> rowGroup, final DRICrosstabColumnGroup<?> columnGroup) {
+            final List<DRICrosstabCellStyle> styles = measuresStyle.get(measure);
+            for (final DRICrosstabCellStyle crosstabCellStyle : styles) {
+                if (equalsGroup(rowGroup, crosstabCellStyle.getRowGroup()) && equalsGroup(columnGroup, crosstabCellStyle.getColumnGroup())) {
+                    return crosstabCellStyle.getStyle();
+                }
+            }
+            for (final DRICrosstabCellStyle crosstabCellStyle : styles) {
+                if (crosstabCellStyle.getRowGroup() == null && crosstabCellStyle.getColumnGroup() == null) {
+                    return crosstabCellStyle.getStyle();
+                }
+            }
+
+            if (rowGroup == null && columnGroup == null) {
+                return defaultCellStyle;
+            }
+            if (rowGroup != null) {
+                if ((columnGroup == firstColumnGroup || rowGroup == firstRowGroup) && defaultRowGrandTotalStyle != null) {
+                    return defaultRowGrandTotalStyle;
+                }
+                if (defaultRowGroupTotalStyle != null) {
+                    return defaultRowGroupTotalStyle;
+                }
+            }
+            if (columnGroup == firstColumnGroup || rowGroup == firstRowGroup) {
+                return defaultGrandTotalStyle;
+            } else {
+                return defaultGroupTotalStyle;
+            }
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CustomBatikRenderer.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CustomBatikRenderer.java
new file mode 100644
index 0000000..4a23b1c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CustomBatikRenderer.java
@@ -0,0 +1,61 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperReportsContext;
+import net.sf.jasperreports.engine.util.JRLoader;
+import net.sf.jasperreports.renderers.SimpleDataRenderer;
+import net.sf.jasperreports.renderers.WrappingSvgDataToGraphics2DRenderer;
+
+import java.awt.Dimension;
+import java.awt.geom.Dimension2D;
+import java.net.URL;
+
+/**
+ * <p>CustomBatikRenderer class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CustomBatikRenderer extends WrappingSvgDataToGraphics2DRenderer {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Dimension dimension;
+
+    /**
+     * <p>Constructor for CustomBatikRenderer.</p>
+     *
+     * @param svgURL a {@link java.net.URL} object.
+     * @param width  a int.
+     * @param height a int.
+     * @throws net.sf.jasperreports.engine.JRException if any.
+     */
+    public CustomBatikRenderer(URL svgURL, int width, int height) throws JRException {
+        super(new SimpleDataRenderer(JRLoader.loadBytes(svgURL), null));
+        this.dimension = new Dimension(width, height);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Dimension2D getDimension(JasperReportsContext jasperReportsContext) {
+        return dimension;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetExpressionTransform.java
new file mode 100644
index 0000000..78da367
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetExpressionTransform.java
@@ -0,0 +1,78 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.report.definition.DRIDataset;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.DRISort;
+import net.sf.dynamicreports.report.definition.DRIVariable;
+
+import java.util.List;
+
+/**
+ * <p>DatasetExpressionTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DatasetExpressionTransform extends AbstractExpressionTransform {
+    private DRIDataset dataset;
+
+    /**
+     * <p>Constructor for DatasetExpressionTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param dataset  a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     */
+    public DatasetExpressionTransform(DesignTransformAccessor accessor, DRIDataset dataset) {
+        super(accessor);
+        this.dataset = dataset;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected ResetType getVariableResetType(DRIVariable<?> variable) {
+        return ResetType.REPORT;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected List<? extends DRIField<?>> transformFields() {
+        return dataset.getFields();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected List<? extends DRIVariable<?>> transformVariables() {
+        return dataset.getVariables();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected List<? extends DRISort> transformSorts() {
+        return dataset.getSorts();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected DRIDesignDataset getDataset() {
+        return accessor.getDatasetTransform().getDesignDataset(dataset);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetTransform.java
new file mode 100644
index 0000000..7839eca
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetTransform.java
@@ -0,0 +1,119 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignDataset;
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.jasper.base.JasperScriptlet;
+import net.sf.dynamicreports.report.definition.DRIDataset;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>DatasetTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DatasetTransform {
+    private DesignTransformAccessor accessor;
+    private Map<String, DRIDesignDataset> datasets;
+    private Map<DRIDataset, DRDesignDataset> designDatasets;
+
+    /**
+     * <p>Constructor for DatasetTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public DatasetTransform(DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+        datasets = new HashMap<>();
+        designDatasets = new HashMap<>();
+    }
+
+    /**
+     * <p>transform.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignDataset} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public DRDesignDataset transform(DRIDataset dataset) throws DRException {
+        if (dataset == null) {
+            return null;
+        }
+        if (designDatasets.containsKey(dataset)) {
+            return designDatasets.get(dataset);
+        }
+
+        DatasetExpressionTransform datasetExpressionTransform = new DatasetExpressionTransform(accessor, dataset);
+        datasetExpressionTransform.transform();
+        DRDesignDataset designDataset = new DRDesignDataset(datasetExpressionTransform);
+        if (dataset.getQuery() != null) {
+            designDataset.setQuery(accessor.getReportTransform().query(dataset.getQuery()));
+        }
+        designDataset.setConnectionExpression(accessor.getExpressionTransform().transformExpression(dataset.getConnectionExpression()));
+        designDataset.setDataSourceExpression(accessor.getExpressionTransform().transformExpression(dataset.getDataSourceExpression()));
+        designDataset.setFilterExpression(datasetExpressionTransform.transformExpression(dataset.getFilterExpression(), JasperScriptlet.SCRIPTLET_NAME));
+
+        addDataset(dataset, designDataset);
+
+        return designDataset;
+    }
+
+    /**
+     * <p>getDatasetExpressionTransform.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     * @return a {@link net.sf.dynamicreports.design.transformation.DatasetExpressionTransform} object.
+     */
+    public DatasetExpressionTransform getDatasetExpressionTransform(DRIDataset dataset) {
+        return designDatasets.get(dataset).getDatasetExpressionTransform();
+    }
+
+    /**
+     * <p>getDesignDataset.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignDataset} object.
+     */
+    protected DRDesignDataset getDesignDataset(DRIDataset dataset) {
+        return designDatasets.get(dataset);
+    }
+
+    private void addDataset(DRIDataset dataset, DRDesignDataset designDataset) {
+        if (datasets.containsKey(designDataset.getName())) {
+            throw new DRDesignReportException("Duplicate declaration of dataset \"" + designDataset.getName() + "\"");
+        }
+        datasets.put(designDataset.getName(), designDataset);
+        designDatasets.put(dataset, designDataset);
+    }
+
+    /**
+     * <p>Getter for the field <code>datasets</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRIDesignDataset> getDatasets() {
+        return datasets.values();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DesignTransformAccessor.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DesignTransformAccessor.java
new file mode 100644
index 0000000..c774804
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DesignTransformAccessor.java
@@ -0,0 +1,194 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import net.sf.dynamicreports.design.base.DRDesignPage;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRIDataset;
+import net.sf.dynamicreports.report.definition.DRIReport;
+
+/**
+ * <p>DesignTransformAccessor interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DesignTransformAccessor {
+
+    /**
+     * <p>getReport.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIReport} object.
+     */
+    public DRIReport getReport();
+
+    /**
+     * <p>getPageWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageWidth();
+
+    /**
+     * <p>getReportTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.ReportTransform} object.
+     */
+    public ReportTransform getReportTransform();
+
+    /**
+     * <p>getTemplateTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.TemplateTransform} object.
+     */
+    public TemplateTransform getTemplateTransform();
+
+    /**
+     * <p>transformToMainDataset.</p>
+     */
+    public void transformToMainDataset();
+
+    /**
+     * <p>transformToDataset.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     */
+    public void transformToDataset(DRIDataset dataset);
+
+    /**
+     * <p>getExpressionTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.AbstractExpressionTransform} object.
+     */
+    public AbstractExpressionTransform getExpressionTransform();
+
+    /**
+     * <p>getPageTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.PageTransform} object.
+     */
+    public PageTransform getPageTransform();
+
+    /**
+     * <p>getBandTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.BandTransform} object.
+     */
+    public BandTransform getBandTransform();
+
+    /**
+     * <p>getComponentTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.ComponentTransform} object.
+     */
+    public ComponentTransform getComponentTransform();
+
+    /**
+     * <p>getGroupTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.GroupTransform} object.
+     */
+    public GroupTransform getGroupTransform();
+
+    /**
+     * <p>getColumnTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.ColumnTransform} object.
+     */
+    public ColumnTransform getColumnTransform();
+
+    /**
+     * <p>getColumnGridTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.ColumnGridTransform} object.
+     */
+    public ColumnGridTransform getColumnGridTransform();
+
+    /**
+     * <p>getStyleTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.StyleTransform} object.
+     */
+    public StyleTransform getStyleTransform();
+
+    /**
+     * <p>getCrosstabTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.CrosstabTransform} object.
+     */
+    public CrosstabTransform getCrosstabTransform();
+
+    /**
+     * <p>getDatasetTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.DatasetTransform} object.
+     */
+    public DatasetTransform getDatasetTransform();
+
+    /**
+     * <p>getTableOfContentsTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.transformation.TableOfContentsTransform} object.
+     */
+    public TableOfContentsTransform getTableOfContentsTransform();
+
+    /**
+     * <p>isTableOfContents.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isTableOfContents();
+
+    /**
+     * <p>getPage.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignPage} object.
+     */
+    public DRDesignPage getPage();
+
+    /**
+     * <p>getLocale.</p>
+     *
+     * @return a {@link java.util.Locale} object.
+     */
+    public Locale getLocale();
+
+    /**
+     * <p>getResourceBundle.</p>
+     *
+     * @return a {@link java.util.ResourceBundle} object.
+     */
+    public ResourceBundle getResourceBundle();
+
+    /**
+     * <p>getResourceBundleName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getResourceBundleName();
+
+    /**
+     * <p>getWhenResourceMissingType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     */
+    public WhenResourceMissingType getWhenResourceMissingType();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/GroupTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/GroupTransform.java
new file mode 100644
index 0000000..6b79ca0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/GroupTransform.java
@@ -0,0 +1,331 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignFiller;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.design.transformation.expressions.GroupByDataTypeExpression;
+import net.sf.dynamicreports.report.base.DRVariable;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.definition.DRIBand;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.DRIReport;
+import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>GroupTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GroupTransform {
+    private DesignTransformAccessor accessor;
+    private List<? extends DRIGroup> groups;
+    private Map<DRIGroup, DRDesignGroup> designGroups;
+    private List<DRIValueColumn<?>> hideGroupColumns;
+    private DRIGroup firstResetPageNumberGroup;
+    private int groupPadding;
+
+    /**
+     * <p>Constructor for GroupTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public GroupTransform(DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+        init();
+    }
+
+    private void init() {
+        DRIReport report = accessor.getReport();
+        groups = report.getGroups();
+        designGroups = new LinkedHashMap<DRIGroup, DRDesignGroup>();
+        hideGroupColumns = new ArrayList<DRIValueColumn<?>>();
+        groupPadding = 0;
+    }
+
+    /**
+     * <p>transform.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transform() throws DRException {
+        for (DRIGroup group : groups) {
+            DRDesignGroup designGroup = group(group);
+            addGroup(group, designGroup);
+        }
+    }
+
+    private void addGroup(DRIGroup group, DRDesignGroup designGroup) {
+        if (accessor.getTemplateTransform().isGroupHideColumn(group) && group.getValueField().getValueExpression() instanceof DRIValueColumn<?>) {
+            hideGroupColumns.add((DRIValueColumn<?>) group.getValueField().getValueExpression());
+        }
+        designGroups.put(group, designGroup);
+        if (firstResetPageNumberGroup == null && designGroup.isResetPageNumber()) {
+            firstResetPageNumberGroup = group;
+        }
+        groupPadding += accessor.getTemplateTransform().getGroupPadding(group);
+    }
+
+    /**
+     * <p>transformHeaderAndFooter.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transformHeaderAndFooter() throws DRException {
+        int groupPadding = 0;
+        int level = 0;
+        for (DRIGroup group : groups) {
+            headerAndFooter(group, designGroups.get(group), groupPadding, level++);
+            groupPadding += accessor.getTemplateTransform().getGroupPadding(group);
+        }
+    }
+
+    private void headerAndFooter(DRIGroup group, DRDesignGroup designGroup, int groupPadding, int level) throws DRException {
+        DRDesignList header = new DRDesignList();
+        TemplateTransform templateTransform = accessor.getTemplateTransform();
+
+        DRDesignTableOfContentsHeading designTocHeading = accessor.getTableOfContentsTransform().groupHeading(group, level);
+        if (designTocHeading != null) {
+            header.addComponent(designTocHeading.getReferenceField());
+        }
+
+        switch (templateTransform.getGroupHeaderLayout(group)) {
+            case EMPTY:
+                break;
+            case TITLE_AND_VALUE:
+                if (groupPadding > 0) {
+                    DRDesignFiller filler = new DRDesignFiller();
+                    filler.setWidth(groupPadding);
+                    filler.setHeight(0);
+                    header.addComponent(HorizontalCellComponentAlignment.CENTER, null, filler);
+                }
+                header.addComponent(HorizontalCellComponentAlignment.LEFT, null, titleComponent(group));
+                DRDesignTextField valueComponent = valueComponent(group);
+                header.addComponent(valueComponent);
+                if (designTocHeading != null) {
+                    valueComponent.setAnchorNameExpression(designTocHeading.getReferenceField().getAnchorNameExpression());
+                    valueComponent.setBookmarkLevel(designTocHeading.getReferenceField().getBookmarkLevel());
+                    valueComponent.setHyperLink(designTocHeading.getReferenceField().getHyperLink());
+                }
+                break;
+            case VALUE:
+                if (groupPadding > 0) {
+                    DRDesignFiller filler = new DRDesignFiller();
+                    filler.setWidth(groupPadding);
+                    filler.setHeight(0);
+                    header.addComponent(HorizontalCellComponentAlignment.CENTER, null, filler);
+                }
+                valueComponent = valueComponent(group);
+                header.addComponent(valueComponent);
+                if (designTocHeading != null) {
+                    valueComponent.setAnchorNameExpression(designTocHeading.getReferenceField().getAnchorNameExpression());
+                    valueComponent.setBookmarkLevel(designTocHeading.getReferenceField().getBookmarkLevel());
+                    valueComponent.setHyperLink(designTocHeading.getReferenceField().getHyperLink());
+                }
+                break;
+            default:
+                throw new DRDesignReportException("Group header layout " + templateTransform.getGroupHeaderLayout(group).name() + " not supported");
+        }
+        if (!header.isEmpty()) {
+            DRIBand bnd = group.getHeaderBand();
+            DRDesignBand band = accessor.getBandTransform()
+                                        .band("groupHeaderTitleAndValue", bnd, templateTransform.getGroupHeaderSplitType(bnd), templateTransform.getGroupHeaderStyle(bnd),
+                                              templateTransform.getGroupHeaderBackgroundComponent(bnd));
+            band.addComponent(header);
+            designGroup.addHeaderBand(band);
+        }
+
+        DRIBand band = group.getHeaderBand();
+        designGroup.addHeaderBand(
+            groupBand("groupHeader", band, templateTransform.getGroupHeaderSplitType(band), templateTransform.getGroupHeaderStyle(band), templateTransform.getGroupHeaderBackgroundComponent(band),
+                      groupPadding, designGroup));
+        band = group.getFooterBand();
+        designGroup.addFooterBand(
+            groupBand("groupFooter", band, templateTransform.getGroupFooterSplitType(band), templateTransform.getGroupFooterStyle(band), templateTransform.getGroupFooterBackgroundComponent(band),
+                      groupPadding, designGroup));
+        if (templateTransform.isGroupShowColumnHeaderAndFooter(group)) {
+            designGroup.addHeaderBand(accessor.getBandTransform().getColumnHeaderForGroupBand());
+            designGroup.addFooterBand(accessor.getBandTransform().getColumnFooterBand());
+        }
+    }
+
+    private DRDesignBand groupBand(String name, DRIBand band, SplitType splitType, DRIReportStyle defaultStyle, DRIComponent defaultBackgroundComponent, int groupPadding, DRDesignGroup resetGroup)
+        throws DRException {
+        DRDesignBand designBand = accessor.getBandTransform().band(name, band, splitType, defaultStyle, defaultBackgroundComponent, ResetType.GROUP, resetGroup);
+        if (groupPadding > 0) {
+            DRDesignFiller filler = new DRDesignFiller();
+            filler.setWidth(groupPadding);
+            filler.setHeight(0);
+            DRDesignList list = new DRDesignList();
+            list.addComponent(HorizontalCellComponentAlignment.CENTER, null, filler);
+            list.addComponent(designBand.getList());
+            designBand.setList(list);
+        }
+        return designBand;
+    }
+
+    // title
+    @SuppressWarnings("unchecked")
+    private DRDesignComponent titleComponent(DRIGroup group) throws DRException {
+        @SuppressWarnings("rawtypes") DRTextField titleField = new DRTextField();
+        titleField.setValueExpression(group.getTitleExpression());
+        titleField.setStyle(group.getTitleStyle());
+        titleField.setWidth(group.getTitleWidth());
+        DRDesignTextField designTitleField = accessor.getComponentTransform().textField(titleField, DefaultStyleType.GROUP_TITLE);
+        designTitleField.setUniqueName("group_" + group.getName() + ".title");
+        return designTitleField;
+    }
+
+    // value
+    private DRDesignTextField valueComponent(DRIGroup group) throws DRException {
+        DRDesignTextField designValueField = accessor.getComponentTransform().textField(group.getValueField(), DefaultStyleType.GROUP);
+        designValueField.setUniqueName("group_" + group.getName());
+        return designValueField;
+    }
+
+    // group
+    @SuppressWarnings( {"unchecked", "rawtypes"})
+    private DRDesignGroup group(DRIGroup group) throws DRException {
+        TemplateTransform templateTransform = accessor.getTemplateTransform();
+        DRDesignGroup designGroup = new DRDesignGroup(group.getName());
+        designGroup.setStartInNewPage(templateTransform.isGroupStartInNewPage(group));
+        designGroup.setStartInNewColumn(templateTransform.isGroupStartInNewColumn(group));
+        designGroup.setReprintHeaderOnEachPage(templateTransform.isGroupReprintHeaderOnEachPage(group));
+        designGroup.setResetPageNumber(templateTransform.isGroupResetPageNumber(group));
+        designGroup.setMinHeightToStartNewPage(templateTransform.getGroupMinHeightToStartNewPage(group));
+        designGroup.setFooterPosition(templateTransform.getGroupFooterPosition(group));
+        designGroup.setKeepTogether(templateTransform.isGroupKeepTogether(group));
+        designGroup.setHeaderWithSubtotal(templateTransform.isGroupHeaderWithSubtotal(group));
+        DRIExpression<?> groupExpression = group.getValueField().getValueExpression();
+        if (templateTransform.isGroupByDataType(group) && group.getValueField().getDataType() != null) {
+            accessor.getExpressionTransform().transformExpression(groupExpression);
+            DRIDataType<?, ?> dataType = group.getValueField().getDataType();
+            groupExpression = new GroupByDataTypeExpression(groupExpression, dataType);
+        }
+        groupExpression = new DRVariable(groupExpression, Calculation.NOTHING);
+        designGroup.setGroupExpression(accessor.getExpressionTransform().transformExpression(groupExpression));
+        return designGroup;
+    }
+
+    /**
+     * <p>getGroup.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     */
+    protected DRDesignGroup getGroup(DRIGroup group) {
+        return designGroups.get(group);
+    }
+
+    /**
+     * <p>getFirstGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    protected DRIGroup getFirstGroup() {
+        if (!groups.isEmpty()) {
+            return groups.get(0);
+        }
+        return null;
+    }
+
+    /**
+     * <p>getBeforeGroup.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    protected DRIGroup getBeforeGroup(DRIGroup group) {
+        if (groups.size() > 1 && groups.indexOf(group) > 0) {
+            return groups.get(groups.indexOf(group) - 1);
+        }
+        return null;
+    }
+
+    /**
+     * <p>getLastGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    protected DRIGroup getLastGroup() {
+        if (!groups.isEmpty()) {
+            return groups.get(groups.size() - 1);
+        }
+        return null;
+    }
+
+    /**
+     * <p>Getter for the field <code>firstResetPageNumberGroup</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    protected DRIGroup getFirstResetPageNumberGroup() {
+        return firstResetPageNumberGroup;
+    }
+
+    /**
+     * <p>Getter for the field <code>groupPadding</code>.</p>
+     *
+     * @return a int.
+     */
+    protected int getGroupPadding() {
+        return groupPadding;
+    }
+
+    /**
+     * <p>Getter for the field <code>hideGroupColumns</code>.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    protected List<DRIValueColumn<?>> getHideGroupColumns() {
+        return hideGroupColumns;
+    }
+
+    /**
+     * <p>Getter for the field <code>groups</code>.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    public Collection<DRDesignGroup> getGroups() {
+        return designGroups.values();
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/MainDatasetExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/MainDatasetExpressionTransform.java
new file mode 100644
index 0000000..4eab178
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/MainDatasetExpressionTransform.java
@@ -0,0 +1,98 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignField;
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.DRIReport;
+import net.sf.dynamicreports.report.definition.DRISort;
+import net.sf.dynamicreports.report.definition.DRIVariable;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.List;
+
+/**
+ * <p>MainDatasetExpressionTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MainDatasetExpressionTransform extends AbstractExpressionTransform {
+
+    /**
+     * <p>Constructor for MainDatasetExpressionTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public MainDatasetExpressionTransform(DesignTransformAccessor accessor) {
+        super(accessor);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void transform() throws DRException {
+        DRIReport report = accessor.getReport();
+        List<DRIField<?>> templateDesignFields = report.getTemplateDesign().getFields();
+        if (templateDesignFields != null) {
+            for (DRIField<?> field : templateDesignFields) {
+                DRDesignField designField = (DRDesignField) transformExpression(field);
+                designField.setExternal(true);
+            }
+        }
+        super.transform();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected ResetType getVariableResetType(DRIVariable<?> variable) {
+        return ConstantTransform.variableResetType(variable.getResetType(), variable.getResetGroup(), accessor);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected DRDesignGroup getVariableResetGroup(DRIVariable<?> variable) throws DRException {
+        return accessor.getGroupTransform().getGroup(ConstantTransform.variableResetGroup(variable.getName(), variable.getResetType(), variable.getResetGroup(), accessor));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected List<? extends DRIField<?>> transformFields() {
+        return accessor.getReport().getFields();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected List<? extends DRIVariable<?>> transformVariables() {
+        return accessor.getReport().getVariables();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected List<? extends DRISort> transformSorts() {
+        return accessor.getReport().getSorts();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected DRIDesignDataset getDataset() {
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/PageTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/PageTransform.java
new file mode 100644
index 0000000..6e4320c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/PageTransform.java
@@ -0,0 +1,97 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignMargin;
+import net.sf.dynamicreports.design.base.DRDesignPage;
+import net.sf.dynamicreports.report.definition.DRIMargin;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * <p>PageTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PageTransform {
+    private TemplateTransform templateTransform;
+    private DRDesignPage page;
+    private int maxBandWidth;
+
+    /**
+     * <p>Constructor for PageTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public PageTransform(DesignTransformAccessor accessor) {
+        this.templateTransform = accessor.getTemplateTransform();
+        this.page = new DRDesignPage();
+    }
+
+    /**
+     * <p>transform.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transform() throws DRException {
+        this.page.setHeight(templateTransform.getPageHeight());
+        this.page.setOrientation(templateTransform.getPageOrientation());
+        this.page.setMargin(margin(templateTransform.getPageMargin()));
+        this.page.setColumnsPerPage(templateTransform.getPageColumnsPerPage());
+        this.page.setColumnSpace(templateTransform.getPageColumnSpace());
+    }
+
+    private DRDesignMargin margin(DRIMargin margin) {
+        DRDesignMargin designMargin = new DRDesignMargin();
+        designMargin.setTop(margin.getTop());
+        designMargin.setLeft(margin.getLeft());
+        designMargin.setBottom(margin.getBottom());
+        designMargin.setRight(margin.getRight());
+        return designMargin;
+    }
+
+    /**
+     * <p>Getter for the field <code>page</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignPage} object.
+     */
+    public DRDesignPage getPage() {
+        return page;
+    }
+
+    /**
+     * <p>transformPageWidth.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transformPageWidth() throws DRException {
+        int pageWidth = templateTransform.getPageWidth();
+        maxBandWidth = pageWidth - getPage().getMargin().getLeft() - getPage().getMargin().getRight();
+        this.page.setWidth(pageWidth);
+        this.page.setColumnWidth(templateTransform.getPageColumnWidth(this.page));
+    }
+
+    /**
+     * <p>Getter for the field <code>maxBandWidth</code>.</p>
+     *
+     * @return a int.
+     */
+    public int getMaxBandWidth() {
+        return maxBandWidth;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ReportTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ReportTransform.java
new file mode 100644
index 0000000..d002f18
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ReportTransform.java
@@ -0,0 +1,157 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignHyperLink;
+import net.sf.dynamicreports.design.base.DRDesignParameter;
+import net.sf.dynamicreports.design.base.DRDesignQuery;
+import net.sf.dynamicreports.design.base.DRDesignTemplateDesign;
+import net.sf.dynamicreports.design.definition.DRIDesignParameter;
+import net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.jasper.base.JasperScriptlet;
+import net.sf.dynamicreports.report.definition.DRIHyperLink;
+import net.sf.dynamicreports.report.definition.DRIParameter;
+import net.sf.dynamicreports.report.definition.DRIQuery;
+import net.sf.dynamicreports.report.definition.DRIReport;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>ReportTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ReportTransform {
+    private DesignTransformAccessor accessor;
+    private DRIDesignTemplateDesign templateDesign;
+    private DRDesignQuery query;
+    private List<DRIDesignParameter> parameters;
+    private DRIDesignExpression filterExpression;
+
+    /**
+     * <p>Constructor for ReportTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public ReportTransform(DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+        parameters = new ArrayList<DRIDesignParameter>();
+    }
+
+    /**
+     * <p>transform.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transform() throws DRException {
+        DRIReport report = accessor.getReport();
+        templateDesign = new DRDesignTemplateDesign(report.getTemplateDesign());
+        if (report.getQuery() != null) {
+            query = query(report.getQuery());
+        }
+        for (DRIParameter<?> parameter : report.getParameters()) {
+            parameters.add(parameter(parameter));
+        }
+        filterExpression = accessor.getExpressionTransform().transformExpression(report.getFilterExpression(), JasperScriptlet.SCRIPTLET_NAME);
+    }
+
+    /**
+     * <p>query.</p>
+     *
+     * @param query a {@link net.sf.dynamicreports.report.definition.DRIQuery} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignQuery} object.
+     */
+    protected DRDesignQuery query(DRIQuery query) {
+        DRDesignQuery designQuery = new DRDesignQuery();
+        designQuery.setText(query.getText());
+        designQuery.setLanguage(query.getLanguage());
+        return designQuery;
+    }
+
+    private DRDesignParameter parameter(DRIParameter<?> parameter) {
+        DRDesignParameter designParameter = new DRDesignParameter();
+        designParameter.setName(parameter.getName());
+        designParameter.setValueClass(parameter.getValueClass());
+        designParameter.setValue(parameter.getValue());
+        designParameter.setExternal(accessor.getReport().getTemplateDesign().isDefinedParameter(parameter.getName()));
+        return designParameter;
+    }
+
+    /**
+     * <p>hyperlink.</p>
+     *
+     * @param hyperLink a {@link net.sf.dynamicreports.report.definition.DRIHyperLink} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignHyperLink} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public DRDesignHyperLink hyperlink(DRIHyperLink hyperLink) throws DRException {
+        if (hyperLink == null) {
+            return null;
+        }
+
+        DRDesignHyperLink designHyperLink = new DRDesignHyperLink();
+        designHyperLink.setAnchorExpression(accessor.getExpressionTransform().transformExpression(hyperLink.getAnchorExpression()));
+        designHyperLink.setPageExpression(accessor.getExpressionTransform().transformExpression(hyperLink.getPageExpression()));
+        designHyperLink.setReferenceExpression(accessor.getExpressionTransform().transformExpression(hyperLink.getReferenceExpression()));
+        designHyperLink.setTooltipExpression(accessor.getExpressionTransform().transformExpression(hyperLink.getTooltipExpression()));
+        designHyperLink.setType(hyperLink.getType());
+        designHyperLink.setTarget(hyperLink.getTarget());
+
+        return designHyperLink;
+    }
+
+    /**
+     * <p>Getter for the field <code>templateDesign</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign} object.
+     */
+    public DRIDesignTemplateDesign getTemplateDesign() {
+        return templateDesign;
+    }
+
+    /**
+     * <p>Getter for the field <code>query</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignQuery} object.
+     */
+    public DRDesignQuery getQuery() {
+        return query;
+    }
+
+    /**
+     * <p>Getter for the field <code>parameters</code>.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIDesignParameter> getParameters() {
+        return parameters;
+    }
+
+    /**
+     * <p>Getter for the field <code>filterExpression</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public DRIDesignExpression getFilterExpression() {
+        return filterExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleResolver.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleResolver.java
new file mode 100644
index 0000000..1968ea7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleResolver.java
@@ -0,0 +1,502 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.style.DRDesignStyle;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.report.base.style.DRFont;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import net.sf.jasperreports.engine.DefaultJasperReportsContext;
+import net.sf.jasperreports.engine.fonts.FontUtil;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.font.FontRenderContext;
+import java.awt.image.BufferedImage;
+import java.util.Locale;
+
+/**
+ * <p>StyleResolver class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class StyleResolver {
+    private static FontRenderContext context = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB).createGraphics().getFontRenderContext();
+
+    /**
+     * <p>getFontWidth.</p>
+     *
+     * @param style   a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param columns a int.
+     * @return a int.
+     */
+    protected static int getFontWidth(DRDesignStyle style, int columns) {
+        double width = getFont(style).getStringBounds("m", context).getWidth();
+        return (int) Math.ceil(width * columns) + getHorizontalPadding(style);
+    }
+
+    /**
+     * <p>getFontHeight.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param rows  a int.
+     * @return a int.
+     */
+    protected static int getFontHeight(DRDesignStyle style, int rows) {
+        double height = getFont(style).getMaxCharBounds(context).getHeight();
+        return (int) Math.ceil(height * rows) + getVerticalPadding(style);
+    }
+
+    /**
+     * <p>getFontWidth.</p>
+     *
+     * @param font a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+     * @return a double.
+     */
+    public static double getFontWidth(DRFont font) {
+        Font fnt = getFont(font.getFontName(), font.getBold(), font.getItalic(), font.getFontSize());
+        return fnt.getStringBounds("m", context).getWidth();
+    }
+
+    /**
+     * <p>getFontHeight.</p>
+     *
+     * @param font a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+     * @return a double.
+     */
+    public static double getFontHeight(DRFont font) {
+        Font fnt = getFont(font.getFontName(), font.getBold(), font.getItalic(), font.getFontSize());
+        return fnt.getMaxCharBounds(context).getHeight();
+    }
+
+    private static Font getFont(DRDesignStyle style) {
+        String fontName = getFontName(style);
+        Integer fontSize = getFontSize(style);
+        Boolean bold = getFontBold(style);
+        Boolean italic = getFontItalic(style);
+        return getFont(fontName, bold, italic, fontSize);
+    }
+
+    private static Font getFont(String fontName, Boolean bold, Boolean italic, Integer fontSize) {
+        if (bold == null) {
+            bold = false;
+        }
+        if (italic == null) {
+            italic = false;
+        }
+        int fontStyle;
+        if (bold && italic) {
+            fontStyle = Font.BOLD | Font.ITALIC;
+        } else if (bold) {
+            fontStyle = Font.BOLD;
+        } else if (italic) {
+            fontStyle = Font.ITALIC;
+        } else {
+            fontStyle = Font.PLAIN;
+        }
+
+        FontUtil fontUtil = FontUtil.getInstance(DefaultJasperReportsContext.getInstance());
+        Font font = fontUtil.getAwtFontFromBundles(fontName, fontStyle, (float) fontSize, Locale.getDefault(), true);
+        if (font == null) {
+            font = new Font(fontName, fontStyle, fontSize);
+        }
+        return font;
+    }
+
+    /**
+     * <p>getFontName.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.String} object.
+     */
+    protected static String getFontName(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getFontName() != null) {
+            return style.getFont().getFontName();
+        }
+        if (style.getParentStyle() != null) {
+            return getFontName(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getFontSize.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.Integer} object.
+     */
+    protected static Integer getFontSize(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getFontSize() != null) {
+            return style.getFont().getFontSize();
+        }
+        if (style.getParentStyle() != null) {
+            return getFontSize(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getFontBold.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.Boolean} object.
+     */
+    protected static Boolean getFontBold(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getBold() != null) {
+            return style.getFont().getBold();
+        }
+        if (style.getParentStyle() != null) {
+            return getFontBold(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getFontItalic.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.Boolean} object.
+     */
+    protected static Boolean getFontItalic(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getItalic() != null) {
+            return style.getFont().getItalic();
+        }
+        if (style.getParentStyle() != null) {
+            return getFontItalic(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getFontUnderline.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.Boolean} object.
+     */
+    protected static Boolean getFontUnderline(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getUnderline() != null) {
+            return style.getFont().getUnderline();
+        }
+        if (style.getParentStyle() != null) {
+            return getFontUnderline(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getFontStrikeThrough.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.Boolean} object.
+     */
+    protected static Boolean getFontStrikeThrough(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getStrikeThrough() != null) {
+            return style.getFont().getStrikeThrough();
+        }
+        if (style.getParentStyle() != null) {
+            return getFontStrikeThrough(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getPdfFontName.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.String} object.
+     */
+    protected static String getPdfFontName(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getPdfFontName() != null) {
+            return style.getFont().getPdfFontName();
+        }
+        if (style.getParentStyle() != null) {
+            return getPdfFontName(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getPdfEncoding.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.String} object.
+     */
+    protected static String getPdfEncoding(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getPdfEncoding() != null) {
+            return style.getFont().getPdfEncoding();
+        }
+        if (style.getParentStyle() != null) {
+            return getPdfEncoding(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getPdfEmbedded.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.Boolean} object.
+     */
+    protected static Boolean getPdfEmbedded(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getFont().getPdfEmbedded() != null) {
+            return style.getFont().getPdfEmbedded();
+        }
+        if (style.getParentStyle() != null) {
+            return getPdfEmbedded(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getHorizontalPadding.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @return a int.
+     */
+    public static int getHorizontalPadding(DRIDesignStyle style) {
+        return getLeftPadding(style) + getRightPadding(style) + getLeftIndent(style) + getRightIndent(style);
+    }
+
+    /**
+     * <p>getVerticalPadding.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @return a int.
+     */
+    public static int getVerticalPadding(DRIDesignStyle style) {
+        return getTopPadding(style) + getBottomPadding(style) + getFirstLineIndent(style);
+    }
+
+    private static Integer getTopPadding(DRIDesignStyle style) {
+        if (style == null) {
+            return 0;
+        }
+        if (style.getPadding() != null && style.getPadding().getTop() != null) {
+            return style.getPadding().getTop();
+        }
+        if (style.getParentStyle() != null) {
+            return getTopPadding(style.getParentStyle());
+        }
+        return 0;
+    }
+
+    private static Integer getBottomPadding(DRIDesignStyle style) {
+        if (style == null) {
+            return 0;
+        }
+        if (style.getPadding() != null && style.getPadding().getBottom() != null) {
+            return style.getPadding().getBottom();
+        }
+        if (style.getParentStyle() != null) {
+            return getBottomPadding(style.getParentStyle());
+        }
+        return 0;
+    }
+
+    private static Integer getLeftPadding(DRIDesignStyle style) {
+        if (style == null) {
+            return 0;
+        }
+        if (style.getPadding() != null && style.getPadding().getLeft() != null) {
+            return style.getPadding().getLeft();
+        }
+        if (style.getParentStyle() != null) {
+            return getLeftPadding(style.getParentStyle());
+        }
+        return 0;
+    }
+
+    private static Integer getRightPadding(DRIDesignStyle style) {
+        if (style == null) {
+            return 0;
+        }
+        if (style.getPadding() != null && style.getPadding().getRight() != null) {
+            return style.getPadding().getRight();
+        }
+        if (style.getParentStyle() != null) {
+            return getRightPadding(style.getParentStyle());
+        }
+        return 0;
+    }
+
+    private static Integer getFirstLineIndent(DRIDesignStyle style) {
+        if (style == null) {
+            return 0;
+        }
+        if (style.getParagraph() != null && style.getParagraph().getFirstLineIndent() != null) {
+            return style.getParagraph().getFirstLineIndent();
+        }
+        if (style.getParentStyle() != null) {
+            return getFirstLineIndent(style.getParentStyle());
+        }
+        return 0;
+    }
+
+    private static Integer getLeftIndent(DRIDesignStyle style) {
+        if (style == null) {
+            return 0;
+        }
+        if (style.getParagraph() != null && style.getParagraph().getLeftIndent() != null) {
+            return style.getParagraph().getLeftIndent();
+        }
+        if (style.getParentStyle() != null) {
+            return getLeftIndent(style.getParentStyle());
+        }
+        return 0;
+    }
+
+    private static Integer getRightIndent(DRIDesignStyle style) {
+        if (style == null) {
+            return 0;
+        }
+        if (style.getParagraph() != null && style.getParagraph().getRightIndent() != null) {
+            return style.getParagraph().getRightIndent();
+        }
+        if (style.getParentStyle() != null) {
+            return getRightIndent(style.getParentStyle());
+        }
+        return 0;
+    }
+
+    /**
+     * <p>getPattern.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link java.lang.String} object.
+     */
+    public static String getPattern(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getPattern() != null) {
+            return style.getPattern();
+        }
+        if (style.getParentStyle() != null) {
+            return getPattern(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public static HorizontalTextAlignment getHorizontalTextAlignment(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getHorizontalTextAlignment() != null) {
+            return style.getHorizontalTextAlignment();
+        }
+        if (style.getParentStyle() != null) {
+            return getHorizontalTextAlignment(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getHorizontalImageAlignment.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public static HorizontalImageAlignment getHorizontalImageAlignment(DRDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (style.getHorizontalImageAlignment() != null) {
+            return style.getHorizontalImageAlignment();
+        }
+        if (style.getParentStyle() != null) {
+            return getHorizontalImageAlignment(style.getParentStyle());
+        }
+        return null;
+    }
+
+    /**
+     * <p>getBackgroundColor.</p>
+     *
+     * @param reportStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param transform   a {@link net.sf.dynamicreports.design.transformation.StyleTransform} object.
+     * @return a {@link java.awt.Color} object.
+     */
+    public static Color getBackgroundColor(DRIReportStyle reportStyle, StyleTransform transform) {
+        if (reportStyle == null) {
+            return null;
+        }
+        DRIStyle style = transform.getStyle(reportStyle);
+        if (style.getBackgroundColor() != null) {
+            return style.getBackgroundColor();
+        }
+        if (style.getParentStyle() != null) {
+            return getBackgroundColor(style.getParentStyle(), transform);
+        }
+        return null;
+    }
+
+    /**
+     * <p>mergeColors.</p>
+     *
+     * @param color1  a {@link java.awt.Color} object.
+     * @param color2  a {@link java.awt.Color} object.
+     * @param percent a float.
+     * @return a {@link java.awt.Color} object.
+     */
+    public static Color mergeColors(Color color1, Color color2, float percent) {
+        float amount = 1.0f - percent;
+        int r = (int) (color1.getRed() * amount + color2.getRed() * percent);
+        int g = (int) (color1.getGreen() * amount + color2.getGreen() * percent);
+        int b = (int) (color1.getBlue() * amount + color2.getBlue() * percent);
+        int a = (int) (color1.getAlpha() * amount + color2.getAlpha() * percent);
+        return new Color(r, g, b, a);
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleTransform.java
new file mode 100644
index 0000000..edce792
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleTransform.java
@@ -0,0 +1,440 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+import net.sf.dynamicreports.design.base.style.DRDesignBaseStyle;
+import net.sf.dynamicreports.design.base.style.DRDesignBorder;
+import net.sf.dynamicreports.design.base.style.DRDesignConditionalStyle;
+import net.sf.dynamicreports.design.base.style.DRDesignFont;
+import net.sf.dynamicreports.design.base.style.DRDesignPadding;
+import net.sf.dynamicreports.design.base.style.DRDesignParagraph;
+import net.sf.dynamicreports.design.base.style.DRDesignPen;
+import net.sf.dynamicreports.design.base.style.DRDesignStyle;
+import net.sf.dynamicreports.design.base.style.DRDesignTabStop;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.design.definition.style.DRIDesignTabStop;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.report.base.style.DRBaseStyle;
+import net.sf.dynamicreports.report.base.style.DRBorder;
+import net.sf.dynamicreports.report.base.style.DRFont;
+import net.sf.dynamicreports.report.base.style.DRPadding;
+import net.sf.dynamicreports.report.base.style.DRParagraph;
+import net.sf.dynamicreports.report.base.style.DRPen;
+import net.sf.dynamicreports.report.definition.style.DRIBaseStyle;
+import net.sf.dynamicreports.report.definition.style.DRIBorder;
+import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
+import net.sf.dynamicreports.report.definition.style.DRIFont;
+import net.sf.dynamicreports.report.definition.style.DRIPadding;
+import net.sf.dynamicreports.report.definition.style.DRIParagraph;
+import net.sf.dynamicreports.report.definition.style.DRIPen;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import net.sf.dynamicreports.report.definition.style.DRITabStop;
+import net.sf.dynamicreports.report.definition.style.DRITemplateStyle;
+import net.sf.dynamicreports.report.exception.DRException;
+
+
+/**
+ * <p>StyleTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+public class StyleTransform
+{
+	private final DesignTransformAccessor accessor;
+	private Map<String, DRIDesignStyle> styles;
+	private Map<String, DRDesignStyle> designStyles;
+	private Map<String, DRIStyle> templateStyles;
+	
+	/**
+	 * <p>Constructor for StyleTransform.</p>
+	 *
+	 * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+	 */
+	public StyleTransform(final DesignTransformAccessor accessor)
+	{
+		this.accessor = accessor;
+		this.init();
+	}
+	
+	private void init()
+	{
+		this.styles = new LinkedHashMap<>();
+		this.designStyles = new HashMap<>();
+		this.templateStyles = this.accessor.getTemplateTransform().getTemplateStyles();
+	}
+	
+	private DRDesignStyle transformStyle(final DRIReportStyle style, final boolean textStyle) throws DRException
+	{
+		return this.transformStyle(style, textStyle, DefaultStyleType.NONE);
+	}
+	
+	/**
+	 * <p>transformStyle.</p>
+	 *
+	 * @param style            a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param textStyle        a boolean.
+	 * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
+	 * @return a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected DRDesignStyle transformStyle(
+		final DRIReportStyle style,
+		final boolean textStyle,
+		final DefaultStyleType defaultStyleType) throws DRException
+	{
+		if(style == null)
+		{
+			return this.getDefaultStyle(defaultStyleType);
+		}
+		final String styleName = style.hashCode() + "_" + textStyle;
+		if(this.designStyles.containsKey(styleName))
+		{
+			return this.designStyles.get(styleName);
+		}
+		
+		final DRDesignStyle designStyle = this.style(this.getStyle(style), textStyle, defaultStyleType);
+		if(textStyle)
+		{
+			if(StyleResolver.getFontName(designStyle) == null)
+			{
+				designStyle.getFont().setFontName(this.accessor.getTemplateTransform().getDefaultFontName());
+			}
+			if(StyleResolver.getFontSize(designStyle) == null)
+			{
+				designStyle.getFont().setFontSize(this.accessor.getTemplateTransform().getDefaultFontSize());
+			}
+			if(StyleResolver.getFontBold(designStyle) == null)
+			{
+				designStyle.getFont().setBold(this.accessor.getTemplateTransform().getDefaultFontBold());
+			}
+			if(StyleResolver.getFontItalic(designStyle) == null)
+			{
+				designStyle.getFont().setItalic(this.accessor.getTemplateTransform().getDefaultFontItalic());
+			}
+			if(StyleResolver.getFontUnderline(designStyle) == null)
+			{
+				designStyle.getFont().setUnderline(this.accessor.getTemplateTransform().getDefaultFontUnderline());
+			}
+			if(StyleResolver.getFontStrikeThrough(designStyle) == null)
+			{
+				designStyle.getFont()
+					.setStrikeThrough(this.accessor.getTemplateTransform().getDefaultFontStrikeThrough());
+			}
+			if(StyleResolver.getPdfFontName(designStyle) == null)
+			{
+				designStyle.getFont().setPdfFontName(this.accessor.getTemplateTransform().getDefaultFontPdfFontName());
+			}
+			if(StyleResolver.getPdfEncoding(designStyle) == null)
+			{
+				designStyle.getFont().setPdfEncoding(this.accessor.getTemplateTransform().getDefaultFontPdfEncoding());
+			}
+			if(StyleResolver.getPdfEmbedded(designStyle) == null)
+			{
+				designStyle.getFont().setPdfEmbedded(this.accessor.getTemplateTransform().getDefaultFontPdfEmbedded());
+			}
+		}
+		this.addStyle(styleName, designStyle);
+		return designStyle;
+	}
+	
+	/**
+	 * <p>transformFont.</p>
+	 *
+	 * @param font a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+	 * @return a {@link net.sf.dynamicreports.design.base.style.DRDesignFont} object.
+	 */
+	protected DRDesignFont transformFont(final DRIFont font)
+	{
+		if(font == null)
+		{
+			return null;
+		}
+		
+		final DRDesignFont designFont = new DRDesignFont();
+		designFont.setFontName(font.getFontName());
+		designFont.setFontSize(font.getFontSize());
+		designFont.setBold(font.getBold());
+		designFont.setItalic(font.getItalic());
+		designFont.setUnderline(font.getUnderline());
+		designFont.setStrikeThrough(font.getStrikeThrough());
+		designFont.setPdfFontName(font.getPdfFontName());
+		designFont.setPdfEncoding(font.getPdfEncoding());
+		designFont.setPdfEmbedded(font.getPdfEmbedded());
+		return designFont;
+	}
+	
+	private DRDesignStyle style(final DRIStyle style, final boolean textStyle, final DefaultStyleType defaultStyleType)
+		throws DRException
+	{
+		final DRDesignStyle designStyle;
+		if(StringUtils.isBlank(style.getName()))
+		{
+			designStyle = new DRDesignStyle();
+		}
+		else
+		{
+			designStyle = new DRDesignStyle(style.getName());
+		}
+		this.baseStyle(designStyle, style);
+		if(style.getParentStyle() != null)
+		{
+			designStyle.setParentStyle(this.transformStyle(style.getParentStyle(), textStyle, defaultStyleType));
+		}
+		for(final DRIConditionalStyle conditionalStyle : style.getConditionalStyles())
+		{
+			designStyle.addConditionalStyle(this.conditionalStyle(conditionalStyle));
+		}
+		return designStyle;
+	}
+	
+	/**
+	 * <p>getStyle.</p>
+	 *
+	 * @param reportStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 */
+	protected DRIStyle getStyle(final DRIReportStyle reportStyle)
+	{
+		if(reportStyle == null)
+		{
+			return null;
+		}
+		if(reportStyle instanceof DRIStyle)
+		{
+			return (DRIStyle)reportStyle;
+		}
+		if(reportStyle instanceof DRITemplateStyle)
+		{
+			final String name = ((DRITemplateStyle)reportStyle).getName();
+			final DRIStyle style = this.templateStyles.get(name);
+			if(style == null)
+			{
+				throw new DRDesignReportException("Template style " + name + " not found");
+			}
+			return style;
+		}
+		throw new DRDesignReportException("Style " + reportStyle.getClass().getName() + " not supported");
+	}
+	
+	/**
+	 * <p>transformTemplateStyles.</p>
+	 *
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	public void transformTemplateStyles() throws DRException
+	{
+		for(final DRIStyle style : this.templateStyles.values())
+		{
+			if(this.styles.containsKey(style.getName()))
+			{
+				continue;
+			}
+			this.transformStyle(style, false);
+		}
+	}
+	
+	private DRDesignConditionalStyle conditionalStyle(final DRIConditionalStyle conditionalStyle) throws DRException
+	{
+		final DRDesignConditionalStyle designConditionalStyle = new DRDesignConditionalStyle();
+		this.baseStyle(designConditionalStyle, conditionalStyle);
+		designConditionalStyle.setConditionExpression(this.accessor.getExpressionTransform()
+			.transformExpression(conditionalStyle.getConditionExpression()));
+		designConditionalStyle.setDataset(this.accessor.getExpressionTransform().getDataset());
+		return designConditionalStyle;
+	}
+	
+	private void baseStyle(final DRDesignBaseStyle designBaseStyle, final DRIBaseStyle baseStyle) throws DRException
+	{
+		designBaseStyle.setForegroundColor(baseStyle.getForegroundColor());
+		designBaseStyle.setBackgroundColor(baseStyle.getBackgroundColor());
+		designBaseStyle.setRadius(baseStyle.getRadius());
+		designBaseStyle.setImageScale(baseStyle.getImageScale());
+		designBaseStyle.setHorizontalImageAlignment(baseStyle.getHorizontalImageAlignment());
+		designBaseStyle.setVerticalImageAlignment(baseStyle.getVerticalImageAlignment());
+		designBaseStyle.setHorizontalTextAlignment(baseStyle.getHorizontalTextAlignment());
+		designBaseStyle.setVerticalTextAlignment(baseStyle.getVerticalTextAlignment());
+		designBaseStyle.setBorder(this.border(baseStyle.getBorder()));
+		designBaseStyle.setPadding(this.padding(baseStyle.getPadding()));
+		designBaseStyle.setFont(this.transformFont(baseStyle.getFont()));
+		designBaseStyle.setRotation(baseStyle.getRotation());
+		designBaseStyle.setPattern(baseStyle.getPattern());
+		designBaseStyle.setMarkup(baseStyle.getMarkup());
+		designBaseStyle.setParagraph(this.paragraph(baseStyle.getParagraph()));
+		designBaseStyle.setLinePen(this.pen(baseStyle.getLinePen()));
+	}
+	
+	private DRDesignParagraph paragraph(final DRIParagraph paragraph)
+	{
+		final DRDesignParagraph designParagraph = new DRDesignParagraph();
+		designParagraph.setLineSpacing(paragraph.getLineSpacing());
+		designParagraph.setLineSpacingSize(paragraph.getLineSpacingSize());
+		designParagraph.setFirstLineIndent(paragraph.getFirstLineIndent());
+		designParagraph.setLeftIndent(paragraph.getLeftIndent());
+		designParagraph.setRightIndent(paragraph.getRightIndent());
+		designParagraph.setSpacingBefore(paragraph.getSpacingBefore());
+		designParagraph.setSpacingAfter(paragraph.getSpacingAfter());
+		designParagraph.setTabStopWidth(paragraph.getTabStopWidth());
+		final List<DRIDesignTabStop> designTabStops = new ArrayList<>();
+		for(final DRITabStop tabStop : paragraph.getTabStops())
+		{
+			final DRDesignTabStop designTabStop = new DRDesignTabStop();
+			designTabStop.setPosition(tabStop.getPosition());
+			designTabStop.setAlignment(tabStop.getAlignment());
+			designTabStops.add(designTabStop);
+		}
+		designParagraph.setTabStops(designTabStops);
+		return designParagraph;
+	}
+	
+	private DRDesignBorder border(final DRIBorder border)
+	{
+		final DRDesignBorder designBorder = new DRDesignBorder();
+		designBorder.setTopPen(this.pen(border.getTopPen()));
+		designBorder.setLeftPen(this.pen(border.getLeftPen()));
+		designBorder.setBottomPen(this.pen(border.getBottomPen()));
+		designBorder.setRightPen(this.pen(border.getRightPen()));
+		return designBorder;
+	}
+	
+	private DRDesignPadding padding(final DRIPadding padding)
+	{
+		final DRDesignPadding designPadding = new DRDesignPadding();
+		designPadding.setTop(padding.getTop());
+		designPadding.setLeft(padding.getLeft());
+		designPadding.setBottom(padding.getBottom());
+		designPadding.setRight(padding.getRight());
+		return designPadding;
+	}
+	
+	/**
+	 * <p>pen.</p>
+	 *
+	 * @param pen a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+	 * @return a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+	 */
+	protected DRDesignPen pen(final DRIPen pen)
+	{
+		if(pen == null)
+		{
+			return null;
+		}
+		final DRDesignPen designPen = new DRDesignPen();
+		designPen.setLineWidth(pen.getLineWidth());
+		designPen.setLineStyle(pen.getLineStyle());
+		designPen.setLineColor(pen.getLineColor());
+		return designPen;
+	}
+	
+	/**
+	 * <p>getDefaultStyle.</p>
+	 *
+	 * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
+	 * @return a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected DRDesignStyle getDefaultStyle(final DefaultStyleType defaultStyleType) throws DRException
+	{
+		final TemplateTransform templateTransform = this.accessor.getTemplateTransform();
+		switch(defaultStyleType)
+		{
+			case NONE:
+				return null;
+			case TEXT:
+				return this.transformStyle(templateTransform.getTextStyle(), true);
+			case COLUMN:
+				return this.transformStyle(templateTransform.getColumnStyle(true), true);
+			case COLUMN_TITLE:
+				return this.transformStyle(templateTransform.getColumnTitleStyle(), true);
+			case GROUP:
+				return this.transformStyle(templateTransform.getGroupStyle(), true);
+			case GROUP_TITLE:
+				return this.transformStyle(templateTransform.getGroupTitleStyle(), true);
+			case SUBTOTAL:
+				return this.transformStyle(templateTransform.getSubtotalStyle(), true);
+			case IMAGE:
+				return this.transformStyle(templateTransform.getImageStyle(), false);
+			default:
+				throw new DRDesignReportException("Default style type " + defaultStyleType.name() + " not supported");
+		}
+	}
+	
+	private void addStyle(final String styleName, final DRDesignStyle designStyle)
+	{
+		if(designStyle == null)
+		{
+			return;
+		}
+		if(this.styles.containsKey(designStyle.getName()))
+		{
+			if(!this.styles.get(designStyle.getName()).equals(designStyle))
+			{
+				throw new DRDesignReportException("Duplicate declaration of style \"" + designStyle.getName() + "\"");
+			}
+			return;
+		}
+		this.styles.put(designStyle.getName(), designStyle);
+		this.designStyles.put(styleName, designStyle);
+	}
+	
+	/**
+	 * <p>copyStyle.</p>
+	 *
+	 * @param toStyle   a {@link net.sf.dynamicreports.report.base.style.DRBaseStyle} object.
+	 * @param fromStyle a {@link net.sf.dynamicreports.report.definition.style.DRIBaseStyle} object.
+	 */
+	public void copyStyle(final DRBaseStyle toStyle, final DRIBaseStyle fromStyle)
+	{
+		toStyle.setForegroundColor(fromStyle.getForegroundColor());
+		toStyle.setBackgroundColor(fromStyle.getBackgroundColor());
+		toStyle.setRadius(fromStyle.getRadius());
+		toStyle.setImageScale(fromStyle.getImageScale());
+		toStyle.setHorizontalImageAlignment(fromStyle.getHorizontalImageAlignment());
+		toStyle.setVerticalImageAlignment(fromStyle.getVerticalImageAlignment());
+		toStyle.setHorizontalTextAlignment(fromStyle.getHorizontalTextAlignment());
+		toStyle.setVerticalTextAlignment(fromStyle.getVerticalTextAlignment());
+		toStyle.setBorder((DRBorder)fromStyle.getBorder());
+		toStyle.setPadding((DRPadding)fromStyle.getPadding());
+		toStyle.setFont((DRFont)fromStyle.getFont());
+		toStyle.setRotation(fromStyle.getRotation());
+		toStyle.setPattern(fromStyle.getPattern());
+		toStyle.setMarkup(fromStyle.getMarkup());
+		toStyle.setParagraph((DRParagraph)fromStyle.getParagraph());
+		toStyle.setLinePen((DRPen)fromStyle.getLinePen());
+	}
+	
+	/**
+	 * <p>Getter for the field <code>styles</code>.</p>
+	 *
+	 * @return a {@link java.util.Collection} object.
+	 */
+	public Collection<DRIDesignStyle> getStyles()
+	{
+		return this.styles.values();
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/SubtotalTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/SubtotalTransform.java
new file mode 100644
index 0000000..5e35149
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/SubtotalTransform.java
@@ -0,0 +1,327 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.report.base.component.DRFiller;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.SubtotalPosition;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.DRIBand;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.DRISubtotal;
+import net.sf.dynamicreports.report.definition.column.DRIColumn;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * <p>SubtotalTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SubtotalTransform {
+    private DesignTransformAccessor accessor;
+
+    /**
+     * <p>Constructor for SubtotalTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public SubtotalTransform(DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    // subtotals
+
+    /**
+     * <p>transform.</p>
+     *
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public void transform() throws DRException {
+        ColumnGrid title = accessor.getColumnGridTransform().createColumnGrid();
+        ColumnGrid pageHeader = accessor.getColumnGridTransform().createColumnGrid();
+        ColumnGrid pageFooter = accessor.getColumnGridTransform().createColumnGrid();
+        ColumnGrid columnHeader = accessor.getColumnGridTransform().createColumnGrid();
+        ColumnGrid columnFooter = accessor.getColumnGridTransform().createColumnGrid();
+        Map<DRIGroup, ColumnGrid> groupHeader = new HashMap<DRIGroup, ColumnGrid>();
+        Map<DRIGroup, ColumnGrid> groupFooter = new HashMap<DRIGroup, ColumnGrid>();
+        ColumnGrid lastPageFooter = accessor.getColumnGridTransform().createColumnGrid();
+        ColumnGrid summary = accessor.getColumnGridTransform().createColumnGrid();
+
+        HorizontalCellComponentAlignment horizontalAlignment = HorizontalCellComponentAlignment.FLOAT;
+        VerticalCellComponentAlignment verticalAlignment = VerticalCellComponentAlignment.TOP;
+        for (DRISubtotal<?> subtotal : accessor.getReport().getSubtotals()) {
+            SubtotalPosition position = subtotal.getPosition();
+            DRIColumn<?> showInColumn = subtotal.getShowInColumn();
+            DRDesignTextField subtotalValueComponent = valueComponent(subtotal);
+            DRDesignComponent subtotalComponent = subtotalValueComponent;
+            if (subtotal.getLabelExpression() != null) {
+                subtotalComponent = subtotalWithLabelComponent(subtotal, subtotalComponent);
+            }
+            switch (position) {
+                case TITLE:
+                    title.addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                case PAGE_HEADER:
+                    pageHeader.addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                case PAGE_FOOTER:
+                    pageFooter.addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                case COLUMN_HEADER:
+                    columnHeader.addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                case COLUMN_FOOTER:
+                    columnFooter.addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                case GROUP_HEADER:
+                    EvaluationTime evaluationTime = accessor.getComponentTransform().detectEvaluationTime(subtotalValueComponent.getValueExpression());
+                    if (evaluationTime == null || !evaluationTime.equals(EvaluationTime.AUTO)) {
+                        subtotalValueComponent.setEvaluationTime(EvaluationTime.GROUP);
+                        subtotalValueComponent.setEvaluationGroup(accessor.getGroupTransform().getGroup(subtotal.getGroup()));
+                    }
+                    getGroupGrid(subtotal.getGroup(), groupHeader).addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                case GROUP_FOOTER:
+                    evaluationTime = accessor.getComponentTransform().detectEvaluationTime(subtotalValueComponent.getValueExpression());
+                    if (evaluationTime == null || !evaluationTime.equals(EvaluationTime.AUTO)) {
+                        subtotalValueComponent.setEvaluationTime(EvaluationTime.NOW);
+                    }
+                    getGroupGrid(subtotal.getGroup(), groupFooter).addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                case FIRST_GROUP_HEADER:
+                    DRIGroup firstGroup = accessor.getGroupTransform().getFirstGroup();
+                    evaluationTime = accessor.getComponentTransform().detectEvaluationTime(subtotalValueComponent.getValueExpression());
+                    if (evaluationTime == null || !evaluationTime.equals(EvaluationTime.AUTO)) {
+                        subtotalValueComponent.setEvaluationTime(EvaluationTime.GROUP);
+                        subtotalValueComponent.setEvaluationGroup(accessor.getGroupTransform().getGroup(firstGroup));
+                    }
+                    if (firstGroup != null) {
+                        getGroupGrid(firstGroup, groupHeader).addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    }
+                    break;
+                case FIRST_GROUP_FOOTER:
+                    firstGroup = accessor.getGroupTransform().getFirstGroup();
+                    if (firstGroup != null) {
+                        evaluationTime = accessor.getComponentTransform().detectEvaluationTime(subtotalValueComponent.getValueExpression());
+                        if (evaluationTime == null || !evaluationTime.equals(EvaluationTime.AUTO)) {
+                            subtotalValueComponent.setEvaluationTime(EvaluationTime.NOW);
+                        }
+                        getGroupGrid(firstGroup, groupFooter).addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    }
+                    break;
+                case LAST_GROUP_HEADER:
+                    DRIGroup lastGroup = accessor.getGroupTransform().getLastGroup();
+                    evaluationTime = accessor.getComponentTransform().detectEvaluationTime(subtotalValueComponent.getValueExpression());
+                    if (evaluationTime == null || !evaluationTime.equals(EvaluationTime.AUTO)) {
+                        subtotalValueComponent.setEvaluationTime(EvaluationTime.GROUP);
+                        subtotalValueComponent.setEvaluationGroup(accessor.getGroupTransform().getGroup(lastGroup));
+                    }
+                    if (lastGroup != null) {
+                        getGroupGrid(lastGroup, groupHeader).addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    }
+                    break;
+                case LAST_GROUP_FOOTER:
+                    lastGroup = accessor.getGroupTransform().getLastGroup();
+                    if (lastGroup != null) {
+                        evaluationTime = accessor.getComponentTransform().detectEvaluationTime(subtotalValueComponent.getValueExpression());
+                        if (evaluationTime == null || !evaluationTime.equals(EvaluationTime.AUTO)) {
+                            subtotalValueComponent.setEvaluationTime(EvaluationTime.NOW);
+                        }
+                        getGroupGrid(lastGroup, groupFooter).addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    }
+                    break;
+                case LAST_PAGE_FOOTER:
+                    lastPageFooter.addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                case SUMMARY:
+                    subtotalValueComponent.setEvaluationTime(EvaluationTime.NOW);
+                    summary.addComponent(showInColumn, horizontalAlignment, verticalAlignment, subtotalComponent);
+                    break;
+                default:
+                    throw new DRDesignReportException("Subtotal position " + position.name() + " not supported");
+            }
+        }
+
+        DRFiller filler = null;
+        TemplateTransform templateTransform = accessor.getTemplateTransform();
+        if (templateTransform.getPageColumnsPerPage() > 1) {
+            int fillerWidth = accessor.getPageTransform().getMaxBandWidth() - accessor.getPageTransform().getPage().getColumnWidth();
+            filler = new DRFiller();
+            filler.setWidth(fillerWidth);
+        }
+
+        addAfterBandComponent(accessor.getBandTransform().getTitleBand(), title, filler);
+        addAfterBandComponent(accessor.getBandTransform().getPageHeaderBand(), pageHeader, filler);
+        addBeforeBandComponent(accessor.getBandTransform().getPageFooterBand(), pageFooter, filler);
+        addAfterBandComponent(accessor.getBandTransform().getColumnHeaderBand(), columnHeader, null);
+        addBeforeBandComponent(accessor.getBandTransform().getColumnFooterBand(), columnFooter, null);
+        for (Entry<DRIGroup, ColumnGrid> entry : groupHeader.entrySet()) {
+            DRIGroup group = entry.getKey();
+            DRIBand bnd = group.getHeaderBand();
+            DRDesignGroup designGroup = accessor.getGroupTransform().getGroup(group);
+            DRDesignBand band = accessor.getBandTransform()
+                                        .band("subtotalGroupHeader", bnd, templateTransform.getGroupHeaderSplitType(bnd), templateTransform.getGroupHeaderStyle(bnd),
+                                              templateTransform.getGroupHeaderBackgroundComponent(bnd));
+            addAfterBandComponent(band, entry.getValue(), null);
+            setPrintGroupSubtotalsWhenExpression(group, entry.getValue());
+            designGroup.addHeaderBand(band);
+        }
+        for (Entry<DRIGroup, ColumnGrid> entry : groupFooter.entrySet()) {
+            DRIGroup group = entry.getKey();
+            DRIBand bnd = group.getFooterBand();
+            DRDesignGroup designGroup = accessor.getGroupTransform().getGroup(group);
+            DRDesignBand band = accessor.getBandTransform()
+                                        .band("subtotalGroupFooter", bnd, templateTransform.getGroupFooterSplitType(bnd), templateTransform.getGroupFooterStyle(bnd),
+                                              templateTransform.getGroupFooterBackgroundComponent(bnd));
+            addBeforeBandComponent(band, entry.getValue(), null);
+            setPrintGroupSubtotalsWhenExpression(group, entry.getValue());
+            designGroup.addFooterBand(0, band);
+        }
+        addBeforeBandComponent(accessor.getBandTransform().getLastPageFooterBand(), lastPageFooter, filler);
+        addBeforeBandComponent(accessor.getBandTransform().getSummaryBand(), summary, filler);
+    }
+
+    private DRDesignComponent subtotalWithLabelComponent(DRISubtotal<?> subtotal, DRDesignComponent subtotalComponent) throws DRException {
+        HorizontalCellComponentAlignment horizontalAlignment = HorizontalCellComponentAlignment.FLOAT;
+        VerticalCellComponentAlignment verticalAlignment = VerticalCellComponentAlignment.TOP;
+        DRDesignList list = new DRDesignList();
+
+        Position labelPosition = accessor.getTemplateTransform().getSubtotalLabelPosition(subtotal);
+        switch (labelPosition) {
+            case TOP:
+                list.setType(ListType.VERTICAL);
+                list.addComponent(horizontalAlignment, verticalAlignment, labelComponent(subtotal));
+                list.addComponent(horizontalAlignment, verticalAlignment, subtotalComponent);
+                break;
+            case BOTTOM:
+                list.setType(ListType.VERTICAL);
+                list.addComponent(horizontalAlignment, verticalAlignment, subtotalComponent);
+                list.addComponent(horizontalAlignment, verticalAlignment, labelComponent(subtotal));
+                break;
+            case LEFT:
+                list.setType(ListType.HORIZONTAL);
+                DRDesignComponent labelComponent = labelComponent(subtotal);
+                if (subtotal.getLabelWidth() != null) {
+                    labelComponent.setWidth(subtotal.getLabelWidth());
+                }
+                HorizontalCellComponentAlignment labelHorizontalAlignment = horizontalAlignment;
+                if (subtotal.getLabelWidthType() != null) {
+                    labelHorizontalAlignment = ConstantTransform.toHorizontalCellComponentAlignment(subtotal.getLabelWidthType());
+                }
+                list.addComponent(labelHorizontalAlignment, VerticalCellComponentAlignment.EXPAND, labelComponent);
+                list.addComponent(horizontalAlignment, VerticalCellComponentAlignment.EXPAND, subtotalComponent);
+                break;
+            case RIGHT:
+                list.setType(ListType.HORIZONTAL);
+                labelComponent = labelComponent(subtotal);
+                if (subtotal.getLabelWidth() != null) {
+                    labelComponent.setWidth(subtotal.getLabelWidth());
+                }
+                labelHorizontalAlignment = horizontalAlignment;
+                if (subtotal.getLabelWidthType() != null) {
+                    labelHorizontalAlignment = ConstantTransform.toHorizontalCellComponentAlignment(subtotal.getLabelWidthType());
+                }
+                list.addComponent(horizontalAlignment, VerticalCellComponentAlignment.EXPAND, subtotalComponent);
+                list.addComponent(labelHorizontalAlignment, VerticalCellComponentAlignment.EXPAND, labelComponent);
+                break;
+            default:
+                throw new DRDesignReportException("Subtotal label position " + labelPosition.name() + " not supported");
+        }
+
+        return list;
+    }
+
+    private ColumnGrid getGroupGrid(DRIGroup group, Map<DRIGroup, ColumnGrid> groupList) throws DRException {
+        if (!groupList.containsKey(group)) {
+            groupList.put(group, accessor.getColumnGridTransform().createColumnGrid());
+        }
+        return groupList.get(group);
+    }
+
+    private void setPrintGroupSubtotalsWhenExpression(DRIGroup group, ColumnGrid grid) throws DRException {
+        DRIExpression<Boolean> printSubtotalsWhenExpression = group.getPrintSubtotalsWhenExpression();
+        if (grid.isEmpty() || printSubtotalsWhenExpression == null) {
+            return;
+        }
+        grid.getList().setPrintWhenExpression(accessor.getExpressionTransform().transformExpression(printSubtotalsWhenExpression));
+    }
+
+    private void addAfterBandComponent(DRDesignBand band, ColumnGrid grid, DRFiller filler) throws DRException {
+        if (grid.isEmpty()) {
+            return;
+        }
+        DRDesignList list = grid.getList();
+        if (filler != null) {
+            list = new DRDesignList();
+            list.addComponent(grid.getList());
+            list.addComponent(HorizontalCellComponentAlignment.LEFT, null, accessor.getComponentTransform().filler(filler));
+        }
+
+        band.addComponent(list);
+    }
+
+    private void addBeforeBandComponent(DRDesignBand band, ColumnGrid grid, DRFiller filler) throws DRException {
+        if (grid.isEmpty()) {
+            return;
+        }
+        DRDesignList list = grid.getList();
+        if (filler != null) {
+            list = new DRDesignList();
+            list.addComponent(grid.getList());
+            list.addComponent(HorizontalCellComponentAlignment.LEFT, null, accessor.getComponentTransform().filler(filler));
+        }
+        band.addComponent(0, list);
+    }
+
+    // label
+    @SuppressWarnings("unchecked")
+    private DRDesignComponent labelComponent(DRISubtotal<?> subtotal) throws DRException {
+        @SuppressWarnings("rawtypes") DRTextField labelField = new DRTextField();
+        labelField.setValueExpression(subtotal.getLabelExpression());
+        labelField.setStyle(subtotal.getLabelStyle());
+        labelField.setWidth(accessor.getTemplateTransform().getColumnWidth(subtotal.getShowInColumn(), accessor.getStyleTransform().getDefaultStyle(DefaultStyleType.COLUMN)));
+        DRDesignTextField designLabelField = accessor.getComponentTransform().textField(labelField, DefaultStyleType.TEXT);
+        designLabelField.setUniqueName("column_" + subtotal.getShowInColumn().getName() + ".subtotal.label");
+        return designLabelField;
+    }
+
+    // value
+    private DRDesignTextField valueComponent(DRISubtotal<?> subtotal) throws DRException {
+        DRDesignTextField designValueField = accessor.getComponentTransform().textField(subtotal.getValueField(), DefaultStyleType.SUBTOTAL);
+        designValueField.setUniqueName("column_" + subtotal.getShowInColumn().getName() + ".subtotal");
+        designValueField.setWidth(accessor.getTemplateTransform().getColumnWidth(subtotal.getShowInColumn(), accessor.getStyleTransform().getDefaultStyle(DefaultStyleType.COLUMN)));
+        return designValueField;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TableOfContentsTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TableOfContentsTransform.java
new file mode 100644
index 0000000..23a50f1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TableOfContentsTransform.java
@@ -0,0 +1,143 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.transformation.expressions.TocPrintWhenExpression;
+import net.sf.dynamicreports.design.transformation.expressions.TocReferenceExpression;
+import net.sf.dynamicreports.design.transformation.expressions.TocReferenceLinkExpression;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsHeading;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.component.DRIHyperLinkComponent;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>TableOfContentsTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TableOfContentsTransform {
+    private DesignTransformAccessor accessor;
+    private Map<DRITableOfContentsHeading, Integer> levels;
+
+    /**
+     * <p>Constructor for TableOfContentsTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     */
+    public TableOfContentsTransform(DesignTransformAccessor accessor) {
+        this.accessor = accessor;
+        this.levels = new HashMap<DRITableOfContentsHeading, Integer>();
+    }
+
+    /**
+     * <p>componentHeading.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignTableOfContentsHeading componentHeading(DRIComponent component) throws DRException {
+        DRITableOfContentsHeading tocHeading = component.getTableOfContentsHeading();
+        boolean tableOfContents = accessor.isTableOfContents();
+        if (tableOfContents && tocHeading != null) {
+            DRTextField<String> referenceField = new DRTextField<String>();
+            int level = getLevel(tocHeading);
+            DRIExpression<?> labelExpression = tocHeading.getLabelExpression();
+            if (labelExpression == null && component instanceof DRITextField) {
+                labelExpression = ((DRITextField<?>) component).getValueExpression();
+            }
+            if (labelExpression == null) {
+                labelExpression = Expressions.text("");
+            }
+            String expressionName = labelExpression.getName();
+            DRIExpression<String> anchorNameExpression = null;
+            if (component instanceof DRIHyperLinkComponent) {
+                anchorNameExpression = ((DRIHyperLinkComponent) component).getAnchorNameExpression();
+            }
+            DRIExpression<?> customValueExpression = tocHeading.getCustomValueExpression();
+            referenceField.setValueExpression(new TocReferenceExpression(level, expressionName, labelExpression, anchorNameExpression, customValueExpression));
+            referenceField.setAnchorNameExpression(new TocReferenceLinkExpression(expressionName, anchorNameExpression));
+            referenceField.setPrintWhenExpression(component.getPrintWhenExpression());
+            DRDesignTextField designReferenceField = accessor.getComponentTransform().textField(referenceField, DefaultStyleType.TEXT);
+            designReferenceField.setWidth(1);
+            designReferenceField.setHeight(1);
+            designReferenceField.setUniqueName(expressionName + ".tocReference");
+
+            DRDesignTableOfContentsHeading designTocHeading = new DRDesignTableOfContentsHeading();
+            designTocHeading.setReferenceField(designReferenceField);
+            return designTocHeading;
+        }
+
+        return null;
+    }
+
+    private int getLevel(DRITableOfContentsHeading tocHeading) {
+        if (levels.containsKey(tocHeading)) {
+            return levels.get(tocHeading);
+        }
+        int level = 0;
+        if (tocHeading.getParentHeading() != null) {
+            level = getLevel(tocHeading.getParentHeading()) + 1;
+        }
+        levels.put(tocHeading, level);
+        return level;
+    }
+
+    /**
+     * <p>groupHeading.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @param level a int.
+     * @return a {@link net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    protected DRDesignTableOfContentsHeading groupHeading(DRIGroup group, int level) throws DRException {
+        boolean tableOfContents = accessor.isTableOfContents();
+        boolean isAddGroupToTableOfContents = accessor.getTemplateTransform().isAddGroupToTableOfContents(group);
+        if (tableOfContents && isAddGroupToTableOfContents) {
+            DRTextField<String> referenceField = new DRTextField<String>();
+            DRITextField<?> valueField = group.getValueField();
+            referenceField.setValueExpression(new TocReferenceExpression(level, group.getName(), valueField.getValueExpression(), valueField.getAnchorNameExpression(), null));
+            referenceField.setAnchorNameExpression(new TocReferenceLinkExpression(group.getName(), valueField.getAnchorNameExpression()));
+            referenceField.setPrintWhenExpression(new TocPrintWhenExpression(valueField.getValueExpression()));
+            DRDesignTextField designReferenceField = accessor.getComponentTransform().textField(referenceField, DefaultStyleType.TEXT);
+            designReferenceField.setWidth(0);
+            designReferenceField.setHeight(0);
+            designReferenceField.setUniqueName("group_" + group.getName() + ".tocReference");
+
+            DRDesignTableOfContentsHeading designTocHeading = new DRDesignTableOfContentsHeading();
+            designTocHeading.setReferenceField(designReferenceField);
+            return designTocHeading;
+        }
+
+        return null;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TemplateTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TemplateTransform.java
new file mode 100644
index 0000000..0501506
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TemplateTransform.java
@@ -0,0 +1,3572 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
+import net.sf.dynamicreports.design.base.style.DRDesignStyle;
+import net.sf.dynamicreports.design.constant.DefaultStyleType;
+import net.sf.dynamicreports.design.definition.DRIDesignBand;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.DRIDesignPage;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.definition.DRIBand;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.DRIMargin;
+import net.sf.dynamicreports.report.definition.DRIReport;
+import net.sf.dynamicreports.report.definition.DRIReportTemplate;
+import net.sf.dynamicreports.report.definition.DRISubtotal;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.definition.DRITemplateDesign;
+import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
+import net.sf.dynamicreports.report.definition.column.DRIColumn;
+import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
+import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
+import net.sf.dynamicreports.report.definition.component.DRIBreak;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+import net.sf.dynamicreports.report.definition.component.DRIEllipse;
+import net.sf.dynamicreports.report.definition.component.DRIFiller;
+import net.sf.dynamicreports.report.definition.component.DRIGenericElement;
+import net.sf.dynamicreports.report.definition.component.DRIImage;
+import net.sf.dynamicreports.report.definition.component.DRILine;
+import net.sf.dynamicreports.report.definition.component.DRIList;
+import net.sf.dynamicreports.report.definition.component.DRIMap;
+import net.sf.dynamicreports.report.definition.component.DRIMultiPageList;
+import net.sf.dynamicreports.report.definition.component.DRIPageXofY;
+import net.sf.dynamicreports.report.definition.component.DRIRectangle;
+import net.sf.dynamicreports.report.definition.component.DRISubreport;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.component.DRIXyList;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import net.sf.dynamicreports.report.exception.DRException;
+
+
+/**
+ * <p>TemplateTransform class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ */
+public class TemplateTransform
+{
+	private final DRIReport report;
+	private final DesignTransformAccessor accessor;
+	private final DRIReportTemplate template;
+	private final DRITemplateDesign<?> templateDesign;
+	
+	/**
+	 * <p>Constructor for TemplateTransform.</p>
+	 *
+	 * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+	 */
+	public TemplateTransform(final DesignTransformAccessor accessor)
+	{
+		this.accessor = accessor;
+		this.report = accessor.getReport();
+		this.template = this.report.getTemplate();
+		this.templateDesign = this.report.getTemplateDesign();
+	}
+	
+	/**
+	 * <p>getReportName.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	public String getReportName()
+	{
+		if(this.report.getReportName() != null)
+		{
+			return this.report.getReportName();
+		}
+		if(this.templateDesign.getReportName() != null)
+		{
+			return this.templateDesign.getReportName();
+		}
+		return Defaults.getDefaults().getReportName();
+	}
+	
+	/**
+	 * <p>getLocale.</p>
+	 *
+	 * @return a {@link java.util.Locale} object.
+	 */
+	public Locale getLocale()
+	{
+		if(this.report.getLocale() != null)
+		{
+			return this.report.getLocale();
+		}
+		if(this.template.getLocale() != null)
+		{
+			return this.template.getLocale();
+		}
+		return Defaults.getDefaults().getLocale();
+	}
+	
+	/**
+	 * <p>isShowColumnTitle.</p>
+	 *
+	 * @return a boolean.
+	 */
+	protected boolean isShowColumnTitle()
+	{
+		if(this.report.getShowColumnTitle() != null)
+		{
+			return this.report.getShowColumnTitle();
+		}
+		if(this.template.getShowColumnTitle() != null)
+		{
+			return this.template.getShowColumnTitle();
+		}
+		return Defaults.getDefaults().isShowColumnTitle();
+	}
+	
+	/**
+	 * <p>isShowColumnValues.</p>
+	 *
+	 * @return a boolean.
+	 */
+	protected boolean isShowColumnValues()
+	{
+		if(this.report.getShowColumnValues() != null)
+		{
+			return this.report.getShowColumnValues();
+		}
+		if(this.template.getShowColumnValues() != null)
+		{
+			return this.template.getShowColumnValues();
+		}
+		return Defaults.getDefaults().isShowColumnValues();
+	}
+	
+	/**
+	 * <p>getResourceBundleName.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	public String getResourceBundleName()
+	{
+		if(this.report.getResourceBundleName() != null)
+		{
+			return this.report.getResourceBundleName();
+		}
+		if(this.templateDesign.getResourceBundleName() != null)
+		{
+			return this.templateDesign.getResourceBundleName();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>isIgnorePagination.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isIgnorePagination()
+	{
+		if(this.report.getIgnorePagination() != null)
+		{
+			return this.report.getIgnorePagination();
+		}
+		if(this.templateDesign.getIgnorePagination() != null)
+		{
+			return this.templateDesign.getIgnorePagination();
+		}
+		if(this.template.getIgnorePagination() != null)
+		{
+			return this.template.getIgnorePagination();
+		}
+		return Defaults.getDefaults().isIgnorePagination();
+	}
+	
+	/**
+	 * <p>getWhenNoDataType.</p>
+	 *
+	 * @param emptyDetail a boolean.
+	 * @param noDataBand  a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 */
+	public WhenNoDataType getWhenNoDataType(final boolean emptyDetail, final DRIDesignBand noDataBand)
+	{
+		if(this.report.getWhenNoDataType() != null)
+		{
+			return this.report.getWhenNoDataType();
+		}
+		if(this.templateDesign.getWhenNoDataType() != null)
+		{
+			return this.templateDesign.getWhenNoDataType();
+		}
+		if(this.template.getWhenNoDataType() != null)
+		{
+			return this.template.getWhenNoDataType();
+		}
+		if(noDataBand != null)
+		{
+			return WhenNoDataType.NO_DATA_SECTION;
+		}
+		if(emptyDetail)
+		{
+			return WhenNoDataType.ALL_SECTIONS_NO_DETAIL;
+		}
+		return Defaults.getDefaults().getWhenNoDataType();
+	}
+	
+	/**
+	 * <p>getWhenResourceMissingType.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 */
+	public WhenResourceMissingType getWhenResourceMissingType()
+	{
+		if(this.report.getWhenResourceMissingType() != null)
+		{
+			return this.report.getWhenResourceMissingType();
+		}
+		if(this.templateDesign.getWhenResourceMissingType() != null)
+		{
+			return this.templateDesign.getWhenResourceMissingType();
+		}
+		if(this.template.getWhenResourceMissingType() != null)
+		{
+			return this.template.getWhenResourceMissingType();
+		}
+		return Defaults.getDefaults().getWhenResourceMissingType();
+	}
+	
+	/**
+	 * <p>isTitleOnANewPage.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isTitleOnANewPage()
+	{
+		if(this.report.getTitleOnANewPage() != null)
+		{
+			return this.report.getTitleOnANewPage();
+		}
+		if(this.templateDesign.getTitleOnANewPage() != null)
+		{
+			return this.templateDesign.getTitleOnANewPage();
+		}
+		if(this.template.getTitleOnANewPage() != null)
+		{
+			return this.template.getTitleOnANewPage();
+		}
+		return Defaults.getDefaults().isTitleOnANewPage();
+	}
+	
+	/**
+	 * <p>isSummaryOnANewPage.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isSummaryOnANewPage()
+	{
+		if(this.report.getSummaryOnANewPage() != null)
+		{
+			return this.report.getSummaryOnANewPage();
+		}
+		if(this.templateDesign.getSummaryOnANewPage() != null)
+		{
+			return this.templateDesign.getSummaryOnANewPage();
+		}
+		if(this.template.getSummaryOnANewPage() != null)
+		{
+			return this.template.getSummaryOnANewPage();
+		}
+		return Defaults.getDefaults().isSummaryOnANewPage();
+	}
+	
+	/**
+	 * <p>isSummaryWithPageHeaderAndFooter.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isSummaryWithPageHeaderAndFooter()
+	{
+		if(this.report.getSummaryWithPageHeaderAndFooter() != null)
+		{
+			return this.report.getSummaryWithPageHeaderAndFooter();
+		}
+		if(this.templateDesign.getSummaryWithPageHeaderAndFooter() != null)
+		{
+			return this.templateDesign.getSummaryWithPageHeaderAndFooter();
+		}
+		if(this.template.getSummaryWithPageHeaderAndFooter() != null)
+		{
+			return this.template.getSummaryWithPageHeaderAndFooter();
+		}
+		return Defaults.getDefaults().isSummaryWithPageHeaderAndFooter();
+	}
+	
+	/**
+	 * <p>isFloatColumnFooter.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isFloatColumnFooter()
+	{
+		if(this.report.getFloatColumnFooter() != null)
+		{
+			return this.report.getFloatColumnFooter();
+		}
+		if(this.templateDesign.getFloatColumnFooter() != null)
+		{
+			return this.templateDesign.getFloatColumnFooter();
+		}
+		if(this.template.getFloatColumnFooter() != null)
+		{
+			return this.template.getFloatColumnFooter();
+		}
+		return Defaults.getDefaults().isFloatColumnFooter();
+	}
+	
+	/**
+	 * <p>getPrintOrder.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 */
+	public Orientation getPrintOrder()
+	{
+		if(this.report.getPrintOrder() != null)
+		{
+			return this.report.getPrintOrder();
+		}
+		if(this.template.getPrintOrder() != null)
+		{
+			return this.template.getPrintOrder();
+		}
+		return Defaults.getDefaults().getPrintOrder();
+	}
+	
+	/**
+	 * <p>getColumnDirection.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 */
+	public RunDirection getColumnDirection()
+	{
+		if(this.report.getColumnDirection() != null)
+		{
+			return this.report.getColumnDirection();
+		}
+		if(this.template.getColumnDirection() != null)
+		{
+			return this.template.getColumnDirection();
+		}
+		return Defaults.getDefaults().getColumnDirection();
+	}
+	
+	/**
+	 * <p>getLanguage.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	public String getLanguage()
+	{
+		if(this.report.getLanguage() != null)
+		{
+			return this.report.getLanguage();
+		}
+		if(this.template.getLanguage() != null)
+		{
+			return this.template.getLanguage();
+		}
+		return Defaults.getDefaults().getLanguage();
+	}
+	
+	/**
+	 * <p>getFieldDescription.</p>
+	 *
+	 * @param field a {@link net.sf.dynamicreports.report.definition.DRIField} object.
+	 * @return a {@link java.lang.String} object.
+	 */
+	public String getFieldDescription(final DRIField<?> field)
+	{
+		if(field.getDescription() != null)
+		{
+			return field.getDescription();
+		}
+		if(this.isUseFieldNameAsDescription())
+		{
+			return field.getName();
+		}
+		return null;
+	}
+	
+	private boolean isUseFieldNameAsDescription()
+	{
+		if(this.report.getUseFieldNameAsDescription() != null)
+		{
+			return this.report.getUseFieldNameAsDescription();
+		}
+		if(this.template.getUseFieldNameAsDescription() != null)
+		{
+			return this.template.getUseFieldNameAsDescription();
+		}
+		return Defaults.getDefaults().isUseFieldNameAsDescription();
+	}
+	
+	// table of contents
+	
+	/**
+	 * <p>isTableOfContents.</p>
+	 *
+	 * @param tocHeadings a {@link java.util.Map} object.
+	 * @return a boolean.
+	 */
+	public boolean isTableOfContents(final Map<String, JasperTocHeading> tocHeadings)
+	{
+		if(tocHeadings != null)
+		{
+			return true;
+		}
+		if(this.report.getTableOfContents() != null)
+		{
+			return this.report.getTableOfContents();
+		}
+		if(this.template.getTableOfContents() != null)
+		{
+			return this.template.getTableOfContents();
+		}
+		return Defaults.getDefaults().isTableOfContents();
+	}
+	
+	/**
+	 * <p>getTableOfContentsCustomizer.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+	 */
+	public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
+	{
+		if(this.report.getTableOfContentsCustomizer() != null)
+		{
+			return this.report.getTableOfContentsCustomizer();
+		}
+		if(this.template.getTableOfContentsCustomizer() != null)
+		{
+			return this.template.getTableOfContentsCustomizer();
+		}
+		return Defaults.getDefaults().getTableOfContentsCustomizer();
+	}
+	
+	/**
+	 * <p>isAddGroupToTableOfContents.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	public boolean isAddGroupToTableOfContents(final DRIGroup group)
+	{
+		if(group.getAddToTableOfContents() != null)
+		{
+			return group.getAddToTableOfContents();
+		}
+		return Defaults.getDefaults().isAddGroupToTableOfContents();
+	}
+	
+	// style
+	
+	/**
+	 * <p>getDetailOddRowStyle.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+	 */
+	protected DRISimpleStyle getDetailOddRowStyle()
+	{
+		if(this.isHighlightDetailOddRows())
+		{
+			if(this.report.getDetailOddRowStyle() != null)
+			{
+				return this.report.getDetailOddRowStyle();
+			}
+			if(this.template.getDetailOddRowStyle() != null)
+			{
+				return this.template.getDetailOddRowStyle();
+			}
+			return Defaults.getDefaults().getDetailOddRowStyle();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>getDetailEvenRowStyle.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+	 */
+	protected DRISimpleStyle getDetailEvenRowStyle()
+	{
+		if(this.isHighlightDetailEvenRows())
+		{
+			if(this.report.getDetailEvenRowStyle() != null)
+			{
+				return this.report.getDetailEvenRowStyle();
+			}
+			if(this.template.getDetailEvenRowStyle() != null)
+			{
+				return this.template.getDetailEvenRowStyle();
+			}
+			return Defaults.getDefaults().getDetailEvenRowStyle();
+		}
+		return null;
+	}
+	
+	private boolean isHighlightDetailOddRows()
+	{
+		if(this.report.getHighlightDetailOddRows() != null)
+		{
+			return this.report.getHighlightDetailOddRows();
+		}
+		if(this.template.getHighlightDetailOddRows() != null)
+		{
+			return this.template.getHighlightDetailOddRows();
+		}
+		return Defaults.getDefaults().isHighlightDetailOddRows();
+	}
+	
+	private boolean isHighlightDetailEvenRows()
+	{
+		if(this.report.getHighlightDetailEvenRows() != null)
+		{
+			return this.report.getHighlightDetailEvenRows();
+		}
+		if(this.template.getHighlightDetailEvenRows() != null)
+		{
+			return this.template.getHighlightDetailEvenRows();
+		}
+		return Defaults.getDefaults().isHighlightDetailEvenRows();
+	}
+	
+	/**
+	 * <p>getDefaultFontName.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	protected String getDefaultFontName()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getFontName() != null)
+		{
+			return this.report.getDefaultFont().getFontName();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getFontName() != null)
+		{
+			return this.template.getDefaultFont().getFontName();
+		}
+		return Defaults.getDefaults().getFont().getFontName();
+	}
+	
+	/**
+	 * <p>getDefaultFontSize.</p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getDefaultFontSize()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getFontSize() != null)
+		{
+			return this.report.getDefaultFont().getFontSize();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getFontSize() != null)
+		{
+			return this.template.getDefaultFont().getFontSize();
+		}
+		return Defaults.getDefaults().getFont().getFontSize();
+	}
+	
+	/**
+	 * <p>getDefaultFontBold.</p>
+	 *
+	 * @return a {@link java.lang.Boolean} object.
+	 */
+	protected Boolean getDefaultFontBold()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getBold() != null)
+		{
+			return this.report.getDefaultFont().getBold();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getBold() != null)
+		{
+			return this.template.getDefaultFont().getBold();
+		}
+		return Defaults.getDefaults().getFont().getBold();
+	}
+	
+	/**
+	 * <p>getDefaultFontItalic.</p>
+	 *
+	 * @return a {@link java.lang.Boolean} object.
+	 */
+	protected Boolean getDefaultFontItalic()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getItalic() != null)
+		{
+			return this.report.getDefaultFont().getItalic();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getItalic() != null)
+		{
+			return this.template.getDefaultFont().getItalic();
+		}
+		return Defaults.getDefaults().getFont().getItalic();
+	}
+	
+	/**
+	 * <p>getDefaultFontUnderline.</p>
+	 *
+	 * @return a {@link java.lang.Boolean} object.
+	 */
+	protected Boolean getDefaultFontUnderline()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getUnderline() != null)
+		{
+			return this.report.getDefaultFont().getUnderline();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getUnderline() != null)
+		{
+			return this.template.getDefaultFont().getUnderline();
+		}
+		return Defaults.getDefaults().getFont().getUnderline();
+	}
+	
+	/**
+	 * <p>getDefaultFontStrikeThrough.</p>
+	 *
+	 * @return a {@link java.lang.Boolean} object.
+	 */
+	protected Boolean getDefaultFontStrikeThrough()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getStrikeThrough() != null)
+		{
+			return this.report.getDefaultFont().getStrikeThrough();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getStrikeThrough() != null)
+		{
+			return this.template.getDefaultFont().getStrikeThrough();
+		}
+		return Defaults.getDefaults().getFont().getStrikeThrough();
+	}
+	
+	/**
+	 * <p>getDefaultFontPdfFontName.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	protected String getDefaultFontPdfFontName()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getPdfFontName() != null)
+		{
+			return this.report.getDefaultFont().getPdfFontName();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getPdfFontName() != null)
+		{
+			return this.template.getDefaultFont().getPdfFontName();
+		}
+		return Defaults.getDefaults().getFont().getPdfFontName();
+	}
+	
+	/**
+	 * <p>getDefaultFontPdfEncoding.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	protected String getDefaultFontPdfEncoding()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getPdfEncoding() != null)
+		{
+			return this.report.getDefaultFont().getPdfEncoding();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getPdfEncoding() != null)
+		{
+			return this.template.getDefaultFont().getPdfEncoding();
+		}
+		return Defaults.getDefaults().getFont().getPdfEncoding();
+	}
+	
+	/**
+	 * <p>getDefaultFontPdfEmbedded.</p>
+	 *
+	 * @return a {@link java.lang.Boolean} object.
+	 */
+	protected Boolean getDefaultFontPdfEmbedded()
+	{
+		if(this.report.getDefaultFont() != null && this.report.getDefaultFont().getPdfEmbedded() != null)
+		{
+			return this.report.getDefaultFont().getPdfEmbedded();
+		}
+		if(this.template.getDefaultFont() != null && this.template.getDefaultFont().getPdfEmbedded() != null)
+		{
+			return this.template.getDefaultFont().getPdfEmbedded();
+		}
+		return Defaults.getDefaults().getFont().getPdfEmbedded();
+	}
+	
+	/**
+	 * <p>getTextStyle.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getTextStyle()
+	{
+		if(this.report.getTextStyle() != null)
+		{
+			return this.report.getTextStyle();
+		}
+		if(this.template.getTextStyle() != null)
+		{
+			return this.template.getTextStyle();
+		}
+		return Defaults.getDefaults().getTextStyle();
+	}
+	
+	/**
+	 * <p>getColumnTitleStyle.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getColumnTitleStyle()
+	{
+		if(this.report.getColumnTitleStyle() != null)
+		{
+			return this.report.getColumnTitleStyle();
+		}
+		if(this.template.getColumnTitleStyle() != null)
+		{
+			return this.template.getColumnTitleStyle();
+		}
+		if(Defaults.getDefaults().getColumnTitleStyle() != null)
+		{
+			return Defaults.getDefaults().getColumnTitleStyle();
+		}
+		return this.getTextStyle();
+	}
+	
+	/**
+	 * <p>getColumnStyle.</p>
+	 *
+	 * @param textStyle a boolean.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getColumnStyle(final boolean textStyle)
+	{
+		if(this.report.getColumnStyle() != null)
+		{
+			return this.report.getColumnStyle();
+		}
+		if(this.template.getColumnStyle() != null)
+		{
+			return this.template.getColumnStyle();
+		}
+		if(Defaults.getDefaults().getColumnStyle() != null)
+		{
+			return Defaults.getDefaults().getColumnStyle();
+		}
+		if(textStyle)
+		{
+			return this.getTextStyle();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>getGroupTitleStyle.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getGroupTitleStyle()
+	{
+		if(this.report.getGroupTitleStyle() != null)
+		{
+			return this.report.getGroupTitleStyle();
+		}
+		if(this.template.getGroupTitleStyle() != null)
+		{
+			return this.template.getGroupTitleStyle();
+		}
+		if(Defaults.getDefaults().getGroupTitleStyle() != null)
+		{
+			return Defaults.getDefaults().getGroupTitleStyle();
+		}
+		return this.getTextStyle();
+	}
+	
+	/**
+	 * <p>getGroupStyle.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getGroupStyle()
+	{
+		if(this.report.getGroupStyle() != null)
+		{
+			return this.report.getGroupStyle();
+		}
+		if(this.template.getGroupStyle() != null)
+		{
+			return this.template.getGroupStyle();
+		}
+		if(Defaults.getDefaults().getGroupStyle() != null)
+		{
+			return Defaults.getDefaults().getGroupStyle();
+		}
+		return this.getTextStyle();
+	}
+	
+	/**
+	 * <p>getSubtotalStyle.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getSubtotalStyle()
+	{
+		if(this.report.getSubtotalStyle() != null)
+		{
+			return this.report.getSubtotalStyle();
+		}
+		if(this.template.getSubtotalStyle() != null)
+		{
+			return this.template.getSubtotalStyle();
+		}
+		if(Defaults.getDefaults().getSubtotalStyle() != null)
+		{
+			return Defaults.getDefaults().getSubtotalStyle();
+		}
+		return this.getTextStyle();
+	}
+	
+	/**
+	 * <p>getImageStyle.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getImageStyle()
+	{
+		if(this.report.getImageStyle() != null)
+		{
+			return this.report.getImageStyle();
+		}
+		if(this.template.getImageStyle() != null)
+		{
+			return this.template.getImageStyle();
+		}
+		return Defaults.getDefaults().getImageStyle();
+	}
+	
+	// page
+	
+	/**
+	 * <p>getPageWidth.</p>
+	 *
+	 * @return a int.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected int getPageWidth() throws DRException
+	{
+		if(this.isIgnorePageWidth())
+		{
+			return this.getDynamicPageWidth();
+		}
+		else
+		{
+			return this.getStaticPageWidth();
+		}
+	}
+	
+	private boolean isIgnorePageWidth()
+	{
+		if(this.report.getPage().getIgnorePageWidth() != null)
+		{
+			return this.report.getPage().getIgnorePageWidth();
+		}
+		if(this.template.getIgnorePageWidth() != null)
+		{
+			return this.template.getIgnorePageWidth();
+		}
+		return Defaults.getDefaults().isIgnorePageWidth();
+	}
+	
+	private int getDynamicPageWidth() throws DRException
+	{
+		int maxPageWidth = 0;
+		maxPageWidth = this.getMaxBandWidth(this.accessor.getBandTransform().getTitleBand(), maxPageWidth);
+		maxPageWidth = this.getMaxBandWidth(this.accessor.getBandTransform().getPageHeaderBand(), maxPageWidth);
+		maxPageWidth = this.getMaxBandWidth(this.accessor.getBandTransform().getPageFooterBand(), maxPageWidth);
+		maxPageWidth = this.getMaxBandWidth(this.accessor.getBandTransform().getColumnHeaderBand(), maxPageWidth);
+		maxPageWidth = this.getMaxBandWidth(this.accessor.getBandTransform().getColumnFooterBand(), maxPageWidth);
+		maxPageWidth = this.getMaxBandWidth(this.accessor.getBandTransform().getDetailBand(), maxPageWidth);
+		maxPageWidth = this.getMaxBandWidth(this.accessor.getBandTransform().getLastPageFooterBand(), maxPageWidth);
+		maxPageWidth = this.getMaxBandWidth(this.accessor.getBandTransform().getSummaryBand(), maxPageWidth);
+		
+		return maxPageWidth + this.getPageMargin().getLeft() + this.getPageMargin().getRight();
+	}
+	
+	private int getMaxBandWidth(final DRIDesignBand band, final int maxWidth) throws DRException
+	{
+		if(band == null || band.getList() == null)
+		{
+			return maxWidth;
+		}
+		
+		final int bandWidth = this.detectWidth(band.getList());
+		if(bandWidth > maxWidth)
+		{
+			return bandWidth;
+		}
+		return maxWidth;
+	}
+	
+	private int getStaticPageWidth() throws DRException
+	{
+		if(this.accessor.getPageWidth() != null)
+		{
+			return this.accessor.getPageWidth();
+		}
+		if(this.report.getPage().getWidth() != null)
+		{
+			return this.report.getPage().getWidth();
+		}
+		if(this.templateDesign.getPageWidth() != null)
+		{
+			return this.templateDesign.getPageWidth();
+		}
+		if(this.template.getPageWidth() != null)
+		{
+			return this.template.getPageWidth();
+		}
+		return Defaults.getDefaults().getPageWidth();
+	}
+	
+	/**
+	 * <p>getPageHeight.</p>
+	 *
+	 * @return a int.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected int getPageHeight() throws DRException
+	{
+		if(this.report.getPage().getHeight() != null)
+		{
+			return this.report.getPage().getHeight();
+		}
+		if(this.templateDesign.getPageHeight() != null)
+		{
+			return this.templateDesign.getPageHeight();
+		}
+		if(this.template.getPageHeight() != null)
+		{
+			return this.template.getPageHeight();
+		}
+		return Defaults.getDefaults().getPageHeight();
+	}
+	
+	/**
+	 * <p>getPageOrientation.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected PageOrientation getPageOrientation() throws DRException
+	{
+		if(this.report.getPage().getOrientation() != null)
+		{
+			return this.report.getPage().getOrientation();
+		}
+		if(this.templateDesign.getPageOrientation() != null)
+		{
+			return this.templateDesign.getPageOrientation();
+		}
+		if(this.template.getPageOrientation() != null)
+		{
+			return this.template.getPageOrientation();
+		}
+		return Defaults.getDefaults().getPageOrientation();
+	}
+	
+	/**
+	 * <p>getPageMargin.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.DRIMargin} object.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected DRIMargin getPageMargin() throws DRException
+	{
+		if(this.report.getPage().getMargin() != null)
+		{
+			return this.report.getPage().getMargin();
+		}
+		if(this.templateDesign.getPageMargin() != null)
+		{
+			return this.templateDesign.getPageMargin();
+		}
+		if(this.accessor.getPageWidth() != null)
+		{
+			return Defaults.getDefaults().getSubreportPageMargin();
+		}
+		if(this.template.getPageMargin() != null)
+		{
+			return this.template.getPageMargin();
+		}
+		return Defaults.getDefaults().getPageMargin();
+	}
+	
+	/**
+	 * <p>getPageColumnsPerPage.</p>
+	 *
+	 * @return a int.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected int getPageColumnsPerPage() throws DRException
+	{
+		if(this.report.getPage().getColumnsPerPage() != null)
+		{
+			return this.report.getPage().getColumnsPerPage();
+		}
+		if(this.templateDesign.getPageColumnsPerPage() != null)
+		{
+			return this.templateDesign.getPageColumnsPerPage();
+		}
+		if(this.template.getPageColumnsPerPage() != null)
+		{
+			return this.template.getPageColumnsPerPage();
+		}
+		return Defaults.getDefaults().getPageColumnsPerPage();
+	}
+	
+	/**
+	 * <p>getPageColumnSpace.</p>
+	 *
+	 * @return a int.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected int getPageColumnSpace() throws DRException
+	{
+		if(this.report.getPage().getColumnSpace() != null)
+		{
+			return this.report.getPage().getColumnSpace();
+		}
+		if(this.templateDesign.getPageColumnSpace() != null)
+		{
+			return this.templateDesign.getPageColumnSpace();
+		}
+		if(this.template.getPageColumnSpace() != null)
+		{
+			return this.template.getPageColumnSpace();
+		}
+		return Defaults.getDefaults().getPageColumnSpace();
+	}
+	
+	/**
+	 * <p>getPageColumnWidth.</p>
+	 *
+	 * @param page a {@link net.sf.dynamicreports.design.definition.DRIDesignPage} object.
+	 * @return a int.
+	 */
+	protected int getPageColumnWidth(final DRIDesignPage page)
+	{
+		int columnWidth = page.getWidth() - page.getMargin().getLeft() - page.getMargin().getRight();
+		columnWidth -= page.getColumnSpace() * (page.getColumnsPerPage() - 1);
+		columnWidth = columnWidth / page.getColumnsPerPage();
+		if(this.templateDesign.getPageColumnWidth() != null && this.templateDesign.getPageColumnWidth() > 0
+			&& this.templateDesign.getPageColumnWidth() < columnWidth && !this.isIgnorePageWidth())
+		{
+			return this.templateDesign.getPageColumnWidth();
+		}
+		return columnWidth;
+	}
+	
+	// column
+	
+	/**
+	 * <p>isColumnPrintRepeatedDetailValues.</p>
+	 *
+	 * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIValueColumn} object.
+	 * @return a boolean.
+	 */
+	protected boolean isColumnPrintRepeatedDetailValues(final DRIValueColumn<?> column)
+	{
+		if(column.getPrintRepeatedDetailValues() != null)
+		{
+			return column.getPrintRepeatedDetailValues();
+		}
+		if(this.template.getColumnPrintRepeatedDetailValues() != null)
+		{
+			return this.template.getColumnPrintRepeatedDetailValues();
+		}
+		return Defaults.getDefaults().isColumnPrintRepeatedDetailValues();
+	}
+	
+	/**
+	 * <p>getColumnWidth.</p>
+	 *
+	 * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
+	 * @param style  a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a int.
+	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 */
+	protected int getColumnWidth(final DRIColumn<?> column, final DRDesignStyle style) throws DRException
+	{
+		final DRIComponent component = this.accessor.getColumnTransform().getColumnComponent(column);
+		if(component != null)
+		{
+			if(component instanceof DRIList)
+			{
+				final DRDesignList list =
+					this.accessor.getComponentTransform().list((DRIList)component, DefaultStyleType.COLUMN, null, null);
+				return this.detectWidth(list);
+			}
+			else if(component instanceof DRIDimensionComponent)
+			{
+				if(((DRIDimensionComponent)component).getWidth() != null)
+				{
+					return ((DRIDimensionComponent)component).getWidth();
+				}
+				if(component instanceof DRITextField<?>)
+				{
+					if(((DRITextField<?>)component).getColumns() != null)
+					{
+						return StyleResolver.getFontWidth(style, ((DRITextField<?>)component).getColumns());
+					}
+				}
+			}
+			else
+			{
+				throw new DRDesignReportException("Component " + component.getClass().getName() + " not supported");
+			}
+		}
+		return this.getColumnWidth();
+	}
+	
+	/**
+	 * <p>getColumnWidth.</p>
+	 *
+	 * @return a int.
+	 */
+	protected int getColumnWidth()
+	{
+		if(this.template.getColumnWidth() != null)
+		{
+			return this.template.getColumnWidth();
+		}
+		return Defaults.getDefaults().getColumnWidth();
+	}
+	
+	// component
+	
+	/**
+	 * <p>getRemoveLineWhenBlank.</p>
+	 *
+	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a boolean.
+	 */
+	protected boolean getRemoveLineWhenBlank(final DRIComponent component)
+	{
+		if(component.getRemoveLineWhenBlank() != null)
+		{
+			return component.getRemoveLineWhenBlank();
+		}
+		return Defaults.getDefaults().isRemoveLineWhenBlank();
+	}
+	
+	/**
+	 * <p>getPositionType.</p>
+	 *
+	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+	 */
+	protected ComponentPositionType getPositionType(final DRIComponent component)
+	{
+		if(component instanceof DRIDimensionComponent && ((DRIDimensionComponent)component).getPositionType() != null)
+		{
+			return ((DRIDimensionComponent)component).getPositionType();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>getStretchType.</p>
+	 *
+	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+	 */
+	protected StretchType getStretchType(final DRIComponent component)
+	{
+		if(component instanceof DRIDimensionComponent && ((DRIDimensionComponent)component).getStretchType() != null)
+		{
+			return ((DRIDimensionComponent)component).getStretchType();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>getPrintInFirstWholeBand.</p>
+	 *
+	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a boolean.
+	 */
+	protected boolean getPrintInFirstWholeBand(final DRIComponent component)
+	{
+		if(component instanceof DRIDimensionComponent
+			&& ((DRIDimensionComponent)component).getPrintInFirstWholeBand() != null)
+		{
+			return ((DRIDimensionComponent)component).getPrintInFirstWholeBand();
+		}
+		return Defaults.getDefaults().isPrintInFirstWholeBand();
+	}
+	
+	/**
+	 * <p>getPrintWhenDetailOverflows.</p>
+	 *
+	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a boolean.
+	 */
+	protected boolean getPrintWhenDetailOverflows(final DRIComponent component)
+	{
+		if(component instanceof DRIDimensionComponent
+			&& ((DRIDimensionComponent)component).getPrintWhenDetailOverflows() != null)
+		{
+			return ((DRIDimensionComponent)component).getPrintWhenDetailOverflows();
+		}
+		return Defaults.getDefaults().isPrintWhenDetailOverflows();
+	}
+	
+	/**
+	 * <p>getPrintWhenGroupChanges.</p>
+	 *
+	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+	 */
+	protected DRIDesignGroup getPrintWhenGroupChanges(final DRIComponent component)
+	{
+		if(component instanceof DRIDimensionComponent
+			&& ((DRIDimensionComponent)component).getPrintWhenGroupChanges() != null)
+		{
+			return this.accessor.getGroupTransform().getGroup(((DRIDimensionComponent)component).getPrintWhenGroupChanges());
+		}
+		return null;
+	}
+	
+	// group
+	
+	/**
+	 * <p>getGroupHeaderLayout.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+	 */
+	protected GroupHeaderLayout getGroupHeaderLayout(final DRIGroup group)
+	{
+		if(group.getHeaderLayout() != null)
+		{
+			return group.getHeaderLayout();
+		}
+		if(this.template.getGroupHeaderLayout() != null)
+		{
+			return this.template.getGroupHeaderLayout();
+		}
+		return Defaults.getDefaults().getGroupHeaderLayout();
+	}
+	
+	/**
+	 * <p>isGroupHideColumn.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupHideColumn(final DRIGroup group)
+	{
+		if(group.getHideColumn() != null)
+		{
+			return group.getHideColumn();
+		}
+		if(this.template.getGroupHideColumn() != null)
+		{
+			return this.template.getGroupHideColumn();
+		}
+		return Defaults.getDefaults().isGroupHideColumn();
+	}
+	
+	/**
+	 * <p>isGroupShowColumnHeaderAndFooter.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupShowColumnHeaderAndFooter(final DRIGroup group)
+	{
+		if(group.getShowColumnHeaderAndFooter() != null)
+		{
+			return group.getShowColumnHeaderAndFooter();
+		}
+		if(this.template.getGroupShowColumnHeaderAndFooter() != null)
+		{
+			return this.template.getGroupShowColumnHeaderAndFooter();
+		}
+		return Defaults.getDefaults().isGroupShowColumnHeaderAndFooter();
+	}
+	
+	/**
+	 * <p>getGroupPadding.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a int.
+	 */
+	protected int getGroupPadding(final DRIGroup group)
+	{
+		if(group.getPadding() != null)
+		{
+			return group.getPadding();
+		}
+		if(this.template.getGroupPadding() != null)
+		{
+			return this.template.getGroupPadding();
+		}
+		return Defaults.getDefaults().getGroupPadding();
+	}
+	
+	/**
+	 * <p>isGroupStartInNewPage.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupStartInNewPage(final DRIGroup group)
+	{
+		if(group.getStartInNewPage() != null)
+		{
+			return group.getStartInNewPage();
+		}
+		if(this.template.getGroupStartInNewPage() != null)
+		{
+			return this.template.getGroupStartInNewPage();
+		}
+		return Defaults.getDefaults().isGroupStartInNewPage();
+	}
+	
+	/**
+	 * <p>isGroupStartInNewColumn.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupStartInNewColumn(final DRIGroup group)
+	{
+		if(group.getStartInNewColumn() != null)
+		{
+			return group.getStartInNewColumn();
+		}
+		if(this.template.getGroupStartInNewColumn() != null)
+		{
+			return this.template.getGroupStartInNewColumn();
+		}
+		return Defaults.getDefaults().isGroupStartInNewColumn();
+	}
+	
+	/**
+	 * <p>isGroupReprintHeaderOnEachPage.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupReprintHeaderOnEachPage(final DRIGroup group)
+	{
+		if(group.getReprintHeaderOnEachPage() != null)
+		{
+			return group.getReprintHeaderOnEachPage();
+		}
+		if(this.template.getGroupReprintHeaderOnEachPage() != null)
+		{
+			return this.template.getGroupReprintHeaderOnEachPage();
+		}
+		return Defaults.getDefaults().isGroupReprintHeaderOnEachPage();
+	}
+	
+	/**
+	 * <p>isGroupResetPageNumber.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupResetPageNumber(final DRIGroup group)
+	{
+		if(group.getResetPageNumber() != null)
+		{
+			return group.getResetPageNumber();
+		}
+		if(this.template.getGroupResetPageNumber() != null)
+		{
+			return this.template.getGroupResetPageNumber();
+		}
+		return Defaults.getDefaults().isGroupResetPageNumber();
+	}
+	
+	/**
+	 * <p>getGroupMinHeightToStartNewPage.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getGroupMinHeightToStartNewPage(final DRIGroup group)
+	{
+		if(group.getMinHeightToStartNewPage() != null)
+		{
+			return group.getMinHeightToStartNewPage();
+		}
+		return Defaults.getDefaults().getGroupMinHeightToStartNewPage();
+	}
+	
+	/**
+	 * <p>getGroupFooterPosition.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 */
+	protected GroupFooterPosition getGroupFooterPosition(final DRIGroup group)
+	{
+		if(group.getFooterPosition() != null)
+		{
+			return group.getFooterPosition();
+		}
+		if(this.template.getGroupFooterPosition() != null)
+		{
+			return this.template.getGroupFooterPosition();
+		}
+		return Defaults.getDefaults().getGroupFooterPosition();
+	}
+	
+	/**
+	 * <p>isGroupKeepTogether.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupKeepTogether(final DRIGroup group)
+	{
+		if(group.getKeepTogether() != null)
+		{
+			return group.getKeepTogether();
+		}
+		if(this.template.getGroupKeepTogether() != null)
+		{
+			return this.template.getGroupKeepTogether();
+		}
+		return Defaults.getDefaults().isGroupKeepTogether();
+	}
+	
+	/**
+	 * <p>isGroupHeaderWithSubtotal.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupHeaderWithSubtotal(final DRIGroup group)
+	{
+		if(group.getHeaderWithSubtotal() != null)
+		{
+			return group.getHeaderWithSubtotal();
+		}
+		if(this.template.getGroupHeaderWithSubtotal() != null)
+		{
+			return this.template.getGroupHeaderWithSubtotal();
+		}
+		return Defaults.getDefaults().isGroupHeaderWithSubtotal();
+	}
+	
+	/**
+	 * <p>isGroupByDataType.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a boolean.
+	 */
+	protected boolean isGroupByDataType(final DRIGroup group)
+	{
+		if(group.getGroupByDataType() != null)
+		{
+			return group.getGroupByDataType();
+		}
+		return Defaults.getDefaults().isGroupByDataType();
+	}
+	
+	// subtotal
+	
+	/**
+	 * <p>getSubtotalLabelPosition.</p>
+	 *
+	 * @param subtotal a {@link net.sf.dynamicreports.report.definition.DRISubtotal} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.Position} object.
+	 */
+	public Position getSubtotalLabelPosition(final DRISubtotal<?> subtotal)
+	{
+		if(subtotal.getLabelPosition() != null)
+		{
+			return subtotal.getLabelPosition();
+		}
+		if(this.template.getSubtotalLabelPosition() != null)
+		{
+			return this.template.getSubtotalLabelPosition();
+		}
+		return Defaults.getDefaults().getSubtotalLabelPosition();
+	}
+	
+	// text field
+	
+	/**
+	 * <p>getTextFieldWidth.</p>
+	 *
+	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param style     a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a int.
+	 */
+	protected int getTextFieldWidth(final DRITextField<?> textField, final DRDesignStyle style)
+	{
+		if(textField.getWidth() != null)
+		{
+			return textField.getWidth();
+		}
+		if(textField.getColumns() != null)
+		{
+			return StyleResolver.getFontWidth(style, textField.getColumns());
+		}
+		if(this.template.getTextFieldWidth() != null)
+		{
+			return this.template.getTextFieldWidth();
+		}
+		return Defaults.getDefaults().getTextFieldWidth();
+	}
+	
+	/**
+	 * <p>getTextFieldHeight.</p>
+	 *
+	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param style     a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a int.
+	 */
+	protected int getTextFieldHeight(final DRITextField<?> textField, final DRDesignStyle style)
+	{
+		if(textField.getHeight() != null)
+		{
+			return textField.getHeight();
+		}
+		if(textField.getRows() != null)
+		{
+			return StyleResolver.getFontHeight(style, textField.getRows());
+		}
+		return StyleResolver.getFontHeight(style, 1);
+	}
+	
+	/**
+	 * <p>getTextFieldPattern.</p>
+	 *
+	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param style     a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a {@link java.lang.String} object.
+	 */
+	protected String getTextFieldPattern(final DRITextField<?> textField, final DRDesignStyle style)
+	{
+		if(textField.getPattern() != null)
+		{
+			return textField.getPattern();
+		}
+		if(StyleResolver.getPattern(style) != null)
+		{
+			return null;// StyleResolver.getPattern(style);
+		}
+		if(textField.getDataType() != null)
+		{
+			return textField.getDataType().getPattern();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>getTextFieldHorizontalTextAlignment.</p>
+	 *
+	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param style     a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+	 */
+	protected HorizontalTextAlignment getTextFieldHorizontalTextAlignment(
+		final DRITextField<?> textField,
+		final DRDesignStyle style)
+	{
+		if(textField.getHorizontalTextAlignment() != null)
+		{
+			return textField.getHorizontalTextAlignment();
+		}
+		if(StyleResolver.getHorizontalTextAlignment(style) != null)
+		{
+			return null;// StyleResolver.getHorizontalTextAlignment(style);
+		}
+		if(textField.getDataType() != null)
+		{
+			return textField.getDataType().getHorizontalTextAlignment();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>getTextFieldValueFormatter.</p>
+	 *
+	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+	 */
+	protected DRIValueFormatter<?, ?> getTextFieldValueFormatter(final DRITextField<?> textField)
+	{
+		if(textField.getValueFormatter() != null)
+		{
+			return textField.getValueFormatter();
+		}
+		if(textField.getDataType() != null)
+		{
+			return textField.getDataType().getValueFormatter();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>getTextFieldStretchWithOverflow.</p>
+	 *
+	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @return a boolean.
+	 * @deprecated replaced by {@link #getTextFieldTextAdjust(DRITextField)}
+	 */
+	@Deprecated
+	protected boolean getTextFieldStretchWithOverflow(final DRITextField<?> textField)
+	{
+		if(textField.getStretchWithOverflow() != null)
+		{
+			return textField.getStretchWithOverflow();
+		}
+		return Defaults.getDefaults().isTextFieldStretchWithOverflow();
+	}
+	
+	/**
+	 * <p>getTextFieldTextAdjust.</p>
+	 *
+	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+	 */
+	protected TextAdjust getTextFieldTextAdjust(final DRITextField<?> textField)
+	{
+		if(textField.getTextAdjust() != null)
+		{
+			return textField.getTextAdjust();
+		}
+		return Defaults.getDefaults().getTextFieldTextAdjust();
+	}
+	
+	/**
+	 * <p>isTextFieldPrintRepeatedValues.</p>
+	 *
+	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @return a boolean.
+	 */
+	protected boolean isTextFieldPrintRepeatedValues(final DRITextField<?> textField)
+	{
+		if(textField.getPrintRepeatedValues() != null)
+		{
+			return textField.getPrintRepeatedValues();
+		}
+		return Defaults.getDefaults().isTextFieldPrintRepeatedValues();
+	}
+	
+	// text field
+	
+	/**
+	 * <p>getBooleanFieldWidth.</p>
+	 *
+	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param style        a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a int.
+	 */
+	protected int getBooleanFieldWidth(final DRIBooleanField booleanField, final DRDesignStyle style)
+	{
+		if(booleanField.getWidth() != null)
+		{
+			return booleanField.getWidth();
+		}
+		if(this.template.getTextFieldWidth() != null)
+		{
+			return this.template.getTextFieldWidth();
+		}
+		return Defaults.getDefaults().getTextFieldWidth();
+	}
+	
+	/**
+	 * <p>getBooleanFieldHeight.</p>
+	 *
+	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param style        a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a int.
+	 */
+	protected int getBooleanFieldHeight(final DRIBooleanField booleanField, final DRDesignStyle style)
+	{
+		if(booleanField.getHeight() != null)
+		{
+			return booleanField.getHeight();
+		}
+		return StyleResolver.getFontHeight(style, 1);
+	}
+	
+	// page x of y
+	
+	/**
+	 * <p>getPageXofYWidth.</p>
+	 *
+	 * @param pageXofY a {@link net.sf.dynamicreports.report.definition.component.DRIPageXofY} object.
+	 * @return a int.
+	 */
+	protected int getPageXofYWidth(final DRIPageXofY pageXofY)
+	{
+		if(pageXofY.getWidth() != null)
+		{
+			return pageXofY.getWidth();
+		}
+		if(this.template.getTextFieldWidth() != null)
+		{
+			return this.template.getTextFieldWidth();
+		}
+		return Defaults.getDefaults().getTextFieldWidth();
+	}
+	
+	/**
+	 * <p>getPageXofYHeight.</p>
+	 *
+	 * @param pageXofY a {@link net.sf.dynamicreports.report.definition.component.DRIPageXofY} object.
+	 * @param style    a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a int.
+	 */
+	protected int getPageXofYHeight(final DRIPageXofY pageXofY, final DRDesignStyle style)
+	{
+		if(pageXofY.getHeight() != null)
+		{
+			return pageXofY.getHeight();
+		}
+		return StyleResolver.getFontHeight(style, 1);
+	}
+	
+	/**
+	 * <p>getPageXofYHorizontalTextAlignment.</p>
+	 *
+	 * @param pageXofY a {@link net.sf.dynamicreports.report.definition.component.DRIPageXofY} object.
+	 * @param style    a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+	 */
+	protected HorizontalTextAlignment getPageXofYHorizontalTextAlignment(
+		final DRIPageXofY pageXofY,
+		final DRDesignStyle style)
+	{
+		if(pageXofY.getHorizontalTextAlignment() != null)
+		{
+			return pageXofY.getHorizontalTextAlignment();
+		}
+		if(StyleResolver.getHorizontalTextAlignment(style) != null)
+		{
+			return StyleResolver.getHorizontalTextAlignment(style);
+		}
+		return Defaults.getDefaults().getPageXofYHorizontalTextAlignment();
+	}
+	
+	// image
+	
+	/**
+	 * <p>getImageWidth.</p>
+	 *
+	 * @param image a {@link net.sf.dynamicreports.report.definition.component.DRIImage} object.
+	 * @return a int.
+	 */
+	protected int getImageWidth(final DRIImage image)
+	{
+		if(image.getWidth() != null)
+		{
+			return image.getWidth();
+		}
+		if(this.template.getImageWidth() != null)
+		{
+			return this.template.getImageWidth();
+		}
+		return Defaults.getDefaults().getImageWidth();
+	}
+	
+	/**
+	 * <p>getImageHeight.</p>
+	 *
+	 * @param image       a {@link net.sf.dynamicreports.report.definition.component.DRIImage} object.
+	 * @param imageHeight a {@link java.lang.Integer} object.
+	 * @param imageHeight a {@link java.lang.Integer} object.
+	 * @param style       a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a int.
+	 */
+	protected int getImageHeight(final DRIImage image, final Integer imageHeight, final DRDesignStyle style)
+	{
+		if(image.getHeight() != null)
+		{
+			return image.getHeight();
+		}
+		if(imageHeight != null)
+		{
+			return imageHeight + StyleResolver.getVerticalPadding(style);
+		}
+		if(this.template.getImageHeight() != null)
+		{
+			return this.template.getImageHeight();
+		}
+		return Defaults.getDefaults().getImageHeight();
+	}
+	
+	// filler
+	
+	/**
+	 * <p>getFillerWidth.</p>
+	 *
+	 * @param filler a {@link net.sf.dynamicreports.report.definition.component.DRIFiller} object.
+	 * @return a int.
+	 */
+	protected int getFillerWidth(final DRIFiller filler)
+	{
+		if(filler.getWidth() != null)
+		{
+			return filler.getWidth();
+		}
+		return Defaults.getDefaults().getFillerWidth();
+	}
+	
+	/**
+	 * <p>getFillerHeight.</p>
+	 *
+	 * @param filler a {@link net.sf.dynamicreports.report.definition.component.DRIFiller} object.
+	 * @return a int.
+	 */
+	protected int getFillerHeight(final DRIFiller filler)
+	{
+		if(filler.getHeight() != null)
+		{
+			return filler.getHeight();
+		}
+		return Defaults.getDefaults().getFillerHeight();
+	}
+	
+	// line
+	
+	/**
+	 * <p>getLineWidth.</p>
+	 *
+	 * @param line a {@link net.sf.dynamicreports.report.definition.component.DRILine} object.
+	 * @return a int.
+	 */
+	protected int getLineWidth(final DRILine line)
+	{
+		if(line.getWidth() != null)
+		{
+			return line.getWidth();
+		}
+		return Defaults.getDefaults().getLineWidth();
+	}
+	
+	/**
+	 * <p>getLineHeight.</p>
+	 *
+	 * @param line a {@link net.sf.dynamicreports.report.definition.component.DRILine} object.
+	 * @return a int.
+	 */
+	protected int getLineHeight(final DRILine line)
+	{
+		if(line.getHeight() != null)
+		{
+			return line.getHeight();
+		}
+		return Defaults.getDefaults().getLineHeight();
+	}
+	
+	// ellipse
+	
+	/**
+	 * <p>getEllipseWidth.</p>
+	 *
+	 * @param ellipse a {@link net.sf.dynamicreports.report.definition.component.DRIEllipse} object.
+	 * @return a int.
+	 */
+	protected int getEllipseWidth(final DRIEllipse ellipse)
+	{
+		if(ellipse.getWidth() != null)
+		{
+			return ellipse.getWidth();
+		}
+		return Defaults.getDefaults().getEllipseWidth();
+	}
+	
+	/**
+	 * <p>getEllipseHeight.</p>
+	 *
+	 * @param ellipse a {@link net.sf.dynamicreports.report.definition.component.DRIEllipse} object.
+	 * @return a int.
+	 */
+	protected int getEllipseHeight(final DRIEllipse ellipse)
+	{
+		if(ellipse.getHeight() != null)
+		{
+			return ellipse.getHeight();
+		}
+		return Defaults.getDefaults().getEllipseHeight();
+	}
+	
+	// rectangle
+	
+	/**
+	 * <p>getRectangleRadius.</p>
+	 *
+	 * @param rectangle a {@link net.sf.dynamicreports.report.definition.component.DRIRectangle} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getRectangleRadius(final DRIRectangle rectangle)
+	{
+		if(rectangle.getRadius() != null)
+		{
+			return rectangle.getRadius();
+		}
+		return Defaults.getDefaults().getRectangleRadius();
+	}
+	
+	/**
+	 * <p>getRectangleWidth.</p>
+	 *
+	 * @param rectangle a {@link net.sf.dynamicreports.report.definition.component.DRIRectangle} object.
+	 * @return a int.
+	 */
+	protected int getRectangleWidth(final DRIRectangle rectangle)
+	{
+		if(rectangle.getWidth() != null)
+		{
+			return rectangle.getWidth();
+		}
+		return Defaults.getDefaults().getRectangleWidth();
+	}
+	
+	/**
+	 * <p>getRectangleHeight.</p>
+	 *
+	 * @param rectangle a {@link net.sf.dynamicreports.report.definition.component.DRIRectangle} object.
+	 * @return a int.
+	 */
+	protected int getRectangleHeight(final DRIRectangle rectangle)
+	{
+		if(rectangle.getHeight() != null)
+		{
+			return rectangle.getHeight();
+		}
+		return Defaults.getDefaults().getRectangleHeight();
+	}
+	
+	// map
+	
+	/**
+	 * <p>getMapWidth.</p>
+	 *
+	 * @param map a {@link net.sf.dynamicreports.report.definition.component.DRIMap} object.
+	 * @return a int.
+	 */
+	protected int getMapWidth(final DRIMap map)
+	{
+		if(map.getWidth() != null)
+		{
+			return map.getWidth();
+		}
+		return Defaults.getDefaults().getMapWidth();
+	}
+	
+	/**
+	 * <p>getMapHeight.</p>
+	 *
+	 * @param map a {@link net.sf.dynamicreports.report.definition.component.DRIMap} object.
+	 * @return a int.
+	 */
+	protected int getMapHeight(final DRIMap map)
+	{
+		if(map.getHeight() != null)
+		{
+			return map.getHeight();
+		}
+		return Defaults.getDefaults().getMapHeight();
+	}
+	
+	// custom component
+	
+	/**
+	 * <p>getCustomComponentWidth.</p>
+	 *
+	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIDimensionComponent} object.
+	 * @return a int.
+	 */
+	protected int getCustomComponentWidth(final DRIDimensionComponent component)
+	{
+		if(component.getWidth() != null)
+		{
+			return component.getWidth();
+		}
+		return Defaults.getDefaults().getCustomComponentWidth();
+	}
+	
+	/**
+	 * <p>getCustomComponentHeight.</p>
+	 *
+	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIDimensionComponent} object.
+	 * @return a int.
+	 */
+	protected int getCustomComponentHeight(final DRIDimensionComponent component)
+	{
+		if(component.getHeight() != null)
+		{
+			return component.getHeight();
+		}
+		return Defaults.getDefaults().getCustomComponentHeight();
+	}
+	
+	// break
+	
+	/**
+	 * <p>getBreakWidth.</p>
+	 *
+	 * @param breakComponent a {@link net.sf.dynamicreports.report.definition.component.DRIBreak} object.
+	 * @return a int.
+	 */
+	protected int getBreakWidth(final DRIBreak breakComponent)
+	{
+		return Defaults.getDefaults().getBreakWidth();
+	}
+	
+	/**
+	 * <p>getBreakHeight.</p>
+	 *
+	 * @param breakComponent a {@link net.sf.dynamicreports.report.definition.component.DRIBreak} object.
+	 * @return a int.
+	 */
+	protected int getBreakHeight(final DRIBreak breakComponent)
+	{
+		return Defaults.getDefaults().getBreakHeight();
+	}
+	
+	// generic element
+	
+	/**
+	 * <p>getGenericElementWidth.</p>
+	 *
+	 * @param genericElement a {@link net.sf.dynamicreports.report.definition.component.DRIGenericElement} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getGenericElementWidth(final DRIGenericElement genericElement)
+	{
+		if(genericElement.getWidth() != null)
+		{
+			return genericElement.getWidth();
+		}
+		return Defaults.getDefaults().getGenericElementWidth();
+	}
+	
+	/**
+	 * <p>getGenericElementHeight.</p>
+	 *
+	 * @param genericElement a {@link net.sf.dynamicreports.report.definition.component.DRIGenericElement} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getGenericElementHeight(final DRIGenericElement genericElement)
+	{
+		if(genericElement.getHeight() != null)
+		{
+			return genericElement.getHeight();
+		}
+		return Defaults.getDefaults().getGenericElementHeight();
+	}
+	
+	// list
+	
+	/**
+	 * <p>getListWidth.</p>
+	 *
+	 * @param list a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getListWidth(final DRIList list)
+	{
+		if(list.getWidth() != null)
+		{
+			return list.getWidth();
+		}
+		return Defaults.getDefaults().getListWidth();
+	}
+	
+	/**
+	 * <p>getListHeight.</p>
+	 *
+	 * @param list a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getListHeight(final DRIList list)
+	{
+		if(list.getHeight() != null)
+		{
+			return list.getHeight();
+		}
+		return Defaults.getDefaults().getListHeight();
+	}
+	
+	/**
+	 * <p>getListGap.</p>
+	 *
+	 * @param list a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+	 * @return a int.
+	 */
+	protected int getListGap(final DRIList list)
+	{
+		if(list.getGap() != null)
+		{
+			return list.getGap();
+		}
+		if(this.template.getListgap() != null)
+		{
+			return this.template.getListgap();
+		}
+		return Defaults.getDefaults().getListgap();
+	}
+	
+	// xy list
+	
+	/**
+	 * <p>getXyListWidth.</p>
+	 *
+	 * @param xyList a {@link net.sf.dynamicreports.report.definition.component.DRIXyList} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getXyListWidth(final DRIXyList xyList)
+	{
+		if(xyList.getWidth() != null)
+		{
+			return xyList.getWidth();
+		}
+		return Defaults.getDefaults().getListWidth();
+	}
+	
+	/**
+	 * <p>getXyListHeight.</p>
+	 *
+	 * @param xyList a {@link net.sf.dynamicreports.report.definition.component.DRIXyList} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getXyListHeight(final DRIXyList xyList)
+	{
+		if(xyList.getHeight() != null)
+		{
+			return xyList.getHeight();
+		}
+		return Defaults.getDefaults().getListHeight();
+	}
+	
+	// multi page list
+	
+	/**
+	 * <p>getMultiPageListWidth.</p>
+	 *
+	 * @param multiPageList a {@link net.sf.dynamicreports.report.definition.component.DRIMultiPageList} object.
+	 * @return a int.
+	 */
+	protected int getMultiPageListWidth(final DRIMultiPageList multiPageList)
+	{
+		if(multiPageList.getWidth() != null)
+		{
+			return multiPageList.getWidth();
+		}
+		if(this.template.getMultiPageListWidth() != null)
+		{
+			return this.template.getMultiPageListWidth();
+		}
+		return Defaults.getDefaults().getMultiPageListWidth();
+	}
+	
+	/**
+	 * <p>getMultiPageListHeight.</p>
+	 *
+	 * @param multiPageList a {@link net.sf.dynamicreports.report.definition.component.DRIMultiPageList} object.
+	 * @return a int.
+	 */
+	protected int getMultiPageListHeight(final DRIMultiPageList multiPageList)
+	{
+		if(multiPageList.getHeight() != null)
+		{
+			return multiPageList.getHeight();
+		}
+		if(this.template.getMultiPageListHeight() != null)
+		{
+			return this.template.getMultiPageListHeight();
+		}
+		return Defaults.getDefaults().getMultiPageListHeight();
+	}
+	
+	// subreport
+	
+	/**
+	 * <p>getSubreportWidth.</p>
+	 *
+	 * @param subreport a {@link net.sf.dynamicreports.report.definition.component.DRISubreport} object.
+	 * @return a int.
+	 */
+	protected int getSubreportWidth(final DRISubreport subreport)
+	{
+		if(subreport.getWidth() != null)
+		{
+			return subreport.getWidth();
+		}
+		if(this.template.getSubreportWidth() != null)
+		{
+			return this.template.getSubreportWidth();
+		}
+		return Defaults.getDefaults().getSubreportWidth();
+	}
+	
+	/**
+	 * <p>getSubreportHeight.</p>
+	 *
+	 * @param subreport a {@link net.sf.dynamicreports.report.definition.component.DRISubreport} object.
+	 * @return a int.
+	 */
+	protected int getSubreportHeight(final DRISubreport subreport)
+	{
+		if(subreport.getHeight() != null)
+		{
+			return subreport.getHeight();
+		}
+		if(this.template.getSubreportHeight() != null)
+		{
+			return this.template.getSubreportHeight();
+		}
+		return Defaults.getDefaults().getSubreportHeight();
+	}
+	
+	// crosstab
+	
+	/**
+	 * <p>getCrosstabWidth.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a int.
+	 */
+	protected int getCrosstabWidth(final DRICrosstab crosstab)
+	{
+		if(crosstab.getWidth() != null)
+		{
+			return crosstab.getWidth();
+		}
+		if(this.template.getCrosstabWidth() != null)
+		{
+			return this.template.getCrosstabWidth();
+		}
+		return Defaults.getDefaults().getCrosstabWidth();
+	}
+	
+	/**
+	 * <p>getCrosstabHeight.</p>
+	 *
+	 * @param crosstab       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param whenNoDataCell a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+	 * @return a int.
+	 */
+	protected int getCrosstabHeight(final DRICrosstab crosstab, final DRDesignCrosstabCellContent whenNoDataCell)
+	{
+		final int height;
+		if(crosstab.getHeight() != null)
+		{
+			height = crosstab.getHeight();
+		}
+		else if(this.template.getCrosstabHeight() != null)
+		{
+			height = this.template.getCrosstabHeight();
+		}
+		else
+		{
+			height = Defaults.getDefaults().getCrosstabHeight();
+		}
+		final int whenNoDataCellHeight = this.getCrosstabWhenNoDataCellHeight(whenNoDataCell);
+		if(height == 0 && whenNoDataCellHeight > 0)
+		{
+			return whenNoDataCellHeight;
+		}
+		return height;
+	}
+	
+	/**
+	 * <p>getCrosstabColumnGroupTotalPosition.</p>
+	 *
+	 * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 */
+	public CrosstabTotalPosition getCrosstabColumnGroupTotalPosition(final DRICrosstabColumnGroup<?> columnGroup)
+	{
+		if(!this.isCrosstabColumnGroupShowTotal(columnGroup))
+		{
+			return null;
+		}
+		if(columnGroup.getTotalPosition() != null)
+		{
+			return columnGroup.getTotalPosition();
+		}
+		return Defaults.getDefaults().getCrosstabColumnGroupTotalPosition();
+	}
+	
+	/**
+	 * <p>getCrosstabRowGroupTotalPosition.</p>
+	 *
+	 * @param rowGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 */
+	public CrosstabTotalPosition getCrosstabRowGroupTotalPosition(final DRICrosstabRowGroup<?> rowGroup)
+	{
+		if(!this.isCrosstabRowGroupShowTotal(rowGroup))
+		{
+			return null;
+		}
+		if(rowGroup.getTotalPosition() != null)
+		{
+			return rowGroup.getTotalPosition();
+		}
+		return Defaults.getDefaults().getCrosstabRowGroupTotalPosition();
+	}
+	
+	/**
+	 * <p>isCrosstabColumnGroupShowTotal.</p>
+	 *
+	 * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+	 * @return a boolean.
+	 */
+	public boolean isCrosstabColumnGroupShowTotal(final DRICrosstabColumnGroup<?> columnGroup)
+	{
+		if(columnGroup.getShowTotal() != null)
+		{
+			return columnGroup.getShowTotal();
+		}
+		return Defaults.getDefaults().isCrosstabColumnGroupShowTotal();
+	}
+	
+	/**
+	 * <p>isCrosstabRowGroupShowTotal.</p>
+	 *
+	 * @param rowGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+	 * @return a boolean.
+	 */
+	public boolean isCrosstabRowGroupShowTotal(final DRICrosstabRowGroup<?> rowGroup)
+	{
+		if(rowGroup.getShowTotal() != null)
+		{
+			return rowGroup.getShowTotal();
+		}
+		return Defaults.getDefaults().isCrosstabRowGroupShowTotal();
+	}
+	
+	/**
+	 * <p>getCrosstabColumnGroupHeaderHeight.</p>
+	 *
+	 * @param columnGroup     a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+	 * @param designCrosstab  a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @param availableHeight a int.
+	 * @return a int.
+	 */
+	public int getCrosstabColumnGroupHeaderHeight(
+		final DRICrosstabColumnGroup<?> columnGroup,
+		final DRDesignCrosstab designCrosstab,
+		final int availableHeight)
+	{
+		if(columnGroup.getHeaderHeight() != null)
+		{
+			return columnGroup.getHeaderHeight();
+		}
+		int maxHeight = 0;
+		for(final DRDesignCrosstabColumnGroup designColumnGroup : designCrosstab.getColumnGroups())
+		{
+			if(designColumnGroup.getName().equals(columnGroup.getName()))
+			{
+				int height = this.detectHeight(designColumnGroup.getHeader().getList());
+				if(maxHeight < height)
+				{
+					maxHeight = height;
+				}
+				if(designColumnGroup.getTotalHeader() != null)
+				{
+					height = this.detectHeight(designColumnGroup.getTotalHeader().getList());
+					if(maxHeight < height && height > availableHeight)
+					{
+						maxHeight = height;
+					}
+				}
+				break;
+			}
+		}
+		return maxHeight;
+	}
+	
+	/**
+	 * <p>getCrosstabColumnGroupTotalHeaderWidth.</p>
+	 *
+	 * @param columnGroup    a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+	 * @param cellWidth      a {@link java.lang.Integer} object.
+	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @return a int.
+	 */
+	public int getCrosstabColumnGroupTotalHeaderWidth(
+		final DRICrosstabColumnGroup<?> columnGroup,
+		final Integer cellWidth,
+		final DRDesignCrosstab designCrosstab)
+	{
+		if(columnGroup.getTotalHeaderWidth() != null)
+		{
+			return columnGroup.getTotalHeaderWidth();
+		}
+		if(cellWidth != null)
+		{
+			return cellWidth;
+		}
+		int maxWidth = 0;
+		for(final DRDesignCrosstabColumnGroup designColumnGroup : designCrosstab.getColumnGroups())
+		{
+			if(designColumnGroup.getName().equals(columnGroup.getName()))
+			{
+				if(designColumnGroup.getTotalHeader() != null)
+				{
+					final int height = this.detectWidth(designColumnGroup.getTotalHeader().getList());
+					if(maxWidth < height)
+					{
+						maxWidth = height;
+					}
+				}
+				break;
+			}
+		}
+		for(final DRDesignCrosstabCell designCell : designCrosstab.getCells())
+		{
+			if(designCell.getColumnTotalGroup() == columnGroup.getName())
+			{
+				final int height = this.detectWidth(designCell.getContent().getList());
+				if(maxWidth < height)
+				{
+					maxWidth = height;
+				}
+			}
+		}
+		if(maxWidth > Defaults.getDefaults().getCrosstabColumnGroupTotalHeaderMaxWidth())
+		{
+			return Defaults.getDefaults().getCrosstabColumnGroupTotalHeaderMaxWidth();
+		}
+		return maxWidth;
+	}
+	
+	/**
+	 * <p>getCrosstabRowGroupHeaderWidth.</p>
+	 *
+	 * @param rowGroup       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @return a int.
+	 */
+	public int getCrosstabRowGroupHeaderWidth(
+		final DRICrosstabRowGroup<?> rowGroup,
+		final DRDesignCrosstab designCrosstab)
+	{
+		if(rowGroup.getHeaderWidth() != null)
+		{
+			return rowGroup.getHeaderWidth();
+		}
+		int maxWidth = 0;
+		for(final DRDesignCrosstabRowGroup designRowGroup : designCrosstab.getRowGroups())
+		{
+			if(designRowGroup.getName().equals(rowGroup.getName()))
+			{
+				int width = this.detectWidth(designRowGroup.getHeader().getList());
+				if(maxWidth < width)
+				{
+					maxWidth = width;
+				}
+				if(designRowGroup.getTotalHeader() != null)
+				{
+					width = this.detectWidth(designRowGroup.getTotalHeader().getList());
+					if(maxWidth < width)
+					{
+						maxWidth = width;
+					}
+				}
+				break;
+			}
+		}
+		if(maxWidth > Defaults.getDefaults().getCrosstabRowGroupHeaderMaxWidth())
+		{
+			return Defaults.getDefaults().getCrosstabRowGroupHeaderMaxWidth();
+		}
+		return maxWidth;
+	}
+	
+	/**
+	 * <p>getCrosstabRowGroupTotalHeaderHeight.</p>
+	 *
+	 * @param rowGroup       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+	 * @param cellHeight     a {@link java.lang.Integer} object.
+	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @return a int.
+	 */
+	public int getCrosstabRowGroupTotalHeaderHeight(
+		final DRICrosstabRowGroup<?> rowGroup,
+		final Integer cellHeight,
+		final DRDesignCrosstab designCrosstab)
+	{
+		if(rowGroup.getTotalHeaderHeight() != null)
+		{
+			return rowGroup.getTotalHeaderHeight();
+		}
+		if(cellHeight != null)
+		{
+			return cellHeight;
+		}
+		int maxHeight = 0;
+		for(final DRDesignCrosstabRowGroup designRowGroup : designCrosstab.getRowGroups())
+		{
+			if(designRowGroup.getName().equals(rowGroup.getName()))
+			{
+				if(designRowGroup.getTotalHeader() != null)
+				{
+					final int height = this.detectHeight(designRowGroup.getTotalHeader().getList());
+					if(maxHeight < height)
+					{
+						maxHeight = height;
+					}
+				}
+				break;
+			}
+		}
+		for(final DRDesignCrosstabCell designCell : designCrosstab.getCells())
+		{
+			if(designCell.getRowTotalGroup() == rowGroup.getName())
+			{
+				final int height = this.detectHeight(designCell.getContent().getList());
+				if(maxHeight < height)
+				{
+					maxHeight = height;
+				}
+			}
+		}
+		return maxHeight;
+	}
+	
+	/**
+	 * <p>getCrosstabCellWidth.</p>
+	 *
+	 * @param crosstab       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @return a int.
+	 */
+	public int getCrosstabCellWidth(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab)
+	{
+		if(crosstab.getCellWidth() != null)
+		{
+			return crosstab.getCellWidth();
+		}
+		int maxWidth = 0;
+		for(final DRDesignCrosstabCell designCell : designCrosstab.getCells())
+		{
+			if(designCell.getColumnTotalGroup() == null)
+			{
+				final int width = this.detectWidth(designCell.getContent().getList());
+				if(maxWidth < width)
+				{
+					maxWidth = width;
+				}
+			}
+		}
+		for(final DRDesignCrosstabColumnGroup designColumnGroup : designCrosstab.getColumnGroups())
+		{
+			final int width = this.detectWidth(designColumnGroup.getHeader().getList());
+			if(maxWidth < width)
+			{
+				maxWidth = width;
+			}
+		}
+		if(maxWidth > Defaults.getDefaults().getCrosstabCellMaxWidth())
+		{
+			return Defaults.getDefaults().getCrosstabCellMaxWidth();
+		}
+		return maxWidth;
+	}
+	
+	/**
+	 * <p>getCrosstabCellHeight.</p>
+	 *
+	 * @param crosstab       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @return a int.
+	 */
+	public int getCrosstabCellHeight(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab)
+	{
+		if(crosstab.getCellHeight() != null)
+		{
+			return crosstab.getCellHeight();
+		}
+		int maxHeight = 0;
+		for(final DRDesignCrosstabCell designCell : designCrosstab.getCells())
+		{
+			if(designCell.getRowTotalGroup() == null)
+			{
+				final int height = this.detectHeight(designCell.getContent().getList());
+				if(maxHeight < height)
+				{
+					maxHeight = height;
+				}
+			}
+		}
+		for(final DRDesignCrosstabRowGroup designRowGroup : designCrosstab.getRowGroups())
+		{
+			final int height = this.detectHeight(designRowGroup.getHeader().getList());
+			if(maxHeight < height)
+			{
+				maxHeight = height;
+			}
+		}
+		return maxHeight;
+	}
+	
+	/**
+	 * <p>getCrosstabWhenNoDataCellHeight.</p>
+	 *
+	 * @param whenNoDataCell a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+	 * @return a int.
+	 */
+	public int getCrosstabWhenNoDataCellHeight(final DRDesignCrosstabCellContent whenNoDataCell)
+	{
+		return this.detectHeight(whenNoDataCell.getList());
+	}
+	
+	/**
+	 * <p>getCrosstabOddRowStyle.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+	 */
+	protected DRISimpleStyle getCrosstabOddRowStyle(final DRICrosstab crosstab)
+	{
+		if(this.isCrosstabHighlightOddRows(crosstab))
+		{
+			if(crosstab.getOddRowStyle() != null)
+			{
+				return crosstab.getOddRowStyle();
+			}
+			if(this.template.getCrosstabOddRowStyle() != null)
+			{
+				return this.template.getCrosstabOddRowStyle();
+			}
+			return Defaults.getDefaults().getCrosstabOddRowStyle();
+		}
+		return null;
+	}
+	
+	/**
+	 * <p>getCrosstabEvenRowStyle.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+	 */
+	protected DRISimpleStyle getCrosstabEvenRowStyle(final DRICrosstab crosstab)
+	{
+		if(this.isCrosstabHighlightEvenRows(crosstab))
+		{
+			if(crosstab.getEvenRowStyle() != null)
+			{
+				return crosstab.getEvenRowStyle();
+			}
+			if(this.template.getCrosstabEvenRowStyle() != null)
+			{
+				return this.template.getCrosstabEvenRowStyle();
+			}
+			return Defaults.getDefaults().getCrosstabEvenRowStyle();
+		}
+		return null;
+	}
+	
+	private boolean isCrosstabHighlightOddRows(final DRICrosstab crosstab)
+	{
+		if(crosstab.getHighlightOddRows() != null)
+		{
+			return crosstab.getHighlightOddRows();
+		}
+		if(this.template.getCrosstabHighlightOddRows() != null)
+		{
+			return this.template.getCrosstabHighlightOddRows();
+		}
+		return Defaults.getDefaults().isCrosstabHighlightOddRows();
+	}
+	
+	private boolean isCrosstabHighlightEvenRows(final DRICrosstab crosstab)
+	{
+		if(crosstab.getHighlightEvenRows() != null)
+		{
+			return crosstab.getHighlightEvenRows();
+		}
+		if(this.template.getCrosstabHighlightEvenRows() != null)
+		{
+			return this.template.getCrosstabHighlightEvenRows();
+		}
+		return Defaults.getDefaults().isCrosstabHighlightEvenRows();
+	}
+	
+	/**
+	 * <p>getCrosstabGroupStyle.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getCrosstabGroupStyle(final DRICrosstab crosstab)
+	{
+		if(crosstab.getGroupStyle() != null)
+		{
+			return crosstab.getGroupStyle();
+		}
+		if(this.template.getCrosstabGroupStyle() != null)
+		{
+			return this.template.getCrosstabGroupStyle();
+		}
+		if(Defaults.getDefaults().getCrosstabGroupStyle() != null)
+		{
+			return Defaults.getDefaults().getCrosstabGroupStyle();
+		}
+		return this.getTextStyle();
+	}
+	
+	/**
+	 * <p>getCrosstabGroupTotalStyle.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getCrosstabGroupTotalStyle(final DRICrosstab crosstab)
+	{
+		if(crosstab.getGroupTotalStyle() != null)
+		{
+			return crosstab.getGroupTotalStyle();
+		}
+		if(this.template.getCrosstabGroupTotalStyle() != null)
+		{
+			return this.template.getCrosstabGroupTotalStyle();
+		}
+		if(Defaults.getDefaults().getCrosstabGroupTotalStyle() != null)
+		{
+			return Defaults.getDefaults().getCrosstabGroupTotalStyle();
+		}
+		return this.getTextStyle();
+	}
+	
+	/**
+	 * <p>getCrosstabGrandTotalStyle.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getCrosstabGrandTotalStyle(final DRICrosstab crosstab)
+	{
+		if(crosstab.getGrandTotalStyle() != null)
+		{
+			return crosstab.getGrandTotalStyle();
+		}
+		if(this.template.getCrosstabGrandTotalStyle() != null)
+		{
+			return this.template.getCrosstabGrandTotalStyle();
+		}
+		if(Defaults.getDefaults().getCrosstabGrandTotalStyle() != null)
+		{
+			return Defaults.getDefaults().getCrosstabGrandTotalStyle();
+		}
+		return this.getTextStyle();
+	}
+	
+	/**
+	 * <p>getCrosstabCellStyle.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getCrosstabCellStyle(final DRICrosstab crosstab)
+	{
+		if(crosstab.getCellStyle() != null)
+		{
+			return crosstab.getCellStyle();
+		}
+		if(this.template.getCrosstabCellStyle() != null)
+		{
+			return this.template.getCrosstabCellStyle();
+		}
+		if(Defaults.getDefaults().getCrosstabCellStyle() != null)
+		{
+			return Defaults.getDefaults().getCrosstabCellStyle();
+		}
+		return this.getTextStyle();
+	}
+	
+	/**
+	 * <p>getCrosstabMeasureTitleStyle.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param measure  a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public DRIReportStyle getCrosstabMeasureTitleStyle(final DRICrosstab crosstab, final DRICrosstabMeasure<?> measure)
+	{
+		if(measure.getTitleStyle() != null)
+		{
+			return measure.getTitleStyle();
+		}
+		if(crosstab.getMeasureTitleStyle() != null)
+		{
+			return crosstab.getMeasureTitleStyle();
+		}
+		if(this.template.getCrosstabMeasureTitleStyle() != null)
+		{
+			return this.template.getCrosstabMeasureTitleStyle();
+		}
+		return Defaults.getDefaults().getCrosstabMeasureTitleStyle();
+	}
+	
+	/**
+	 * <p>getCrosstabPercentageType.</p>
+	 *
+	 * @param variable a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+	 */
+	protected CrosstabPercentageType getCrosstabPercentageType(final DRICrosstabVariable<?> variable)
+	{
+		if(variable.getPercentageType() != null)
+		{
+			return variable.getPercentageType();
+		}
+		return Defaults.getDefaults().getCrosstabPercentageType();
+	}
+	
+	/**
+	 * <p>getBooleanComponentType.</p>
+	 *
+	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+	 */
+	public BooleanComponentType getBooleanComponentType(final DRIBooleanField booleanField)
+	{
+		if(booleanField.getComponentType() != null)
+		{
+			return booleanField.getComponentType();
+		}
+		if(this.template.getBooleanComponentType() != null)
+		{
+			return this.template.getBooleanComponentType();
+		}
+		return Defaults.getDefaults().getBooleanComponentType();
+	}
+	
+	/**
+	 * <p>getBooleanEmptyWhenNullValue.</p>
+	 *
+	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @return a boolean.
+	 */
+	public boolean getBooleanEmptyWhenNullValue(final DRIBooleanField booleanField)
+	{
+		if(booleanField.getEmptyWhenNullValue() != null)
+		{
+			return booleanField.getEmptyWhenNullValue();
+		}
+		if(this.template.getBooleanEmptyWhenNullValue() != null)
+		{
+			return this.template.getBooleanEmptyWhenNullValue();
+		}
+		return Defaults.getDefaults().isBooleanEmptyWhenNullValue();
+	}
+	
+	/**
+	 * <p>getBooleanImageWidth.</p>
+	 *
+	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @return a int.
+	 */
+	public int getBooleanImageWidth(final DRIBooleanField booleanField)
+	{
+		if(booleanField.getImageWidth() != null)
+		{
+			return booleanField.getImageWidth();
+		}
+		if(this.template.getBooleanImageWidth() != null)
+		{
+			return this.template.getBooleanImageWidth();
+		}
+		return Defaults.getDefaults().getBooleanImageWidth();
+	}
+	
+	/**
+	 * <p>getBooleanImageHeight.</p>
+	 *
+	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @return a int.
+	 */
+	public int getBooleanImageHeight(final DRIBooleanField booleanField)
+	{
+		if(booleanField.getImageHeight() != null)
+		{
+			return booleanField.getImageHeight();
+		}
+		if(this.template.getBooleanImageHeight() != null)
+		{
+			return this.template.getBooleanImageHeight();
+		}
+		return Defaults.getDefaults().getBooleanImageHeight();
+	}
+	
+	/**
+	 * <p>getBooleanHorizontalImageAlignment.</p>
+	 *
+	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param style        a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+	 */
+	protected HorizontalImageAlignment getBooleanHorizontalImageAlignment(
+		final DRIBooleanField booleanField,
+		final DRDesignStyle style)
+	{
+		if(booleanField.getHorizontalImageAlignment() != null)
+		{
+			return booleanField.getHorizontalImageAlignment();
+		}
+		if(StyleResolver.getHorizontalImageAlignment(style) != null)
+		{
+			return null;// StyleResolver.getHorizontalAlignment(style);
+		}
+		return Defaults.getDefaults().getBooleanHorizontalImageAlignment();
+	}
+	
+	/**
+	 * <p>getBooleanColumnStyle.</p>
+	 *
+	 * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIBooleanColumn} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public DRIReportStyle getBooleanColumnStyle(final DRIBooleanColumn column)
+	{
+		if(column.getComponent().getStyle() != null)
+		{
+			return column.getComponent().getStyle();
+		}
+		if(this.template.getBooleanColumnStyle() != null)
+		{
+			return this.template.getBooleanColumnStyle();
+		}
+		return Defaults.getDefaults().getBooleanColumnStyle();
+	}
+	
+	/**
+	 * <p>getTemplateStyles.</p>
+	 *
+	 * @return a {@link java.util.Map} object.
+	 */
+	public Map<String, DRIStyle> getTemplateStyles()
+	{
+		final Map<String, DRIStyle> templateStyles = new HashMap<>();
+		for(final DRIStyle style : this.template.getTemplateStyles())
+		{
+			templateStyles.put(style.getName(), style);
+		}
+		for(final DRIStyle style : this.report.getTemplateStyles())
+		{
+			templateStyles.put(style.getName(), style);
+		}
+		return templateStyles;
+	}
+	
+	// split
+	
+	/**
+	 * <p>getTitleSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getTitleSplitType(final DRIBand band)
+	{
+		return this.getSplitType(band, this.template.getTitleSplitType(), Defaults.getDefaults().getTitleSplitType());
+	}
+	
+	/**
+	 * <p>getPageHeaderSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getPageHeaderSplitType(final DRIBand band)
+	{
+		return this.getSplitType(band,
+			this.template.getPageHeaderSplitType(), Defaults.getDefaults().getPageHeaderSplitType());
+	}
+	
+	/**
+	 * <p>getPageFooterSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getPageFooterSplitType(final DRIBand band)
+	{
+		return this.getSplitType(band,
+			this.template.getPageFooterSplitType(), Defaults.getDefaults().getPageFooterSplitType());
+	}
+	
+	/**
+	 * <p>getColumnHeaderSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getColumnHeaderSplitType(final DRIBand band)
+	{
+		return this.getSplitType(
+			band,
+			this.template.getColumnHeaderSplitType(),
+			Defaults.getDefaults().getColumnHeaderSplitType());
+	}
+	
+	/**
+	 * <p>getColumnFooterSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getColumnFooterSplitType(final DRIBand band)
+	{
+		return this.getSplitType(
+			band,
+			this.template.getColumnFooterSplitType(),
+			Defaults.getDefaults().getColumnFooterSplitType());
+	}
+	
+	/**
+	 * <p>getGroupHeaderSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getGroupHeaderSplitType(final DRIBand band)
+	{
+		return this.getSplitType(band, this.template.getGroupHeaderSplitType(),
+            Defaults.getDefaults().getGroupHeaderSplitType());
+	}
+	
+	/**
+	 * <p>getGroupFooterSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getGroupFooterSplitType(final DRIBand band)
+	{
+		return this.getSplitType(band, this.template.getGroupFooterSplitType(),
+		 Defaults.getDefaults().getGroupFooterSplitType());
+	}
+	
+	/**
+	 * <p>getDetailHeaderSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getDetailHeaderSplitType(final DRIBand band)
+	{
+		return this.getSplitType(
+			band,
+			this.template.getDetailHeaderSplitType(),
+			Defaults.getDefaults().getDetailHeaderSplitType());
+	}
+	
+	/**
+	 * <p>getDetailSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getDetailSplitType(final DRIBand band)
+	{
+		return this.getSplitType(band, this.template.getDetailSplitType(), Defaults.getDefaults().getDetailSplitType());
+	}
+	
+	/**
+	 * <p>getDetailFooterSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getDetailFooterSplitType(final DRIBand band)
+	{
+		return this.getSplitType(
+			band,
+			this.template.getDetailFooterSplitType(),
+			Defaults.getDefaults().getDetailFooterSplitType());
+	}
+	
+	/**
+	 * <p>getLastPageFooterSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getLastPageFooterSplitType(final DRIBand band)
+	{
+		return this.getSplitType(
+			band,
+			this.template.getLastPageFooterSplitType(),
+			Defaults.getDefaults().getLastPageFooterSplitType());
+	}
+	
+	/**
+	 * <p>getSummarySplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getSummarySplitType(final DRIBand band)
+	{
+		return this.getSplitType(band, this.template.getSummarySplitType(), Defaults.getDefaults().getSummarySplitType());
+	}
+	
+	/**
+	 * <p>getNoDataSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getNoDataSplitType(final DRIBand band)
+	{
+		return this.getSplitType(band, this.template.getNoDataSplitType(), Defaults.getDefaults().getNoDataSplitType());
+	}
+	
+	/**
+	 * <p>getBackgroundSplitType.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	protected SplitType getBackgroundSplitType(final DRIBand band)
+	{
+		return this.getSplitType(band,
+			this.template.getBackgroundSplitType(), Defaults.getDefaults().getBackgroundSplitType());
+	}
+	
+	private SplitType getSplitType(final DRIBand band, final SplitType templateSplitType, final SplitType splitType)
+	{
+		if(band.getSplitType() != null)
+		{
+			return band.getSplitType();
+		}
+		if(templateSplitType != null)
+		{
+			return templateSplitType;
+		}
+		if(splitType != null)
+		{
+			return splitType;
+		}
+		if(this.template.getDefaultSplitType() != null)
+		{
+			return this.template.getDefaultSplitType();
+		}
+		return Defaults.getDefaults().getDefaultSplitType();
+	}
+	
+	// band style
+	
+	/**
+	 * <p>getTitleStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getTitleStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getTitleStyle());
+	}
+	
+	/**
+	 * <p>getPageHeaderStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getPageHeaderStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getPageHeaderStyle());
+	}
+	
+	/**
+	 * <p>getPageFooterStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getPageFooterStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getPageFooterStyle());
+	}
+	
+	/**
+	 * <p>getColumnHeaderStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getColumnHeaderStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getColumnHeaderStyle());
+	}
+	
+	/**
+	 * <p>getColumnFooterStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getColumnFooterStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getColumnFooterStyle());
+	}
+	
+	/**
+	 * <p>getGroupHeaderStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getGroupHeaderStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getGroupHeaderStyle());
+	}
+	
+	/**
+	 * <p>getGroupFooterStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getGroupFooterStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getGroupFooterStyle());
+	}
+	
+	/**
+	 * <p>getDetailHeaderStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getDetailHeaderStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getDetailHeaderStyle());
+	}
+	
+	/**
+	 * <p>getDetailStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getDetailStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getDetailStyle());
+	}
+	
+	/**
+	 * <p>getDetailFooterStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getDetailFooterStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getDetailFooterStyle());
+	}
+	
+	/**
+	 * <p>getLastPageFooterStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getLastPageFooterStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getLastPageFooterStyle());
+	}
+	
+	/**
+	 * <p>getSummaryStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getSummaryStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getSummaryStyle());
+	}
+	
+	/**
+	 * <p>getNoDataStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getNoDataStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getNoDataStyle());
+	}
+	
+	/**
+	 * <p>getBackgroundStyle.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	protected DRIReportStyle getBackgroundStyle(final DRIBand band)
+	{
+		return this.getBandStyle(band, this.template.getBackgroundStyle());
+	}
+	
+	private DRIReportStyle getBandStyle(final DRIBand band, final DRIReportStyle templateStyle)
+	{
+		if(band.getList().getStyle() != null)
+		{
+			return band.getList().getStyle();
+		}
+		if(templateStyle != null)
+		{
+			return templateStyle;
+		}
+		return Defaults.getDefaults().getBandStyle();
+	}
+	
+	// band background component
+	
+	/**
+	 * <p>getTitleBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getTitleBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getTitleBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getPageHeaderBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getPageHeaderBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getPageHeaderBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getPageFooterBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getPageFooterBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getPageFooterBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getColumnHeaderBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getColumnHeaderBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getColumnHeaderBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getColumnFooterBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getColumnFooterBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getColumnFooterBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getGroupHeaderBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getGroupHeaderBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getGroupHeaderBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getGroupFooterBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getGroupFooterBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getGroupFooterBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getDetailHeaderBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getDetailHeaderBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getDetailHeaderBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getDetailBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getDetailBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getDetailBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getDetailFooterBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getDetailFooterBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getDetailFooterBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getLastPageFooterBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getLastPageFooterBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getLastPageFooterBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getSummaryBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getSummaryBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getSummaryBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getNoDataBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getNoDataBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getNoDataBackgroundComponent());
+	}
+	
+	/**
+	 * <p>getBackgroundBackgroundComponent.</p>
+	 *
+	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	protected DRIComponent getBackgroundBackgroundComponent(final DRIBand band)
+	{
+		return this.getBandBackgroundComponent(band, this.template.getBackgroundBackgroundComponent());
+	}
+	
+	private DRIComponent getBandBackgroundComponent(final DRIBand band, final DRIComponent templateBackgroundComponent)
+	{
+		if(band.getList().getBackgroundComponent() != null)
+		{
+			return band.getList().getBackgroundComponent();
+		}
+		if(templateBackgroundComponent != null)
+		{
+			return templateBackgroundComponent;
+		}
+		return Defaults.getDefaults().getBandBackgroundComponent();
+	}
+	
+	private int detectWidth(final DRDesignList designList)
+	{
+		ComponentPosition.width(designList);
+		return designList.getWidth();
+	}
+	
+	private int detectHeight(final DRDesignList designList)
+	{
+		ComponentPosition.height(designList);
+		return designList.getHeight();
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanImageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanImageExpression.java
new file mode 100644
index 0000000..2abfe5a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanImageExpression.java
@@ -0,0 +1,113 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.design.transformation.CustomBatikRenderer;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.renderers.Renderable;
+
+import java.util.List;
+
+/**
+ * <p>BooleanImageExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BooleanImageExpression extends AbstractComplexExpression<Renderable> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Renderable imageTrue;
+    private Renderable imageFalse;
+    private boolean emptyWhenNullValue;
+
+    /**
+     * <p>Constructor for BooleanImageExpression.</p>
+     *
+     * @param booleanField       a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+     * @param emptyWhenNullValue a boolean.
+     * @param width              a int.
+     * @param height             a int.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public BooleanImageExpression(DRIBooleanField booleanField, boolean emptyWhenNullValue, int width, int height) throws DRException {
+        this.emptyWhenNullValue = emptyWhenNullValue;
+        addExpression(booleanField.getValueExpression());
+        String fileNameTrue;
+        String fileNameFalse;
+        switch (booleanField.getComponentType()) {
+            case IMAGE_STYLE_1:
+                fileNameTrue = "boolean1_true";
+                fileNameFalse = "boolean1_false";
+                break;
+            case IMAGE_STYLE_2:
+                fileNameTrue = "boolean2_true";
+                fileNameFalse = "boolean2_false";
+                break;
+            case IMAGE_STYLE_3:
+                fileNameTrue = "boolean3_true";
+                fileNameFalse = "boolean3_false";
+                break;
+            case IMAGE_STYLE_4:
+                fileNameTrue = "boolean1_true";
+                fileNameFalse = "boolean4_false";
+                break;
+            case IMAGE_CHECKBOX_1:
+                fileNameTrue = "checkbox1_true";
+                fileNameFalse = "checkbox_false";
+                break;
+            case IMAGE_CHECKBOX_2:
+                fileNameTrue = "checkbox2_true";
+                fileNameFalse = "checkbox_false";
+                break;
+            case IMAGE_BALL:
+                fileNameTrue = "ball_green";
+                fileNameFalse = "ball_red";
+                break;
+            default:
+                throw new DRDesignReportException("BooleanComponentType " + booleanField.getComponentType().name() + " not supported");
+        }
+        try {
+            imageTrue = new CustomBatikRenderer(ReportUtils.class.getResource("images/" + fileNameTrue + ".svg"), width, height);
+            imageFalse = new CustomBatikRenderer(ReportUtils.class.getResource("images/" + fileNameFalse + ".svg"), width, height);
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Renderable evaluate(List<?> values, ReportParameters reportParameters) {
+        Boolean value = (Boolean) values.get(0);
+        if (emptyWhenNullValue && value == null) {
+            return null;
+        }
+        if (value != null && value) {
+            return imageTrue;
+        } else {
+            return imageFalse;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java
new file mode 100644
index 0000000..70971a4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.ResourceBundle;
+
+/**
+ * <p>BooleanTextValueFormatter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BooleanTextValueFormatter extends AbstractValueFormatter<String, Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String keyTrue;
+    private String keyFalse;
+    private boolean emptyWhenNullValue;
+
+    /**
+     * <p>Constructor for BooleanTextValueFormatter.</p>
+     *
+     * @param keyTrue            a {@link java.lang.String} object.
+     * @param keyFalse           a {@link java.lang.String} object.
+     * @param emptyWhenNullValue a boolean.
+     */
+    public BooleanTextValueFormatter(String keyTrue, String keyFalse, boolean emptyWhenNullValue) {
+        this.keyTrue = keyTrue;
+        this.keyFalse = keyFalse;
+        this.emptyWhenNullValue = emptyWhenNullValue;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String format(Boolean value, ReportParameters reportParameters) {
+        if (emptyWhenNullValue && value == null) {
+            return "";
+        }
+        String key;
+        if (value != null && value) {
+            key = keyTrue;
+        } else {
+            key = keyFalse;
+        }
+        return ResourceBundle.getBundle(Constants.RESOURCE_BUNDLE_NAME, reportParameters.getLocale()).getString(key);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabExpression.java
new file mode 100644
index 0000000..b2b83ad
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabExpression.java
@@ -0,0 +1,90 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRICustomValues;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import net.sf.dynamicreports.report.definition.expression.DRIComplexExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.List;
+
+/**
+ * <p>CrosstabExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabExpression<T> extends AbstractComplexExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<T> expression;
+
+    /**
+     * <p>Constructor for CrosstabExpression.</p>
+     *
+     * @param crosstab   a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public CrosstabExpression(DRICrosstab crosstab, DRIExpression<T> expression) throws DRException {
+        this.expression = expression;
+        if (expression instanceof DRIComplexExpression) {
+            for (DRIExpression<?> express : ((DRIComplexExpression<?>) expression).getExpressions()) {
+                addExpression(express);
+            }
+        }
+        for (DRICrosstabVariable<?> variable : crosstab.getVariables()) {
+            addExpression(variable);
+        }
+        for (DRICrosstabMeasure<?> measure : crosstab.getMeasures()) {
+            if (measure.getExpression() instanceof DRICrosstabVariable<?>) {
+                addExpression(measure.getExpression());
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override
+    public T evaluate(List<?> values, ReportParameters reportParameters) {
+        DRICustomValues customValues = (DRICustomValues) reportParameters.getParameterValue(DRICustomValues.NAME);
+        for (int i = 0; i < getExpressions().size(); i++) {
+            customValues.setSystemValue(getExpressions().get(i).getName(), values.get(i));
+        }
+        if (expression instanceof DRIComplexExpression) {
+            DRIComplexExpression<?> express = (DRIComplexExpression<?>) expression;
+            return (T) express.evaluate(values, reportParameters);
+        } else {
+            return reportParameters.getValue(expression.getName());
+        }
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings( {"rawtypes", "unchecked"})
+    @Override
+    public Class getValueClass() {
+        return expression.getValueClass();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java
new file mode 100644
index 0000000..47eb1aa
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.util.List;
+
+/**
+ * <p>CrosstabMeasureExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabMeasureExpression extends AbstractComplexExpression<Double> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CrosstabMeasureExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public CrosstabMeasureExpression(DRIExpression<?> expression) {
+        addExpression(expression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Double evaluate(List<?> values, ReportParameters reportParameters) {
+        Number value = (Number) values.get(0);
+        if (value != null) {
+            return value.doubleValue();
+        }
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java
new file mode 100644
index 0000000..c2d1a5d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>CrosstabPrintInEvenRow class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabPrintInEvenRow extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        return reportParameters.getCrosstabRowNumber() % 2 == 0;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java
new file mode 100644
index 0000000..7b893e3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>CrosstabPrintInOddRow class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabPrintInOddRow extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        return reportParameters.getCrosstabRowNumber() % 2 != 0;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCount.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCount.java
new file mode 100644
index 0000000..115bc6b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCount.java
@@ -0,0 +1,40 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>CrosstabRowCount class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabRowCount extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        CrosstabRowCounter counter = reportParameters.getValue(ReportParameters.CROSSTAB_ROW_COUNTER);
+        counter.increment();
+        return false;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java
new file mode 100644
index 0000000..74dc23c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java
@@ -0,0 +1,62 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>CrosstabRowCounter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabRowCounter extends AbstractSimpleExpression<CrosstabRowCounter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int rowNumber = 1;
+
+    /** {@inheritDoc} */
+    @Override
+    public CrosstabRowCounter evaluate(ReportParameters reportParameters) {
+        return this;
+    }
+
+    /**
+     * <p>increment.</p>
+     */
+    public void increment() {
+        rowNumber++;
+    }
+
+    /**
+     * <p>Getter for the field <code>rowNumber</code>.</p>
+     *
+     * @return a int.
+     */
+    public int getRowNumber() {
+        return rowNumber;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return ReportParameters.CROSSTAB_ROW_COUNTER;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CurrentDateExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CurrentDateExpression.java
new file mode 100644
index 0000000..c2bbe0a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CurrentDateExpression.java
@@ -0,0 +1,69 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.builder.datatype.DataTypes;
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * <p>CurrentDateExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CurrentDateExpression extends AbstractComplexExpression<String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String datePattern;
+
+    /**
+     * <p>Constructor for CurrentDateExpression.</p>
+     *
+     * @param currentDateExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param datePattern           a {@link java.lang.String} object.
+     */
+    public CurrentDateExpression(DRIExpression<String> currentDateExpression, String datePattern) {
+        this.datePattern = datePattern;
+        addExpression(currentDateExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String evaluate(List<?> values, ReportParameters reportParameters) {
+        String pattern = (String) values.get(0);
+        Locale locale = reportParameters.getLocale();
+        MessageFormat format = new MessageFormat(pattern, locale);
+        String date;
+        if (datePattern == null) {
+            date = DataTypes.dateType().valueToString(new Date(), locale);
+        } else {
+            date = new SimpleDateFormat(datePattern, locale).format(new Date());
+        }
+        String result = format.format(new Object[] {date});
+        return result;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java
new file mode 100644
index 0000000..3adb189
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>GroupByDataTypeExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GroupByDataTypeExpression extends AbstractSimpleExpression<String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+    DRIDataType<?, ?> dataType;
+    private DRIExpression<?> valueExpression;
+
+    /**
+     * <p>Constructor for GroupByDataTypeExpression.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param dataType        a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    public GroupByDataTypeExpression(DRIExpression<?> valueExpression, DRIDataType<?, ?> dataType) {
+        this.valueExpression = valueExpression;
+        this.dataType = dataType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String evaluate(ReportParameters reportParameters) {
+        return dataType.valueToString(valueExpression.getName(), reportParameters);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java
new file mode 100644
index 0000000..fbceaf5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+/**
+ * <p>MultiPageListDataSourceExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MultiPageListDataSourceExpression extends AbstractSimpleExpression<JRDataSource> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int count;
+
+    /**
+     * <p>Constructor for MultiPageListDataSourceExpression.</p>
+     *
+     * @param count a int.
+     */
+    public MultiPageListDataSourceExpression(int count) {
+        this.count = count;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public JRDataSource evaluate(ReportParameters reportParameters) {
+        return new JREmptyDataSource(count);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<JRDataSource> getValueClass() {
+        return JRDataSource.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java
new file mode 100644
index 0000000..6392fcf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java
@@ -0,0 +1,90 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.DRBand;
+import net.sf.dynamicreports.report.base.component.DRComponent;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * <p>MultiPageListSubreportExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MultiPageListSubreportExpression extends AbstractSimpleExpression<JasperReportBuilder> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Locale locale;
+    private ResourceBundle resourceBundle;
+    private String resourceBundleName;
+    private WhenResourceMissingType whenResourceMissingType;
+    private List<DRIComponent> detailComponents;
+    private Map<String, DRIStyle> templateStyles;
+
+    /**
+     * <p>Constructor for MultiPageListSubreportExpression.</p>
+     *
+     * @param locale                  a {@link java.util.Locale} object.
+     * @param resourceBundle          a {@link java.util.ResourceBundle} object.
+     * @param resourceBundleName      a {@link java.lang.String} object.
+     * @param resourceBundleName      a {@link java.lang.String} object.
+     * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     * @param detailComponents        a {@link java.util.List} object.
+     * @param templateStyles          a {@link java.util.Map} object.
+     */
+    public MultiPageListSubreportExpression(Locale locale, ResourceBundle resourceBundle, String resourceBundleName, WhenResourceMissingType whenResourceMissingType,
+                                            List<DRIComponent> detailComponents, Map<String, DRIStyle> templateStyles) {
+        this.locale = locale;
+        this.resourceBundle = resourceBundle;
+        this.resourceBundleName = resourceBundleName;
+        this.whenResourceMissingType = whenResourceMissingType;
+        this.detailComponents = detailComponents;
+        this.templateStyles = templateStyles;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperReportBuilder evaluate(ReportParameters reportParameters) {
+        JasperReportBuilder report = report();
+        report.setLocale(locale);
+        report.setResourceBundle(resourceBundle);
+        report.setResourceBundle(resourceBundleName);
+        report.setWhenResourceMissingType(whenResourceMissingType);
+        for (DRIStyle style : templateStyles.values()) {
+            report.getReport().addTemplateStyle(style);
+        }
+        DRBand titleBand = report.getReport().getTitleBand();
+        DRComponent detailComponent = (DRComponent) detailComponents.get(reportParameters.getReportRowNumber() - 1);
+        titleBand.addComponent(detailComponent);
+        return report;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageNumberExpression.java
new file mode 100644
index 0000000..2f48670
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageNumberExpression.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.text.MessageFormat;
+import java.util.List;
+
+/**
+ * <p>PageNumberExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PageNumberExpression extends AbstractComplexExpression<String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for PageNumberExpression.</p>
+     *
+     * @param pageNumberFormatExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public PageNumberExpression(DRIExpression<String> pageNumberFormatExpression) {
+        addExpression(pageNumberFormatExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String evaluate(List<?> values, ReportParameters reportParameters) {
+        String pattern = (String) values.get(0);
+        MessageFormat format = new MessageFormat(pattern, reportParameters.getLocale());
+        String result = format.format(new Object[] {reportParameters.getPageNumber()});
+        return result;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java
new file mode 100644
index 0000000..a2b3136
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java
@@ -0,0 +1,69 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+
+import java.text.MessageFormat;
+import java.util.List;
+
+/**
+ * <p>PageXofYNumberExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PageXofYNumberExpression extends AbstractComplexExpression<String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int index;
+
+    /**
+     * <p>Constructor for PageXofYNumberExpression.</p>
+     *
+     * @param pageNumberFormatExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param index                      a int.
+     */
+    public PageXofYNumberExpression(DRIExpression<String> pageNumberFormatExpression, int index) {
+        addExpression(pageNumberFormatExpression);
+        this.index = index;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String evaluate(List<?> values, ReportParameters reportParameters) {
+        String pattern = (String) values.get(0);
+        Validate.isTrue(StringUtils.contains(pattern, "{0}"), "Wrong format pattern \"" + pattern + "\", missing argument {0}");
+        Validate.isTrue(StringUtils.contains(pattern, "{1}"), "Wrong format pattern \"" + pattern + "\", missing argument {1}");
+        Validate.isTrue(pattern.indexOf("{0}") < pattern.indexOf("{1}"), "Wrong format pattern \"" + pattern + "\", argument {0} must be before {1}");
+        int index1 = pattern.indexOf("{0}");
+        if (index == 0) {
+            pattern = pattern.substring(0, index1 + 3);
+        } else {
+            pattern = pattern.substring(index1 + 3);
+        }
+        MessageFormat format = new MessageFormat(pattern, reportParameters.getLocale());
+        String result = format.format(new Object[] {reportParameters.getPageNumber(), reportParameters.getPageNumber()});
+        return result;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/SerieValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/SerieValueExpression.java
new file mode 100644
index 0000000..9a0e47a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/SerieValueExpression.java
@@ -0,0 +1,114 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>SerieValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SerieValueExpression extends AbstractSimpleExpression<Number> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIDesignExpression valueExpression;
+    private DRIDesignExpression serieExpression;
+    private ResetType resetType;
+    private DRDesignGroup resetGroup;
+    private String key;
+    private Object resetValue;
+    private Map<Object, Double> values;
+
+    /**
+     * <p>Constructor for SerieValueExpression.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param serieExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param resetType       a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup      a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param key             a {@link java.lang.String} object.
+     */
+    public SerieValueExpression(DRIDesignExpression valueExpression, DRIDesignExpression serieExpression, ResetType resetType, DRDesignGroup resetGroup, String key) {
+        this.valueExpression = valueExpression;
+        this.serieExpression = serieExpression;
+        this.resetType = resetType;
+        this.resetGroup = resetGroup;
+        this.key = key;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Number evaluate(ReportParameters reportParameters) {
+        if (reportParameters.getReportRowNumber() <= 1) {
+            resetValue = null;
+            values = new HashMap<Object, Double>();
+        }
+
+        Object resetValue = null;
+        switch (resetType) {
+            case NONE:
+            case REPORT:
+                break;
+            case PAGE:
+                resetValue = reportParameters.getPageNumber();
+                break;
+            case COLUMN:
+                resetValue = reportParameters.getColumnNumber();
+                break;
+            case GROUP:
+                resetValue = reportParameters.getValue(resetGroup.getGroupExpression().getName());
+                break;
+            default:
+                throw new DRDesignReportException("Reset type " + resetType.name() + " not supported");
+        }
+        if (this.resetValue != null && !this.resetValue.equals(resetValue)) {
+            this.values = new HashMap<Object, Double>();
+        }
+        this.resetValue = resetValue;
+
+        Object keyValue;
+        if (key != null) {
+            keyValue = reportParameters.getValue(valueExpression.getName()) + "_" + reportParameters.getValue(key);
+        } else {
+            keyValue = reportParameters.getValue(valueExpression.getName());
+        }
+        Number serieValue = reportParameters.getValue(serieExpression.getName());
+        Double value = values.get(keyValue);
+        if (serieValue != null) {
+            if (value == null) {
+                value = serieValue.doubleValue();
+            } else {
+                value += serieValue.doubleValue();
+            }
+            values.put(keyValue, value);
+        }
+
+        return value;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java
new file mode 100644
index 0000000..d9df066
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.util.List;
+
+/**
+ * <p>TocPrintWhenExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TocPrintWhenExpression extends AbstractComplexExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Object lastValue;
+
+    /**
+     * <p>Constructor for TocPrintWhenExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public TocPrintWhenExpression(DRIExpression<?> expression) {
+        addExpression(expression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(List<?> values, ReportParameters reportParameters) {
+        Object value = values.get(0);
+        if (lastValue != null && lastValue.equals(value)) {
+            lastValue = value;
+            return false;
+        }
+        lastValue = value;
+        return true;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceExpression.java
new file mode 100644
index 0000000..17d263d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceExpression.java
@@ -0,0 +1,86 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRICustomValues;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.util.List;
+
+/**
+ * <p>TocReferenceExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TocReferenceExpression extends AbstractComplexExpression<String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int level;
+    private String expressionName;
+    private boolean customId;
+    private boolean isCustomValue;
+
+    /**
+     * <p>Constructor for TocReferenceExpression.</p>
+     *
+     * @param level                 a int.
+     * @param expressionName        a {@link java.lang.String} object.
+     * @param labelExpression       a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param anchorNameExpression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param customValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public TocReferenceExpression(int level, String expressionName, DRIExpression<?> labelExpression, DRIExpression<String> anchorNameExpression, DRIExpression<?> customValueExpression) {
+        this.level = level;
+        this.expressionName = expressionName;
+        customId = anchorNameExpression != null;
+        addExpression(labelExpression);
+        if (anchorNameExpression != null) {
+            addExpression(anchorNameExpression);
+        }
+        isCustomValue = customValueExpression != null;
+        if (customValueExpression != null) {
+            addExpression(customValueExpression);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String evaluate(List<?> values, ReportParameters reportParameters) {
+        String id;
+        Object customValue = null;
+        if (customId) {
+            id = (String) values.get(1);
+            if (isCustomValue) {
+                customValue = values.get(2);
+            }
+        } else {
+            id = expressionName + "_" + reportParameters.getReportRowNumber();
+            if (isCustomValue) {
+                customValue = values.get(1);
+            }
+        }
+        DRICustomValues customValues = (DRICustomValues) reportParameters.getParameterValue(DRICustomValues.NAME);
+        String text = String.valueOf(values.get(0));
+        customValues.addTocHeading(level, id, text, customValue);
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java
new file mode 100644
index 0000000..6ab6d53
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.design.transformation.expressions;
+
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.util.List;
+
+/**
+ * <p>TocReferenceLinkExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TocReferenceLinkExpression extends AbstractComplexExpression<String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String expressionName;
+    private boolean customId;
+
+    /**
+     * <p>Constructor for TocReferenceLinkExpression.</p>
+     *
+     * @param expressionName       a {@link java.lang.String} object.
+     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public TocReferenceLinkExpression(String expressionName, DRIExpression<String> anchorNameExpression) {
+        this.expressionName = expressionName;
+        customId = anchorNameExpression != null;
+        if (anchorNameExpression != null) {
+            addExpression(anchorNameExpression);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String evaluate(List<?> values, ReportParameters reportParameters) {
+        String id;
+        if (customId) {
+            id = (String) values.get(0);
+        } else {
+            id = expressionName + "_" + reportParameters.getReportRowNumber();
+        }
+        return id;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/CustomScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/CustomScriptlet.java
new file mode 100644
index 0000000..a44dd8f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/CustomScriptlet.java
@@ -0,0 +1,121 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.jasperreports.engine.JRAbstractScriptlet;
+import net.sf.jasperreports.engine.JRScriptletException;
+
+/**
+ * <p>CustomScriptlet class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CustomScriptlet extends JRAbstractScriptlet {
+    private DRIScriptlet scriptlet;
+    private JasperReportParameters reportParameters;
+
+    /**
+     * <p>Constructor for CustomScriptlet.</p>
+     *
+     * @param scriptlet a {@link net.sf.dynamicreports.report.definition.DRIScriptlet} object.
+     */
+    public CustomScriptlet(DRIScriptlet scriptlet) {
+        this.scriptlet = scriptlet;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterColumnInit() throws JRScriptletException {
+        scriptlet.afterColumnInit(getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterDetailEval() throws JRScriptletException {
+        scriptlet.afterDetailEval(getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterGroupInit(String groupName) throws JRScriptletException {
+        scriptlet.afterGroupInit(groupName, getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterPageInit() throws JRScriptletException {
+        scriptlet.afterPageInit(getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterReportInit() throws JRScriptletException {
+        scriptlet.afterReportInit(getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforeColumnInit() throws JRScriptletException {
+        scriptlet.beforeColumnInit(getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforeDetailEval() throws JRScriptletException {
+        scriptlet.beforeDetailEval(getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforeGroupInit(String groupName) throws JRScriptletException {
+        scriptlet.beforeGroupInit(groupName, getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforePageInit() throws JRScriptletException {
+        scriptlet.beforePageInit(getReportParameters());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforeReportInit() throws JRScriptletException {
+        scriptlet.beforeReportInit(getReportParameters());
+    }
+
+    private JasperReportParameters getReportParameters() {
+        if (reportParameters == null) {
+            try {
+                reportParameters = ((JasperScriptlet) getParameterValue(JasperScriptlet.SCRIPTLET_NAME)).getReportParameters();
+            } catch (JRScriptletException e) {
+            }
+        }
+        return reportParameters;
+    }
+
+    /**
+     * <p>Getter for the field <code>scriptlet</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIScriptlet} object.
+     */
+    protected DRIScriptlet getScriptlet() {
+        return scriptlet;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/DefaultJasperScriptletManager.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/DefaultJasperScriptletManager.java
new file mode 100644
index 0000000..8f11642
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/DefaultJasperScriptletManager.java
@@ -0,0 +1,42 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+/**
+ * Simple, default implementation of {@link net.sf.dynamicreports.jasper.base.JasperScriptletManager}.
+ *
+ * @author edwin.njeru
+ * @version 6.0.1-SNAPSHOT
+ */
+public class DefaultJasperScriptletManager implements JasperScriptletManager {
+
+    private JasperScriptlet jasperScriptlet;
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperScriptlet getJasperScriptlet() {
+        return jasperScriptlet;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setJasperScriptlet(JasperScriptlet jasperScriptlet) {
+        this.jasperScriptlet = jasperScriptlet;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperCustomValues.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperCustomValues.java
new file mode 100644
index 0000000..05dcf3e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperCustomValues.java
@@ -0,0 +1,363 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import static java.lang.Boolean.TRUE;
+import static net.sf.dynamicreports.jasper.base.JasperScriptletManager.USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.commons.lang3.StringUtils;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import net.sf.dynamicreports.jasper.constant.ValueType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRICustomValues;
+
+
+/**
+ * <p>
+ * JasperCustomValues class.
+ * </p>
+ *
+ * @author edwin.njeru
+ */
+public class JasperCustomValues implements DRICustomValues
+{
+	private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+	
+	private Map<String, ValueType> valueTypes;
+	private Map<String, DRIDesignSimpleExpression> simpleExpressions;
+	private Map<String, DRIDesignComplexExpression> complexExpressions;
+	private Map<String, Object> systemValues;
+	private Integer startPageNumber;
+	private Map<String, JasperTocHeading> tocHeadings;
+	private Integer subreportWidth;
+	private transient JasperScriptletManager scriptletManager;
+	
+	/**
+	 * <p>
+	 * Constructor for JasperCustomValues.
+	 * </p>
+	 *
+	 * @param properties a {@link java.util.Properties} object.
+	 */
+	public JasperCustomValues(final Properties properties)
+	{
+		this.init(properties);
+	}
+	
+	private void init(final Properties properties)
+	{
+		this.valueTypes = new HashMap<>();
+		this.simpleExpressions = new HashMap<>();
+		this.complexExpressions = new HashMap<>();
+		this.systemValues = new HashMap<>();
+		this.scriptletManager = this.createScriptletManager(properties);
+	}
+	
+	private JasperScriptletManager createScriptletManager(final Properties properties)
+	{
+		final String useThreadSafeScriptletManagerPropertyValue =
+			properties.getProperty(USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY);
+		if(TRUE.toString().equalsIgnoreCase(useThreadSafeScriptletManagerPropertyValue))
+		{
+			return new ThreadSafeJasperScriptletManager();
+		}
+		return new DefaultJasperScriptletManager();
+	}
+	
+	/**
+	 * <p>
+	 * addSimpleExpression.
+	 * </p>
+	 *
+	 * @param simpleExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression}
+	 *                         object.
+	 */
+	public void addSimpleExpression(final DRIDesignSimpleExpression simpleExpression)
+	{
+		this.simpleExpressions.put(simpleExpression.getName(), simpleExpression);
+		this.addValueType(simpleExpression.getName(), ValueType.SIMPLE_EXPRESSION);
+	}
+	
+	/**
+	 * <p>
+	 * addComplexExpression.
+	 * </p>
+	 *
+	 * @param complexExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression}
+	 *                          object.
+	 */
+	public void addComplexExpression(final DRIDesignComplexExpression complexExpression)
+	{
+		this.complexExpressions.put(complexExpression.getName(), complexExpression);
+		this.addValueType(complexExpression.getName(), ValueType.COMPLEX_EXPRESSION);
+	}
+	
+	/**
+	 * <p>
+	 * addValueType.
+	 * </p>
+	 *
+	 * @param name      a {@link java.lang.String} object.
+	 * @param valueType a {@link net.sf.dynamicreports.jasper.constant.ValueType} object.
+	 */
+	public void addValueType(final String name, final ValueType valueType)
+	{
+		this.valueTypes.put(name, valueType);
+	}
+	
+	/**
+	 * <p>
+	 * getValueType.
+	 * </p>
+	 *
+	 * @param name a {@link java.lang.String} object.
+	 * @return a {@link net.sf.dynamicreports.jasper.constant.ValueType} object.
+	 */
+	protected ValueType getValueType(final String name)
+	{
+		return this.valueTypes.get(name);
+	}
+	
+	/**
+	 * <p>
+	 * getSimpleExpression.
+	 * </p>
+	 *
+	 * @param name a {@link java.lang.String} object.
+	 * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
+	 */
+	protected DRIDesignSimpleExpression getSimpleExpression(final String name)
+	{
+		return this.simpleExpressions.get(name);
+	}
+	
+	/**
+	 * <p>
+	 * getComplexExpression.
+	 * </p>
+	 *
+	 * @param name a {@link java.lang.String} object.
+	 * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
+	 */
+	protected DRIDesignComplexExpression getComplexExpression(final String name)
+	{
+		return this.complexExpressions.get(name);
+	}
+	
+	/**
+	 * <p>
+	 * isEmpty.
+	 * </p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isEmpty()
+	{
+		if(!this.simpleExpressions.isEmpty())
+		{
+			return false;
+		}
+		if(!this.complexExpressions.isEmpty())
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * <p>
+	 * getValue.
+	 * </p>
+	 *
+	 * @param valueName a {@link java.lang.String} object.
+	 * @return a {@link java.lang.Object} object.
+	 */
+	public Object getValue(final String valueName)
+	{
+		return this.scriptletManager.getJasperScriptlet().getValue(valueName);
+	}
+	
+	/**
+	 * <p>
+	 * getValue.
+	 * </p>
+	 *
+	 * @param name   a {@link java.lang.String} object.
+	 * @param values an array of {@link java.lang.Object} objects.
+	 * @return a {@link java.lang.Object} object.
+	 */
+	public Object getValue(final String name, final Object[] values)
+	{
+		return this.scriptletManager.getJasperScriptlet().getValue(name, values);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setSystemValue(final String name, final Object value)
+	{
+		this.systemValues.put(name, value);
+	}
+	
+	/**
+	 * <p>
+	 * getSystemValue.
+	 * </p>
+	 *
+	 * @param name a {@link java.lang.String} object.
+	 * @return a {@link java.lang.Object} object.
+	 */
+	protected Object getSystemValue(final String name)
+	{
+		return this.systemValues.get(name);
+	}
+	
+	/**
+	 * <p>
+	 * Getter for the field <code>jasperScriptlet</code>.
+	 * </p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} object.
+	 */
+	protected JasperScriptlet getJasperScriptlet()
+	{
+		return this.scriptletManager.getJasperScriptlet();
+	}
+	
+	/**
+	 * <p>
+	 * Setter for the field <code>jasperScriptlet</code>.
+	 * </p>
+	 *
+	 * @param jasperScriptlet a {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} object.
+	 */
+	protected void setJasperScriptlet(final JasperScriptlet jasperScriptlet)
+	{
+		this.scriptletManager.setJasperScriptlet(jasperScriptlet);
+	}
+	
+	/**
+	 * <p>
+	 * Getter for the field <code>startPageNumber</code>.
+	 * </p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	public Integer getStartPageNumber()
+	{
+		return this.startPageNumber;
+	}
+	
+	/**
+	 * <p>
+	 * Setter for the field <code>startPageNumber</code>.
+	 * </p>
+	 *
+	 * @param startPageNumber a {@link java.lang.Integer} object.
+	 */
+	public void setStartPageNumber(final Integer startPageNumber)
+	{
+		this.startPageNumber = startPageNumber;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addTocHeading(final int level, final String id, final String text, final Object customValue)
+	{
+		final JasperTocHeading heading = new JasperTocHeading();
+		heading.setLevel(level);
+		heading.setText(text);
+		heading.setReference(id);
+		heading.setCustomValue(customValue);
+		this.tocHeadings.put(id, heading);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Map<String, JasperTocHeading> getTocHeadings()
+	{
+		return this.tocHeadings;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setTocHeadings(final Map<String, JasperTocHeading> tocHeadings)
+	{
+		this.tocHeadings = tocHeadings;
+	}
+	
+	/**
+	 * <p>
+	 * Getter for the field <code>subreportWidth</code>.
+	 * </p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	public Integer getSubreportWidth()
+	{
+		return this.subreportWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setSubreportWidth(final Integer subreportWidth)
+	{
+		this.subreportWidth = subreportWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString()
+	{
+		final StringBuilder result = new StringBuilder();
+		for(final String name : this.valueTypes.keySet())
+		{
+			result.append(this.valueTypes.get(name).name() + ":" + name);
+			result.append(", ");
+		}
+		return "{" + StringUtils.removeEnd(result.toString(), ", ") + "}";
+	}
+	
+	/**
+	 * Getter for testing purposes.
+	 *
+	 * @return the {@link JasperScriptletManager}
+	 */
+	JasperScriptletManager getScriptletManager()
+	{
+		return this.scriptletManager;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportDesign.java
new file mode 100644
index 0000000..6b88548
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportDesign.java
@@ -0,0 +1,143 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import net.sf.dynamicreports.design.definition.DRIDesignReport;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.design.JasperDesign;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>JasperReportDesign class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperReportDesign implements Serializable {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private JasperCustomValues customValues;
+    private JasperDesign design;
+    private Map<String, Object> parameters;
+    private ReportParameters masterReportParameters;
+    private Integer startPageNumber;
+    private boolean tableOfContents;
+    private DRITableOfContentsCustomizer tableOfContentsCustomizer;
+
+    /**
+     * <p>Constructor for JasperReportDesign.</p>
+     *
+     * @param report          a {@link net.sf.dynamicreports.design.definition.DRIDesignReport} object.
+     * @param startPageNumber a {@link java.lang.Integer} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportDesign(DRIDesignReport report, Integer startPageNumber) throws DRException {
+        this(report, null, startPageNumber);
+    }
+
+    /**
+     * <p>Constructor for JasperReportDesign.</p>
+     *
+     * @param report                 a {@link net.sf.dynamicreports.design.definition.DRIDesignReport} object.
+     * @param masterReportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param startPageNumber        a {@link java.lang.Integer} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportDesign(DRIDesignReport report, ReportParameters masterReportParameters, Integer startPageNumber) throws DRException {
+        this.masterReportParameters = masterReportParameters;
+        this.startPageNumber = startPageNumber;
+        init(report);
+    }
+
+    private void init(DRIDesignReport report) throws DRException {
+        this.design = (JasperDesign) report.getTemplateDesign().getDesign();
+        this.tableOfContents = report.isTableOfContents();
+        this.tableOfContentsCustomizer = report.getTableOfContentsCustomizer();
+        this.customValues = new JasperCustomValues(report.getProperties());
+        this.parameters = new HashMap<String, Object>();
+    }
+
+    /**
+     * <p>Getter for the field <code>customValues</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.base.JasperCustomValues} object.
+     */
+    public JasperCustomValues getCustomValues() {
+        return customValues;
+    }
+
+    /**
+     * <p>Getter for the field <code>design</code>.</p>
+     *
+     * @return a {@link net.sf.jasperreports.engine.design.JasperDesign} object.
+     */
+    public JasperDesign getDesign() {
+        return design;
+    }
+
+    /**
+     * <p>Getter for the field <code>parameters</code>.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     */
+    public Map<String, Object> getParameters() {
+        return parameters;
+    }
+
+    /**
+     * <p>Getter for the field <code>startPageNumber</code>.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getStartPageNumber() {
+        return startPageNumber;
+    }
+
+    /**
+     * <p>Getter for the field <code>masterReportParameters</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public ReportParameters getMasterReportParameters() {
+        return masterReportParameters;
+    }
+
+    /**
+     * <p>isTableOfContents.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isTableOfContents() {
+        return tableOfContents;
+    }
+
+    /**
+     * <p>Getter for the field <code>tableOfContentsCustomizer</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+     */
+    public DRITableOfContentsCustomizer getTableOfContentsCustomizer() {
+        return tableOfContentsCustomizer;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportParameters.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportParameters.java
new file mode 100644
index 0000000..3d336a9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportParameters.java
@@ -0,0 +1,280 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.transformation.expressions.CrosstabRowCounter;
+import net.sf.dynamicreports.jasper.constant.ValueType;
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.exception.DRReportException;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JRScriptlet;
+import net.sf.jasperreports.engine.JRScriptletException;
+import net.sf.jasperreports.engine.JRVariable;
+
+import java.sql.Connection;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+/**
+ * <p>JasperReportParameters class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperReportParameters implements ReportParameters {
+    /**
+     * Constant <code>MASTER_REPORT_PARAMETERS="MASTER_REPORT_PARAMETERS"</code>
+     */
+    public static final String MASTER_REPORT_PARAMETERS = "MASTER_REPORT_PARAMETERS";
+
+    private JasperScriptlet jasperScriptlet;
+
+    /**
+     * <p>Constructor for JasperReportParameters.</p>
+     *
+     * @param jasperScriptlet a {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} object.
+     */
+    protected JasperReportParameters(JasperScriptlet jasperScriptlet) {
+        this.jasperScriptlet = jasperScriptlet;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getValue(String name) {
+        ValueType type = jasperScriptlet.getValueType(name);
+        if (type != null) {
+            switch (type) {
+                case FIELD:
+                    return (T) getFieldValue(name);
+                case VARIABLE:
+                    return (T) getVariableValue(name);
+                case PARAMETER:
+                    return (T) getParameterValue(name);
+                case SIMPLE_EXPRESSION:
+                    return (T) getSimpleExpressionValue(name);
+                case COMPLEX_EXPRESSION:
+                    return (T) getComplexExpressionValue(name);
+                case SYSTEM_EXPRESSION:
+                    return (T) getSystemExpressionValue(name);
+                default:
+                    break;
+            }
+        }
+
+        throw new DRReportException("Value " + name + " not found");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getValue(DRIValue<T> value) {
+        return (T) getValue(value.getName());
+    }
+
+    // field
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getFieldValue(String name) {
+        try {
+            return (T) jasperScriptlet.getFieldValue(name);
+        } catch (JRScriptletException e) {
+            throw new DRReportException(e);
+        }
+    }
+
+    // variable
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getVariableValue(String name) {
+        try {
+            return (T) jasperScriptlet.getVariableValue(name);
+        } catch (JRScriptletException e) {
+            throw new DRReportException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageNumber() {
+        return (Integer) getVariableValue(JRVariable.PAGE_NUMBER);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getColumnNumber() {
+        return (Integer) getVariableValue(JRVariable.COLUMN_NUMBER);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getReportRowNumber() {
+        return (Integer) getVariableValue(JRVariable.REPORT_COUNT);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageRowNumber() {
+        return (Integer) getVariableValue(JRVariable.PAGE_COUNT);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getColumnRowNumber() {
+        return (Integer) getVariableValue(JRVariable.COLUMN_COUNT);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getCrosstabRowNumber() {
+        CrosstabRowCounter counter = (CrosstabRowCounter) getValue(CROSSTAB_ROW_COUNTER);
+        if (counter != null) {
+            return counter.getRowNumber();
+        }
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getGroupCount(String groupName) {
+        return (Integer) getVariableValue(groupName + "_COUNT");
+    }
+
+    // parameter
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getParameterValue(String name) {
+        try {
+            return (T) ((Map<?, ?>) jasperScriptlet.getParameterValue(JRParameter.REPORT_PARAMETERS_MAP)).get(name);
+        } catch (JRScriptletException e) {
+            throw new DRReportException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Connection getConnection() {
+        return (Connection) getParameterValue(JRParameter.REPORT_CONNECTION);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Locale getLocale() {
+        return (Locale) getParameterValue(JRParameter.REPORT_LOCALE);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIScriptlet getScriptlet(String name) {
+        return ((CustomScriptlet) getParameterValue(name + JRScriptlet.SCRIPTLET_PARAMETER_NAME_SUFFIX)).getScriptlet();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMessage(String key) {
+        return ((ResourceBundle) getParameterValue(JRParameter.REPORT_RESOURCE_BUNDLE)).getString(key);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMessage(String key, Object[] arguments) {
+        String message = getMessage(key);
+        if (arguments != null) {
+            MessageFormat format = new MessageFormat(message, getLocale());
+            message = format.format(arguments);
+        }
+        return message;
+    }
+
+    // simple expression
+    private Object getSimpleExpressionValue(String name) {
+        return jasperScriptlet.getSimpleExpression(name).evaluate(this);
+    }
+
+    // complex expression
+    private Object getComplexExpressionValue(String name) {
+        List<Object> values = new ArrayList<Object>();
+        DRIDesignComplexExpression complexExpression = jasperScriptlet.getComplexExpression(name);
+        for (DRIDesignExpression valueExpression : complexExpression.getExpressions()) {
+            values.add(getValue(valueExpression.getName()));
+        }
+        return complexExpression.evaluate(values, this);
+    }
+
+    // system expression
+    private Object getSystemExpressionValue(String name) {
+        return jasperScriptlet.getSystemValue(name);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ReportParameters getMasterParameters() {
+        return (ReportParameters) getParameterValue(MASTER_REPORT_PARAMETERS);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getSubreportWidth() {
+        return jasperScriptlet.getSubreportWidth();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        StringBuilder result = new StringBuilder();
+
+        result.append("FIELDS:\n");
+        Collection<String> names = jasperScriptlet.getFields();
+        for (String name : names) {
+            result.append(name + " = " + getFieldValue(name));
+            result.append("\n");
+        }
+
+        result.append("VARIABLES:\n");
+        names = jasperScriptlet.getVariables();
+        for (String name : names) {
+            result.append(name + " = " + getVariableValue(name));
+            result.append("\n");
+        }
+
+        result.append("PARAMETERS:\n");
+        names = jasperScriptlet.getParameters();
+        for (String name : names) {
+            result.append(name + " = " + getParameterValue(name));
+            result.append("\n");
+        }
+
+        return result.toString();
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptlet.java
new file mode 100644
index 0000000..92b0701
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptlet.java
@@ -0,0 +1,211 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.jasper.constant.ValueType;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.jasperreports.engine.JRDefaultScriptlet;
+import net.sf.jasperreports.engine.JRScriptlet;
+import net.sf.jasperreports.engine.JRScriptletException;
+import net.sf.jasperreports.engine.fill.JRFillField;
+import net.sf.jasperreports.engine.fill.JRFillGroup;
+import net.sf.jasperreports.engine.fill.JRFillParameter;
+import net.sf.jasperreports.engine.fill.JRFillVariable;
+
+
+/**
+ * <p>JasperScriptlet class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+public class JasperScriptlet extends JRDefaultScriptlet
+{
+	/**
+	 * Constant <code>NAME="DYNAMICREPORTS"</code>
+	 */
+	public static final String NAME = "DYNAMICREPORTS";
+	/**
+	 * Constant <code>SCRIPTLET_NAME="NAME + JRScriptlet.SCRIPTLET_PARAMETER_"{trunked}</code>
+	 */
+	public static final String SCRIPTLET_NAME = NAME + JRScriptlet.SCRIPTLET_PARAMETER_NAME_SUFFIX;
+	
+	private JasperReportParameters reportParameters;
+	
+	/**
+	 * <p>getValue.</p>
+	 *
+	 * @param valueName a {@link java.lang.String} object.
+	 * @return a {@link java.lang.Object} object.
+	 */
+	public Object getValue(final String valueName)
+	{
+		return this.reportParameters.getValue(valueName);
+	}
+	
+	/**
+	 * <p>getValue.</p>
+	 *
+	 * @param name   a {@link java.lang.String} object.
+	 * @param values an array of {@link java.lang.Object} objects.
+	 * @return a {@link java.lang.Object} object.
+	 */
+	public Object getValue(final String name, final Object[] values)
+	{
+		return this.getComplexExpression(name).evaluate(Arrays.asList(values), this.reportParameters);
+	}
+	
+	/**
+	 * <p>Getter for the field <code>reportParameters</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.jasper.base.JasperReportParameters} object.
+	 */
+	public JasperReportParameters getReportParameters()
+	{
+		return this.reportParameters;
+	}
+	
+	private JasperCustomValues getCustomValues()
+	{
+		try
+		{
+			return (JasperCustomValues)this.getParameterValue(JasperCustomValues.NAME, false);
+		}
+		catch(final JRScriptletException e)
+		{
+			throw new JasperDesignException("Custom values not found", e);
+		}
+	}
+	
+	/**
+	 * <p>getValueType.</p>
+	 *
+	 * @param name a {@link java.lang.String} object.
+	 * @return a {@link net.sf.dynamicreports.jasper.constant.ValueType} object.
+	 */
+	protected ValueType getValueType(final String name)
+	{
+		return this.getCustomValues().getValueType(name);
+	}
+	
+	/**
+	 * <p>getSimpleExpression.</p>
+	 *
+	 * @param name a {@link java.lang.String} object.
+	 * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
+	 */
+	protected DRIDesignSimpleExpression getSimpleExpression(final String name)
+	{
+		return this.getCustomValues().getSimpleExpression(name);
+	}
+	
+	/**
+	 * <p>getComplexExpression.</p>
+	 *
+	 * @param name a {@link java.lang.String} object.
+	 * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
+	 */
+	protected DRIDesignComplexExpression getComplexExpression(final String name)
+	{
+		return this.getCustomValues().getComplexExpression(name);
+	}
+	
+	/**
+	 * <p>getSystemValue.</p>
+	 *
+	 * @param name a {@link java.lang.String} object.
+	 * @return a {@link java.lang.Object} object.
+	 */
+	protected Object getSystemValue(final String name)
+	{
+		return this.getCustomValues().getSystemValue(name);
+	}
+	
+	/**
+	 * <p>getFields.</p>
+	 *
+	 * @return a {@link java.util.Collection} object.
+	 */
+	protected Collection<String> getFields()
+	{
+		return this.fieldsMap.keySet();
+	}
+	
+	/**
+	 * <p>getVariables.</p>
+	 *
+	 * @return a {@link java.util.Collection} object.
+	 */
+	protected Collection<String> getVariables()
+	{
+		return this.variablesMap.keySet();
+	}
+	
+	/**
+	 * <p>getParameters.</p>
+	 *
+	 * @return a {@link java.util.Collection} object.
+	 */
+	protected Collection<String> getParameters()
+	{
+		return this.parametersMap.keySet();
+	}
+	
+	/**
+	 * <p>getSubreportWidth.</p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected Integer getSubreportWidth()
+	{
+		return this.getCustomValues().getSubreportWidth();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setData(
+		final Map<String, JRFillParameter> parsm,
+		final Map<String, JRFillField> fldsm,
+		final Map<String, JRFillVariable> varsm,
+		final JRFillGroup[] grps)
+	{
+		super.setData(parsm, fldsm, varsm, grps);
+		this.reportParameters = new JasperReportParameters(this);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void afterReportInit() throws JRScriptletException
+	{
+		super.afterReportInit();
+		final JasperCustomValues customValues = this.getCustomValues();
+		if(customValues != null)
+		{
+			customValues.setJasperScriptlet(this);
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptletManager.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptletManager.java
new file mode 100644
index 0000000..c7704b7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptletManager.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+/**
+ * Interface for managers of {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} used in {@link net.sf.dynamicreports.jasper.base.JasperCustomValues}.
+ *
+ * @author edwin.njeru
+ * @version 6.0.1-SNAPSHOT
+ */
+public interface JasperScriptletManager {
+
+    /**
+     * Property key used for selecting thread safe implementation.
+     */
+    public static final String USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY = "net.sf.dynamicreports.useThreadSafeScriptletManager";
+
+    /**
+     * Getter for the {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} instance.
+     *
+     * @return the set {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} instance
+     */
+    JasperScriptlet getJasperScriptlet();
+
+    /**
+     * Setter for the {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} instance.
+     *
+     * @param jasperScriptlet the {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} instance to set
+     */
+    void setJasperScriptlet(JasperScriptlet jasperScriptlet);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java
new file mode 100644
index 0000000..823b022
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.jasperreports.engine.JRPropertiesMap;
+import net.sf.jasperreports.engine.JRPropertiesUtil;
+import net.sf.jasperreports.engine.JRPropertiesUtil.PropertySuffix;
+import net.sf.jasperreports.engine.fonts.FontExtensionsRegistry;
+import net.sf.jasperreports.extensions.DefaultExtensionsRegistry;
+import net.sf.jasperreports.extensions.ExtensionsRegistry;
+import net.sf.jasperreports.extensions.ExtensionsRegistryFactory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * <p>JasperSystemFontExtensionsRegistryFactory class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperSystemFontExtensionsRegistryFactory implements ExtensionsRegistryFactory {
+    /**
+     * Constant <code>SYSTEM_FONT_FAMILIES_PROPERTY_PREFIX="DefaultExtensionsRegistry.PROPERTY_REGI"{trunked}</code>
+     */
+    public static final String SYSTEM_FONT_FAMILIES_PROPERTY_PREFIX = DefaultExtensionsRegistry.PROPERTY_REGISTRY_PREFIX + "system.font.families.";
+    /**
+     * Constant <code>PROPERTY_SYSTEM_FONT_FAMILIES_REGISTRY_FACTORY="DefaultExtensionsRegistry.PROPERTY_REGI"{trunked}</code>
+     */
+    public static final String PROPERTY_SYSTEM_FONT_FAMILIES_REGISTRY_FACTORY = DefaultExtensionsRegistry.PROPERTY_REGISTRY_FACTORY_PREFIX + "system.font.families";
+
+    /** {@inheritDoc} */
+    @Override
+    public ExtensionsRegistry createRegistry(String registryId, JRPropertiesMap properties) {
+        List<PropertySuffix> fontFamiliesProperties = JRPropertiesUtil.getProperties(properties, SYSTEM_FONT_FAMILIES_PROPERTY_PREFIX);
+        List<String> fontFamiliesLocations = new ArrayList<String>();
+        if (Defaults.getDefaults().isLoadSystemFonts()) {
+            for (Iterator<PropertySuffix> it = fontFamiliesProperties.iterator(); it.hasNext(); ) {
+                PropertySuffix fontFamiliesProp = it.next();
+                String fontFamiliesLocation = fontFamiliesProp.getValue();
+                fontFamiliesLocations.add(fontFamiliesLocation);
+            }
+        }
+
+        return new FontExtensionsRegistry(fontFamiliesLocations);
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperTemplateStyleLoader.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperTemplateStyleLoader.java
new file mode 100644
index 0000000..d5e7f8f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperTemplateStyleLoader.java
@@ -0,0 +1,426 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.report.base.style.DRBaseStyle;
+import net.sf.dynamicreports.report.base.style.DRBorder;
+import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
+import net.sf.dynamicreports.report.base.style.DRFont;
+import net.sf.dynamicreports.report.base.style.DRPadding;
+import net.sf.dynamicreports.report.base.style.DRParagraph;
+import net.sf.dynamicreports.report.base.style.DRPen;
+import net.sf.dynamicreports.report.base.style.DRStyle;
+import net.sf.dynamicreports.report.base.style.DRTabStop;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.LineSpacing;
+import net.sf.dynamicreports.report.constant.LineStyle;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.Rotation;
+import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
+import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRConditionalStyle;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRLineBox;
+import net.sf.jasperreports.engine.JRParagraph;
+import net.sf.jasperreports.engine.JRPen;
+import net.sf.jasperreports.engine.JRStyle;
+import net.sf.jasperreports.engine.JRTemplate;
+import net.sf.jasperreports.engine.TabStop;
+import net.sf.jasperreports.engine.type.HorizontalImageAlignEnum;
+import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
+import net.sf.jasperreports.engine.type.LineSpacingEnum;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+import net.sf.jasperreports.engine.type.RotationEnum;
+import net.sf.jasperreports.engine.type.ScaleImageEnum;
+import net.sf.jasperreports.engine.type.TabStopAlignEnum;
+import net.sf.jasperreports.engine.type.VerticalImageAlignEnum;
+import net.sf.jasperreports.engine.type.VerticalTextAlignEnum;
+import net.sf.jasperreports.engine.xml.JRXmlTemplateLoader;
+import org.apache.commons.lang3.Validate;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * <p>JasperTemplateStyleLoader class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperTemplateStyleLoader {
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param file a {@link java.io.File} object.
+     * @return an array of {@link net.sf.dynamicreports.report.base.style.DRStyle} objects.
+     */
+    public static DRStyle[] loadStyles(File file) {
+        Validate.notNull(file, "file must not be null");
+        return loadStyles(JRXmlTemplateLoader.load(file));
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param fileName a {@link java.lang.String} object.
+     * @return an array of {@link net.sf.dynamicreports.report.base.style.DRStyle} objects.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public static DRStyle[] loadStyles(String fileName) throws DRException {
+        Validate.notNull(fileName, "fileName must not be null");
+        try {
+            return loadStyles(JRXmlTemplateLoader.load(fileName));
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param inputStream a {@link java.io.InputStream} object.
+     * @return an array of {@link net.sf.dynamicreports.report.base.style.DRStyle} objects.
+     */
+    public static DRStyle[] loadStyles(InputStream inputStream) {
+        Validate.notNull(inputStream, "inputStream must not be null");
+        return loadStyles(JRXmlTemplateLoader.load(inputStream));
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param url a {@link java.net.URL} object.
+     * @return an array of {@link net.sf.dynamicreports.report.base.style.DRStyle} objects.
+     */
+    public static DRStyle[] loadStyles(URL url) {
+        Validate.notNull(url, "url must not be null");
+        return loadStyles(JRXmlTemplateLoader.load(url));
+    }
+
+    private static DRStyle[] loadStyles(JRTemplate template) {
+        Validate.notNull(template, "template must not be null");
+        JRStyle[] jrStyles = template.getStyles();
+        DRStyle[] styles = new DRStyle[jrStyles.length];
+        for (int i = 0; i < jrStyles.length; i++) {
+            JRStyle jrStyle = jrStyles[i];
+            styles[i] = convertStyle(jrStyle);
+        }
+        return styles;
+    }
+
+    private static DRStyle convertStyle(JRStyle jrStyle) {
+        DRStyle style = new DRStyle();
+        abstractStyle(jrStyle, style);
+
+        style.setName(jrStyle.getName());
+        JRStyle jrParentStyle = jrStyle.getStyle();
+        if (jrParentStyle != null) {
+            style.setParentStyle(convertStyle(jrParentStyle));
+        }
+        for (JRConditionalStyle jrConditionalStyle : jrStyle.getConditionalStyles()) {
+            style.addConditionalStyle(conditionalStyle(jrConditionalStyle));
+        }
+        return style;
+    }
+
+    private static DRConditionalStyle conditionalStyle(JRConditionalStyle jrConditionalStyle) {
+        DRIExpression<Boolean> expression = Expressions.jasperSyntax(jrConditionalStyle.getConditionExpression().getText(), Boolean.class);
+        DRConditionalStyle conditionalStyle = new DRConditionalStyle(expression);
+        abstractStyle(jrConditionalStyle, conditionalStyle);
+        return conditionalStyle;
+    }
+
+    private static void abstractStyle(JRStyle jrStyle, DRBaseStyle style) {
+        style.setForegroundColor(jrStyle.getOwnForecolor());
+        style.setBackgroundColor(jrStyle.getOwnBackcolor());
+        style.setRadius(jrStyle.getOwnRadius());
+        style.setImageScale(imageScale(jrStyle.getOwnScaleImageValue()));
+        style.setHorizontalImageAlignment(horizontalImageAlignment(jrStyle.getOwnHorizontalImageAlign()));
+        style.setVerticalImageAlignment(verticalImageAlignment(jrStyle.getOwnVerticalImageAlign()));
+        style.setHorizontalTextAlignment(horizontalTextAlignment(jrStyle.getOwnHorizontalTextAlign()));
+        style.setVerticalTextAlignment(verticalTextAlignment(jrStyle.getOwnVerticalTextAlign()));
+        border(jrStyle.getLineBox(), style.getBorder());
+        padding(jrStyle.getLineBox(), style.getPadding());
+        font(jrStyle, style.getFont());
+        style.setRotation(rotation(jrStyle.getOwnRotationValue()));
+        style.setPattern(jrStyle.getOwnPattern());
+        style.setMarkup(markup(jrStyle.getOwnMarkup()));
+        paragraph(jrStyle.getParagraph(), style.getParagraph());
+        pen(jrStyle.getLinePen(), style.getLinePen());
+    }
+
+    private static void paragraph(JRParagraph jrParagraph, DRParagraph paragraph) {
+        paragraph.setLineSpacing(lineSpacing(jrParagraph.getOwnLineSpacing()));
+        paragraph.setLineSpacingSize(jrParagraph.getOwnLineSpacingSize());
+        paragraph.setFirstLineIndent(jrParagraph.getOwnFirstLineIndent());
+        paragraph.setLeftIndent(jrParagraph.getOwnLeftIndent());
+        paragraph.setRightIndent(jrParagraph.getOwnRightIndent());
+        paragraph.setSpacingBefore(jrParagraph.getOwnSpacingBefore());
+        paragraph.setSpacingAfter(jrParagraph.getOwnSpacingAfter());
+        paragraph.setTabStopWidth(jrParagraph.getOwnTabStopWidth());
+        if (jrParagraph.getOwnTabStops() != null) {
+            for (TabStop jrTabStop : jrParagraph.getOwnTabStops()) {
+                DRTabStop tabStop = new DRTabStop();
+                tabStop.setPosition(jrTabStop.getPosition());
+                tabStop.setAlignment(tabStopAlignment(jrTabStop.getAlignment()));
+                paragraph.getTabStops().add(tabStop);
+            }
+        }
+    }
+
+    /**
+     * <p>pen.</p>
+     *
+     * @param jrPen a {@link net.sf.jasperreports.engine.JRPen} object.
+     * @param pen   a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    protected static void pen(JRPen jrPen, DRPen pen) {
+        pen.setLineColor(jrPen.getOwnLineColor());
+        pen.setLineStyle(lineStyle(jrPen.getOwnLineStyleValue()));
+        pen.setLineWidth(jrPen.getOwnLineWidth());
+    }
+
+    private static void border(JRLineBox jrLineBox, DRBorder border) {
+        pen(jrLineBox.getLeftPen(), border.getLeftPen());
+        pen(jrLineBox.getRightPen(), border.getRightPen());
+        pen(jrLineBox.getTopPen(), border.getTopPen());
+        pen(jrLineBox.getBottomPen(), border.getBottomPen());
+    }
+
+    private static void padding(JRLineBox jrLineBox, DRPadding padding) {
+        padding.setLeft(jrLineBox.getOwnLeftPadding());
+        padding.setRight(jrLineBox.getOwnRightPadding());
+        padding.setTop(jrLineBox.getOwnTopPadding());
+        padding.setBottom(jrLineBox.getOwnBottomPadding());
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void font(JRStyle jrStyle, DRFont font) {
+        font.setFontName(jrStyle.getOwnFontName());
+        font.setBold(jrStyle.isOwnBold());
+        font.setItalic(jrStyle.isOwnItalic());
+        font.setFontSize(jrStyle.getOwnFontsize() == null ? null : jrStyle.getOwnFontsize().intValue());
+        font.setStrikeThrough(jrStyle.isOwnStrikeThrough());
+        font.setUnderline(jrStyle.isOwnUnderline());
+        font.setPdfFontName(jrStyle.getOwnPdfFontName());
+        font.setPdfEncoding(jrStyle.getOwnPdfEncoding());
+        font.setPdfEmbedded(jrStyle.isOwnPdfEmbedded());
+    }
+
+    private static LineStyle lineStyle(LineStyleEnum lineStyle) {
+        if (lineStyle == null) {
+            return null;
+        }
+
+        switch (lineStyle) {
+            case SOLID:
+                return LineStyle.SOLID;
+            case DASHED:
+                return LineStyle.DASHED;
+            case DOTTED:
+                return LineStyle.DOTTED;
+            case DOUBLE:
+                return LineStyle.DOUBLE;
+            default:
+                throw new JasperDesignException("Line style " + lineStyle.name() + " not supported");
+        }
+    }
+
+    private static ImageScale imageScale(ScaleImageEnum imageScale) {
+        if (imageScale == null) {
+            return null;
+        }
+
+        switch (imageScale) {
+            case CLIP:
+                return ImageScale.CLIP;
+            case FILL_FRAME:
+                return ImageScale.FILL_FRAME;
+            case RETAIN_SHAPE:
+                return ImageScale.RETAIN_SHAPE;
+            case REAL_HEIGHT:
+                return ImageScale.REAL_HEIGHT;
+            case REAL_SIZE:
+                return ImageScale.REAL_SIZE;
+            default:
+                throw new JasperDesignException("Image scale " + imageScale.name() + " not supported");
+        }
+    }
+
+    private static HorizontalImageAlignment horizontalImageAlignment(HorizontalImageAlignEnum horizontalImageAlignment) {
+        if (horizontalImageAlignment == null) {
+            return null;
+        }
+
+        switch (horizontalImageAlignment) {
+            case LEFT:
+                return HorizontalImageAlignment.LEFT;
+            case CENTER:
+                return HorizontalImageAlignment.CENTER;
+            case RIGHT:
+                return HorizontalImageAlignment.RIGHT;
+            default:
+                throw new JasperDesignException("Horizontal image alignment " + horizontalImageAlignment.name() + " not supported");
+        }
+    }
+
+    private static VerticalImageAlignment verticalImageAlignment(VerticalImageAlignEnum verticalImageAlignment) {
+        if (verticalImageAlignment == null) {
+            return null;
+        }
+
+        switch (verticalImageAlignment) {
+            case TOP:
+                return VerticalImageAlignment.TOP;
+            case MIDDLE:
+                return VerticalImageAlignment.MIDDLE;
+            case BOTTOM:
+                return VerticalImageAlignment.BOTTOM;
+            default:
+                throw new JasperDesignException("Vertical image alignment " + verticalImageAlignment.name() + " not supported");
+        }
+    }
+
+    private static HorizontalTextAlignment horizontalTextAlignment(HorizontalTextAlignEnum horizontalTextAlignment) {
+        if (horizontalTextAlignment == null) {
+            return null;
+        }
+
+        switch (horizontalTextAlignment) {
+            case LEFT:
+                return HorizontalTextAlignment.LEFT;
+            case CENTER:
+                return HorizontalTextAlignment.CENTER;
+            case RIGHT:
+                return HorizontalTextAlignment.RIGHT;
+            case JUSTIFIED:
+                return HorizontalTextAlignment.JUSTIFIED;
+            default:
+                throw new JasperDesignException("Horizontal text alignment " + horizontalTextAlignment.name() + " not supported");
+        }
+    }
+
+    private static VerticalTextAlignment verticalTextAlignment(VerticalTextAlignEnum verticalTextAlignment) {
+        if (verticalTextAlignment == null) {
+            return null;
+        }
+
+        switch (verticalTextAlignment) {
+            case TOP:
+                return VerticalTextAlignment.TOP;
+            case MIDDLE:
+                return VerticalTextAlignment.MIDDLE;
+            case BOTTOM:
+                return VerticalTextAlignment.BOTTOM;
+            case JUSTIFIED:
+                return VerticalTextAlignment.JUSTIFIED;
+            default:
+                throw new JasperDesignException("Vertical text alignment " + verticalTextAlignment.name() + " not supported");
+        }
+    }
+
+    private static Markup markup(String markup) {
+        if (markup == null) {
+            return null;
+        }
+
+        if (markup.equals("none")) {
+            return Markup.NONE;
+        }
+        if (markup.equals("styled")) {
+            return Markup.STYLED;
+        }
+        if (markup.equals("rtf")) {
+            return Markup.RTF;
+        }
+        if (markup.equals("html")) {
+            return Markup.HTML;
+        }
+        throw new JasperDesignException("Markup " + markup + " not supported");
+    }
+
+    private static LineSpacing lineSpacing(LineSpacingEnum lineSpacing) {
+        if (lineSpacing == null) {
+            return null;
+        }
+
+        switch (lineSpacing) {
+            case SINGLE:
+                return LineSpacing.SINGLE;
+            case ONE_AND_HALF:
+                return LineSpacing.ONE_AND_HALF;
+            case DOUBLE:
+                return LineSpacing.DOUBLE;
+            case AT_LEAST:
+                return LineSpacing.AT_LEAST;
+            case FIXED:
+                return LineSpacing.FIXED;
+            case PROPORTIONAL:
+                return LineSpacing.PROPORTIONAL;
+            default:
+                throw new JasperDesignException("LineSpacing " + lineSpacing.name() + " not supported");
+        }
+    }
+
+    /**
+     * <p>rotation.</p>
+     *
+     * @param rotation a {@link net.sf.jasperreports.engine.type.RotationEnum} object.
+     * @return a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     */
+    protected static Rotation rotation(RotationEnum rotation) {
+        if (rotation == null) {
+            return null;
+        }
+
+        switch (rotation) {
+            case NONE:
+                return Rotation.NONE;
+            case LEFT:
+                return Rotation.LEFT;
+            case RIGHT:
+                return Rotation.RIGHT;
+            case UPSIDE_DOWN:
+                return Rotation.UPSIDE_DOWN;
+            default:
+                throw new JasperDesignException("Rotation " + rotation.name() + " not supported");
+        }
+    }
+
+    private static TabStopAlignment tabStopAlignment(TabStopAlignEnum alignment) {
+        switch (alignment) {
+            case LEFT:
+                return TabStopAlignment.LEFT;
+            case CENTER:
+                return TabStopAlignment.CENTER;
+            case RIGHT:
+                return TabStopAlignment.RIGHT;
+            default:
+                throw new JasperDesignException("TabStopAlignment " + alignment.name() + " not supported");
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/StartPageNumberScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/StartPageNumberScriptlet.java
new file mode 100644
index 0000000..6ebff7d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/StartPageNumberScriptlet.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.jasperreports.engine.JRDefaultScriptlet;
+import net.sf.jasperreports.engine.JRScriptletException;
+import net.sf.jasperreports.engine.JRVariable;
+
+/**
+ * <p>StartPageNumberScriptlet class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class StartPageNumberScriptlet extends JRDefaultScriptlet {
+
+    private JasperCustomValues getCustomValues() {
+        try {
+            return (JasperCustomValues) getParameterValue(JasperCustomValues.NAME, false);
+        } catch (JRScriptletException e) {
+            throw new JasperDesignException("Custom values not found", e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterReportInit() throws JRScriptletException {
+        super.afterReportInit();
+        JasperCustomValues customValues = getCustomValues();
+        if (customValues != null && customValues.getStartPageNumber() != null) {
+            setVariableValue(JRVariable.PAGE_NUMBER, customValues.getStartPageNumber());
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java
new file mode 100644
index 0000000..f326d47
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+/**
+ * Thread safe implementation of {@link net.sf.dynamicreports.jasper.base.JasperScriptletManager} used for filling cached reports concurrently. Note: use of this class can lead to memory leaks if the threads starting the report fill
+ * are not terminated properly.
+ *
+ * @author edwin.njeru
+ * @version 6.0.1-SNAPSHOT
+ */
+public class ThreadSafeJasperScriptletManager implements JasperScriptletManager {
+
+    private ThreadLocal<JasperScriptlet> threadLocalScriptlet = new ThreadLocal<>();
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperScriptlet getJasperScriptlet() {
+        return threadLocalScriptlet.get();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setJasperScriptlet(JasperScriptlet jasperScriptlet) {
+        threadLocalScriptlet.set(jasperScriptlet);
+
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java
new file mode 100644
index 0000000..5f80f3e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java
@@ -0,0 +1,679 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIExcelExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ImageAnchorType;
+import net.sf.dynamicreports.report.constant.RunDirection;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>Abstract AbstractJasperExcelExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractJasperExcelExporter extends AbstractJasperExporter implements JasperIExcelExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean onePagePerSheet;
+    private Boolean removeEmptySpaceBetweenRows;
+    private Boolean removeEmptySpaceBetweenColumns;
+    private Boolean whitePageBackground;
+    private Boolean detectCellType;
+    private List<String> sheetNames;
+    private Boolean fontSizeFixEnabled;
+    private Boolean imageBorderFixEnabled;
+    private Integer maxRowsPerSheet;
+    private Boolean ignoreGraphics;
+    private Boolean collapseRowSpan;
+    private Boolean ignoreCellBorder;
+    private Boolean ignoreCellBackground;
+    private String password;
+    private Boolean ignorePageMargins;
+    private Boolean wrapText;
+    private Boolean cellLocked;
+    private Boolean cellHidden;
+    private String sheetHeaderLeft;
+    private String sheetHeaderCenter;
+    private String sheetHeaderRight;
+    private String sheetFooterLeft;
+    private String sheetFooterCenter;
+    private String sheetFooterRight;
+    private Map<String, String> formatPatternsMap;
+    private Boolean ignoreHyperLink;
+    private Boolean ignoreAnchors;
+    private Integer fitWidth;
+    private Integer fitHeight;
+    private Integer pageScale;
+    private RunDirection sheetDirection;
+    private Float columnWidthRatio;
+    private Boolean useTimeZone;
+    private Integer firstPageNumber;
+    private Boolean showGridLines;
+    private ImageAnchorType imageAnchorType;
+    private Boolean createCustomPalette;
+    private String workbookTemplate;
+    private Boolean keepWorkbookTemplateSheets;
+
+    /**
+     * <p>Constructor for AbstractJasperExcelExporter.</p>
+     */
+    public AbstractJasperExcelExporter() {
+        this.sheetNames = new ArrayList<String>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getOnePagePerSheet() {
+        return onePagePerSheet;
+    }
+
+    /**
+     * <p>Setter for the field <code>onePagePerSheet</code>.</p>
+     *
+     * @param onePagePerSheet a {@link java.lang.Boolean} object.
+     */
+    public void setOnePagePerSheet(Boolean onePagePerSheet) {
+        this.onePagePerSheet = onePagePerSheet;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getRemoveEmptySpaceBetweenRows() {
+        return removeEmptySpaceBetweenRows;
+    }
+
+    /**
+     * <p>Setter for the field <code>removeEmptySpaceBetweenRows</code>.</p>
+     *
+     * @param removeEmptySpaceBetweenRows a {@link java.lang.Boolean} object.
+     */
+    public void setRemoveEmptySpaceBetweenRows(Boolean removeEmptySpaceBetweenRows) {
+        this.removeEmptySpaceBetweenRows = removeEmptySpaceBetweenRows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getRemoveEmptySpaceBetweenColumns() {
+        return removeEmptySpaceBetweenColumns;
+    }
+
+    /**
+     * <p>Setter for the field <code>removeEmptySpaceBetweenColumns</code>.</p>
+     *
+     * @param removeEmptySpaceBetweenColumns a {@link java.lang.Boolean} object.
+     */
+    public void setRemoveEmptySpaceBetweenColumns(Boolean removeEmptySpaceBetweenColumns) {
+        this.removeEmptySpaceBetweenColumns = removeEmptySpaceBetweenColumns;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getWhitePageBackground() {
+        return whitePageBackground;
+    }
+
+    /**
+     * <p>Setter for the field <code>whitePageBackground</code>.</p>
+     *
+     * @param whitePageBackground a {@link java.lang.Boolean} object.
+     */
+    public void setWhitePageBackground(Boolean whitePageBackground) {
+        this.whitePageBackground = whitePageBackground;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getDetectCellType() {
+        return detectCellType;
+    }
+
+    /**
+     * <p>Setter for the field <code>detectCellType</code>.</p>
+     *
+     * @param detectCellType a {@link java.lang.Boolean} object.
+     */
+    public void setDetectCellType(Boolean detectCellType) {
+        this.detectCellType = detectCellType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<String> getSheetNames() {
+        return sheetNames;
+    }
+
+    /**
+     * <p>Setter for the field <code>sheetNames</code>.</p>
+     *
+     * @param sheetNames a {@link java.util.List} object.
+     */
+    public void setSheetNames(List<String> sheetNames) {
+        this.sheetNames = sheetNames;
+    }
+
+    /**
+     * <p>addSheetName.</p>
+     *
+     * @param sheetName a {@link java.lang.String} object.
+     */
+    public void addSheetName(String sheetName) {
+        this.sheetNames.add(sheetName);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFontSizeFixEnabled() {
+        return fontSizeFixEnabled;
+    }
+
+    /**
+     * <p>Setter for the field <code>fontSizeFixEnabled</code>.</p>
+     *
+     * @param fontSizeFixEnabled a {@link java.lang.Boolean} object.
+     */
+    public void setFontSizeFixEnabled(Boolean fontSizeFixEnabled) {
+        this.fontSizeFixEnabled = fontSizeFixEnabled;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getImageBorderFixEnabled() {
+        return imageBorderFixEnabled;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageBorderFixEnabled</code>.</p>
+     *
+     * @param imageBorderFixEnabled a {@link java.lang.Boolean} object.
+     */
+    public void setImageBorderFixEnabled(Boolean imageBorderFixEnabled) {
+        this.imageBorderFixEnabled = imageBorderFixEnabled;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getMaxRowsPerSheet() {
+        return maxRowsPerSheet;
+    }
+
+    /**
+     * <p>Setter for the field <code>maxRowsPerSheet</code>.</p>
+     *
+     * @param maxRowsPerSheet a {@link java.lang.Integer} object.
+     */
+    public void setMaxRowsPerSheet(Integer maxRowsPerSheet) {
+        this.maxRowsPerSheet = maxRowsPerSheet;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreGraphics() {
+        return ignoreGraphics;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreGraphics</code>.</p>
+     *
+     * @param ignoreGraphics a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreGraphics(Boolean ignoreGraphics) {
+        this.ignoreGraphics = ignoreGraphics;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getCollapseRowSpan() {
+        return collapseRowSpan;
+    }
+
+    /**
+     * <p>Setter for the field <code>collapseRowSpan</code>.</p>
+     *
+     * @param collapseRowSpan a {@link java.lang.Boolean} object.
+     */
+    public void setCollapseRowSpan(Boolean collapseRowSpan) {
+        this.collapseRowSpan = collapseRowSpan;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreCellBorder() {
+        return ignoreCellBorder;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreCellBorder</code>.</p>
+     *
+     * @param ignoreCellBorder a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreCellBorder(Boolean ignoreCellBorder) {
+        this.ignoreCellBorder = ignoreCellBorder;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreCellBackground() {
+        return ignoreCellBackground;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreCellBackground</code>.</p>
+     *
+     * @param ignoreCellBackground a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreCellBackground(Boolean ignoreCellBackground) {
+        this.ignoreCellBackground = ignoreCellBackground;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * <p>Setter for the field <code>password</code>.</p>
+     *
+     * @param password a {@link java.lang.String} object.
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnorePageMargins() {
+        return ignorePageMargins;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignorePageMargins</code>.</p>
+     *
+     * @param ignorePageMargins a {@link java.lang.Boolean} object.
+     */
+    public void setIgnorePageMargins(Boolean ignorePageMargins) {
+        this.ignorePageMargins = ignorePageMargins;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getWrapText() {
+        return wrapText;
+    }
+
+    /**
+     * <p>Setter for the field <code>wrapText</code>.</p>
+     *
+     * @param wrapText a {@link java.lang.Boolean} object.
+     */
+    public void setWrapText(Boolean wrapText) {
+        this.wrapText = wrapText;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getCellLocked() {
+        return cellLocked;
+    }
+
+    /**
+     * <p>Setter for the field <code>cellLocked</code>.</p>
+     *
+     * @param cellLocked a {@link java.lang.Boolean} object.
+     */
+    public void setCellLocked(Boolean cellLocked) {
+        this.cellLocked = cellLocked;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getCellHidden() {
+        return cellHidden;
+    }
+
+    /**
+     * <p>Setter for the field <code>cellHidden</code>.</p>
+     *
+     * @param cellHidden a {@link java.lang.Boolean} object.
+     */
+    public void setCellHidden(Boolean cellHidden) {
+        this.cellHidden = cellHidden;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getSheetHeaderLeft() {
+        return sheetHeaderLeft;
+    }
+
+    /**
+     * <p>Setter for the field <code>sheetHeaderLeft</code>.</p>
+     *
+     * @param sheetHeaderLeft a {@link java.lang.String} object.
+     */
+    public void setSheetHeaderLeft(String sheetHeaderLeft) {
+        this.sheetHeaderLeft = sheetHeaderLeft;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getSheetHeaderCenter() {
+        return sheetHeaderCenter;
+    }
+
+    /**
+     * <p>Setter for the field <code>sheetHeaderCenter</code>.</p>
+     *
+     * @param sheetHeaderCenter a {@link java.lang.String} object.
+     */
+    public void setSheetHeaderCenter(String sheetHeaderCenter) {
+        this.sheetHeaderCenter = sheetHeaderCenter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getSheetHeaderRight() {
+        return sheetHeaderRight;
+    }
+
+    /**
+     * <p>Setter for the field <code>sheetHeaderRight</code>.</p>
+     *
+     * @param sheetHeaderRight a {@link java.lang.String} object.
+     */
+    public void setSheetHeaderRight(String sheetHeaderRight) {
+        this.sheetHeaderRight = sheetHeaderRight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getSheetFooterLeft() {
+        return sheetFooterLeft;
+    }
+
+    /**
+     * <p>Setter for the field <code>sheetFooterLeft</code>.</p>
+     *
+     * @param sheetFooterLeft a {@link java.lang.String} object.
+     */
+    public void setSheetFooterLeft(String sheetFooterLeft) {
+        this.sheetFooterLeft = sheetFooterLeft;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getSheetFooterCenter() {
+        return sheetFooterCenter;
+    }
+
+    /**
+     * <p>Setter for the field <code>sheetFooterCenter</code>.</p>
+     *
+     * @param sheetFooterCenter a {@link java.lang.String} object.
+     */
+    public void setSheetFooterCenter(String sheetFooterCenter) {
+        this.sheetFooterCenter = sheetFooterCenter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getSheetFooterRight() {
+        return sheetFooterRight;
+    }
+
+    /**
+     * <p>Setter for the field <code>sheetFooterRight</code>.</p>
+     *
+     * @param sheetFooterRight a {@link java.lang.String} object.
+     */
+    public void setSheetFooterRight(String sheetFooterRight) {
+        this.sheetFooterRight = sheetFooterRight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<String, String> getFormatPatternsMap() {
+        return formatPatternsMap;
+    }
+
+    /**
+     * <p>Setter for the field <code>formatPatternsMap</code>.</p>
+     *
+     * @param formatPatternsMap a {@link java.util.Map} object.
+     */
+    public void setFormatPatternsMap(Map<String, String> formatPatternsMap) {
+        this.formatPatternsMap = formatPatternsMap;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreHyperLink() {
+        return ignoreHyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreHyperLink</code>.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.ignoreHyperLink = ignoreHyperLink;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreAnchors() {
+        return ignoreAnchors;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreAnchors</code>.</p>
+     *
+     * @param ignoreAnchors a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreAnchors(Boolean ignoreAnchors) {
+        this.ignoreAnchors = ignoreAnchors;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getFitWidth() {
+        return fitWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>fitWidth</code>.</p>
+     *
+     * @param fitWidth a {@link java.lang.Integer} object.
+     */
+    public void setFitWidth(Integer fitWidth) {
+        this.fitWidth = fitWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getFitHeight() {
+        return fitHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>fitHeight</code>.</p>
+     *
+     * @param fitHeight a {@link java.lang.Integer} object.
+     */
+    public void setFitHeight(Integer fitHeight) {
+        this.fitHeight = fitHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageScale() {
+        return pageScale;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageScale</code>.</p>
+     *
+     * @param pageScale a {@link java.lang.Integer} object.
+     */
+    public void setPageScale(Integer pageScale) {
+        this.pageScale = pageScale;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public RunDirection getSheetDirection() {
+        return sheetDirection;
+    }
+
+    /**
+     * <p>Setter for the field <code>sheetDirection</code>.</p>
+     *
+     * @param sheetDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public void setSheetDirection(RunDirection sheetDirection) {
+        this.sheetDirection = sheetDirection;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getColumnWidthRatio() {
+        return columnWidthRatio;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnWidthRatio</code>.</p>
+     *
+     * @param columnWidthRatio a {@link java.lang.Float} object.
+     */
+    public void setColumnWidthRatio(Float columnWidthRatio) {
+        this.columnWidthRatio = columnWidthRatio;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getUseTimeZone() {
+        return useTimeZone;
+    }
+
+    /**
+     * <p>Setter for the field <code>useTimeZone</code>.</p>
+     *
+     * @param useTimeZone a {@link java.lang.Boolean} object.
+     */
+    public void setUseTimeZone(Boolean useTimeZone) {
+        this.useTimeZone = useTimeZone;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getFirstPageNumber() {
+        return firstPageNumber;
+    }
+
+    /**
+     * <p>Setter for the field <code>firstPageNumber</code>.</p>
+     *
+     * @param firstPageNumber a {@link java.lang.Integer} object.
+     */
+    public void setFirstPageNumber(Integer firstPageNumber) {
+        this.firstPageNumber = firstPageNumber;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getShowGridLines() {
+        return showGridLines;
+    }
+
+    /**
+     * <p>Setter for the field <code>showGridLines</code>.</p>
+     *
+     * @param showGridLines a {@link java.lang.Boolean} object.
+     */
+    public void setShowGridLines(Boolean showGridLines) {
+        this.showGridLines = showGridLines;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ImageAnchorType getImageAnchorType() {
+        return imageAnchorType;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageAnchorType</code>.</p>
+     *
+     * @param imageAnchorType a {@link net.sf.dynamicreports.report.constant.ImageAnchorType} object.
+     */
+    public void setImageAnchorType(ImageAnchorType imageAnchorType) {
+        this.imageAnchorType = imageAnchorType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getCreateCustomPalette() {
+        return createCustomPalette;
+    }
+
+    /**
+     * <p>Setter for the field <code>createCustomPalette</code>.</p>
+     *
+     * @param createCustomPalette a {@link java.lang.Boolean} object.
+     */
+    public void setCreateCustomPalette(Boolean createCustomPalette) {
+        this.createCustomPalette = createCustomPalette;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getWorkbookTemplate() {
+        return workbookTemplate;
+    }
+
+    /**
+     * <p>Setter for the field <code>workbookTemplate</code>.</p>
+     *
+     * @param workbookTemplate a {@link java.lang.String} object.
+     */
+    public void setWorkbookTemplate(String workbookTemplate) {
+        this.workbookTemplate = workbookTemplate;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getKeepWorkbookTemplateSheets() {
+        return keepWorkbookTemplateSheets;
+    }
+
+    /**
+     * <p>Setter for the field <code>keepWorkbookTemplateSheets</code>.</p>
+     *
+     * @param keepWorkbookTemplateSheets a {@link java.lang.Boolean} object.
+     */
+    public void setKeepWorkbookTemplateSheets(Boolean keepWorkbookTemplateSheets) {
+        this.keepWorkbookTemplateSheets = keepWorkbookTemplateSheets;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExporter.java
new file mode 100644
index 0000000..5bd698d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExporter.java
@@ -0,0 +1,203 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.Validate;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.io.Writer;
+
+/**
+ * <p>Abstract AbstractJasperExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractJasperExporter implements JasperIExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Writer outputWriter;
+    private OutputStream outputStream;
+    private File outputFile;
+    private String outputFileName;
+
+    private Integer pageIndex;
+    private Integer startPageIndex;
+    private Integer endPageIndex;
+    private String characterEncoding;
+    private Integer offsetX;
+    private Integer offsetY;
+
+    /** {@inheritDoc} */
+    @Override
+    public Writer getOutputWriter() {
+        return outputWriter;
+    }
+
+    /**
+     * <p>Setter for the field <code>outputWriter</code>.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     */
+    public void setOutputWriter(Writer outputWriter) {
+        Validate.notNull(outputWriter, "outputWriter must not be null");
+        this.outputWriter = outputWriter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public OutputStream getOutputStream() {
+        return outputStream;
+    }
+
+    /**
+     * <p>Setter for the field <code>outputStream</code>.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     */
+    public void setOutputStream(OutputStream outputStream) {
+        Validate.notNull(outputStream, "outputStream must not be null");
+        this.outputStream = outputStream;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public File getOutputFile() {
+        return outputFile;
+    }
+
+    /**
+     * <p>Setter for the field <code>outputFile</code>.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     */
+    public void setOutputFile(File outputFile) {
+        Validate.notNull(outputFile, "outputFile must not be null");
+        this.outputFile = outputFile;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getOutputFileName() {
+        return outputFileName;
+    }
+
+    /**
+     * <p>Setter for the field <code>outputFileName</code>.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     */
+    public void setOutputFileName(String outputFileName) {
+        Validate.notNull(outputFileName, "outputFileName must not be null");
+        this.outputFileName = outputFileName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageIndex</code>.</p>
+     *
+     * @param pageIndex a {@link java.lang.Integer} object.
+     */
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getStartPageIndex() {
+        return startPageIndex;
+    }
+
+    /**
+     * <p>Setter for the field <code>startPageIndex</code>.</p>
+     *
+     * @param startPageIndex a {@link java.lang.Integer} object.
+     */
+    public void setStartPageIndex(Integer startPageIndex) {
+        this.startPageIndex = startPageIndex;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getEndPageIndex() {
+        return endPageIndex;
+    }
+
+    /**
+     * <p>Setter for the field <code>endPageIndex</code>.</p>
+     *
+     * @param endPageIndex a {@link java.lang.Integer} object.
+     */
+    public void setEndPageIndex(Integer endPageIndex) {
+        this.endPageIndex = endPageIndex;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getCharacterEncoding() {
+        return characterEncoding;
+    }
+
+    /**
+     * <p>Setter for the field <code>characterEncoding</code>.</p>
+     *
+     * @param characterEncoding a {@link java.lang.String} object.
+     */
+    public void setCharacterEncoding(String characterEncoding) {
+        this.characterEncoding = characterEncoding;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getOffsetX() {
+        return offsetX;
+    }
+
+    /**
+     * <p>Setter for the field <code>offsetX</code>.</p>
+     *
+     * @param offsetX a {@link java.lang.Integer} object.
+     */
+    public void setOffsetX(Integer offsetX) {
+        this.offsetX = offsetX;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getOffsetY() {
+        return offsetY;
+    }
+
+    /**
+     * <p>Setter for the field <code>offsetY</code>.</p>
+     *
+     * @param offsetY a {@link java.lang.Integer} object.
+     */
+    public void setOffsetY(Integer offsetY) {
+        this.offsetY = offsetY;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperCsvExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperCsvExporter.java
new file mode 100644
index 0000000..3b8b159
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperCsvExporter.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperICsvExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperCsvExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperCsvExporter extends AbstractJasperExporter implements JasperICsvExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String fieldDelimiter;
+    private String recordDelimiter;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getFieldDelimiter() {
+        return fieldDelimiter;
+    }
+
+    /**
+     * <p>Setter for the field <code>fieldDelimiter</code>.</p>
+     *
+     * @param fieldDelimiter a {@link java.lang.String} object.
+     */
+    public void setFieldDelimiter(String fieldDelimiter) {
+        this.fieldDelimiter = fieldDelimiter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getRecordDelimiter() {
+        return recordDelimiter;
+    }
+
+    /**
+     * <p>Setter for the field <code>recordDelimiter</code>.</p>
+     *
+     * @param recordDelimiter a {@link java.lang.String} object.
+     */
+    public void setRecordDelimiter(String recordDelimiter) {
+        this.recordDelimiter = recordDelimiter;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperDocxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperDocxExporter.java
new file mode 100644
index 0000000..f15adff
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperDocxExporter.java
@@ -0,0 +1,81 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIDocxExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperDocxExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperDocxExporter extends AbstractJasperExporter implements JasperIDocxExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean framesAsNestedTables;
+    private Boolean flexibleRowHeight;
+    private Boolean ignoreHyperLink;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFramesAsNestedTables() {
+        return framesAsNestedTables;
+    }
+
+    /**
+     * <p>Setter for the field <code>framesAsNestedTables</code>.</p>
+     *
+     * @param framesAsNestedTables a {@link java.lang.Boolean} object.
+     */
+    public void setFramesAsNestedTables(Boolean framesAsNestedTables) {
+        this.framesAsNestedTables = framesAsNestedTables;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFlexibleRowHeight() {
+        return flexibleRowHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>flexibleRowHeight</code>.</p>
+     *
+     * @param flexibleRowHeight a {@link java.lang.Boolean} object.
+     */
+    public void setFlexibleRowHeight(Boolean flexibleRowHeight) {
+        this.flexibleRowHeight = flexibleRowHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreHyperLink() {
+        return ignoreHyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreHyperLink</code>.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.ignoreHyperLink = ignoreHyperLink;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperHtmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperHtmlExporter.java
new file mode 100644
index 0000000..9e01882
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperHtmlExporter.java
@@ -0,0 +1,322 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.constant.SizeUnit;
+import net.sf.dynamicreports.jasper.definition.export.JasperIHtmlExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperHtmlExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperHtmlExporter extends AbstractJasperExporter implements JasperIHtmlExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean outputImagesToDir;
+    private String imagesDirName;
+    private String imagesURI;
+    private String htmlHeader;
+    private String betweenPagesHtml;
+    private String htmlFooter;
+    private Boolean removeEmptySpaceBetweenRows;
+    private Boolean whitePageBackground;
+    private Boolean usingImagesToAlign;
+    private Boolean wrapBreakWord;
+    private SizeUnit sizeUnit;
+    private Boolean framesAsNestedTables;
+    private Boolean ignorePageMargins;
+    private String borderCollapse;
+    private Boolean accessibleHtml;
+    private Float zoomRatio;
+    private Boolean ignoreHyperLink;
+    private Boolean flushOutput;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getOutputImagesToDir() {
+        return outputImagesToDir;
+    }
+
+    /**
+     * <p>Setter for the field <code>outputImagesToDir</code>.</p>
+     *
+     * @param outputImagesToDir a {@link java.lang.Boolean} object.
+     */
+    public void setOutputImagesToDir(Boolean outputImagesToDir) {
+        this.outputImagesToDir = outputImagesToDir;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getImagesDirName() {
+        return imagesDirName;
+    }
+
+    /**
+     * <p>Setter for the field <code>imagesDirName</code>.</p>
+     *
+     * @param imagesDirName a {@link java.lang.String} object.
+     */
+    public void setImagesDirName(String imagesDirName) {
+        this.imagesDirName = imagesDirName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getImagesURI() {
+        return imagesURI;
+    }
+
+    /**
+     * <p>Setter for the field <code>imagesURI</code>.</p>
+     *
+     * @param imagesURI a {@link java.lang.String} object.
+     */
+    public void setImagesURI(String imagesURI) {
+        this.imagesURI = imagesURI;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getHtmlHeader() {
+        return htmlHeader;
+    }
+
+    /**
+     * <p>Setter for the field <code>htmlHeader</code>.</p>
+     *
+     * @param htmlHeader a {@link java.lang.String} object.
+     */
+    public void setHtmlHeader(String htmlHeader) {
+        this.htmlHeader = htmlHeader;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getBetweenPagesHtml() {
+        return betweenPagesHtml;
+    }
+
+    /**
+     * <p>Setter for the field <code>betweenPagesHtml</code>.</p>
+     *
+     * @param betweenPagesHtml a {@link java.lang.String} object.
+     */
+    public void setBetweenPagesHtml(String betweenPagesHtml) {
+        this.betweenPagesHtml = betweenPagesHtml;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getHtmlFooter() {
+        return htmlFooter;
+    }
+
+    /**
+     * <p>Setter for the field <code>htmlFooter</code>.</p>
+     *
+     * @param htmlFooter a {@link java.lang.String} object.
+     */
+    public void setHtmlFooter(String htmlFooter) {
+        this.htmlFooter = htmlFooter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getRemoveEmptySpaceBetweenRows() {
+        return removeEmptySpaceBetweenRows;
+    }
+
+    /**
+     * <p>Setter for the field <code>removeEmptySpaceBetweenRows</code>.</p>
+     *
+     * @param removeEmptySpaceBetweenRows a {@link java.lang.Boolean} object.
+     */
+    public void setRemoveEmptySpaceBetweenRows(Boolean removeEmptySpaceBetweenRows) {
+        this.removeEmptySpaceBetweenRows = removeEmptySpaceBetweenRows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getWhitePageBackground() {
+        return whitePageBackground;
+    }
+
+    /**
+     * <p>Setter for the field <code>whitePageBackground</code>.</p>
+     *
+     * @param whitePageBackground a {@link java.lang.Boolean} object.
+     */
+    public void setWhitePageBackground(Boolean whitePageBackground) {
+        this.whitePageBackground = whitePageBackground;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getUsingImagesToAlign() {
+        return usingImagesToAlign;
+    }
+
+    /**
+     * <p>Setter for the field <code>usingImagesToAlign</code>.</p>
+     *
+     * @param usingImagesToAlign a {@link java.lang.Boolean} object.
+     */
+    public void setUsingImagesToAlign(Boolean usingImagesToAlign) {
+        this.usingImagesToAlign = usingImagesToAlign;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getWrapBreakWord() {
+        return wrapBreakWord;
+    }
+
+    /**
+     * <p>Setter for the field <code>wrapBreakWord</code>.</p>
+     *
+     * @param wrapBreakWord a {@link java.lang.Boolean} object.
+     */
+    public void setWrapBreakWord(Boolean wrapBreakWord) {
+        this.wrapBreakWord = wrapBreakWord;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public SizeUnit getSizeUnit() {
+        return sizeUnit;
+    }
+
+    /**
+     * <p>Setter for the field <code>sizeUnit</code>.</p>
+     *
+     * @param sizeUnit a {@link net.sf.dynamicreports.jasper.constant.SizeUnit} object.
+     */
+    public void setSizeUnit(SizeUnit sizeUnit) {
+        this.sizeUnit = sizeUnit;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFramesAsNestedTables() {
+        return framesAsNestedTables;
+    }
+
+    /**
+     * <p>Setter for the field <code>framesAsNestedTables</code>.</p>
+     *
+     * @param framesAsNestedTables a {@link java.lang.Boolean} object.
+     */
+    public void setFramesAsNestedTables(Boolean framesAsNestedTables) {
+        this.framesAsNestedTables = framesAsNestedTables;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnorePageMargins() {
+        return ignorePageMargins;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignorePageMargins</code>.</p>
+     *
+     * @param ignorePageMargins a {@link java.lang.Boolean} object.
+     */
+    public void setIgnorePageMargins(Boolean ignorePageMargins) {
+        this.ignorePageMargins = ignorePageMargins;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getBorderCollapse() {
+        return borderCollapse;
+    }
+
+    /**
+     * <p>Setter for the field <code>borderCollapse</code>.</p>
+     *
+     * @param borderCollapse a {@link java.lang.String} object.
+     */
+    public void setBorderCollapse(String borderCollapse) {
+        this.borderCollapse = borderCollapse;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getAccessibleHtml() {
+        return accessibleHtml;
+    }
+
+    /**
+     * <p>Setter for the field <code>accessibleHtml</code>.</p>
+     *
+     * @param accessibleHtml a {@link java.lang.Boolean} object.
+     */
+    public void setAccessibleHtml(Boolean accessibleHtml) {
+        this.accessibleHtml = accessibleHtml;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getZoomRatio() {
+        return zoomRatio;
+    }
+
+    /**
+     * <p>Setter for the field <code>zoomRatio</code>.</p>
+     *
+     * @param zoomRatio a {@link java.lang.Float} object.
+     */
+    public void setZoomRatio(Float zoomRatio) {
+        this.zoomRatio = zoomRatio;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreHyperLink() {
+        return ignoreHyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreHyperLink</code>.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.ignoreHyperLink = ignoreHyperLink;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFlushOutput() {
+        return flushOutput;
+    }
+
+    /**
+     * <p>Setter for the field <code>flushOutput</code>.</p>
+     *
+     * @param flushOutput a {@link java.lang.Boolean} object.
+     */
+    public void setFlushOutput(Boolean flushOutput) {
+        this.flushOutput = flushOutput;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperImageExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperImageExporter.java
new file mode 100644
index 0000000..e52542f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperImageExporter.java
@@ -0,0 +1,83 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.constant.ImageType;
+import net.sf.dynamicreports.jasper.definition.export.JasperIImageExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>JasperImageExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperImageExporter extends AbstractJasperExporter implements JasperIImageExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer pageGap;
+    private ImageType imageType;
+    private Float zoomRatio;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageGap() {
+        return pageGap;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageGap</code>.</p>
+     *
+     * @param pageGap a {@link java.lang.Integer} object.
+     */
+    public void setPageGap(Integer pageGap) {
+        this.pageGap = pageGap;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ImageType getImageType() {
+        return imageType;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageType</code>.</p>
+     *
+     * @param imageType a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     */
+    public void setImageType(ImageType imageType) {
+        Validate.notNull(imageType, "imageType must not be null");
+        this.imageType = imageType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getZoomRatio() {
+        return zoomRatio;
+    }
+
+    /**
+     * <p>Setter for the field <code>zoomRatio</code>.</p>
+     *
+     * @param zoomRatio a {@link java.lang.Float} object.
+     */
+    public void setZoomRatio(Float zoomRatio) {
+        this.zoomRatio = zoomRatio;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdsExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdsExporter.java
new file mode 100644
index 0000000..3808a3d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdsExporter.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIOdsExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperOdsExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperOdsExporter extends AbstractJasperExcelExporter implements JasperIOdsExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean flexibleRowHeight;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFlexibleRowHeight() {
+        return flexibleRowHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>flexibleRowHeight</code>.</p>
+     *
+     * @param flexibleRowHeight a {@link java.lang.Boolean} object.
+     */
+    public void setFlexibleRowHeight(Boolean flexibleRowHeight) {
+        this.flexibleRowHeight = flexibleRowHeight;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdtExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdtExporter.java
new file mode 100644
index 0000000..3ee1298
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdtExporter.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIOdtExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperOdtExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperOdtExporter extends AbstractJasperExporter implements JasperIOdtExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean flexibleRowHeight;
+    private Boolean ignoreHyperLink;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFlexibleRowHeight() {
+        return flexibleRowHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>flexibleRowHeight</code>.</p>
+     *
+     * @param flexibleRowHeight a {@link java.lang.Boolean} object.
+     */
+    public void setFlexibleRowHeight(Boolean flexibleRowHeight) {
+        this.flexibleRowHeight = flexibleRowHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreHyperLink() {
+        return ignoreHyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreHyperLink</code>.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.ignoreHyperLink = ignoreHyperLink;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPdfExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPdfExporter.java
new file mode 100644
index 0000000..69252dc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPdfExporter.java
@@ -0,0 +1,488 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.constant.PdfPermission;
+import net.sf.dynamicreports.jasper.constant.PdfVersion;
+import net.sf.dynamicreports.jasper.definition.export.JasperIPdfExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.PdfPrintScaling;
+import net.sf.dynamicreports.report.constant.PdfaConformance;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>JasperPdfExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperPdfExporter extends AbstractJasperExporter implements JasperIPdfExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean creatingBatchModeBookmarks;
+    private Boolean compressed;
+    private Boolean encrypted;
+    private Boolean bitKey128;
+    private String userPassword;
+    private String ownerPassword;
+    private List<PdfPermission> permissions;
+    private PdfVersion pdfVersion;
+    private String metadataTitle;
+    private String metadataAuthor;
+    private String metadataSubject;
+    private String metadataKeyWords;
+    private String metadataCreator;
+    private Boolean forceSvgShapes;
+    private String pdfJavaScript;
+    private Boolean tagged;
+    private String tagLanguage;
+    private Boolean collapseMissingBookmarkLevels;
+    private Boolean sizePageToContent;
+    private Boolean ignoreHyperLink;
+    private Boolean forceLineBreakPolicy;
+    private PdfPrintScaling printScaling;
+    private PdfaConformance pdfaConformance;
+    private String iccProfilePath;
+    private String allowedPermissionsHint;
+    private String deniedPermissionsHint;
+    private Boolean displayMetadataTitle;
+
+    /**
+     * <p>Constructor for JasperPdfExporter.</p>
+     */
+    public JasperPdfExporter() {
+        permissions = new ArrayList<PdfPermission>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getCreatingBatchModeBookmarks() {
+        return creatingBatchModeBookmarks;
+    }
+
+    /**
+     * <p>Setter for the field <code>creatingBatchModeBookmarks</code>.</p>
+     *
+     * @param creatingBatchModeBookmarks a {@link java.lang.Boolean} object.
+     */
+    public void setCreatingBatchModeBookmarks(Boolean creatingBatchModeBookmarks) {
+        this.creatingBatchModeBookmarks = creatingBatchModeBookmarks;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getCompressed() {
+        return compressed;
+    }
+
+    /**
+     * <p>Setter for the field <code>compressed</code>.</p>
+     *
+     * @param compressed a {@link java.lang.Boolean} object.
+     */
+    public void setCompressed(Boolean compressed) {
+        this.compressed = compressed;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getEncrypted() {
+        return encrypted;
+    }
+
+    /**
+     * <p>Setter for the field <code>encrypted</code>.</p>
+     *
+     * @param encrypted a {@link java.lang.Boolean} object.
+     */
+    public void setEncrypted(Boolean encrypted) {
+        this.encrypted = encrypted;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getBitKey128() {
+        return bitKey128;
+    }
+
+    /**
+     * <p>Setter for the field <code>bitKey128</code>.</p>
+     *
+     * @param bitKey128 a {@link java.lang.Boolean} object.
+     */
+    public void setBitKey128(Boolean bitKey128) {
+        this.bitKey128 = bitKey128;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getUserPassword() {
+        return userPassword;
+    }
+
+    /**
+     * <p>Setter for the field <code>userPassword</code>.</p>
+     *
+     * @param userPassword a {@link java.lang.String} object.
+     */
+    public void setUserPassword(String userPassword) {
+        this.userPassword = userPassword;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getOwnerPassword() {
+        return ownerPassword;
+    }
+
+    /**
+     * <p>Setter for the field <code>ownerPassword</code>.</p>
+     *
+     * @param ownerPassword a {@link java.lang.String} object.
+     */
+    public void setOwnerPassword(String ownerPassword) {
+        this.ownerPassword = ownerPassword;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<PdfPermission> getPermissions() {
+        return permissions;
+    }
+
+    /**
+     * <p>Setter for the field <code>permissions</code>.</p>
+     *
+     * @param permissions a {@link java.util.List} object.
+     */
+    public void setPermissions(List<PdfPermission> permissions) {
+        this.permissions = permissions;
+    }
+
+    /**
+     * <p>addPermission.</p>
+     *
+     * @param permission a {@link net.sf.dynamicreports.jasper.constant.PdfPermission} object.
+     */
+    public void addPermission(PdfPermission permission) {
+        this.permissions.add(permission);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PdfVersion getPdfVersion() {
+        return pdfVersion;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfVersion</code>.</p>
+     *
+     * @param pdfVersion a {@link net.sf.dynamicreports.jasper.constant.PdfVersion} object.
+     */
+    public void setPdfVersion(PdfVersion pdfVersion) {
+        this.pdfVersion = pdfVersion;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMetadataTitle() {
+        return metadataTitle;
+    }
+
+    /**
+     * <p>Setter for the field <code>metadataTitle</code>.</p>
+     *
+     * @param metadataTitle a {@link java.lang.String} object.
+     */
+    public void setMetadataTitle(String metadataTitle) {
+        this.metadataTitle = metadataTitle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMetadataAuthor() {
+        return metadataAuthor;
+    }
+
+    /**
+     * <p>Setter for the field <code>metadataAuthor</code>.</p>
+     *
+     * @param metadataAuthor a {@link java.lang.String} object.
+     */
+    public void setMetadataAuthor(String metadataAuthor) {
+        this.metadataAuthor = metadataAuthor;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMetadataSubject() {
+        return metadataSubject;
+    }
+
+    /**
+     * <p>Setter for the field <code>metadataSubject</code>.</p>
+     *
+     * @param metadataSubject a {@link java.lang.String} object.
+     */
+    public void setMetadataSubject(String metadataSubject) {
+        this.metadataSubject = metadataSubject;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMetadataKeyWords() {
+        return metadataKeyWords;
+    }
+
+    /**
+     * <p>Setter for the field <code>metadataKeyWords</code>.</p>
+     *
+     * @param metadataKeyWords a {@link java.lang.String} object.
+     */
+    public void setMetadataKeyWords(String metadataKeyWords) {
+        this.metadataKeyWords = metadataKeyWords;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMetadataCreator() {
+        return metadataCreator;
+    }
+
+    /**
+     * <p>Setter for the field <code>metadataCreator</code>.</p>
+     *
+     * @param metadataCreator a {@link java.lang.String} object.
+     */
+    public void setMetadataCreator(String metadataCreator) {
+        this.metadataCreator = metadataCreator;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getForceSvgShapes() {
+        return forceSvgShapes;
+    }
+
+    /**
+     * <p>Setter for the field <code>forceSvgShapes</code>.</p>
+     *
+     * @param forceSvgShapes a {@link java.lang.Boolean} object.
+     */
+    public void setForceSvgShapes(Boolean forceSvgShapes) {
+        this.forceSvgShapes = forceSvgShapes;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPdfJavaScript() {
+        return pdfJavaScript;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfJavaScript</code>.</p>
+     *
+     * @param pdfJavaScript a {@link java.lang.String} object.
+     */
+    public void setPdfJavaScript(String pdfJavaScript) {
+        this.pdfJavaScript = pdfJavaScript;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getTagged() {
+        return tagged;
+    }
+
+    /**
+     * <p>Setter for the field <code>tagged</code>.</p>
+     *
+     * @param tagged a {@link java.lang.Boolean} object.
+     */
+    public void setTagged(Boolean tagged) {
+        this.tagged = tagged;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTagLanguage() {
+        return tagLanguage;
+    }
+
+    /**
+     * <p>Setter for the field <code>tagLanguage</code>.</p>
+     *
+     * @param tagLanguage a {@link java.lang.String} object.
+     */
+    public void setTagLanguage(String tagLanguage) {
+        this.tagLanguage = tagLanguage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getCollapseMissingBookmarkLevels() {
+        return collapseMissingBookmarkLevels;
+    }
+
+    /**
+     * <p>Setter for the field <code>collapseMissingBookmarkLevels</code>.</p>
+     *
+     * @param collapseMissingBookmarkLevels a {@link java.lang.Boolean} object.
+     */
+    public void setCollapseMissingBookmarkLevels(Boolean collapseMissingBookmarkLevels) {
+        this.collapseMissingBookmarkLevels = collapseMissingBookmarkLevels;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getSizePageToContent() {
+        return sizePageToContent;
+    }
+
+    /**
+     * <p>Setter for the field <code>sizePageToContent</code>.</p>
+     *
+     * @param sizePageToContent a {@link java.lang.Boolean} object.
+     */
+    public void setSizePageToContent(Boolean sizePageToContent) {
+        this.sizePageToContent = sizePageToContent;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreHyperLink() {
+        return ignoreHyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreHyperLink</code>.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.ignoreHyperLink = ignoreHyperLink;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getForceLineBreakPolicy() {
+        return forceLineBreakPolicy;
+    }
+
+    /**
+     * <p>Setter for the field <code>forceLineBreakPolicy</code>.</p>
+     *
+     * @param forceLineBreakPolicy a {@link java.lang.Boolean} object.
+     */
+    public void setForceLineBreakPolicy(Boolean forceLineBreakPolicy) {
+        this.forceLineBreakPolicy = forceLineBreakPolicy;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PdfPrintScaling getPrintScaling() {
+        return printScaling;
+    }
+
+    /**
+     * <p>Setter for the field <code>printScaling</code>.</p>
+     *
+     * @param printScaling a {@link net.sf.dynamicreports.report.constant.PdfPrintScaling} object.
+     */
+    public void setPrintScaling(PdfPrintScaling printScaling) {
+        this.printScaling = printScaling;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PdfaConformance getPdfaConformance() {
+        return pdfaConformance;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfaConformance</code>.</p>
+     *
+     * @param pdfaConformance a {@link net.sf.dynamicreports.report.constant.PdfaConformance} object.
+     */
+    public void setPdfaConformance(PdfaConformance pdfaConformance) {
+        this.pdfaConformance = pdfaConformance;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getIccProfilePath() {
+        return iccProfilePath;
+    }
+
+    /**
+     * <p>Setter for the field <code>iccProfilePath</code>.</p>
+     *
+     * @param iccProfilePath a {@link java.lang.String} object.
+     */
+    public void setIccProfilePath(String iccProfilePath) {
+        this.iccProfilePath = iccProfilePath;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getAllowedPermissionsHint() {
+        return allowedPermissionsHint;
+    }
+
+    /**
+     * <p>Setter for the field <code>allowedPermissionsHint</code>.</p>
+     *
+     * @param allowedPermissionsHint a {@link java.lang.String} object.
+     */
+    public void setAllowedPermissionsHint(String allowedPermissionsHint) {
+        this.allowedPermissionsHint = allowedPermissionsHint;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getDeniedPermissionsHint() {
+        return deniedPermissionsHint;
+    }
+
+    /**
+     * <p>Setter for the field <code>deniedPermissionsHint</code>.</p>
+     *
+     * @param deniedPermissionsHint a {@link java.lang.String} object.
+     */
+    public void setDeniedPermissionsHint(String deniedPermissionsHint) {
+        this.deniedPermissionsHint = deniedPermissionsHint;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getDisplayMetadataTitle() {
+        return displayMetadataTitle;
+    }
+
+    /**
+     * <p>Setter for the field <code>displayMetadataTitle</code>.</p>
+     *
+     * @param displayMetadataTitle a {@link java.lang.Boolean} object.
+     */
+    public void setDisplayMetadataTitle(Boolean displayMetadataTitle) {
+        this.displayMetadataTitle = displayMetadataTitle;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPptxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPptxExporter.java
new file mode 100644
index 0000000..56df328
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPptxExporter.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIPptxExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperPptxExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperPptxExporter extends AbstractJasperExporter implements JasperIPptxExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean ignoreHyperLink;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreHyperLink() {
+        return ignoreHyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreHyperLink</code>.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.ignoreHyperLink = ignoreHyperLink;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperRtfExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperRtfExporter.java
new file mode 100644
index 0000000..dca907e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperRtfExporter.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIRtfExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperRtfExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperRtfExporter extends AbstractJasperExporter implements JasperIRtfExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean ignoreHyperLink;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreHyperLink() {
+        return ignoreHyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreHyperLink</code>.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.ignoreHyperLink = ignoreHyperLink;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperTextExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperTextExporter.java
new file mode 100644
index 0000000..0e900b5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperTextExporter.java
@@ -0,0 +1,145 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperITextExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperTextExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperTextExporter extends AbstractJasperExporter implements JasperITextExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Float characterWidth;
+    private Float characterHeight;
+    private Integer pageWidthInChars;
+    private Integer pageHeightInChars;
+    private String pageSeparator;
+    private String lineSeparator;
+    private Boolean trimLineRight;
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getCharacterWidth() {
+        return characterWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>characterWidth</code>.</p>
+     *
+     * @param characterWidth a {@link java.lang.Float} object.
+     */
+    public void setCharacterWidth(Float characterWidth) {
+        this.characterWidth = characterWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getCharacterHeight() {
+        return characterHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>characterHeight</code>.</p>
+     *
+     * @param characterHeight a {@link java.lang.Float} object.
+     */
+    public void setCharacterHeight(Float characterHeight) {
+        this.characterHeight = characterHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageWidthInChars() {
+        return pageWidthInChars;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageWidthInChars</code>.</p>
+     *
+     * @param pageWidthInChars a {@link java.lang.Integer} object.
+     */
+    public void setPageWidthInChars(Integer pageWidthInChars) {
+        this.pageWidthInChars = pageWidthInChars;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageHeightInChars() {
+        return pageHeightInChars;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageHeightInChars</code>.</p>
+     *
+     * @param pageHeightInChars a {@link java.lang.Integer} object.
+     */
+    public void setPageHeightInChars(Integer pageHeightInChars) {
+        this.pageHeightInChars = pageHeightInChars;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPageSeparator() {
+        return pageSeparator;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageSeparator</code>.</p>
+     *
+     * @param pageSeparator a {@link java.lang.String} object.
+     */
+    public void setPageSeparator(String pageSeparator) {
+        this.pageSeparator = pageSeparator;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getLineSeparator() {
+        return lineSeparator;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineSeparator</code>.</p>
+     *
+     * @param lineSeparator a {@link java.lang.String} object.
+     */
+    public void setLineSeparator(String lineSeparator) {
+        this.lineSeparator = lineSeparator;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getTrimLineRight() {
+        return trimLineRight;
+    }
+
+    /**
+     * <p>Setter for the field <code>trimLineRight</code>.</p>
+     *
+     * @param trimLineRight a {@link java.lang.Boolean} object.
+     */
+    public void setTrimLineRight(Boolean trimLineRight) {
+        this.trimLineRight = trimLineRight;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsExporter.java
new file mode 100644
index 0000000..cb8c5b8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsExporter.java
@@ -0,0 +1,31 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIXlsExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperXlsExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperXlsExporter extends AbstractJasperExcelExporter implements JasperIXlsExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsxExporter.java
new file mode 100644
index 0000000..e940826
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsxExporter.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperXlsxExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperXlsxExporter extends AbstractJasperExcelExporter implements JasperIXlsxExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String macroTemplate;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMacroTemplate() {
+        return macroTemplate;
+    }
+
+    /**
+     * <p>Setter for the field <code>macroTemplate</code>.</p>
+     *
+     * @param macroTemplate a {@link java.lang.String} object.
+     */
+    public void setMacroTemplate(String macroTemplate) {
+        this.macroTemplate = macroTemplate;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXmlExporter.java
new file mode 100644
index 0000000..833dc99
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXmlExporter.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.export;
+
+import net.sf.dynamicreports.jasper.definition.export.JasperIXmlExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperXmlExporter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperXmlExporter extends AbstractJasperExporter implements JasperIXmlExporter {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean embeddingImages;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getEmbeddingImages() {
+        return embeddingImages;
+    }
+
+    /**
+     * <p>Setter for the field <code>embeddingImages</code>.</p>
+     *
+     * @param embeddingImages a {@link java.lang.Boolean} object.
+     */
+    public void setEmbeddingImages(Boolean embeddingImages) {
+        this.embeddingImages = embeddingImages;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java
new file mode 100644
index 0000000..2f8d11e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java
@@ -0,0 +1,74 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.reporthandler;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
+import net.sf.jasperreports.engine.JasperPrint;
+
+/**
+ * <p>Abstract AbstractPrintListHandler class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractPrintListHandler implements JasperReportHandler {
+    private boolean continuousPageNumbering;
+    private int pageNumber;
+
+    /**
+     * <p>Constructor for AbstractPrintListHandler.</p>
+     */
+    public AbstractPrintListHandler() {
+        continuousPageNumbering = false;
+        pageNumber = 1;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void concatenate(JasperReportBuilder... jasperReportBuilders) {
+        for (JasperReportBuilder jasperReportBuilder : jasperReportBuilders) {
+            try {
+                if (continuousPageNumbering) {
+                    jasperReportBuilder.setStartPageNumber(pageNumber);
+                } else {
+                    jasperReportBuilder.setStartPageNumber(null);
+                }
+                JasperPrint jasperPrint = jasperReportBuilder.toJasperPrint();
+                add(jasperPrint);
+                pageNumber += jasperPrint.getPages().size();
+                jasperReportBuilder.rebuild();
+            } catch (Exception e) {
+            }
+        }
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param jasperPrint a {@link net.sf.jasperreports.engine.JasperPrint} object.
+     */
+    protected abstract void add(JasperPrint jasperPrint);
+
+    /** {@inheritDoc} */
+    @Override
+    public void setContinuousPageNumbering(boolean continuousPageNumbering) {
+        this.continuousPageNumbering = continuousPageNumbering;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java
new file mode 100644
index 0000000..271c96e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java
@@ -0,0 +1,249 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.reporthandler;
+
+import net.sf.dynamicreports.report.exception.DRReportException;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRVirtualizer;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.util.JRLoader;
+import net.sf.jasperreports.engine.util.JRSaver;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * <p>JasperPrintListFileHandler class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperPrintListFileHandler extends AbstractPrintListHandler {
+    private static final String TEMP_FILE_PREFIX = "JasperPrint";
+
+    private List<JasperPrint> printList;
+    private List<File> tempFiles;
+    private File directory;
+    private JRVirtualizer virtualizer;
+
+    /**
+     * <p>Constructor for JasperPrintListFileHandler.</p>
+     *
+     * @param directory a {@link java.lang.String} object.
+     */
+    public JasperPrintListFileHandler(String directory) {
+        this(directory, null);
+    }
+
+    /**
+     * <p>Constructor for JasperPrintListFileHandler.</p>
+     *
+     * @param directory   a {@link java.lang.String} object.
+     * @param virtualizer a {@link net.sf.jasperreports.engine.JRVirtualizer} object.
+     */
+    public JasperPrintListFileHandler(String directory, JRVirtualizer virtualizer) {
+        this.virtualizer = virtualizer;
+        if (directory != null) {
+            this.directory = new File(directory);
+        }
+        printList = new PrintList();
+        tempFiles = new ArrayList<File>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void add(JasperPrint jasperPrint) {
+        try {
+            File tempFile = File.createTempFile(TEMP_FILE_PREFIX, null, directory);
+            JRSaver.saveObject(jasperPrint, tempFile);
+            tempFiles.add(tempFile);
+        } catch (JRException e) {
+            throw new DRReportException(e);
+        } catch (IOException e) {
+            throw new DRReportException(e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<JasperPrint> getPrintList() {
+        return printList;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void finalize() throws Throwable {
+        for (File tempFile : tempFiles) {
+            tempFile.delete();
+        }
+        super.finalize();
+    }
+
+    private class PrintList implements List<JasperPrint> {
+
+        @Override
+        public int size() {
+            return tempFiles.size();
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return tempFiles.isEmpty();
+        }
+
+        @Override
+        public boolean contains(Object o) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Iterator<JasperPrint> iterator() {
+            return new Iterator<JasperPrint>() {
+                private Iterator<File> it = tempFiles.iterator();
+
+                @Override
+                public boolean hasNext() {
+                    return it.hasNext();
+                }
+
+                @Override
+                public JasperPrint next() {
+                    File tempFile = it.next();
+                    try {
+                        JasperPrint jasperPrint = JRLoader.loadJasperPrint(tempFile, virtualizer);
+                        return jasperPrint;
+                    } catch (JRException e) {
+                        throw new DRReportException(e);
+                    }
+                }
+
+                @Override
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+
+            };
+        }
+
+        @Override
+        public Object[] toArray() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public <T> T[] toArray(T[] a) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean add(JasperPrint o) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean remove(Object o) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean containsAll(Collection<?> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean addAll(Collection<? extends JasperPrint> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean addAll(int index, Collection<? extends JasperPrint> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean removeAll(Collection<?> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean retainAll(Collection<?> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void clear() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public JasperPrint get(int index) {
+            try {
+                File tempFile = tempFiles.get(index);
+                JasperPrint jasperPrint = JRLoader.loadJasperPrint(tempFile, virtualizer);
+                return jasperPrint;
+            } catch (JRException e) {
+                throw new DRReportException(e);
+            }
+        }
+
+        @Override
+        public JasperPrint set(int index, JasperPrint element) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void add(int index, JasperPrint element) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public JasperPrint remove(int index) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int indexOf(Object o) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int lastIndexOf(Object o) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ListIterator<JasperPrint> listIterator() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ListIterator<JasperPrint> listIterator(int index) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public List<JasperPrint> subList(int fromIndex, int toIndex) {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java
new file mode 100644
index 0000000..f2e58e9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.reporthandler;
+
+import net.sf.jasperreports.engine.JasperPrint;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>JasperPrintListHandler class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperPrintListHandler extends AbstractPrintListHandler {
+    private List<JasperPrint> printList;
+
+    /**
+     * <p>Constructor for JasperPrintListHandler.</p>
+     */
+    public JasperPrintListHandler() {
+        printList = new ArrayList<JasperPrint>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void add(JasperPrint jasperPrint) {
+        printList.add(jasperPrint);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<JasperPrint> getPrintList() {
+        return printList;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java
new file mode 100644
index 0000000..dc015ad
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java
@@ -0,0 +1,78 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.reporthandler;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JasperPrint;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>JasperReportBuilderHandler class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperReportBuilderHandler implements JasperReportHandler {
+    private List<JasperReportBuilder> jasperReportBuilders;
+    private boolean continuousPageNumbering;
+
+    /**
+     * <p>Constructor for JasperReportBuilderHandler.</p>
+     */
+    public JasperReportBuilderHandler() {
+        jasperReportBuilders = new ArrayList<JasperReportBuilder>();
+        continuousPageNumbering = false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void concatenate(JasperReportBuilder... jasperReportBuilders) {
+        for (JasperReportBuilder jasperReportBuilder : jasperReportBuilders) {
+            this.jasperReportBuilders.add(jasperReportBuilder);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setContinuousPageNumbering(boolean continuousPageNumbering) {
+        this.continuousPageNumbering = continuousPageNumbering;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<JasperPrint> getPrintList() throws DRException {
+        List<JasperPrint> printList = new ArrayList<JasperPrint>();
+        int pageNumber = 1;
+        for (JasperReportBuilder jasperReportBuilder : jasperReportBuilders) {
+            if (continuousPageNumbering) {
+                jasperReportBuilder.setStartPageNumber(pageNumber);
+            } else {
+                jasperReportBuilder.setStartPageNumber(null);
+            }
+            JasperPrint jasperPrint = jasperReportBuilder.toJasperPrint();
+            printList.add(jasperPrint);
+            pageNumber += jasperPrint.getPages().size();
+        }
+        return printList;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java
new file mode 100644
index 0000000..aa62c6b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java
@@ -0,0 +1,129 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.tableofcontents;
+
+import net.sf.dynamicreports.report.constant.Constants;
+
+import java.io.Serializable;
+
+/**
+ * <p>JasperTocHeading class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperTocHeading implements Serializable {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer level;
+    private String text;
+    private String reference;
+    private Integer pageIndex;
+    private Object customValue;
+
+    /**
+     * <p>Getter for the field <code>level</code>.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getLevel() {
+        return level;
+    }
+
+    /**
+     * <p>Setter for the field <code>level</code>.</p>
+     *
+     * @param level a {@link java.lang.Integer} object.
+     */
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    /**
+     * <p>Getter for the field <code>text</code>.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * <p>Setter for the field <code>text</code>.</p>
+     *
+     * @param text a {@link java.lang.String} object.
+     */
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    /**
+     * <p>Getter for the field <code>reference</code>.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getReference() {
+        return reference;
+    }
+
+    /**
+     * <p>Setter for the field <code>reference</code>.</p>
+     *
+     * @param reference a {@link java.lang.String} object.
+     */
+    public void setReference(String reference) {
+        this.reference = reference;
+    }
+
+    /**
+     * <p>Getter for the field <code>pageIndex</code>.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageIndex</code>.</p>
+     *
+     * @param pageIndex a {@link java.lang.Integer} object.
+     */
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    /**
+     * <p>Getter for the field <code>customValue</code>.</p>
+     *
+     * @return a {@link java.lang.Object} object.
+     */
+    public Object getCustomValue() {
+        return customValue;
+    }
+
+    /**
+     * <p>Setter for the field <code>customValue</code>.</p>
+     *
+     * @param customValue a {@link java.lang.Object} object.
+     */
+    public void setCustomValue(Object customValue) {
+        this.customValue = customValue;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java
new file mode 100644
index 0000000..388c418
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java
@@ -0,0 +1,151 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.tableofcontents;
+
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.dynamicreports.jasper.base.JasperReportDesign;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.jasper.transformation.ConstantTransform;
+import net.sf.dynamicreports.report.base.DRPage;
+import net.sf.dynamicreports.report.builder.MarginBuilder;
+import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JRPrintElement;
+import net.sf.jasperreports.engine.JRPrintFrame;
+import net.sf.jasperreports.engine.JRPrintPage;
+import net.sf.jasperreports.engine.JRPrintText;
+import net.sf.jasperreports.engine.JRStyle;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * <p>JasperTocReport class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperTocReport {
+
+    /**
+     * <p>createTocReport.</p>
+     *
+     * @param jasperReportDesign a {@link net.sf.dynamicreports.jasper.base.JasperReportDesign} object.
+     * @param jasperPrint        a {@link net.sf.jasperreports.engine.JasperPrint} object.
+     * @param parameters         a {@link java.util.Map} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws net.sf.jasperreports.engine.JRException if any.
+     */
+    public static void createTocReport(JasperReportDesign jasperReportDesign, JasperPrint jasperPrint, Map<String, Object> parameters) throws DRException, JRException {
+        JasperCustomValues customValues = jasperReportDesign.getCustomValues();
+        Map<String, JasperTocHeading> headings = customValues.getTocHeadings();
+        if (headings != null && !headings.isEmpty()) {
+            JasperReportBuilder tocReport = report();
+
+            List<JasperTocHeading> headingList = new ArrayList<JasperTocHeading>();
+            int pageNumber = 1;
+            for (JRPrintPage page : jasperPrint.getPages()) {
+                for (JRPrintElement element : page.getElements()) {
+                    addTocHeading(headings, headingList, element, pageNumber);
+                }
+                pageNumber++;
+            }
+
+            int levels = 0;
+            for (JasperTocHeading heading : headingList) {
+                if (heading.getLevel() > levels) {
+                    levels = heading.getLevel();
+                }
+            }
+            levels++;
+
+            DRPage tocPage = tocReport.getReport().getPage();
+            tocPage.setWidth(jasperReportDesign.getDesign().getPageWidth());
+            tocPage.setHeight(jasperReportDesign.getDesign().getPageHeight());
+            tocPage.setOrientation(ConstantTransform.pageOrientation(jasperReportDesign.getDesign().getOrientationValue()));
+            MarginBuilder tocMargin = margin();
+            tocMargin.setTop(jasperReportDesign.getDesign().getTopMargin());
+            tocMargin.setLeft(jasperReportDesign.getDesign().getLeftMargin());
+            tocMargin.setBottom(jasperReportDesign.getDesign().getBottomMargin());
+            tocMargin.setRight(jasperReportDesign.getDesign().getRightMargin());
+            tocReport.setLocale((Locale) parameters.get(JRParameter.REPORT_LOCALE));
+            tocReport.setResourceBundle((ResourceBundle) parameters.get(JRParameter.REPORT_RESOURCE_BUNDLE));
+            tocReport.setPageMargin(tocMargin);
+            tocReport.setDataSource(new JRBeanCollectionDataSource(headingList));
+
+            DRITableOfContentsCustomizer tableOfContents = jasperReportDesign.getTableOfContentsCustomizer();
+            tableOfContents.setReport(tocReport);
+            tableOfContents.setHeadingList(headingList);
+            tableOfContents.setHeadings(headings.size());
+            tableOfContents.setLevels(levels);
+            tableOfContents.customize();
+
+            TableOfContentsPosition tableOfContentsPosition = tableOfContents.getPosition();
+            if (tableOfContentsPosition == null) {
+                tableOfContentsPosition = Defaults.getDefaults().getTableOfContentsPosition();
+            }
+            JasperPrint tocJasperPrint = tocReport.toJasperPrint();
+            for (
+                int i = 0; i < tocJasperPrint.getPages().size(); i++) {
+                JRPrintPage page = tocJasperPrint.getPages().get(i);
+                switch (tableOfContentsPosition) {
+                    case TOP:
+                        jasperPrint.addPage(i, page);
+                        break;
+                    case BOTTOM:
+                        jasperPrint.addPage(page);
+                        break;
+                    default:
+                        throw new JasperDesignException("Table of contents position " + tableOfContentsPosition.name() + " not supported");
+                }
+            }
+            for (JRStyle style : tocJasperPrint.getStyles()) {
+                jasperPrint.addStyle(style);
+            }
+        }
+    }
+
+    private static void addTocHeading(Map<String, JasperTocHeading> headings, List<JasperTocHeading> headingList, JRPrintElement element, int pageNumber) {
+        if (element instanceof JRPrintText && StringUtils.contains(element.getKey(), ".tocReference")) {
+            String id = ((JRPrintText) element).getAnchorName();
+            JasperTocHeading heading = headings.get(id);
+            heading.setPageIndex(pageNumber);
+            headingList.add(heading);
+        }
+        if (element instanceof JRPrintFrame) {
+            for (JRPrintElement element2 : ((JRPrintFrame) element).getElements()) {
+                addTocHeading(headings, headingList, element2, pageNumber);
+            }
+        }
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java
new file mode 100644
index 0000000..c8f29d0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java
@@ -0,0 +1,40 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.templatedesign;
+
+import net.sf.dynamicreports.report.base.AbstractTemplateDesign;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.design.JasperDesign;
+
+/**
+ * <p>JasperEmptyTemplateDesign class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperEmptyTemplateDesign extends AbstractTemplateDesign<JasperDesign> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperDesign getDesign() throws DRException {
+        JasperDesign design = new JasperDesign();
+        return design;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java
new file mode 100644
index 0000000..73a176e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java
@@ -0,0 +1,336 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base.templatedesign;
+
+import net.sf.dynamicreports.jasper.transformation.ConstantTransform;
+import net.sf.dynamicreports.report.base.DRField;
+import net.sf.dynamicreports.report.base.DRMargin;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.DRIMargin;
+import net.sf.dynamicreports.report.definition.DRITemplateDesign;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRBand;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRField;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.design.JasperDesign;
+import net.sf.jasperreports.engine.xml.JRXmlLoader;
+import net.sf.jasperreports.engine.xml.JRXmlWriter;
+import org.apache.commons.lang3.Validate;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>JasperTemplateDesign class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperTemplateDesign implements DRITemplateDesign<JasperDesign> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private JasperDesign jasperDesign;
+    private List<DRIField<?>> fields;
+    private DRMargin margin;
+    private transient ByteArrayOutputStream templateDesign;
+
+    /**
+     * <p>Constructor for JasperTemplateDesign.</p>
+     *
+     * @param jasperDesign a {@link net.sf.jasperreports.engine.design.JasperDesign} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperTemplateDesign(JasperDesign jasperDesign) throws DRException {
+        init(jasperDesign);
+    }
+
+    /**
+     * <p>Constructor for JasperTemplateDesign.</p>
+     *
+     * @param file a {@link java.io.File} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperTemplateDesign(File file) throws DRException {
+        Validate.notNull(file, "file must not be null");
+        try {
+            init(JRXmlLoader.load(file));
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+    }
+
+    /**
+     * <p>Constructor for JasperTemplateDesign.</p>
+     *
+     * @param fileName a {@link java.lang.String} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperTemplateDesign(String fileName) throws DRException {
+        Validate.notNull(fileName, "fileName must not be null");
+        try {
+            init(JRXmlLoader.load(fileName));
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+    }
+
+    /**
+     * <p>Constructor for JasperTemplateDesign.</p>
+     *
+     * @param inputStream a {@link java.io.InputStream} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperTemplateDesign(InputStream inputStream) throws DRException {
+        Validate.notNull(inputStream, "inputStream must not be null");
+        try {
+            init(JRXmlLoader.load(inputStream));
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+    }
+
+    /**
+     * <p>Constructor for JasperTemplateDesign.</p>
+     *
+     * @param url a {@link java.net.URL} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperTemplateDesign(URL url) throws DRException {
+        Validate.notNull(url, "url must not be null");
+        try {
+            init(JRXmlLoader.load(url.openStream()));
+        } catch (JRException e) {
+            throw new DRException(e);
+        } catch (IOException e) {
+            throw new DRException(e);
+        }
+    }
+
+    private void init(JasperDesign jasperDesign) throws DRException {
+        Validate.notNull(jasperDesign, "jasperDesign must not be null");
+        this.jasperDesign = jasperDesign;
+
+        this.fields = new ArrayList<DRIField<?>>();
+        for (JRField jrField : jasperDesign.getFields()) {
+            @SuppressWarnings( {"unchecked", "rawtypes"}) DRField<?> field = new DRField(jrField.getName(), jrField.getValueClass());
+            fields.add(field);
+        }
+
+        this.margin = new DRMargin();
+        margin.setTop(jasperDesign.getTopMargin());
+        margin.setLeft(jasperDesign.getLeftMargin());
+        margin.setBottom(jasperDesign.getBottomMargin());
+        margin.setRight(jasperDesign.getRightMargin());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getReportName() {
+        return jasperDesign.getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIField<?>> getFields() {
+        return fields;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isDefinedParameter(String name) {
+        JRParameter parameter = jasperDesign.getParametersMap().get(name);
+        return parameter != null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getResourceBundleName() {
+        return jasperDesign.getResourceBundle();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnorePagination() {
+        return jasperDesign.isIgnorePagination();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public WhenNoDataType getWhenNoDataType() {
+        return ConstantTransform.whenNoDataType(jasperDesign.getWhenNoDataTypeValue());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public WhenResourceMissingType getWhenResourceMissingType() {
+        return ConstantTransform.whenResourceMissingType(jasperDesign.getWhenResourceMissingTypeValue());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getTitleOnANewPage() {
+        return jasperDesign.isTitleNewPage();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getSummaryOnANewPage() {
+        return jasperDesign.isSummaryNewPage();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getSummaryWithPageHeaderAndFooter() {
+        return jasperDesign.isSummaryWithPageHeaderAndFooter();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFloatColumnFooter() {
+        return jasperDesign.isFloatColumnFooter();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageWidth() {
+        return jasperDesign.getPageWidth();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageHeight() {
+        return jasperDesign.getPageHeight();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PageOrientation getPageOrientation() {
+        return ConstantTransform.pageOrientation(jasperDesign.getOrientationValue());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIMargin getPageMargin() {
+        return margin;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageColumnsPerPage() {
+        return jasperDesign.getColumnCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageColumnSpace() {
+        return jasperDesign.getColumnSpacing();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageColumnWidth() {
+        return jasperDesign.getColumnWidth();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getTitleComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getTitle());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPageHeaderComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getPageHeader());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPageFooterComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getPageFooter());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnHeaderComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getColumnHeader());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnFooterComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getColumnFooter());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getLastPageFooterComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getLastPageFooter());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getSummaryComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getSummary());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getNoDataComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getNoData());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getBackgroundComponentsCount() {
+        return getBandComponentsCount(jasperDesign.getBackground());
+    }
+
+    private int getBandComponentsCount(JRBand band) {
+        if (band != null && band.getElements() != null) {
+            return band.getElements().length;
+        }
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperDesign getDesign() throws DRException {
+        try {
+            if (templateDesign == null) {
+                templateDesign = new ByteArrayOutputStream();
+                JRXmlWriter.writeReport(jasperDesign, templateDesign, "UTF-8");
+            }
+
+            return JRXmlLoader.load(new ByteArrayInputStream(templateDesign.toByteArray()));
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
new file mode 100644
index 0000000..aa8331e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
@@ -0,0 +1,508 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder;
+
+import net.sf.dynamicreports.jasper.base.export.AbstractJasperExporter;
+import net.sf.dynamicreports.jasper.base.reporthandler.JasperReportBuilderHandler;
+import net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.Exporters;
+import net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
+import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
+import net.sf.dynamicreports.jasper.transformation.ExporterTransform;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
+import net.sf.jasperreports.export.Exporter;
+import net.sf.jasperreports.export.ExporterInput;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleGraphics2DExporterConfiguration;
+import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
+import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
+import org.apache.commons.lang3.Validate;
+
+import javax.imageio.ImageIO;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Serializable;
+
+/**
+ * This report builder allows concatenating several separated reports into one single document. Each report starts on a new page with its own page dimension.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperConcatenatedReportBuilder implements Serializable {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private JasperReportHandler jasperReportHandler;
+
+    /**
+     * <p>Constructor for JasperConcatenatedReportBuilder.</p>
+     */
+    public JasperConcatenatedReportBuilder() {
+        this(new JasperReportBuilderHandler());
+    }
+
+    /**
+     * <p>Constructor for JasperConcatenatedReportBuilder.</p>
+     *
+     * @param jasperReportHandler a {@link net.sf.dynamicreports.jasper.definition.JasperReportHandler} object.
+     */
+    public JasperConcatenatedReportBuilder(JasperReportHandler jasperReportHandler) {
+        this.jasperReportHandler = jasperReportHandler;
+    }
+
+    /**
+     * <p>concatenate.</p>
+     *
+     * @param jasperReportBuilders a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     */
+    public JasperConcatenatedReportBuilder concatenate(JasperReportBuilder... jasperReportBuilders) {
+        Validate.notNull(jasperReportBuilders, "jasperReportBuilders must not be null");
+        Validate.noNullElements(jasperReportBuilders, "jasperReportBuilders must not contains null jasperReportBuilder");
+        jasperReportHandler.concatenate(jasperReportBuilders);
+        return this;
+    }
+
+    /**
+     * <p>toPng.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toPng(OutputStream outputStream) throws DRException {
+        return toPng(outputStream, 1);
+    }
+
+    /**
+     * <p>toPng.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @param zoom         a float.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toPng(OutputStream outputStream, float zoom) throws DRException {
+        Validate.notNull(outputStream, "outputStream must not be null");
+        Validate.isTrue(zoom > 0, "zoom must be > 0");
+
+        int maxWidth = 0;
+        int maxHeight = 0;
+
+        for (JasperPrint jasperPrint : jasperReportHandler.getPrintList()) {
+            int pages = jasperPrint.getPages().size();
+            int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
+            maxWidth += pageWidth * pages + pages - 1 + 2;
+            int height = (int) (jasperPrint.getPageHeight() * zoom) + 2;
+            if (height > maxHeight) {
+                maxHeight = height;
+            }
+        }
+
+        Image image = new BufferedImage(maxWidth, maxHeight, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = (Graphics2D) image.getGraphics();
+        g2d.setColor(Color.LIGHT_GRAY);
+        g2d.fill(new Rectangle2D.Float(1, 1, maxWidth - 1, maxHeight - 1));
+
+        int offset = 1;
+        for (JasperPrint jasperPrint : jasperReportHandler.getPrintList()) {
+            int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
+            int pageHeight = (int) (jasperPrint.getPageHeight() * zoom);
+            for (
+                int i = 0; i < jasperPrint.getPages().size(); i++) {
+                try {
+                    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+                    SimpleGraphics2DExporterOutput exporterOutput = new SimpleGraphics2DExporterOutput();
+                    Image pageImage = new BufferedImage(pageWidth, pageHeight, BufferedImage.TYPE_INT_RGB);
+                    exporterOutput.setGraphics2D((Graphics2D) pageImage.getGraphics());
+                    SimpleGraphics2DReportConfiguration reportExportConfiguration = new SimpleGraphics2DReportConfiguration();
+                    reportExportConfiguration.setPageIndex(i);
+                    reportExportConfiguration.setZoomRatio(zoom);
+                    SimpleGraphics2DExporterConfiguration exporterConfiguration = new SimpleGraphics2DExporterConfiguration();
+
+                    JRGraphics2DExporter jrExporter = new JRGraphics2DExporter();
+                    jrExporter.setExporterInput(exporterInput);
+                    jrExporter.setExporterOutput(exporterOutput);
+                    jrExporter.setConfiguration(reportExportConfiguration);
+                    jrExporter.setConfiguration(exporterConfiguration);
+
+                    jrExporter.exportReport();
+                    ((Graphics2D) image.getGraphics()).drawImage(pageImage, offset, 1, null);
+                    offset += pageWidth + 1;
+                } catch (JRException e) {
+                    throw new DRException(e);
+                }
+            }
+        }
+        try {
+            ImageIO.write((RenderedImage) image, "png", outputStream);
+        } catch (IOException e) {
+            throw new DRException(e);
+        }
+        return this;
+    }
+
+    /**
+     * <p>continuousPageNumbering.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     */
+    public JasperConcatenatedReportBuilder continuousPageNumbering() {
+        return setContinuousPageNumbering(true);
+    }
+
+    /**
+     * <p>setContinuousPageNumbering.</p>
+     *
+     * @param continuousPageNumbering a boolean.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     */
+    public JasperConcatenatedReportBuilder setContinuousPageNumbering(boolean continuousPageNumbering) {
+        jasperReportHandler.setContinuousPageNumbering(continuousPageNumbering);
+        return this;
+    }
+
+    // csv
+
+    /**
+     * <p>toCsv.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toCsv(OutputStream outputStream) throws DRException {
+        return toCsv(Exporters.csvExporter(outputStream));
+    }
+
+    /**
+     * <p>toCsv.</p>
+     *
+     * @param csvExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toCsv(JasperCsvExporterBuilder csvExporterBuilder) throws DRException {
+        return export(csvExporterBuilder);
+    }
+
+    // docx
+
+    /**
+     * <p>toDocx.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toDocx(OutputStream outputStream) throws DRException {
+        return toDocx(Exporters.docxExporter(outputStream));
+    }
+
+    /**
+     * <p>toDocx.</p>
+     *
+     * @param docxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toDocx(JasperDocxExporterBuilder docxExporterBuilder) throws DRException {
+        return export(docxExporterBuilder);
+    }
+
+    // html
+
+    /**
+     * <p>toHtml.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toHtml(OutputStream outputStream) throws DRException {
+        return toHtml(Exporters.htmlExporter(outputStream));
+    }
+
+    /**
+     * <p>toHtml.</p>
+     *
+     * @param htmlExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toHtml(JasperHtmlExporterBuilder htmlExporterBuilder) throws DRException {
+        return export(htmlExporterBuilder);
+    }
+
+    // ods
+
+    /**
+     * <p>toOds.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toOds(OutputStream outputStream) throws DRException {
+        return toOds(Exporters.odsExporter(outputStream));
+    }
+
+    /**
+     * <p>toOds.</p>
+     *
+     * @param odsExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toOds(JasperOdsExporterBuilder odsExporterBuilder) throws DRException {
+        return export(odsExporterBuilder);
+    }
+
+    // odt
+
+    /**
+     * <p>toOdt.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toOdt(OutputStream outputStream) throws DRException {
+        return toOdt(Exporters.odtExporter(outputStream));
+    }
+
+    /**
+     * <p>toOdt.</p>
+     *
+     * @param odtExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toOdt(JasperOdtExporterBuilder odtExporterBuilder) throws DRException {
+        return export(odtExporterBuilder);
+    }
+
+    // pdf
+
+    /**
+     * <p>toPdf.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toPdf(OutputStream outputStream) throws DRException {
+        return toPdf(Exporters.pdfExporter(outputStream));
+    }
+
+    /**
+     * <p>toPdf.</p>
+     *
+     * @param pdfExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toPdf(JasperPdfExporterBuilder pdfExporterBuilder) throws DRException {
+        return export(pdfExporterBuilder);
+    }
+
+    // rtf
+
+    /**
+     * <p>toRtf.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toRtf(OutputStream outputStream) throws DRException {
+        return toRtf(Exporters.rtfExporter(outputStream));
+    }
+
+    /**
+     * <p>toRtf.</p>
+     *
+     * @param rtfExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toRtf(JasperRtfExporterBuilder rtfExporterBuilder) throws DRException {
+        return export(rtfExporterBuilder);
+    }
+
+    // text
+
+    /**
+     * <p>toText.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toText(OutputStream outputStream) throws DRException {
+        return toText(Exporters.textExporter(outputStream));
+    }
+
+    /**
+     * <p>toText.</p>
+     *
+     * @param textExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toText(JasperTextExporterBuilder textExporterBuilder) throws DRException {
+        return export(textExporterBuilder);
+    }
+
+    // xls
+
+    /**
+     * <p>toXls.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toXls(OutputStream outputStream) throws DRException {
+        return toXls(Exporters.xlsExporter(outputStream));
+    }
+
+    /**
+     * <p>toXls.</p>
+     *
+     * @param xlsExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toXls(JasperXlsExporterBuilder xlsExporterBuilder) throws DRException {
+        return export(xlsExporterBuilder);
+    }
+
+    // xlsx
+
+    /**
+     * <p>toXlsx.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toXlsx(OutputStream outputStream) throws DRException {
+        return toXlsx(Exporters.xlsxExporter(outputStream));
+    }
+
+    /**
+     * <p>toXlsx.</p>
+     *
+     * @param xlsxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toXlsx(JasperXlsxExporterBuilder xlsxExporterBuilder) throws DRException {
+        return export(xlsxExporterBuilder);
+    }
+
+    // xml
+
+    /**
+     * <p>toXml.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toXml(OutputStream outputStream) throws DRException {
+        return toXml(Exporters.xmlExporter(outputStream));
+    }
+
+    /**
+     * <p>toXml.</p>
+     *
+     * @param xmlExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toXml(JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
+        return export(xmlExporterBuilder);
+    }
+
+    // pptx
+
+    /**
+     * <p>toPptx.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toPptx(OutputStream outputStream) throws DRException {
+        return toPptx(Exporters.pptxExporter(outputStream));
+    }
+
+    /**
+     * <p>toPptx.</p>
+     *
+     * @param pptxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder toPptx(JasperPptxExporterBuilder pptxExporterBuilder) throws DRException {
+        return export(pptxExporterBuilder);
+    }
+
+    /**
+     * <p>export.</p>
+     *
+     * @param exporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperConcatenatedReportBuilder export(AbstractJasperExporterBuilder<?, ? extends AbstractJasperExporter> exporterBuilder) throws DRException {
+        Validate.notNull(exporterBuilder, "exporterBuilder must not be null");
+        try {
+            ExporterTransform exporterTransform = new ExporterTransform(exporterBuilder.build());
+            @SuppressWarnings("unchecked") Exporter<ExporterInput, ?, ?, ?> exporter = (Exporter<ExporterInput, ?, ?, ?>) exporterTransform.transform();
+            exporter.setExporterInput(SimpleExporterInput.getInstance(jasperReportHandler.getPrintList()));
+            exporter.exportReport();
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java
new file mode 100644
index 0000000..0476e52
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java
@@ -0,0 +1,937 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder;
+
+import net.sf.dynamicreports.design.base.DRDesignReport;
+import net.sf.dynamicreports.design.definition.DRIDesignReport;
+import net.sf.dynamicreports.jasper.base.JasperReportDesign;
+import net.sf.dynamicreports.jasper.base.export.AbstractJasperExporter;
+import net.sf.dynamicreports.jasper.base.export.JasperImageExporter;
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocReport;
+import net.sf.dynamicreports.jasper.base.templatedesign.JasperEmptyTemplateDesign;
+import net.sf.dynamicreports.jasper.base.templatedesign.JasperTemplateDesign;
+import net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.Exporters;
+import net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
+import net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
+import net.sf.dynamicreports.jasper.constant.ImageType;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.jasper.transformation.ExporterTransform;
+import net.sf.dynamicreports.jasper.transformation.JasperTransform;
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.QueryBuilder;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.QueryLanguage;
+import net.sf.dynamicreports.report.definition.DRITemplateDesign;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JRResultSetDataSource;
+import net.sf.jasperreports.engine.JRRewindableDataSource;
+import net.sf.jasperreports.engine.JRVirtualizer;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperFillManager;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperPrintManager;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+import net.sf.jasperreports.engine.design.JasperDesign;
+import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
+import net.sf.jasperreports.engine.xml.JRXmlWriter;
+import net.sf.jasperreports.export.Exporter;
+import net.sf.jasperreports.export.ExporterInput;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleGraphics2DExporterConfiguration;
+import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
+import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
+import net.sf.jasperreports.view.JasperDesignViewer;
+import net.sf.jasperreports.view.JasperViewer;
+import org.apache.commons.lang3.Validate;
+
+import javax.imageio.ImageIO;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The most used report builder for creating reports. It allows constructing and customizing the whole report content. A report consists of bands, columns, subtotals, groups, and other parts. Each
+ * part is created and configured using a particular builder method and it's passed to the report builder instance.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperReportBuilder extends ReportBuilder<JasperReportBuilder> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private JasperReportDesign reportDesign;
+    private JasperDesign jasperDesign;
+    private JasperReport jasperReport;
+    private JasperPrint jasperPrint;
+    private transient JRDataSource dataSource;
+    private transient Connection connection;
+    private transient JRVirtualizer virtualizer;
+    private Integer startPageNumber;
+    private Map<String, Object> parameters;
+
+    /**
+     * <p>Constructor for JasperReportBuilder.</p>
+     */
+    public JasperReportBuilder() {
+        setTemplateDesign(new JasperEmptyTemplateDesign());
+    }
+
+    /**
+     * <p>Setter for the field <code>startPageNumber</code>.</p>
+     *
+     * @param startPageNumber a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder setStartPageNumber(Integer startPageNumber) throws DRException {
+        if (this.startPageNumber == startPageNumber) {
+            return this;
+        }
+        this.startPageNumber = startPageNumber;
+        rebuild();
+        return this;
+    }
+
+    /**
+     * Sets a data source object. Creates a new JRBeanCollectionDataSource data source object.
+     *
+     * @param collection - the collection values
+     * @return a report builder
+     */
+    public JasperReportBuilder setDataSource(Collection<?> collection) {
+        return setDataSource(new JRBeanCollectionDataSource(collection));
+    }
+
+    /**
+     * Sets a database data source. In this type of data source, data are retrieved from a database.
+     *
+     * @param resultSet - the resultSet object
+     * @return a report builder
+     */
+    public JasperReportBuilder setDataSource(ResultSet resultSet) {
+        return setDataSource(new JRResultSetDataSource(resultSet));
+    }
+
+    /**
+     * Sets a database data source. In this type of data source, data are retrieved from a database.
+     *
+     * @param sql        - the sql query
+     * @param connection - the database connection
+     * @return a report builder
+     */
+    public JasperReportBuilder setDataSource(String sql, Connection connection) {
+        Validate.notNull(sql, "sql must not be null");
+        return setDataSource(DynamicReports.query(sql, QueryLanguage.SQL), connection);
+    }
+
+    /**
+     * Sets a database data source. In this type of data source, data are retrieved from a database.
+     *
+     * @param query      - the query definition
+     * @param connection - the database connection
+     * @return a report builder
+     */
+    public JasperReportBuilder setDataSource(QueryBuilder query, Connection connection) {
+        Validate.notNull(query, "query must not be null");
+        Validate.notNull(connection, "connection must not be null");
+        getObject().setQuery(query.build());
+        this.connection = connection;
+        dataSource = null;
+        return this;
+    }
+
+    /**
+     * <p>setTemplateDesign.</p>
+     *
+     * @param inputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder setTemplateDesign(InputStream inputStream) throws DRException {
+        return setTemplateDesign(new JasperTemplateDesign(inputStream));
+    }
+
+    /**
+     * <p>setTemplateDesign.</p>
+     *
+     * @param file a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder setTemplateDesign(File file) throws DRException {
+        return setTemplateDesign(new JasperTemplateDesign(file));
+    }
+
+    // template design
+
+    /**
+     * <p>setTemplateDesign.</p>
+     *
+     * @param fileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder setTemplateDesign(String fileName) throws DRException {
+        return setTemplateDesign(new JasperTemplateDesign(fileName));
+    }
+
+    /**
+     * <p>setTemplateDesign.</p>
+     *
+     * @param jasperDesign a {@link net.sf.jasperreports.engine.design.JasperDesign} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder setTemplateDesign(JasperDesign jasperDesign) throws DRException {
+        return setTemplateDesign(new JasperTemplateDesign(jasperDesign));
+    }
+
+    /**
+     * <p>setTemplateDesign.</p>
+     *
+     * @param jasperDesignUrl a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder setTemplateDesign(URL jasperDesignUrl) throws DRException {
+        return setTemplateDesign(new JasperTemplateDesign(jasperDesignUrl));
+    }
+
+    private JasperReportBuilder setTemplateDesign(DRITemplateDesign<JasperDesign> templateDesign) {
+        getObject().setTemplateDesign(templateDesign);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperReportBuilder setParameter(String name, Object value) {
+        super.setParameter(name, value);
+        parameters = null;
+        jasperPrint = null;
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperReportBuilder setParameters(Map<String, Object> parameters) {
+        super.setParameters(parameters);
+        this.parameters = null;
+        jasperPrint = null;
+        return this;
+    }
+
+    /**
+     * <p>rebuild.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder rebuild() throws DRException {
+        builded = false;
+        reportDesign = null;
+        jasperDesign = null;
+        jasperReport = null;
+        parameters = null;
+        jasperPrint = null;
+        if (dataSource != null && dataSource instanceof JRRewindableDataSource) {
+            try {
+                ((JRRewindableDataSource) dataSource).moveFirst();
+            } catch (JRException e) {
+                throw new DRException(e);
+            }
+        }
+        return this;
+    }
+
+    private JasperReportDesign toJasperReportDesign() throws DRException {
+        if (reportDesign == null) {
+            DRIDesignReport report = new DRDesignReport(build());
+            reportDesign = new JasperReportDesign(report, startPageNumber);
+            JasperTransform jasperTransform = new JasperTransform(report, reportDesign);
+            jasperTransform.transform();
+        }
+        return reportDesign;
+    }
+
+    /**
+     * <p>toJasperDesign.</p>
+     *
+     * @return a {@link net.sf.jasperreports.engine.design.JasperDesign} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperDesign toJasperDesign() throws DRException {
+        if (jasperDesign == null) {
+            jasperDesign = toJasperReportDesign().getDesign();
+        }
+        return jasperDesign;
+    }
+
+    /**
+     * <p>toJasperReport.</p>
+     *
+     * @return a {@link net.sf.jasperreports.engine.JasperReport} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReport toJasperReport() throws DRException {
+        if (jasperReport == null) {
+            try {
+                jasperReport = JasperCompileManager.compileReport(toJasperDesign());
+            } catch (JRException e) {
+                throw new DRException(e);
+            }
+        }
+        return jasperReport;
+    }
+
+    /**
+     * <p>getJasperParameters.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public Map<String, Object> getJasperParameters() throws DRException {
+        if (parameters == null) {
+            parameters = new HashMap<>();
+            JasperReportDesign jasperReportDesign = toJasperReportDesign();
+            parameters.putAll(jasperReportDesign.getParameters());
+            if (getReport().getParameterValues() != null) {
+                parameters.putAll(getReport().getParameterValues());
+            }
+        }
+        return parameters;
+    }
+
+    /**
+     * <p>toJasperPrint.</p>
+     *
+     * @return a {@link net.sf.jasperreports.engine.JasperPrint} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperPrint toJasperPrint() throws DRException {
+        if (jasperPrint == null) {
+            Map<String, Object> parameters = getJasperParameters();
+            if (virtualizer != null) {
+                parameters.put(JRParameter.REPORT_VIRTUALIZER, virtualizer);
+            }
+
+            try {
+                if (connection != null && toJasperReport().getQuery() != null) {
+                    jasperPrint = JasperFillManager.fillReport(toJasperReport(), parameters, connection);
+                } else if (dataSource != null) {
+                    jasperPrint = JasperFillManager.fillReport(toJasperReport(), parameters, dataSource);
+                } else {
+                    jasperPrint = JasperFillManager.fillReport(toJasperReport(), parameters);
+                }
+
+                if (toJasperReportDesign().isTableOfContents()) {
+                    JasperTocReport.createTocReport(toJasperReportDesign(), jasperPrint, parameters);
+                }
+            } catch (JRException e) {
+                throw new DRException(e);
+            }
+
+        }
+        return jasperPrint;
+    }
+
+    /**
+     * <p>show.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder show() throws DRException {
+        JasperViewer.viewReport(toJasperPrint());
+        return this;
+    }
+
+    /**
+     * <p>show.</p>
+     *
+     * @param exitOnClose a boolean.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder show(boolean exitOnClose) throws DRException {
+        JasperViewer.viewReport(toJasperPrint(), exitOnClose, null);
+        return this;
+    }
+
+    /**
+     * <p>showJrXml.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder showJrXml() throws DRException {
+        try {
+            JasperDesignViewer.viewReportDesign(toJasperDesign());
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+        return this;
+    }
+
+    /**
+     * <p>toJrXml.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toJrXml(OutputStream outputStream) throws DRException {
+        Validate.notNull(outputStream, "outputStream must not be null");
+        try {
+            JRXmlWriter.writeReport(toJasperDesign(), outputStream, "UTF-8");
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+        return this;
+    }
+
+    /**
+     * <p>print.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder print() throws DRException {
+        return print(true);
+    }
+
+    /**
+     * <p>print.</p>
+     *
+     * @param withPrintDialog a boolean.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder print(boolean withPrintDialog) throws DRException {
+        try {
+            JasperPrintManager.printReport(toJasperPrint(), withPrintDialog);
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+        return this;
+    }
+
+    /**
+     * <p>Setter for the field <code>virtualizer</code>.</p>
+     *
+     * @param virtualizer a {@link net.sf.jasperreports.engine.JRVirtualizer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     */
+    public JasperReportBuilder setVirtualizer(JRVirtualizer virtualizer) {
+        this.virtualizer = virtualizer;
+        return this;
+    }
+
+    /**
+     * <p>toImage.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @param imageType    a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toImage(OutputStream outputStream, ImageType imageType) throws DRException {
+        return toImage(Exporters.imageExporter(outputStream, imageType));
+    }
+
+    /**
+     * <p>toImage.</p>
+     *
+     * @param imageExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toImage(JasperImageExporterBuilder imageExporterBuilder) throws DRException {
+        Validate.notNull(imageExporterBuilder, "imageExporterBuilder must not be null");
+
+        JasperImageExporter imageExporter = imageExporterBuilder.build();
+
+        JasperPrint jasperPrint = toJasperPrint();
+        Integer fromPage = null;
+        Integer toPage = null;
+        float zoom = 1;
+        String imageType = imageExporter.getImageType().name().toLowerCase();
+        int offsetX = 0;
+        int offsetY = 0;
+        int pageGap = 0;
+
+        if (imageExporter.getZoomRatio() != null) {
+            zoom = imageExporter.getZoomRatio();
+        }
+        if (imageExporter.getOffsetX() != null) {
+            offsetX = imageExporter.getOffsetX();
+        }
+        if (imageExporter.getOffsetY() != null) {
+            offsetY = imageExporter.getOffsetY();
+        }
+        if (imageExporter.getPageGap() != null) {
+            pageGap = imageExporter.getPageGap();
+        }
+
+        if (imageExporter.getPageIndex() != null && imageExporter.getPageIndex() >= 0) {
+            fromPage = imageExporter.getPageIndex();
+            toPage = imageExporter.getPageIndex() + 1;
+        } else {
+            if (imageExporter.getStartPageIndex() != null) {
+                fromPage = imageExporter.getStartPageIndex();
+            }
+            if (imageExporter.getEndPageIndex() != null) {
+                toPage = imageExporter.getEndPageIndex();
+            }
+        }
+        if (fromPage == null) {
+            fromPage = 0;
+        }
+        if (toPage == null) {
+            toPage = jasperPrint.getPages().size();
+        }
+
+        int pages = toPage - fromPage;
+
+        int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
+        int pageHeight = (int) (jasperPrint.getPageHeight() * zoom);
+        int width = pageWidth * pages + pages - 1 + offsetX * 2;
+        int height = (int) (jasperPrint.getPageHeight() * zoom) + offsetY * 2;
+        Image image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+
+        int offset = offsetX;
+        for (int i = 0; i < pages; i++) {
+            try {
+                SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+                SimpleGraphics2DExporterOutput exporterOutput = new SimpleGraphics2DExporterOutput();
+                Image pageImage = new BufferedImage(pageWidth, pageHeight, BufferedImage.TYPE_INT_RGB);
+                exporterOutput.setGraphics2D((Graphics2D) pageImage.getGraphics());
+                SimpleGraphics2DReportConfiguration reportExportConfiguration = new SimpleGraphics2DReportConfiguration();
+                reportExportConfiguration.setPageIndex(fromPage);
+                reportExportConfiguration.setZoomRatio(zoom);
+                SimpleGraphics2DExporterConfiguration exporterConfiguration = new SimpleGraphics2DExporterConfiguration();
+
+                JRGraphics2DExporter jrExporter = new JRGraphics2DExporter();
+                jrExporter.setExporterInput(exporterInput);
+                jrExporter.setExporterOutput(exporterOutput);
+                jrExporter.setConfiguration(reportExportConfiguration);
+                jrExporter.setConfiguration(exporterConfiguration);
+
+                jrExporter.exportReport();
+                ((Graphics2D) image.getGraphics()).drawImage(pageImage, offset, offsetY, null);
+                fromPage++;
+                offset += pageWidth + pageGap;
+            } catch (JRException e) {
+                throw new DRException(e);
+            }
+        }
+        try {
+            if (imageExporter.getOutputStream() != null) {
+                ImageIO.write((RenderedImage) image, imageType, imageExporter.getOutputStream());
+            } else if (imageExporter.getOutputFileName() != null) {
+                ImageIO.write((RenderedImage) image, imageType, new File(imageExporter.getOutputFileName()));
+            } else if (imageExporter.getOutputFile() != null) {
+                ImageIO.write((RenderedImage) image, imageType, imageExporter.getOutputFile());
+            } else {
+                throw new JasperDesignException("ImageExporter output not supported");
+            }
+        } catch (IOException e) {
+            throw new DRException(e);
+        }
+        return this;
+    }
+
+    // image
+
+    /**
+     * <p>toCsv.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toCsv(OutputStream outputStream) throws DRException {
+        return toCsv(Exporters.csvExporter(outputStream));
+    }
+
+    /**
+     * <p>toCsv.</p>
+     *
+     * @param csvExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toCsv(JasperCsvExporterBuilder csvExporterBuilder) throws DRException {
+        return export(csvExporterBuilder);
+    }
+
+    // csv
+
+    /**
+     * <p>toDocx.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toDocx(OutputStream outputStream) throws DRException {
+        return toDocx(Exporters.docxExporter(outputStream));
+    }
+
+    /**
+     * <p>toDocx.</p>
+     *
+     * @param docxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toDocx(JasperDocxExporterBuilder docxExporterBuilder) throws DRException {
+        return export(docxExporterBuilder);
+    }
+
+    // docx
+
+    /**
+     * <p>toHtml.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toHtml(OutputStream outputStream) throws DRException {
+        return toHtml(Exporters.htmlExporter(outputStream));
+    }
+
+    /**
+     * <p>toHtml.</p>
+     *
+     * @param htmlExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toHtml(JasperHtmlExporterBuilder htmlExporterBuilder) throws DRException {
+        return export(htmlExporterBuilder);
+    }
+
+    // html
+
+    /**
+     * <p>toOds.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toOds(OutputStream outputStream) throws DRException {
+        return toOds(Exporters.odsExporter(outputStream));
+    }
+
+    /**
+     * <p>toOds.</p>
+     *
+     * @param odsExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toOds(JasperOdsExporterBuilder odsExporterBuilder) throws DRException {
+        return export(odsExporterBuilder);
+    }
+
+    // ods
+
+    /**
+     * <p>toOdt.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toOdt(OutputStream outputStream) throws DRException {
+        return toOdt(Exporters.odtExporter(outputStream));
+    }
+
+    /**
+     * <p>toOdt.</p>
+     *
+     * @param odtExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toOdt(JasperOdtExporterBuilder odtExporterBuilder) throws DRException {
+        return export(odtExporterBuilder);
+    }
+
+    // odt
+
+    /**
+     * <p>toPdf.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toPdf(OutputStream outputStream) throws DRException {
+        return toPdf(Exporters.pdfExporter(outputStream));
+    }
+
+    /**
+     * <p>toPdf.</p>
+     *
+     * @param pdfExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toPdf(JasperPdfExporterBuilder pdfExporterBuilder) throws DRException {
+        return export(pdfExporterBuilder);
+    }
+
+    // pdf
+
+    /**
+     * <p>toRtf.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toRtf(OutputStream outputStream) throws DRException {
+        return toRtf(Exporters.rtfExporter(outputStream));
+    }
+
+    /**
+     * <p>toRtf.</p>
+     *
+     * @param rtfExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toRtf(JasperRtfExporterBuilder rtfExporterBuilder) throws DRException {
+        return export(rtfExporterBuilder);
+    }
+
+    // rtf
+
+    /**
+     * <p>toText.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toText(OutputStream outputStream) throws DRException {
+        return toText(Exporters.textExporter(outputStream));
+    }
+
+    /**
+     * <p>toText.</p>
+     *
+     * @param textExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toText(JasperTextExporterBuilder textExporterBuilder) throws DRException {
+        return export(textExporterBuilder);
+    }
+
+    // text
+
+    /**
+     * <p>toXls.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toXls(OutputStream outputStream) throws DRException {
+        return toXls(Exporters.xlsExporter(outputStream));
+    }
+
+    /**
+     * <p>toXls.</p>
+     *
+     * @param xlsExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toXls(JasperXlsExporterBuilder xlsExporterBuilder) throws DRException {
+        return export(xlsExporterBuilder);
+    }
+
+    // xls
+
+    /**
+     * <p>toXlsx.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toXlsx(OutputStream outputStream) throws DRException {
+        return toXlsx(Exporters.xlsxExporter(outputStream));
+    }
+
+    /**
+     * <p>toXlsx.</p>
+     *
+     * @param xlsxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toXlsx(JasperXlsxExporterBuilder xlsxExporterBuilder) throws DRException {
+        return export(xlsxExporterBuilder);
+    }
+
+    // xlsx
+
+    /**
+     * <p>toXml.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toXml(OutputStream outputStream) throws DRException {
+        return toXml(Exporters.xmlExporter(outputStream));
+    }
+
+    /**
+     * <p>toXml.</p>
+     *
+     * @param xmlExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toXml(JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
+        return export(xmlExporterBuilder);
+    }
+
+    // xml
+
+    /**
+     * <p>toPptx.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toPptx(OutputStream outputStream) throws DRException {
+        return toPptx(Exporters.pptxExporter(outputStream));
+    }
+
+    /**
+     * <p>toPptx.</p>
+     *
+     * @param pptxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder toPptx(JasperPptxExporterBuilder pptxExporterBuilder) throws DRException {
+        return export(pptxExporterBuilder);
+    }
+
+    // pptx
+
+    /**
+     * <p>export.</p>
+     *
+     * @param exporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperReportBuilder export(AbstractJasperExporterBuilder<?, ? extends AbstractJasperExporter> exporterBuilder) throws DRException {
+        Validate.notNull(exporterBuilder, "exporterBuilder must not be null");
+        try {
+            ExporterTransform exporterTransform = new ExporterTransform(exporterBuilder.build());
+            @SuppressWarnings("unchecked") Exporter<ExporterInput, ?, ?, ?> exporter = (Exporter<ExporterInput, ?, ?, ?>) exporterTransform.transform();
+            exporter.setExporterInput(new SimpleExporterInput(toJasperPrint()));
+            exporter.exportReport();
+        } catch (JRException e) {
+            throw new DRException(e);
+        }
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>connection</code>.</p>
+     *
+     * @return a {@link java.sql.Connection} object.
+     */
+    public Connection getConnection() {
+        return connection;
+    }
+
+    /**
+     * <p>Setter for the field <code>connection</code>.</p>
+     *
+     * @param connection a {@link java.sql.Connection} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     */
+    public JasperReportBuilder setConnection(Connection connection) {
+        Validate.notNull(connection, "connection must not be null");
+        this.connection = connection;
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>dataSource</code>.</p>
+     *
+     * @return a {@link net.sf.jasperreports.engine.JRDataSource} object.
+     */
+    public JRDataSource getDataSource() {
+        return dataSource;
+    }
+
+    /**
+     * Sets a data source object.
+     *
+     * @param dataSource - the JRDataSource object
+     * @return a report builder
+     */
+    public JasperReportBuilder setDataSource(JRDataSource dataSource) {
+        this.dataSource = dataSource;
+        connection = null;
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java
new file mode 100644
index 0000000..0fe781d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java
@@ -0,0 +1,489 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.AbstractJasperExcelExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ImageAnchorType;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import org.apache.commons.lang3.Validate;
+
+import java.util.Map;
+
+/**
+ * <p>Abstract AbstractJasperExcelExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("unchecked")
+public abstract class AbstractJasperExcelExporterBuilder<T extends AbstractJasperExcelExporterBuilder<T, U>, U extends AbstractJasperExcelExporter> extends AbstractJasperExporterBuilder<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for AbstractJasperExcelExporterBuilder.</p>
+     *
+     * @param exporter a U object.
+     */
+    protected AbstractJasperExcelExporterBuilder(U exporter) {
+        super(exporter);
+    }
+
+    /**
+     * <p>setOnePagePerSheet.</p>
+     *
+     * @param onePagePerSheet a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setOnePagePerSheet(Boolean onePagePerSheet) {
+        this.getObject().setOnePagePerSheet(onePagePerSheet);
+        return (T) this;
+    }
+
+    /**
+     * <p>setRemoveEmptySpaceBetweenRows.</p>
+     *
+     * @param removeEmptySpaceBetweenRows a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setRemoveEmptySpaceBetweenRows(Boolean removeEmptySpaceBetweenRows) {
+        this.getObject().setRemoveEmptySpaceBetweenRows(removeEmptySpaceBetweenRows);
+        return (T) this;
+    }
+
+    /**
+     * <p>setRemoveEmptySpaceBetweenColumns.</p>
+     *
+     * @param removeEmptySpaceBetweenColumns a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setRemoveEmptySpaceBetweenColumns(Boolean removeEmptySpaceBetweenColumns) {
+        this.getObject().setRemoveEmptySpaceBetweenColumns(removeEmptySpaceBetweenColumns);
+        return (T) this;
+    }
+
+    /**
+     * <p>setWhitePageBackground.</p>
+     *
+     * @param whitePageBackground a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setWhitePageBackground(Boolean whitePageBackground) {
+        this.getObject().setWhitePageBackground(whitePageBackground);
+        return (T) this;
+    }
+
+    /**
+     * <p>setDetectCellType.</p>
+     *
+     * @param detectCellType a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setDetectCellType(Boolean detectCellType) {
+        this.getObject().setDetectCellType(detectCellType);
+        return (T) this;
+    }
+
+    /**
+     * <p>sheetNames.</p>
+     *
+     * @param sheetNames a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T sheetNames(String... sheetNames) {
+        return addSheetName(sheetNames);
+    }
+
+    /**
+     * <p>addSheetName.</p>
+     *
+     * @param sheetNames a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T addSheetName(String... sheetNames) {
+        Validate.notNull(sheetNames, "sheetNames must not be null");
+        Validate.noNullElements(sheetNames, "sheetNames must not contains null sheetName");
+        for (String sheetName : sheetNames) {
+            this.getObject().addSheetName(sheetName);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setFontSizeFixEnabled.</p>
+     *
+     * @param fontSizeFixEnabled a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setFontSizeFixEnabled(Boolean fontSizeFixEnabled) {
+        this.getObject().setFontSizeFixEnabled(fontSizeFixEnabled);
+        return (T) this;
+    }
+
+    /**
+     * <p>setImageBorderFixEnabled.</p>
+     *
+     * @param imageBorderFixEnabled a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setImageBorderFixEnabled(Boolean imageBorderFixEnabled) {
+        this.getObject().setImageBorderFixEnabled(imageBorderFixEnabled);
+        return (T) this;
+    }
+
+    /**
+     * <p>setMaxRowsPerSheet.</p>
+     *
+     * @param maxRowsPerSheet a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setMaxRowsPerSheet(Integer maxRowsPerSheet) {
+        this.getObject().setMaxRowsPerSheet(maxRowsPerSheet);
+        return (T) this;
+    }
+
+    /**
+     * <p>setIgnoreGraphics.</p>
+     *
+     * @param ignoreGraphics a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setIgnoreGraphics(Boolean ignoreGraphics) {
+        this.getObject().setIgnoreGraphics(ignoreGraphics);
+        return (T) this;
+    }
+
+    /**
+     * <p>setCollapseRowSpan.</p>
+     *
+     * @param collapseRowSpan a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setCollapseRowSpan(Boolean collapseRowSpan) {
+        this.getObject().setCollapseRowSpan(collapseRowSpan);
+        return (T) this;
+    }
+
+    /**
+     * <p>setIgnoreCellBorder.</p>
+     *
+     * @param ignoreCellBorder a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setIgnoreCellBorder(Boolean ignoreCellBorder) {
+        this.getObject().setIgnoreCellBorder(ignoreCellBorder);
+        return (T) this;
+    }
+
+    /**
+     * <p>setIgnoreCellBackground.</p>
+     *
+     * @param ignoreCellBackground a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setIgnoreCellBackground(Boolean ignoreCellBackground) {
+        this.getObject().setIgnoreCellBackground(ignoreCellBackground);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPassword.</p>
+     *
+     * @param password a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setPassword(String password) {
+        this.getObject().setPassword(password);
+        return (T) this;
+    }
+
+    /**
+     * <p>setIgnorePageMargins.</p>
+     *
+     * @param ignorePageMargins a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setIgnorePageMargins(Boolean ignorePageMargins) {
+        this.getObject().setIgnorePageMargins(ignorePageMargins);
+        return (T) this;
+    }
+
+    /**
+     * <p>setWrapText.</p>
+     *
+     * @param wrapText a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setWrapText(Boolean wrapText) {
+        this.getObject().setWrapText(wrapText);
+        return (T) this;
+    }
+
+    /**
+     * <p>setCellLocked.</p>
+     *
+     * @param cellLocked a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setCellLocked(Boolean cellLocked) {
+        this.getObject().setCellLocked(cellLocked);
+        return (T) this;
+    }
+
+    /**
+     * <p>setCellHidden.</p>
+     *
+     * @param cellHidden a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setCellHidden(Boolean cellHidden) {
+        this.getObject().setCellHidden(cellHidden);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSheetHeaderLeft.</p>
+     *
+     * @param sheetHeaderLeft a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setSheetHeaderLeft(String sheetHeaderLeft) {
+        this.getObject().setSheetHeaderLeft(sheetHeaderLeft);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSheetHeaderCenter.</p>
+     *
+     * @param sheetHeaderCenter a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setSheetHeaderCenter(String sheetHeaderCenter) {
+        this.getObject().setSheetHeaderCenter(sheetHeaderCenter);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSheetHeaderRight.</p>
+     *
+     * @param sheetHeaderRight a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setSheetHeaderRight(String sheetHeaderRight) {
+        this.getObject().setSheetHeaderRight(sheetHeaderRight);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSheetFooterLeft.</p>
+     *
+     * @param sheetFooterLeft a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setSheetFooterLeft(String sheetFooterLeft) {
+        this.getObject().setSheetFooterLeft(sheetFooterLeft);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSheetFooterCenter.</p>
+     *
+     * @param sheetFooterCenter a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setSheetFooterCenter(String sheetFooterCenter) {
+        this.getObject().setSheetFooterCenter(sheetFooterCenter);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSheetFooterRight.</p>
+     *
+     * @param sheetFooterRight a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setSheetFooterRight(String sheetFooterRight) {
+        this.getObject().setSheetFooterRight(sheetFooterRight);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFormatPatternsMap.</p>
+     *
+     * @param formatPatternsMap a {@link java.util.Map} object.
+     * @return a T object.
+     */
+    public T setFormatPatternsMap(Map<String, String> formatPatternsMap) {
+        this.getObject().setFormatPatternsMap(formatPatternsMap);
+        return (T) this;
+    }
+
+    /**
+     * <p>setIgnoreHyperLink.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.getObject().setIgnoreHyperLink(ignoreHyperLink);
+        return (T) this;
+    }
+
+    /**
+     * <p>setIgnoreAnchors.</p>
+     *
+     * @param ignoreAnchors a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setIgnoreAnchors(Boolean ignoreAnchors) {
+        this.getObject().setIgnoreAnchors(ignoreAnchors);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFitWidth.</p>
+     *
+     * @param fitWidth a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setFitWidth(Integer fitWidth) {
+        this.getObject().setFitWidth(fitWidth);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFitHeight.</p>
+     *
+     * @param fitHeight a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setFitHeight(Integer fitHeight) {
+        this.getObject().setFitHeight(fitHeight);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPageScale.</p>
+     *
+     * @param pageScale a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setPageScale(Integer pageScale) {
+        this.getObject().setPageScale(pageScale);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSheetDirection.</p>
+     *
+     * @param sheetDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @return a T object.
+     */
+    public T setSheetDirection(RunDirection sheetDirection) {
+        this.getObject().setSheetDirection(sheetDirection);
+        return (T) this;
+    }
+
+    /**
+     * <p>setColumnWidthRatio.</p>
+     *
+     * @param columnWidthRatio a {@link java.lang.Float} object.
+     * @return a T object.
+     */
+    public T setColumnWidthRatio(Float columnWidthRatio) {
+        this.getObject().setColumnWidthRatio(columnWidthRatio);
+        return (T) this;
+    }
+
+    /**
+     * <p>setUseTimeZone.</p>
+     *
+     * @param useTimeZone a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setUseTimeZone(Boolean useTimeZone) {
+        this.getObject().setUseTimeZone(useTimeZone);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFirstPageNumber.</p>
+     *
+     * @param firstPageNumber a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setFirstPageNumber(Integer firstPageNumber) {
+        this.getObject().setFirstPageNumber(firstPageNumber);
+        return (T) this;
+    }
+
+    /**
+     * <p>setShowGridLines.</p>
+     *
+     * @param showGridLines a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setShowGridLines(Boolean showGridLines) {
+        this.getObject().setShowGridLines(showGridLines);
+        return (T) this;
+    }
+
+    /**
+     * <p>setImageAnchorType.</p>
+     *
+     * @param imageAnchorType a {@link net.sf.dynamicreports.report.constant.ImageAnchorType} object.
+     * @return a T object.
+     */
+    public T setImageAnchorType(ImageAnchorType imageAnchorType) {
+        this.getObject().setImageAnchorType(imageAnchorType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setCreateCustomPalette.</p>
+     *
+     * @param createCustomPalette a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setCreateCustomPalette(Boolean createCustomPalette) {
+        this.getObject().setCreateCustomPalette(createCustomPalette);
+        return (T) this;
+    }
+
+    /**
+     * <p>setWorkbookTemplate.</p>
+     *
+     * @param workbookTemplate a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setWorkbookTemplate(String workbookTemplate) {
+        this.getObject().setWorkbookTemplate(workbookTemplate);
+        return (T) this;
+    }
+
+    /**
+     * <p>setKeepWorkbookTemplateSheets.</p>
+     *
+     * @param keepWorkbookTemplateSheets a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setKeepWorkbookTemplateSheets(Boolean keepWorkbookTemplateSheets) {
+        this.getObject().setKeepWorkbookTemplateSheets(keepWorkbookTemplateSheets);
+        return (T) this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java
new file mode 100644
index 0000000..afff26e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java
@@ -0,0 +1,165 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.AbstractJasperExporter;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.io.Writer;
+
+/**
+ * <p>Abstract AbstractJasperExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("unchecked")
+public abstract class AbstractJasperExporterBuilder<T extends AbstractJasperExporterBuilder<T, U>, U extends AbstractJasperExporter> extends AbstractBuilder<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for AbstractJasperExporterBuilder.</p>
+     *
+     * @param jasperExporter a U object.
+     */
+    protected AbstractJasperExporterBuilder(U jasperExporter) {
+        super(jasperExporter);
+    }
+
+    /**
+     * <p>setOutputWriter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a T object.
+     */
+    protected T setOutputWriter(Writer outputWriter) {
+        getObject().setOutputWriter(outputWriter);
+        return (T) this;
+    }
+
+    /**
+     * <p>setOutputStream.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a T object.
+     */
+    protected T setOutputStream(OutputStream outputStream) {
+        getObject().setOutputStream(outputStream);
+        return (T) this;
+    }
+
+    /**
+     * <p>setOutputFile.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a T object.
+     */
+    protected T setOutputFile(File outputFile) {
+        getObject().setOutputFile(outputFile);
+        return (T) this;
+    }
+
+    /**
+     * <p>setOutputFileName.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    protected T setOutputFileName(String outputFileName) {
+        getObject().setOutputFileName(outputFileName);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPageIndex.</p>
+     *
+     * @param pageIndex a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setPageIndex(Integer pageIndex) {
+        getObject().setPageIndex(pageIndex);
+        return (T) this;
+    }
+
+    /**
+     * <p>setStartPageIndex.</p>
+     *
+     * @param startPageIndex a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setStartPageIndex(Integer startPageIndex) {
+        getObject().setStartPageIndex(startPageIndex);
+        return (T) this;
+    }
+
+    /**
+     * <p>setEndPageIndex.</p>
+     *
+     * @param endPageIndex a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setEndPageIndex(Integer endPageIndex) {
+        getObject().setEndPageIndex(endPageIndex);
+        return (T) this;
+    }
+
+    /**
+     * <p>setCharacterEncoding.</p>
+     *
+     * @param characterEncoding a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setCharacterEncoding(String characterEncoding) {
+        getObject().setCharacterEncoding(characterEncoding);
+        return (T) this;
+    }
+
+    /**
+     * <p>setOffsetX.</p>
+     *
+     * @param offsetX a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setOffsetX(Integer offsetX) {
+        getObject().setOffsetX(offsetX);
+        return (T) this;
+    }
+
+    /**
+     * <p>setOffsetY.</p>
+     *
+     * @param offsetY a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setOffsetY(Integer offsetY) {
+        getObject().setOffsetY(offsetY);
+        return (T) this;
+    }
+
+    /**
+     * <p>getExporter.</p>
+     *
+     * @return a U object.
+     */
+    public U getExporter() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java
new file mode 100644
index 0000000..d4a5f7e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java
@@ -0,0 +1,572 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.constant.ImageType;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.io.Writer;
+
+/**
+ * A set of methods of creating exporters
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ExporterBuilders {
+
+    // csv
+
+    /**
+     * <p>csvExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public JasperCsvExporterBuilder csvExporter(Writer outputWriter) {
+        return Exporters.csvExporter(outputWriter);
+    }
+
+    /**
+     * <p>csvExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public JasperCsvExporterBuilder csvExporter(OutputStream outputStream) {
+        return Exporters.csvExporter(outputStream);
+    }
+
+    /**
+     * <p>csvExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public JasperCsvExporterBuilder csvExporter(File outputFile) {
+        return Exporters.csvExporter(outputFile);
+    }
+
+    /**
+     * <p>csvExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public JasperCsvExporterBuilder csvExporter(String outputFileName) {
+        return Exporters.csvExporter(outputFileName);
+    }
+
+    // docx
+
+    /**
+     * <p>docxExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public JasperDocxExporterBuilder docxExporter(Writer outputWriter) {
+        return Exporters.docxExporter(outputWriter);
+    }
+
+    /**
+     * <p>docxExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public JasperDocxExporterBuilder docxExporter(OutputStream outputStream) {
+        return Exporters.docxExporter(outputStream);
+    }
+
+    /**
+     * <p>docxExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public JasperDocxExporterBuilder docxExporter(File outputFile) {
+        return Exporters.docxExporter(outputFile);
+    }
+
+    /**
+     * <p>docxExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public JasperDocxExporterBuilder docxExporter(String outputFileName) {
+        return Exporters.docxExporter(outputFileName);
+    }
+
+    // html
+
+    /**
+     * <p>htmlExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder htmlExporter(Writer outputWriter) {
+        return Exporters.htmlExporter(outputWriter);
+    }
+
+    /**
+     * <p>htmlExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder htmlExporter(OutputStream outputStream) {
+        return Exporters.htmlExporter(outputStream);
+    }
+
+    /**
+     * <p>htmlExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder htmlExporter(File outputFile) {
+        return Exporters.htmlExporter(outputFile);
+    }
+
+    /**
+     * <p>htmlExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder htmlExporter(String outputFileName) {
+        return Exporters.htmlExporter(outputFileName);
+    }
+
+    // ods
+
+    /**
+     * <p>odsExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public JasperOdsExporterBuilder odsExporter(Writer outputWriter) {
+        return Exporters.odsExporter(outputWriter);
+    }
+
+    /**
+     * <p>odsExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public JasperOdsExporterBuilder odsExporter(OutputStream outputStream) {
+        return Exporters.odsExporter(outputStream);
+    }
+
+    /**
+     * <p>odsExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public JasperOdsExporterBuilder odsExporter(File outputFile) {
+        return Exporters.odsExporter(outputFile);
+    }
+
+    /**
+     * <p>odsExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public JasperOdsExporterBuilder odsExporter(String outputFileName) {
+        return Exporters.odsExporter(outputFileName);
+    }
+
+    // odt
+
+    /**
+     * <p>odtExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public JasperOdtExporterBuilder odtExporter(Writer outputWriter) {
+        return Exporters.odtExporter(outputWriter);
+    }
+
+    /**
+     * <p>odtExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public JasperOdtExporterBuilder odtExporter(OutputStream outputStream) {
+        return Exporters.odtExporter(outputStream);
+    }
+
+    /**
+     * <p>odtExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public JasperOdtExporterBuilder odtExporter(File outputFile) {
+        return Exporters.odtExporter(outputFile);
+    }
+
+    /**
+     * <p>odtExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public JasperOdtExporterBuilder odtExporter(String outputFileName) {
+        return Exporters.odtExporter(outputFileName);
+    }
+
+    // pdf
+
+    /**
+     * <p>pdfExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder pdfExporter(Writer outputWriter) {
+        return Exporters.pdfExporter(outputWriter);
+    }
+
+    /**
+     * <p>pdfExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder pdfExporter(OutputStream outputStream) {
+        return Exporters.pdfExporter(outputStream);
+    }
+
+    /**
+     * <p>pdfExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder pdfExporter(File outputFile) {
+        return Exporters.pdfExporter(outputFile);
+    }
+
+    /**
+     * <p>pdfExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder pdfExporter(String outputFileName) {
+        return Exporters.pdfExporter(outputFileName);
+    }
+
+    // rtf
+
+    /**
+     * <p>rtfExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public JasperRtfExporterBuilder rtfExporter(Writer outputWriter) {
+        return Exporters.rtfExporter(outputWriter);
+    }
+
+    /**
+     * <p>rtfExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public JasperRtfExporterBuilder rtfExporter(OutputStream outputStream) {
+        return Exporters.rtfExporter(outputStream);
+    }
+
+    /**
+     * <p>rtfExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public JasperRtfExporterBuilder rtfExporter(File outputFile) {
+        return Exporters.rtfExporter(outputFile);
+    }
+
+    /**
+     * <p>rtfExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public JasperRtfExporterBuilder rtfExporter(String outputFileName) {
+        return Exporters.rtfExporter(outputFileName);
+    }
+
+    // text
+
+    /**
+     * <p>textExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder textExporter(Writer outputWriter) {
+        return Exporters.textExporter(outputWriter);
+    }
+
+    /**
+     * <p>textExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder textExporter(OutputStream outputStream) {
+        return Exporters.textExporter(outputStream);
+    }
+
+    /**
+     * <p>textExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder textExporter(File outputFile) {
+        return Exporters.textExporter(outputFile);
+    }
+
+    /**
+     * <p>textExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder textExporter(String outputFileName) {
+        return Exporters.textExporter(outputFileName);
+    }
+
+    // xls
+
+    /**
+     * <p>xlsExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     */
+    public JasperXlsExporterBuilder xlsExporter(Writer outputWriter) {
+        return Exporters.xlsExporter(outputWriter);
+    }
+
+    /**
+     * <p>xlsExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     */
+    public JasperXlsExporterBuilder xlsExporter(OutputStream outputStream) {
+        return Exporters.xlsExporter(outputStream);
+    }
+
+    /**
+     * <p>xlsExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     */
+    public JasperXlsExporterBuilder xlsExporter(File outputFile) {
+        return Exporters.xlsExporter(outputFile);
+    }
+
+    /**
+     * <p>xlsExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     */
+    public JasperXlsExporterBuilder xlsExporter(String outputFileName) {
+        return Exporters.xlsExporter(outputFileName);
+    }
+
+    // xlsx
+
+    /**
+     * <p>xlsxExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public JasperXlsxExporterBuilder xlsxExporter(Writer outputWriter) {
+        return Exporters.xlsxExporter(outputWriter);
+    }
+
+    /**
+     * <p>xlsxExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public JasperXlsxExporterBuilder xlsxExporter(OutputStream outputStream) {
+        return Exporters.xlsxExporter(outputStream);
+    }
+
+    /**
+     * <p>xlsxExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public JasperXlsxExporterBuilder xlsxExporter(File outputFile) {
+        return Exporters.xlsxExporter(outputFile);
+    }
+
+    /**
+     * <p>xlsxExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public JasperXlsxExporterBuilder xlsxExporter(String outputFileName) {
+        return Exporters.xlsxExporter(outputFileName);
+    }
+
+    // xml
+
+    /**
+     * <p>xmlExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public JasperXmlExporterBuilder xmlExporter(Writer outputWriter) {
+        return Exporters.xmlExporter(outputWriter);
+    }
+
+    /**
+     * <p>xmlExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public JasperXmlExporterBuilder xmlExporter(OutputStream outputStream) {
+        return Exporters.xmlExporter(outputStream);
+    }
+
+    /**
+     * <p>xmlExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public JasperXmlExporterBuilder xmlExporter(File outputFile) {
+        return Exporters.xmlExporter(outputFile);
+    }
+
+    /**
+     * <p>xmlExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public JasperXmlExporterBuilder xmlExporter(String outputFileName) {
+        return Exporters.xmlExporter(outputFileName);
+    }
+
+    // pptx
+
+    /**
+     * <p>pptxExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public JasperPptxExporterBuilder pptxExporter(Writer outputWriter) {
+        return Exporters.pptxExporter(outputWriter);
+    }
+
+    /**
+     * <p>pptxExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public JasperPptxExporterBuilder pptxExporter(OutputStream outputStream) {
+        return Exporters.pptxExporter(outputStream);
+    }
+
+    /**
+     * <p>pptxExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public JasperPptxExporterBuilder pptxExporter(File outputFile) {
+        return Exporters.pptxExporter(outputFile);
+    }
+
+    /**
+     * <p>pptxExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public JasperPptxExporterBuilder pptxExporter(String outputFileName) {
+        return Exporters.pptxExporter(outputFileName);
+    }
+
+    // image
+
+    /**
+     * <p>imageExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @param imageType    a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public JasperImageExporterBuilder imageExporter(OutputStream outputStream, ImageType imageType) {
+        return Exporters.imageExporter(outputStream, imageType);
+    }
+
+    /**
+     * <p>imageExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @param imageType  a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public JasperImageExporterBuilder imageExporter(File outputFile, ImageType imageType) {
+        return Exporters.imageExporter(outputFile, imageType);
+    }
+
+    /**
+     * <p>imageExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @param imageType      a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public JasperImageExporterBuilder imageExporter(String outputFileName, ImageType imageType) {
+        return Exporters.imageExporter(outputFileName, imageType);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java
new file mode 100644
index 0000000..02b61c7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java
@@ -0,0 +1,572 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.constant.ImageType;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.io.Writer;
+
+/**
+ * A set of methods of creating exporters
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Exporters {
+
+    // csv
+
+    /**
+     * <p>csvExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public static JasperCsvExporterBuilder csvExporter(Writer outputWriter) {
+        return new JasperCsvExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>csvExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public static JasperCsvExporterBuilder csvExporter(OutputStream outputStream) {
+        return new JasperCsvExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>csvExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public static JasperCsvExporterBuilder csvExporter(File outputFile) {
+        return new JasperCsvExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>csvExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public static JasperCsvExporterBuilder csvExporter(String outputFileName) {
+        return new JasperCsvExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // docx
+
+    /**
+     * <p>docxExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public static JasperDocxExporterBuilder docxExporter(Writer outputWriter) {
+        return new JasperDocxExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>docxExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public static JasperDocxExporterBuilder docxExporter(OutputStream outputStream) {
+        return new JasperDocxExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>docxExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public static JasperDocxExporterBuilder docxExporter(File outputFile) {
+        return new JasperDocxExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>docxExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public static JasperDocxExporterBuilder docxExporter(String outputFileName) {
+        return new JasperDocxExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // html
+
+    /**
+     * <p>htmlExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public static JasperHtmlExporterBuilder htmlExporter(Writer outputWriter) {
+        return new JasperHtmlExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>htmlExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public static JasperHtmlExporterBuilder htmlExporter(OutputStream outputStream) {
+        return new JasperHtmlExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>htmlExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public static JasperHtmlExporterBuilder htmlExporter(File outputFile) {
+        return new JasperHtmlExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>htmlExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public static JasperHtmlExporterBuilder htmlExporter(String outputFileName) {
+        return new JasperHtmlExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // ods
+
+    /**
+     * <p>odsExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public static JasperOdsExporterBuilder odsExporter(Writer outputWriter) {
+        return new JasperOdsExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>odsExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public static JasperOdsExporterBuilder odsExporter(OutputStream outputStream) {
+        return new JasperOdsExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>odsExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public static JasperOdsExporterBuilder odsExporter(File outputFile) {
+        return new JasperOdsExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>odsExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public static JasperOdsExporterBuilder odsExporter(String outputFileName) {
+        return new JasperOdsExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // odt
+
+    /**
+     * <p>odtExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public static JasperOdtExporterBuilder odtExporter(Writer outputWriter) {
+        return new JasperOdtExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>odtExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public static JasperOdtExporterBuilder odtExporter(OutputStream outputStream) {
+        return new JasperOdtExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>odtExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public static JasperOdtExporterBuilder odtExporter(File outputFile) {
+        return new JasperOdtExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>odtExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public static JasperOdtExporterBuilder odtExporter(String outputFileName) {
+        return new JasperOdtExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // pdf
+
+    /**
+     * <p>pdfExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public static JasperPdfExporterBuilder pdfExporter(Writer outputWriter) {
+        return new JasperPdfExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>pdfExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public static JasperPdfExporterBuilder pdfExporter(OutputStream outputStream) {
+        return new JasperPdfExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>pdfExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public static JasperPdfExporterBuilder pdfExporter(File outputFile) {
+        return new JasperPdfExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>pdfExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public static JasperPdfExporterBuilder pdfExporter(String outputFileName) {
+        return new JasperPdfExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // rtf
+
+    /**
+     * <p>rtfExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public static JasperRtfExporterBuilder rtfExporter(Writer outputWriter) {
+        return new JasperRtfExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>rtfExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public static JasperRtfExporterBuilder rtfExporter(OutputStream outputStream) {
+        return new JasperRtfExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>rtfExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public static JasperRtfExporterBuilder rtfExporter(File outputFile) {
+        return new JasperRtfExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>rtfExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public static JasperRtfExporterBuilder rtfExporter(String outputFileName) {
+        return new JasperRtfExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // text
+
+    /**
+     * <p>textExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public static JasperTextExporterBuilder textExporter(Writer outputWriter) {
+        return new JasperTextExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>textExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public static JasperTextExporterBuilder textExporter(OutputStream outputStream) {
+        return new JasperTextExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>textExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public static JasperTextExporterBuilder textExporter(File outputFile) {
+        return new JasperTextExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>textExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public static JasperTextExporterBuilder textExporter(String outputFileName) {
+        return new JasperTextExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // xls
+
+    /**
+     * <p>xlsExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     */
+    public static JasperXlsExporterBuilder xlsExporter(Writer outputWriter) {
+        return new JasperXlsExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>xlsExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     */
+    public static JasperXlsExporterBuilder xlsExporter(OutputStream outputStream) {
+        return new JasperXlsExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>xlsExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     */
+    public static JasperXlsExporterBuilder xlsExporter(File outputFile) {
+        return new JasperXlsExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>xlsExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
+     */
+    public static JasperXlsExporterBuilder xlsExporter(String outputFileName) {
+        return new JasperXlsExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // xlsx
+
+    /**
+     * <p>xlsxExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public static JasperXlsxExporterBuilder xlsxExporter(Writer outputWriter) {
+        return new JasperXlsxExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>xlsxExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public static JasperXlsxExporterBuilder xlsxExporter(OutputStream outputStream) {
+        return new JasperXlsxExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>xlsxExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public static JasperXlsxExporterBuilder xlsxExporter(File outputFile) {
+        return new JasperXlsxExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>xlsxExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public static JasperXlsxExporterBuilder xlsxExporter(String outputFileName) {
+        return new JasperXlsxExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // xml
+
+    /**
+     * <p>xmlExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public static JasperXmlExporterBuilder xmlExporter(Writer outputWriter) {
+        return new JasperXmlExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>xmlExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public static JasperXmlExporterBuilder xmlExporter(OutputStream outputStream) {
+        return new JasperXmlExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>xmlExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public static JasperXmlExporterBuilder xmlExporter(File outputFile) {
+        return new JasperXmlExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>xmlExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public static JasperXmlExporterBuilder xmlExporter(String outputFileName) {
+        return new JasperXmlExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // pptx
+
+    /**
+     * <p>pptxExporter.</p>
+     *
+     * @param outputWriter a {@link java.io.Writer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public static JasperPptxExporterBuilder pptxExporter(Writer outputWriter) {
+        return new JasperPptxExporterBuilder().setOutputWriter(outputWriter);
+    }
+
+    /**
+     * <p>pptxExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public static JasperPptxExporterBuilder pptxExporter(OutputStream outputStream) {
+        return new JasperPptxExporterBuilder().setOutputStream(outputStream);
+    }
+
+    /**
+     * <p>pptxExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public static JasperPptxExporterBuilder pptxExporter(File outputFile) {
+        return new JasperPptxExporterBuilder().setOutputFile(outputFile);
+    }
+
+    /**
+     * <p>pptxExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public static JasperPptxExporterBuilder pptxExporter(String outputFileName) {
+        return new JasperPptxExporterBuilder().setOutputFileName(outputFileName);
+    }
+
+    // image
+
+    /**
+     * <p>imageExporter.</p>
+     *
+     * @param outputStream a {@link java.io.OutputStream} object.
+     * @param imageType    a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public static JasperImageExporterBuilder imageExporter(OutputStream outputStream, ImageType imageType) {
+        return new JasperImageExporterBuilder().setOutputStream(outputStream).setImageType(imageType);
+    }
+
+    /**
+     * <p>imageExporter.</p>
+     *
+     * @param outputFile a {@link java.io.File} object.
+     * @param imageType  a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public static JasperImageExporterBuilder imageExporter(File outputFile, ImageType imageType) {
+        return new JasperImageExporterBuilder().setOutputFile(outputFile).setImageType(imageType);
+    }
+
+    /**
+     * <p>imageExporter.</p>
+     *
+     * @param outputFileName a {@link java.lang.String} object.
+     * @param imageType      a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public static JasperImageExporterBuilder imageExporter(String outputFileName, ImageType imageType) {
+        return new JasperImageExporterBuilder().setOutputFileName(outputFileName).setImageType(imageType);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java
new file mode 100644
index 0000000..63034c0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperCsvExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperCsvExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperCsvExporterBuilder extends AbstractJasperExporterBuilder<JasperCsvExporterBuilder, JasperCsvExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperCsvExporterBuilder.</p>
+     */
+    protected JasperCsvExporterBuilder() {
+        super(new JasperCsvExporter());
+    }
+
+    /**
+     * <p>setFieldDelimiter.</p>
+     *
+     * @param fieldDelimiter a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public JasperCsvExporterBuilder setFieldDelimiter(String fieldDelimiter) {
+        this.getObject().setFieldDelimiter(fieldDelimiter);
+        return this;
+    }
+
+    /**
+     * <p>setRecordDelimiter.</p>
+     *
+     * @param recordDelimiter a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     */
+    public JasperCsvExporterBuilder setRecordDelimiter(String recordDelimiter) {
+        this.getObject().setRecordDelimiter(recordDelimiter);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java
new file mode 100644
index 0000000..412b405
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java
@@ -0,0 +1,71 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperDocxExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperDocxExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperDocxExporterBuilder extends AbstractJasperExporterBuilder<JasperDocxExporterBuilder, JasperDocxExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperDocxExporterBuilder.</p>
+     */
+    protected JasperDocxExporterBuilder() {
+        super(new JasperDocxExporter());
+    }
+
+    /**
+     * <p>setFramesAsNestedTables.</p>
+     *
+     * @param framesAsNestedTables a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public JasperDocxExporterBuilder setFramesAsNestedTables(Boolean framesAsNestedTables) {
+        this.getObject().setFramesAsNestedTables(framesAsNestedTables);
+        return this;
+    }
+
+    /**
+     * <p>setFlexibleRowHeight.</p>
+     *
+     * @param flexibleRowHeight a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public JasperDocxExporterBuilder setFlexibleRowHeight(Boolean flexibleRowHeight) {
+        this.getObject().setFlexibleRowHeight(flexibleRowHeight);
+        return this;
+    }
+
+    /**
+     * <p>setIgnoreHyperLink.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     */
+    public JasperDocxExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.getObject().setIgnoreHyperLink(ignoreHyperLink);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java
new file mode 100644
index 0000000..5db5cb3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java
@@ -0,0 +1,241 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperHtmlExporter;
+import net.sf.dynamicreports.jasper.constant.SizeUnit;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperHtmlExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperHtmlExporterBuilder extends AbstractJasperExporterBuilder<JasperHtmlExporterBuilder, JasperHtmlExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperHtmlExporterBuilder.</p>
+     */
+    protected JasperHtmlExporterBuilder() {
+        super(new JasperHtmlExporter());
+    }
+
+    /**
+     * <p>setOutputImagesToDir.</p>
+     *
+     * @param outputImagesToDir a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setOutputImagesToDir(Boolean outputImagesToDir) {
+        this.getObject().setOutputImagesToDir(outputImagesToDir);
+        return this;
+    }
+
+    /**
+     * <p>setImagesDirName.</p>
+     *
+     * @param imagesDirName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setImagesDirName(String imagesDirName) {
+        this.getObject().setImagesDirName(imagesDirName);
+        return this;
+    }
+
+    /**
+     * <p>setImagesURI.</p>
+     *
+     * @param imagesURI a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setImagesURI(String imagesURI) {
+        this.getObject().setImagesURI(imagesURI);
+        return this;
+    }
+
+    /**
+     * <p>setHtmlHeader.</p>
+     *
+     * @param htmlHeader a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setHtmlHeader(String htmlHeader) {
+        this.getObject().setHtmlHeader(htmlHeader);
+        return this;
+    }
+
+    /**
+     * <p>setBetweenPagesHtml.</p>
+     *
+     * @param betweenPagesHtml a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setBetweenPagesHtml(String betweenPagesHtml) {
+        this.getObject().setBetweenPagesHtml(betweenPagesHtml);
+        return this;
+    }
+
+    /**
+     * <p>setHtmlFooter.</p>
+     *
+     * @param htmlFooter a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setHtmlFooter(String htmlFooter) {
+        this.getObject().setHtmlFooter(htmlFooter);
+        return this;
+    }
+
+    /**
+     * <p>setRemoveEmptySpaceBetweenRows.</p>
+     *
+     * @param removeEmptySpaceBetweenRows a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setRemoveEmptySpaceBetweenRows(Boolean removeEmptySpaceBetweenRows) {
+        this.getObject().setRemoveEmptySpaceBetweenRows(removeEmptySpaceBetweenRows);
+        return this;
+    }
+
+    /**
+     * <p>setWhitePageBackground.</p>
+     *
+     * @param whitePageBackground a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setWhitePageBackground(Boolean whitePageBackground) {
+        this.getObject().setWhitePageBackground(whitePageBackground);
+        return this;
+    }
+
+    /**
+     * <p>setUsingImagesToAlign.</p>
+     *
+     * @param usingImagesToAlign a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @deprecated To be removed.
+     */
+    @Deprecated
+    public JasperHtmlExporterBuilder setUsingImagesToAlign(Boolean usingImagesToAlign) {
+        this.getObject().setUsingImagesToAlign(usingImagesToAlign);
+        return this;
+    }
+
+    /**
+     * <p>setWrapBreakWord.</p>
+     *
+     * @param wrapBreakWord a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setWrapBreakWord(Boolean wrapBreakWord) {
+        this.getObject().setWrapBreakWord(wrapBreakWord);
+        return this;
+    }
+
+    /**
+     * <p>setSizeUnit.</p>
+     *
+     * @param sizeUnit a {@link net.sf.dynamicreports.jasper.constant.SizeUnit} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setSizeUnit(SizeUnit sizeUnit) {
+        this.getObject().setSizeUnit(sizeUnit);
+        return this;
+    }
+
+    /**
+     * <p>setFramesAsNestedTables.</p>
+     *
+     * @param framesAsNestedTables a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @deprecated To be removed.
+     */
+    @Deprecated
+    public JasperHtmlExporterBuilder setFramesAsNestedTables(Boolean framesAsNestedTables) {
+        this.getObject().setFramesAsNestedTables(framesAsNestedTables);
+        return this;
+    }
+
+    /**
+     * <p>setIgnorePageMargins.</p>
+     *
+     * @param ignorePageMargins a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setIgnorePageMargins(Boolean ignorePageMargins) {
+        this.getObject().setIgnorePageMargins(ignorePageMargins);
+        return this;
+    }
+
+    /**
+     * <p>setBorderCollapse.</p>
+     *
+     * @param borderCollapse a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setBorderCollapse(String borderCollapse) {
+        this.getObject().setBorderCollapse(borderCollapse);
+        return this;
+    }
+
+    /**
+     * <p>setAccessibleHtml.</p>
+     *
+     * @param accessibleHtml a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setAccessibleHtml(Boolean accessibleHtml) {
+        this.getObject().setAccessibleHtml(accessibleHtml);
+        return this;
+    }
+
+    /**
+     * <p>setZoomRatio.</p>
+     *
+     * @param zoomRatio a {@link java.lang.Float} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setZoomRatio(Float zoomRatio) {
+        this.getObject().setZoomRatio(zoomRatio);
+        return this;
+    }
+
+    /**
+     * <p>setIgnoreHyperLink.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.getObject().setIgnoreHyperLink(ignoreHyperLink);
+        return this;
+    }
+
+    /**
+     * <p>setFlushOutput.</p>
+     *
+     * @param flushOutput a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     */
+    public JasperHtmlExporterBuilder setFlushOutput(Boolean flushOutput) {
+        this.getObject().setFlushOutput(flushOutput);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
new file mode 100644
index 0000000..96db9fa
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
@@ -0,0 +1,84 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperImageExporter;
+import net.sf.dynamicreports.jasper.constant.ImageType;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperImageExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperImageExporterBuilder extends AbstractJasperExporterBuilder<JasperImageExporterBuilder, JasperImageExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperImageExporterBuilder.</p>
+     */
+    protected JasperImageExporterBuilder() {
+        super(new JasperImageExporter());
+    }
+
+    /**
+     * <p>setPageGap.</p>
+     *
+     * @param pageGap a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public JasperImageExporterBuilder setPageGap(Integer pageGap) {
+        this.getObject().setPageGap(pageGap);
+        return this;
+    }
+
+    /**
+     * <p>setImageType.</p>
+     *
+     * @param imageType a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public JasperImageExporterBuilder setImageType(ImageType imageType) {
+        this.getObject().setImageType(imageType);
+        return this;
+    }
+
+    /**
+     * <p>setZoom.</p>
+     *
+     * @param zoom a {@link java.lang.Float} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @deprecated To be removed. Use setZoomRatio instead.
+     */
+    @Deprecated
+    public JasperImageExporterBuilder setZoom(Float zoom) {
+        return setZoomRatio(zoom);
+    }
+
+    /**
+     * <p>setZoomRatio.</p>
+     *
+     * @param zoom a {@link java.lang.Float} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     */
+    public JasperImageExporterBuilder setZoomRatio(Float zoom) {
+        this.getObject().setZoomRatio(zoom);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java
new file mode 100644
index 0000000..ef75735
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperOdsExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperOdsExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperOdsExporterBuilder extends AbstractJasperExporterBuilder<JasperOdsExporterBuilder, JasperOdsExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperOdsExporterBuilder.</p>
+     */
+    protected JasperOdsExporterBuilder() {
+        super(new JasperOdsExporter());
+    }
+
+    /**
+     * <p>setFlexibleRowHeight.</p>
+     *
+     * @param flexibleRowHeight a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     */
+    public JasperOdsExporterBuilder setFlexibleRowHeight(Boolean flexibleRowHeight) {
+        getObject().setFlexibleRowHeight(flexibleRowHeight);
+        return this;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java
new file mode 100644
index 0000000..e5c889e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperOdtExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperOdtExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperOdtExporterBuilder extends AbstractJasperExporterBuilder<JasperOdtExporterBuilder, JasperOdtExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperOdtExporterBuilder.</p>
+     */
+    protected JasperOdtExporterBuilder() {
+        super(new JasperOdtExporter());
+    }
+
+    /**
+     * <p>setFlexibleRowHeight.</p>
+     *
+     * @param flexibleRowHeight a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public JasperOdtExporterBuilder setFlexibleRowHeight(Boolean flexibleRowHeight) {
+        this.getObject().setFlexibleRowHeight(flexibleRowHeight);
+        return this;
+    }
+
+    /**
+     * <p>setIgnoreHyperLink.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     */
+    public JasperOdtExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.getObject().setIgnoreHyperLink(ignoreHyperLink);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java
new file mode 100644
index 0000000..f235f75
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java
@@ -0,0 +1,354 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperPdfExporter;
+import net.sf.dynamicreports.jasper.constant.PdfPermission;
+import net.sf.dynamicreports.jasper.constant.PdfVersion;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.PdfPrintScaling;
+import net.sf.dynamicreports.report.constant.PdfaConformance;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>JasperPdfExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperPdfExporterBuilder extends AbstractJasperExporterBuilder<JasperPdfExporterBuilder, JasperPdfExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperPdfExporterBuilder.</p>
+     */
+    protected JasperPdfExporterBuilder() {
+        super(new JasperPdfExporter());
+    }
+
+    /**
+     * <p>setCreatingBatchModeBookmarks.</p>
+     *
+     * @param creatingBatchModeBookmarks a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setCreatingBatchModeBookmarks(Boolean creatingBatchModeBookmarks) {
+        this.getObject().setCreatingBatchModeBookmarks(creatingBatchModeBookmarks);
+        return this;
+    }
+
+    /**
+     * <p>setCompressed.</p>
+     *
+     * @param compressed a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setCompressed(Boolean compressed) {
+        this.getObject().setCompressed(compressed);
+        return this;
+    }
+
+    /**
+     * <p>setEncrypted.</p>
+     *
+     * @param encrypted a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setEncrypted(Boolean encrypted) {
+        this.getObject().setEncrypted(encrypted);
+        return this;
+    }
+
+    /**
+     * <p>setBitKey128.</p>
+     *
+     * @param bitKey128 a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setBitKey128(Boolean bitKey128) {
+        this.getObject().setBitKey128(bitKey128);
+        return this;
+    }
+
+    /**
+     * <p>setUserPassword.</p>
+     *
+     * @param userPassword a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setUserPassword(String userPassword) {
+        this.getObject().setUserPassword(userPassword);
+        return this;
+    }
+
+    /**
+     * <p>setOwnerPassword.</p>
+     *
+     * @param ownerPassword a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setOwnerPassword(String ownerPassword) {
+        this.getObject().setOwnerPassword(ownerPassword);
+        return this;
+    }
+
+    /**
+     * <p>permissions.</p>
+     *
+     * @param permissions a {@link net.sf.dynamicreports.jasper.constant.PdfPermission} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder permissions(PdfPermission... permissions) {
+        return addPermission(permissions);
+    }
+
+    /**
+     * <p>addPermission.</p>
+     *
+     * @param permissions a {@link net.sf.dynamicreports.jasper.constant.PdfPermission} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder addPermission(PdfPermission... permissions) {
+        Validate.notNull(permissions, "permissions must not be null");
+        Validate.noNullElements(permissions, "permissions must not contains null permission");
+        for (PdfPermission permission : permissions) {
+            this.getObject().addPermission(permission);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setPdfVersion.</p>
+     *
+     * @param pdfVersion a {@link net.sf.dynamicreports.jasper.constant.PdfVersion} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setPdfVersion(PdfVersion pdfVersion) {
+        this.getObject().setPdfVersion(pdfVersion);
+        return this;
+    }
+
+    /**
+     * <p>setMetadataTitle.</p>
+     *
+     * @param metadataTitle a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setMetadataTitle(String metadataTitle) {
+        this.getObject().setMetadataTitle(metadataTitle);
+        return this;
+    }
+
+    /**
+     * <p>setMetadataAuthor.</p>
+     *
+     * @param metadataAuthor a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setMetadataAuthor(String metadataAuthor) {
+        this.getObject().setMetadataAuthor(metadataAuthor);
+        return this;
+    }
+
+    /**
+     * <p>setMetadataSubject.</p>
+     *
+     * @param metadataSubject a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setMetadataSubject(String metadataSubject) {
+        this.getObject().setMetadataSubject(metadataSubject);
+        return this;
+    }
+
+    /**
+     * <p>setMetadataKeyWords.</p>
+     *
+     * @param metadataKeyWords a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setMetadataKeyWords(String metadataKeyWords) {
+        this.getObject().setMetadataKeyWords(metadataKeyWords);
+        return this;
+    }
+
+    /**
+     * <p>setMetadataCreator.</p>
+     *
+     * @param metadataCreator a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setMetadataCreator(String metadataCreator) {
+        this.getObject().setMetadataCreator(metadataCreator);
+        return this;
+    }
+
+    /**
+     * <p>setForceSvgShapes.</p>
+     *
+     * @param forceSvgShapes a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setForceSvgShapes(Boolean forceSvgShapes) {
+        this.getObject().setForceSvgShapes(forceSvgShapes);
+        return this;
+    }
+
+    /**
+     * <p>setPdfJavaScript.</p>
+     *
+     * @param pdfJavaScript a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setPdfJavaScript(String pdfJavaScript) {
+        this.getObject().setPdfJavaScript(pdfJavaScript);
+        return this;
+    }
+
+    /**
+     * <p>setTagged.</p>
+     *
+     * @param tagged a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setTagged(Boolean tagged) {
+        this.getObject().setTagged(tagged);
+        return this;
+    }
+
+    /**
+     * <p>setTagLanguage.</p>
+     *
+     * @param tagLanguage a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setTagLanguage(String tagLanguage) {
+        this.getObject().setTagLanguage(tagLanguage);
+        return this;
+    }
+
+    /**
+     * <p>setCollapseMissingBookmarkLevels.</p>
+     *
+     * @param collapseMissingBookmarkLevels a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setCollapseMissingBookmarkLevels(Boolean collapseMissingBookmarkLevels) {
+        this.getObject().setCollapseMissingBookmarkLevels(collapseMissingBookmarkLevels);
+        return this;
+    }
+
+    /**
+     * <p>setSizePageToContent.</p>
+     *
+     * @param sizePageToContent a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setSizePageToContent(Boolean sizePageToContent) {
+        this.getObject().setSizePageToContent(sizePageToContent);
+        return this;
+    }
+
+    /**
+     * <p>setIgnoreHyperLink.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.getObject().setIgnoreHyperLink(ignoreHyperLink);
+        return this;
+    }
+
+    /**
+     * <p>setForceLineBreakPolicy.</p>
+     *
+     * @param forceLineBreakPolicy a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setForceLineBreakPolicy(Boolean forceLineBreakPolicy) {
+        this.getObject().setForceLineBreakPolicy(forceLineBreakPolicy);
+        return this;
+    }
+
+    /**
+     * <p>setPrintScaling.</p>
+     *
+     * @param printScaling a {@link net.sf.dynamicreports.report.constant.PdfPrintScaling} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setPrintScaling(PdfPrintScaling printScaling) {
+        this.getObject().setPrintScaling(printScaling);
+        return this;
+    }
+
+    /**
+     * <p>setPdfaConformance.</p>
+     *
+     * @param pdfaConformance a {@link net.sf.dynamicreports.report.constant.PdfaConformance} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setPdfaConformance(PdfaConformance pdfaConformance) {
+        this.getObject().setPdfaConformance(pdfaConformance);
+        return this;
+    }
+
+    /**
+     * <p>setIccProfilePath.</p>
+     *
+     * @param iccProfilePath a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setIccProfilePath(String iccProfilePath) {
+        this.getObject().setIccProfilePath(iccProfilePath);
+        return this;
+    }
+
+    /**
+     * <p>setAllowedPermissionsHint.</p>
+     *
+     * @param allowedPermissionsHint a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setAllowedPermissionsHint(String allowedPermissionsHint) {
+        this.getObject().setAllowedPermissionsHint(allowedPermissionsHint);
+        return this;
+    }
+
+    /**
+     * <p>setDeniedPermissionsHint.</p>
+     *
+     * @param deniedPermissionsHint a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setDeniedPermissionsHint(String deniedPermissionsHint) {
+        this.getObject().setDeniedPermissionsHint(deniedPermissionsHint);
+        return this;
+    }
+
+    /**
+     * <p>setDisplayMetadataTitle.</p>
+     *
+     * @param displayMetadataTitle a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     */
+    public JasperPdfExporterBuilder setDisplayMetadataTitle(Boolean displayMetadataTitle) {
+        this.getObject().setDisplayMetadataTitle(displayMetadataTitle);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java
new file mode 100644
index 0000000..a0d90d3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperPptxExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperPptxExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperPptxExporterBuilder extends AbstractJasperExporterBuilder<JasperPptxExporterBuilder, JasperPptxExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperPptxExporterBuilder.</p>
+     */
+    protected JasperPptxExporterBuilder() {
+        super(new JasperPptxExporter());
+    }
+
+    /**
+     * <p>setIgnoreHyperLink.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     */
+    public JasperPptxExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.getObject().setIgnoreHyperLink(ignoreHyperLink);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java
new file mode 100644
index 0000000..87dbb51
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperRtfExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperRtfExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperRtfExporterBuilder extends AbstractJasperExporterBuilder<JasperRtfExporterBuilder, JasperRtfExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperRtfExporterBuilder.</p>
+     */
+    protected JasperRtfExporterBuilder() {
+        super(new JasperRtfExporter());
+    }
+
+    /**
+     * <p>setIgnoreHyperLink.</p>
+     *
+     * @param ignoreHyperLink a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     */
+    public JasperRtfExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
+        this.getObject().setIgnoreHyperLink(ignoreHyperLink);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java
new file mode 100644
index 0000000..57367d3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java
@@ -0,0 +1,164 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperTextExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperTextExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperTextExporterBuilder extends AbstractJasperExporterBuilder<JasperTextExporterBuilder, JasperTextExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperTextExporterBuilder.</p>
+     */
+    protected JasperTextExporterBuilder() {
+        super(new JasperTextExporter());
+    }
+
+    /**
+     * <p>setCharacterWidth.</p>
+     *
+     * @param characterWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @deprecated To be removed. Use setCharacterWidth(Float characterWidth) instead.
+     */
+    @Deprecated
+    public JasperTextExporterBuilder setCharacterWidth(Integer characterWidth) {
+        return setCharacterWidth(characterWidth != null ? characterWidth.floatValue() : null);
+    }
+
+    /**
+     * <p>setCharacterWidth.</p>
+     *
+     * @param characterWidth a {@link java.lang.Float} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder setCharacterWidth(Float characterWidth) {
+        this.getObject().setCharacterWidth(characterWidth);
+        return this;
+    }
+
+    /**
+     * <p>setCharacterHeight.</p>
+     *
+     * @param characterHeight a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @deprecated To be removed. Use setCharacterHeight(Float characterHeight) instead.
+     */
+    @Deprecated
+    public JasperTextExporterBuilder setCharacterHeight(Integer characterHeight) {
+        return setCharacterHeight(characterHeight != null ? characterHeight.floatValue() : null);
+    }
+
+    /**
+     * <p>setCharacterHeight.</p>
+     *
+     * @param characterHeight a {@link java.lang.Float} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder setCharacterHeight(Float characterHeight) {
+        this.getObject().setCharacterHeight(characterHeight);
+        return this;
+    }
+
+    /**
+     * <p>setPageWidth.</p>
+     *
+     * @param pageWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @deprecated To be removed. Use setPageWidthInChars instead.
+     */
+    @Deprecated
+    public JasperTextExporterBuilder setPageWidth(Integer pageWidth) {
+        return setPageWidthInChars(pageWidth);
+    }
+
+    /**
+     * <p>setPageWidthInChars.</p>
+     *
+     * @param pageWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder setPageWidthInChars(Integer pageWidth) {
+        this.getObject().setPageWidthInChars(pageWidth);
+        return this;
+    }
+
+    /**
+     * <p>setPageHeight.</p>
+     *
+     * @param pageHeight a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @deprecated To be removed. Use setPageHeightInChars instead.
+     */
+    @Deprecated
+    public JasperTextExporterBuilder setPageHeight(Integer pageHeight) {
+        return setPageHeightInChars(pageHeight);
+    }
+
+    /**
+     * <p>setPageHeightInChars.</p>
+     *
+     * @param pageHeight a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder setPageHeightInChars(Integer pageHeight) {
+        this.getObject().setPageHeightInChars(pageHeight);
+        return this;
+    }
+
+    /**
+     * <p>setBetweenPagesText.</p>
+     *
+     * @param betweenPagesText a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @deprecated To be removed. Use setPageSeparator instead.
+     */
+    @Deprecated
+    public JasperTextExporterBuilder setBetweenPagesText(String betweenPagesText) {
+        return setPageSeparator(betweenPagesText);
+    }
+
+    /**
+     * <p>setPageSeparator.</p>
+     *
+     * @param pageSeparator a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder setPageSeparator(String pageSeparator) {
+        this.getObject().setPageSeparator(pageSeparator);
+        return this;
+    }
+
+    /**
+     * <p>setLineSeparator.</p>
+     *
+     * @param lineSeparator a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     */
+    public JasperTextExporterBuilder setLineSeparator(String lineSeparator) {
+        this.getObject().setLineSeparator(lineSeparator);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsExporterBuilder.java
new file mode 100644
index 0000000..093dfea
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsExporterBuilder.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperXlsExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperXlsExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperXlsExporterBuilder extends AbstractJasperExcelExporterBuilder<JasperXlsExporterBuilder, JasperXlsExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperXlsExporterBuilder.</p>
+     */
+    protected JasperXlsExporterBuilder() {
+        super(new JasperXlsExporter());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java
new file mode 100644
index 0000000..47e250f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperXlsxExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperXlsxExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperXlsxExporterBuilder extends AbstractJasperExcelExporterBuilder<JasperXlsxExporterBuilder, JasperXlsxExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperXlsxExporterBuilder.</p>
+     */
+    protected JasperXlsxExporterBuilder() {
+        super(new JasperXlsxExporter());
+    }
+
+    /**
+     * <p>setMacroTemplate.</p>
+     *
+     * @param macroTemplate a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     */
+    public JasperXlsxExporterBuilder setMacroTemplate(String macroTemplate) {
+        getObject().setMacroTemplate(macroTemplate);
+        return this;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
new file mode 100644
index 0000000..8b9a7fa
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.builder.export;
+
+import net.sf.dynamicreports.jasper.base.export.JasperXmlExporter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperXmlExporterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperXmlExporterBuilder extends AbstractJasperExporterBuilder<JasperXmlExporterBuilder, JasperXmlExporter> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperXmlExporterBuilder.</p>
+     */
+    protected JasperXmlExporterBuilder() {
+        super(new JasperXmlExporter());
+    }
+
+    /**
+     * <p>setEmbeddingImages.</p>
+     *
+     * @param embeddingImages a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     */
+    public JasperXmlExporterBuilder setEmbeddingImages(Boolean embeddingImages) {
+        this.getObject().setEmbeddingImages(embeddingImages);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ImageType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ImageType.java
new file mode 100644
index 0000000..19ca37f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ImageType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.constant;
+
+/**
+ * <p>ImageType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ImageType {
+    GIF, PNG, JPG
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/JasperProperty.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/JasperProperty.java
new file mode 100644
index 0000000..8c8c8f5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/JasperProperty.java
@@ -0,0 +1,487 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.constant;
+
+import net.sf.jasperreports.engine.JRAbstractExporter;
+import net.sf.jasperreports.engine.JRTextElement;
+import net.sf.jasperreports.engine.export.HtmlExporter;
+import net.sf.jasperreports.engine.export.JRCsvMetadataExporter;
+import net.sf.jasperreports.engine.export.JRPdfExporterTagHelper;
+import net.sf.jasperreports.engine.export.JRXlsAbstractExporter;
+import net.sf.jasperreports.engine.export.JRXlsAbstractMetadataExporter;
+import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
+import net.sf.jasperreports.engine.util.JRTextMeasurerUtil;
+import net.sf.jasperreports.engine.xml.PrintSaxParserFactory;
+import net.sf.jasperreports.export.CommonExportConfiguration;
+import net.sf.jasperreports.export.CsvExporterConfiguration;
+import net.sf.jasperreports.export.CsvMetadataReportConfiguration;
+import net.sf.jasperreports.export.DocxReportConfiguration;
+import net.sf.jasperreports.export.Graphics2DReportConfiguration;
+import net.sf.jasperreports.export.HtmlExporterConfiguration;
+import net.sf.jasperreports.export.HtmlReportConfiguration;
+import net.sf.jasperreports.export.PdfExporterConfiguration;
+import net.sf.jasperreports.export.PdfReportConfiguration;
+import net.sf.jasperreports.export.ReportExportConfiguration;
+import net.sf.jasperreports.export.TextReportConfiguration;
+import net.sf.jasperreports.export.WriterExporterOutput;
+import net.sf.jasperreports.export.XlsExporterConfiguration;
+import net.sf.jasperreports.export.XlsMetadataReportConfiguration;
+import net.sf.jasperreports.export.XlsReportConfiguration;
+
+
+/**
+ * <p>JasperProperty class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+public class JasperProperty
+{
+	
+	// export
+	/**
+	 * @see WriterExporterOutput#PROPERTY_CHARACTER_ENCODING
+	 */
+	public static final String EXPORT_CHARACTER_ENCODING = WriterExporterOutput.PROPERTY_CHARACTER_ENCODING;
+	/**
+	 * @see CommonExportConfiguration#PROPERTY_EXPORT_CONFIGURATION_OVERRIDE_REPORT_HINTS
+	 * @deprecated Replaced by {@link EXPORT_CONFIGURATION_OVERRIDE_REPORT_HINTS}.
+	 */
+	@Deprecated
+	public static final String EXPORT_PARAMETERS_OVERRIDE_REPORT_HINTS =
+		CommonExportConfiguration.PROPERTY_EXPORT_CONFIGURATION_OVERRIDE_REPORT_HINTS;
+	/**
+	 * @see CommonExportConfiguration#PROPERTY_EXPORT_CONFIGURATION_OVERRIDE_REPORT_HINTS
+	 */
+	public static final String EXPORT_CONFIGURATION_OVERRIDE_REPORT_HINTS =
+		CommonExportConfiguration.PROPERTY_EXPORT_CONFIGURATION_OVERRIDE_REPORT_HINTS;
+	/**
+	 * @see ReportExportConfiguration#PROPERTY_IGNORE_PAGE_MARGINS
+	 */
+	public static final String EXPORT_IGNORE_PAGE_MARGINS = ReportExportConfiguration.PROPERTY_IGNORE_PAGE_MARGINS;
+	/**
+	 * @see Graphics2DReportConfiguration#MINIMIZE_PRINTER_JOB_SIZE
+	 */
+	public static final String EXPORT_GRAPHICD2D_MINIMIZE_PRINTER_JOB_SIZE =
+		Graphics2DReportConfiguration.MINIMIZE_PRINTER_JOB_SIZE;
+	/**
+	 * @see JRAbstractExporter#PROPERTY_DEFAULT_FILTER_FACTORY
+	 */
+	public static final String EXPORT_DEFAULT_FILTER_FACTORY = JRAbstractExporter.PROPERTY_DEFAULT_FILTER_FACTORY;
+	
+	// text
+	/**
+	 * @see JRTextElement#PROPERTY_PRINT_KEEP_FULL_TEXT
+	 */
+	public static final String PRINT_KEEP_FULL_TEXT = JRTextElement.PROPERTY_PRINT_KEEP_FULL_TEXT;
+	/**
+	 * @see JRTextElement#PROPERTY_TRUNCATE_AT_CHAR
+	 */
+	public static final String TEXT_TRUNCATE_AT_CHAR = JRTextElement.PROPERTY_TRUNCATE_AT_CHAR;
+	/**
+	 * @see JRTextElement#PROPERTY_TRUNCATE_SUFFIX
+	 */
+	public static final String TEXT_TRUNCATE_SUFFIX = JRTextElement.PROPERTY_TRUNCATE_SUFFIX;
+	/**
+	 * @see JRTextElement#PROPERTY_SAVE_LINE_BREAKS
+	 */
+	public static final String TEXT_SAVE_LINE_BREAKS = JRTextElement.PROPERTY_SAVE_LINE_BREAKS;
+	/**
+	 * @see JRTextMeasurerUtil#PROPERTY_TEXT_MEASURER_FACTORY
+	 */
+	public static final String TEXT_MEASURER_FACTORY = JRTextMeasurerUtil.PROPERTY_TEXT_MEASURER_FACTORY;
+	/**
+	 * @see TextReportConfiguration#PROPERTY_CHARACTER_WIDTH
+	 */
+	public static final String EXPORT_TEXT_CHARACTER_WIDTH = TextReportConfiguration.PROPERTY_CHARACTER_WIDTH;
+	/**
+	 * @see TextReportConfiguration#PROPERTY_CHARACTER_HEIGHT
+	 */
+	public static final String EXPORT_TEXT_CHARACTER_HEIGHT = TextReportConfiguration.PROPERTY_CHARACTER_HEIGHT;
+	/**
+	 * @see TextReportConfiguration#PROPERTY_PAGE_WIDTH
+	 */
+	public static final String EXPORT_TEXT_PAGE_WIDTH = TextReportConfiguration.PROPERTY_PAGE_WIDTH;
+	/**
+	 * @see TextReportConfiguration#PROPERTY_PAGE_HEIGHT
+	 */
+	public static final String EXPORT_TEXT_PAGE_HEIGHT = TextReportConfiguration.PROPERTY_PAGE_HEIGHT;
+	
+	// pdf
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_TABLE
+	 */
+	public static final String EXPORT_PDF_TAG_TABLE = JRPdfExporterTagHelper.PROPERTY_TAG_TABLE;
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_TR
+	 */
+	public static final String EXPORT_PDF_TAG_TR = JRPdfExporterTagHelper.PROPERTY_TAG_TR;
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_TH
+	 */
+	public static final String EXPORT_PDF_TAG_TH = JRPdfExporterTagHelper.PROPERTY_TAG_TH;
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_TD
+	 */
+	public static final String EXPORT_PDF_TAG_TD = JRPdfExporterTagHelper.PROPERTY_TAG_TD;
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_H1
+	 */
+	public static final String EXPORT_PDF_TAG_H1 = JRPdfExporterTagHelper.PROPERTY_TAG_H1;
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_H2
+	 */
+	public static final String EXPORT_PDF_TAG_H2 = JRPdfExporterTagHelper.PROPERTY_TAG_H2;
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_H3
+	 */
+	public static final String EXPORT_PDF_TAG_H3 = JRPdfExporterTagHelper.PROPERTY_TAG_H3;
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_COLSPAN
+	 */
+	public static final String EXPORT_PDF_TAG_COLSPAN = JRPdfExporterTagHelper.PROPERTY_TAG_COLSPAN;
+	/**
+	 * @see JRPdfExporterTagHelper#PROPERTY_TAG_ROWSPAN
+	 */
+	public static final String EXPORT_PDF_TAG_ROWSPAN = JRPdfExporterTagHelper.PROPERTY_TAG_ROWSPAN;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_CREATE_BATCH_MODE_BOOKMARKS
+	 */
+	public static final String EXPORT_PDF_CREATE_BATCH_MODE_BOOKMARKS =
+		PdfExporterConfiguration.PROPERTY_CREATE_BATCH_MODE_BOOKMARKS;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_COMPRESSED
+	 */
+	public static final String EXPORT_PDF_COMPRESSED = PdfExporterConfiguration.PROPERTY_COMPRESSED;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_ENCRYPTED
+	 */
+	public static final String EXPORT_PDF_ENCRYPTED = PdfExporterConfiguration.PROPERTY_ENCRYPTED;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_128_BIT_KEY
+	 */
+	public static final String EXPORT_PDF_128_BIT_KEY = PdfExporterConfiguration.PROPERTY_128_BIT_KEY;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_USER_PASSWORD
+	 */
+	public static final String EXPORT_PDF_USER_PASSWORD = PdfExporterConfiguration.PROPERTY_USER_PASSWORD;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_OWNER_PASSWORD
+	 */
+	public static final String EXPORT_PDF_OWNER_PASSWORD = PdfExporterConfiguration.PROPERTY_OWNER_PASSWORD;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_PDF_VERSION
+	 */
+	public static final String EXPORT_PDF_VERSION = PdfExporterConfiguration.PROPERTY_PDF_VERSION;
+	/**
+	 * @see PdfReportConfiguration#PROPERTY_FORCE_SVG_SHAPES
+	 */
+	public static final String EXPORT_PDF_FORCE_SVG_SHAPES = PdfReportConfiguration.PROPERTY_FORCE_SVG_SHAPES;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_PDF_JAVASCRIPT
+	 */
+	public static final String EXPORT_PDF_JAVASCRIPT = PdfExporterConfiguration.PROPERTY_PDF_JAVASCRIPT;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_PRINT_SCALING
+	 */
+	public static final String EXPORT_PDF_PRINT_SCALING = PdfExporterConfiguration.PROPERTY_PRINT_SCALING;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_TAGGED
+	 */
+	public static final String EXPORT_PDF_TAGGED = PdfExporterConfiguration.PROPERTY_TAGGED;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_TAG_LANGUAGE
+	 */
+	public static final String EXPORT_PDF_TAG_LANGUAGE = PdfExporterConfiguration.PROPERTY_TAG_LANGUAGE;
+	/**
+	 * @see PdfReportConfiguration#PROPERTY_COLLAPSE_MISSING_BOOKMARK_LEVELS
+	 */
+	public static final String EXPORT_PDF_COLLAPSE_MISSING_BOOKMARK_LEVELS =
+		PdfReportConfiguration.PROPERTY_COLLAPSE_MISSING_BOOKMARK_LEVELS;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_PDFA_CONFORMANCE
+	 */
+	public static final String EXPORT_PDF_PDFA_CONFORMANCE = PdfExporterConfiguration.PROPERTY_PDFA_CONFORMANCE;
+	/**
+	 * @see PdfExporterConfiguration#PROPERTY_PDFA_ICC_PROFILE_PATH
+	 */
+	public static final String EXPORT_PDF_PDFA_ICC_PROFILE_PATH =
+		PdfExporterConfiguration.PROPERTY_PDFA_ICC_PROFILE_PATH;
+	
+	// html
+	/**
+	 * @see HtmlExporter#PROPERTY_HTML_CLASS
+	 */
+	public static final String EXPORT_HTML_CLASS = HtmlExporter.PROPERTY_HTML_CLASS;
+	/**
+	 * @see HtmlExporter#PROPERTY_HTML_ID
+	 */
+	public static final String EXPORT_HTML_ID = HtmlExporter.PROPERTY_HTML_ID;
+	/**
+	 * @see HtmlReportConfiguration#PROPERTY_ACCESSIBLE
+	 */
+	public static final String EXPORT_HTML_ACCESSIBLE = HtmlReportConfiguration.PROPERTY_ACCESSIBLE;
+	/**
+	 * @see HtmlReportConfiguration#PROPERTY_REMOVE_EMPTY_SPACE_BETWEEN_ROWS
+	 */
+	public static final String EXPORT_HTML_REMOVE_EMPTY_SPACE_BETWEEN_ROWS =
+		HtmlReportConfiguration.PROPERTY_REMOVE_EMPTY_SPACE_BETWEEN_ROWS;
+	/**
+	 * @see HtmlReportConfiguration#PROPERTY_WHITE_PAGE_BACKGROUND
+	 */
+	public static final String EXPORT_HTML_WHITE_PAGE_BACKGROUND =
+		HtmlReportConfiguration.PROPERTY_WHITE_PAGE_BACKGROUND;
+	/**
+	 * @see HtmlReportConfiguration#PROPERTY_WRAP_BREAK_WORD
+	 */
+	public static final String EXPORT_HTML_WRAP_BREAK_WORD = HtmlReportConfiguration.PROPERTY_WRAP_BREAK_WORD;
+	/**
+	 * @see HtmlReportConfiguration#PROPERTY_SIZE_UNIT
+	 */
+	public static final String EXPORT_HTML_SIZE_UNIT = HtmlReportConfiguration.PROPERTY_SIZE_UNIT;
+	/**
+	 * @see HtmlExporterConfiguration#PROPERTY_FLUSH_OUTPUT
+	 */
+	public static final String EXPORT_HTML_FLUSH_OUTPUT = HtmlExporterConfiguration.PROPERTY_FLUSH_OUTPUT;
+	
+	// xls
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_ONE_PAGE_PER_SHEET
+	 */
+	public static final String EXPORT_XLS_ONE_PAGE_PER_SHEET = XlsReportConfiguration.PROPERTY_ONE_PAGE_PER_SHEET;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_REMOVE_EMPTY_SPACE_BETWEEN_ROWS
+	 */
+	public static final String EXPORT_XLS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS =
+		XlsReportConfiguration.PROPERTY_REMOVE_EMPTY_SPACE_BETWEEN_ROWS;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_REMOVE_EMPTY_SPACE_BETWEEN_COLUMNS
+	 */
+	public static final String EXPORT_XLS_REMOVE_EMPTY_SPACE_BETWEEN_COLUMNS =
+		XlsReportConfiguration.PROPERTY_REMOVE_EMPTY_SPACE_BETWEEN_COLUMNS;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_WHITE_PAGE_BACKGROUND
+	 */
+	public static final String EXPORT_XLS_WHITE_PAGE_BACKGROUND =
+        XlsReportConfiguration.PROPERTY_WHITE_PAGE_BACKGROUND;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_DETECT_CELL_TYPE
+	 */
+	public static final String EXPORT_XLS_DETECT_CELL_TYPE = XlsReportConfiguration.PROPERTY_DETECT_CELL_TYPE;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_SHEET_NAMES_PREFIX
+	 */
+	public static final String EXPORT_XLS_SHEET_NAMES_PREFIX = XlsReportConfiguration.PROPERTY_SHEET_NAMES_PREFIX;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_FONT_SIZE_FIX_ENABLED
+	 */
+	public static final String EXPORT_XLS_FONT_SIZE_FIX_ENABLED =
+        XlsReportConfiguration.PROPERTY_FONT_SIZE_FIX_ENABLED;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_IMAGE_BORDER_FIX_ENABLED
+	 */
+	public static final String EXPORT_XLS_IMAGE_BORDER_FIX_ENABLED =
+		XlsReportConfiguration.PROPERTY_IMAGE_BORDER_FIX_ENABLED;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_MAXIMUM_ROWS_PER_SHEET
+	 */
+	public static final String EXPORT_XLS_MAXIMUM_ROWS_PER_SHEET =
+		XlsReportConfiguration.PROPERTY_MAXIMUM_ROWS_PER_SHEET;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_IGNORE_GRAPHICS
+	 */
+	public static final String EXPORT_XLS_IGNORE_GRAPHICS = XlsReportConfiguration.PROPERTY_IGNORE_GRAPHICS;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_COLLAPSE_ROW_SPAN
+	 */
+	public static final String EXPORT_XLS_COLLAPSE_ROW_SPAN = XlsReportConfiguration.PROPERTY_COLLAPSE_ROW_SPAN;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_IGNORE_CELL_BORDER
+	 */
+	public static final String EXPORT_XLS_IGNORE_CELL_BORDER = XlsReportConfiguration.PROPERTY_IGNORE_CELL_BORDER;
+	/**
+	 * @see XlsExporterConfiguration#PROPERTY_CREATE_CUSTOM_PALETTE
+	 */
+	public static final String EXPORT_XLS_CREATE_CUSTOM_PALETTE =
+		XlsExporterConfiguration.PROPERTY_CREATE_CUSTOM_PALETTE;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_IGNORE_CELL_BACKGROUND
+	 */
+	public static final String EXPORT_XLS_IGNORE_CELL_BACKGROUND =
+		XlsReportConfiguration.PROPERTY_IGNORE_CELL_BACKGROUND;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_PASSWORD
+	 */
+	public static final String EXPORT_XLS_PASSWORD = XlsReportConfiguration.PROPERTY_PASSWORD;
+	/**
+	 * @see JRXlsAbstractExporter#PROPERTY_CELL_FORMULA
+	 */
+	public static final String EXPORT_XLS_CELL_FORMULA = JRXlsAbstractExporter.PROPERTY_CELL_FORMULA;
+	/**
+	 * @see JRXlsAbstractExporter#PROPERTY_CELL_PATTERN
+	 */
+	public static final String EXPORT_XLS_CELL_PATTERN = JRXlsAbstractExporter.PROPERTY_CELL_PATTERN;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_WRAP_TEXT
+	 */
+	public static final String EXPORT_XLS_WRAP_TEXT = XlsReportConfiguration.PROPERTY_WRAP_TEXT;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_FIT_WIDTH
+	 */
+	public static final String EXPORT_XLS_FIT_WIDTH = XlsReportConfiguration.PROPERTY_FIT_WIDTH;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_FIT_HEIGHT
+	 */
+	public static final String EXPORT_XLS_FIT_HEIGHT = XlsReportConfiguration.PROPERTY_FIT_HEIGHT;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_CELL_LOCKED
+	 */
+	public static final String EXPORT_XLS_CELL_LOCKED = XlsReportConfiguration.PROPERTY_CELL_LOCKED;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_CELL_HIDDEN
+	 */
+	public static final String EXPORT_XLS_CELL_HIDDEN = XlsReportConfiguration.PROPERTY_CELL_HIDDEN;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_SHEET_HEADER_LEFT
+	 */
+	public static final String EXPORT_XLS_SHEET_HEADER_LEFT = XlsReportConfiguration.PROPERTY_SHEET_HEADER_LEFT;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_SHEET_HEADER_CENTER
+	 */
+	public static final String EXPORT_XLS_SHEET_HEADER_CENTER = XlsReportConfiguration.PROPERTY_SHEET_HEADER_CENTER;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_SHEET_HEADER_RIGHT
+	 */
+	public static final String EXPORT_XLS_SHEET_HEADER_RIGHT = XlsReportConfiguration.PROPERTY_SHEET_HEADER_RIGHT;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_SHEET_FOOTER_LEFT
+	 */
+	public static final String EXPORT_XLS_SHEET_FOOTER_LEFT = XlsReportConfiguration.PROPERTY_SHEET_FOOTER_LEFT;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_SHEET_FOOTER_CENTER
+	 */
+	public static final String EXPORT_XLS_SHEET_FOOTER_CENTER = XlsReportConfiguration.PROPERTY_SHEET_FOOTER_CENTER;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_SHEET_FOOTER_RIGHT
+	 */
+	public static final String EXPORT_XLS_SHEET_FOOTER_RIGHT = XlsReportConfiguration.PROPERTY_SHEET_FOOTER_RIGHT;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_SHEET_DIRECTION
+	 */
+	public static final String EXPORT_XLS_SHEET_DIRECTION = XlsReportConfiguration.PROPERTY_SHEET_DIRECTION;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_FREEZE_ROW
+	 */
+	public static final String EXPORT_XLS_FREEZE_ROW = XlsReportConfiguration.PROPERTY_FREEZE_ROW;
+	/**
+	 * @see XlsReportConfiguration#PROPERTY_FREEZE_COLUMN
+	 */
+	public static final String EXPORT_XLS_FREEZE_COLUMN = XlsReportConfiguration.PROPERTY_FREEZE_COLUMN;
+	/**
+	 * @see JRXlsAbstractExporter#PROPERTY_FREEZE_ROW_EDGE
+	 */
+	public static final String EXPORT_XLS_FREEZE_ROW_EDGE = JRXlsAbstractExporter.PROPERTY_FREEZE_ROW_EDGE;
+	/**
+	 * @see JRXlsAbstractExporter#PROPERTY_FREEZE_COLUMN_EDGE
+	 */
+	public static final String EXPORT_XLS_FREEZE_COLUMN_EDGE = JRXlsAbstractExporter.PROPERTY_FREEZE_COLUMN_EDGE;
+	/**
+	 * @see JRXlsAbstractExporter#PROPERTY_BREAK_BEFORE_ROW
+	 */
+	public static final String EXPORT_XLS_BREAK_BEFORE_ROW = JRXlsAbstractExporter.PROPERTY_BREAK_BEFORE_ROW;
+	/**
+	 * @see JRXlsAbstractExporter#PROPERTY_BREAK_AFTER_ROW
+	 */
+	public static final String EXPORT_XLS_BREAK_AFTER_ROW = JRXlsAbstractExporter.PROPERTY_BREAK_AFTER_ROW;
+	
+	// xls metadata
+	/**
+	 * @see XlsMetadataReportConfiguration#PROPERTY_COLUMN_NAMES_PREFIX
+	 */
+	public static final String EXPORT_XLSMETADATA_COLUMN_NAMES_PREFIX =
+		XlsMetadataReportConfiguration.PROPERTY_COLUMN_NAMES_PREFIX;
+	/**
+	 * @see XlsMetadataReportConfiguration#PROPERTY_WRITE_HEADER
+	 */
+	public static final String EXPORT_XLSMETADATA_WRITE_HEADER = XlsMetadataReportConfiguration.PROPERTY_WRITE_HEADER;
+	/**
+	 * @see JRXlsAbstractMetadataExporter#PROPERTY_COLUMN_NAME
+	 */
+	public static final String EXPORT_XLSMETADATA_COLUMN_NAME = JRXlsAbstractMetadataExporter.PROPERTY_COLUMN_NAME;
+	/**
+	 * @see JRXlsAbstractMetadataExporter#PROPERTY_REPEAT_VALUE
+	 */
+	public static final String EXPORT_XLSMETADATA_REPEAT_VALUE = JRXlsAbstractMetadataExporter.PROPERTY_REPEAT_VALUE;
+	/**
+	 * @see JRXlsAbstractMetadataExporter#PROPERTY_DATA
+	 */
+	public static final String EXPORT_XLSMETADATA_DATA = JRXlsAbstractMetadataExporter.PROPERTY_DATA;
+	
+	// xml
+	/**
+	 * @see PrintSaxParserFactory#EXPORT_XML_VALIDATION
+	 */
+	public static final String EXPORT_XML_VALIDATION = PrintSaxParserFactory.EXPORT_XML_VALIDATION;
+	
+	// csv
+	/**
+	 * @see CsvExporterConfiguration#PROPERTY_FIELD_DELIMITER
+	 */
+	public static final String EXPORT_CSV_FIELD_DELIMITER = CsvExporterConfiguration.PROPERTY_FIELD_DELIMITER;
+	/**
+	 * @see CsvExporterConfiguration#PROPERTY_RECORD_DELIMITER
+	 */
+	public static final String EXPORT_CSV_RECORD_DELIMITER = CsvExporterConfiguration.PROPERTY_RECORD_DELIMITER;
+	
+	// csv metadata
+	/**
+	 * @see CsvMetadataReportConfiguration#PROPERTY_COLUMN_NAMES_PREFIX
+	 */
+	public static final String EXPORT_CSVMETADATA_COLUMN_NAMES_PREFIX =
+		CsvMetadataReportConfiguration.PROPERTY_COLUMN_NAMES_PREFIX;
+	/**
+	 * @see CsvMetadataReportConfiguration#PROPERTY_WRITE_HEADER
+	 */
+	public static final String EXPORT_CSVMETADATA_WRITE_HEADER = CsvMetadataReportConfiguration.PROPERTY_WRITE_HEADER;
+	/**
+	 * @see JRCsvMetadataExporter#PROPERTY_COLUMN_NAME
+	 */
+	public static final String EXPORT_CSVMETADATA_COLUMN_NAME = JRCsvMetadataExporter.PROPERTY_COLUMN_NAME;
+	/**
+	 * @see JRCsvMetadataExporter#PROPERTY_REPEAT_VALUE
+	 */
+	public static final String EXPORT_CSVMETADATA_REPEAT_VALUE = JRCsvMetadataExporter.PROPERTY_REPEAT_VALUE;
+	/**
+	 * @see JRCsvMetadataExporter#PROPERTY_DATA
+	 */
+	public static final String EXPORT_CSVMETADATA_DATA = JRCsvMetadataExporter.PROPERTY_DATA;
+	
+	// docx
+	/**
+	 * @see JRDocxExporter#PROPERTY_HIDDEN_TEXT
+	 */
+	public static final String EXPORT_DOCX_HIDDEN_TEXT = JRDocxExporter.PROPERTY_HIDDEN_TEXT;
+	/**
+	 * @see DocxReportConfiguration#PROPERTY_FRAMES_AS_NESTED_TABLES
+	 */
+	public static final String EXPORT_DOCX_FRAMES_AS_NESTED_TABLES =
+		DocxReportConfiguration.PROPERTY_FRAMES_AS_NESTED_TABLES;
+	/**
+	 * @see DocxReportConfiguration#PROPERTY_FLEXIBLE_ROW_HEIGHT
+	 */
+	public static final String EXPORT_DOCX_FLEXIBLE_ROW_HEIGHT = DocxReportConfiguration.PROPERTY_FLEXIBLE_ROW_HEIGHT;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfPermission.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfPermission.java
new file mode 100644
index 0000000..e23b0eb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfPermission.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.constant;
+
+/**
+ * <p>PdfPermission class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum PdfPermission {
+    PRINTING, MODIFY_CONTENTS, COPY, MODIFY_ANNOTATIONS, FILL_IN, SCREEN_READERS, ASSEMBLY, DEGRADED_PRINTING
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfVersion.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfVersion.java
new file mode 100644
index 0000000..9d1bde1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfVersion.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.constant;
+
+/**
+ * <p>PdfVersion class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum PdfVersion {
+    VERION_1_2, VERION_1_3, VERION_1_4, VERION_1_5, VERION_1_6, VERION_1_7
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/SizeUnit.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/SizeUnit.java
new file mode 100644
index 0000000..4730e6c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/SizeUnit.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.constant;
+
+/**
+ * <p>SizeUnit class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum SizeUnit {
+    PIXEL, POINT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ValueType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ValueType.java
new file mode 100644
index 0000000..9f4cd39
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ValueType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.constant;
+
+/**
+ * <p>ValueType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ValueType {
+    FIELD, VARIABLE, PARAMETER, SIMPLE_EXPRESSION, COMPLEX_EXPRESSION, SYSTEM_EXPRESSION
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/JasperReportHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/JasperReportHandler.java
new file mode 100644
index 0000000..6ac1336
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/JasperReportHandler.java
@@ -0,0 +1,55 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JasperPrint;
+
+import java.util.List;
+
+/**
+ * <p>JasperReportHandler interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperReportHandler {
+
+    /**
+     * <p>concatenate.</p>
+     *
+     * @param jasperReportBuilders a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     */
+    public void concatenate(JasperReportBuilder... jasperReportBuilders);
+
+    /**
+     * <p>setContinuousPageNumbering.</p>
+     *
+     * @param continuousPageNumbering a boolean.
+     */
+    public void setContinuousPageNumbering(boolean continuousPageNumbering);
+
+    /**
+     * <p>getPrintList.</p>
+     *
+     * @return a {@link java.util.List} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public List<JasperPrint> getPrintList() throws DRException;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperICsvExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperICsvExporter.java
new file mode 100644
index 0000000..fe9ee91
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperICsvExporter.java
@@ -0,0 +1,41 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperICsvExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperICsvExporter extends JasperIExporter {
+
+    /**
+     * <p>getFieldDelimiter.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getFieldDelimiter();
+
+    /**
+     * <p>getRecordDelimiter.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getRecordDelimiter();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIDocxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIDocxExporter.java
new file mode 100644
index 0000000..5ac263f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIDocxExporter.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperIDocxExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIDocxExporter extends JasperIExporter {
+
+    /**
+     * <p>getFramesAsNestedTables.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFramesAsNestedTables();
+
+    /**
+     * <p>getFlexibleRowHeight.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFlexibleRowHeight();
+
+    /**
+     * <p>getIgnoreHyperLink.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreHyperLink();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExcelExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExcelExporter.java
new file mode 100644
index 0000000..d6ced73
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExcelExporter.java
@@ -0,0 +1,306 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+import net.sf.dynamicreports.report.constant.ImageAnchorType;
+import net.sf.dynamicreports.report.constant.RunDirection;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>JasperIExcelExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIExcelExporter extends JasperIExporter {
+
+    /**
+     * <p>getOnePagePerSheet.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getOnePagePerSheet();
+
+    /**
+     * <p>getRemoveEmptySpaceBetweenRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getRemoveEmptySpaceBetweenRows();
+
+    /**
+     * <p>getRemoveEmptySpaceBetweenColumns.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getRemoveEmptySpaceBetweenColumns();
+
+    /**
+     * <p>getWhitePageBackground.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getWhitePageBackground();
+
+    /**
+     * <p>getDetectCellType.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getDetectCellType();
+
+    /**
+     * <p>getSheetNames.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<String> getSheetNames();
+
+    /**
+     * <p>getFontSizeFixEnabled.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFontSizeFixEnabled();
+
+    /**
+     * <p>getImageBorderFixEnabled.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getImageBorderFixEnabled();
+
+    /**
+     * <p>getMaxRowsPerSheet.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getMaxRowsPerSheet();
+
+    /**
+     * <p>getIgnoreGraphics.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreGraphics();
+
+    /**
+     * <p>getCollapseRowSpan.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCollapseRowSpan();
+
+    /**
+     * <p>getIgnoreCellBorder.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreCellBorder();
+
+    /**
+     * <p>getIgnoreCellBackground.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreCellBackground();
+
+    /**
+     * <p>getPassword.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPassword();
+
+    /**
+     * <p>getIgnorePageMargins.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnorePageMargins();
+
+    /**
+     * <p>getWrapText.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getWrapText();
+
+    /**
+     * <p>getCellLocked.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCellLocked();
+
+    /**
+     * <p>getCellHidden.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCellHidden();
+
+    /**
+     * <p>getSheetHeaderLeft.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getSheetHeaderLeft();
+
+    /**
+     * <p>getSheetHeaderCenter.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getSheetHeaderCenter();
+
+    /**
+     * <p>getSheetHeaderRight.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getSheetHeaderRight();
+
+    /**
+     * <p>getSheetFooterLeft.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getSheetFooterLeft();
+
+    /**
+     * <p>getSheetFooterCenter.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getSheetFooterCenter();
+
+    /**
+     * <p>getSheetFooterRight.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getSheetFooterRight();
+
+    /**
+     * <p>getFormatPatternsMap.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     */
+    public Map<String, String> getFormatPatternsMap();
+
+    /**
+     * <p>getIgnoreHyperLink.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreHyperLink();
+
+    /**
+     * <p>getIgnoreAnchors.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreAnchors();
+
+    /**
+     * <p>getFitWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getFitWidth();
+
+    /**
+     * <p>getFitHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getFitHeight();
+
+    /**
+     * <p>getPageScale.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageScale();
+
+    /**
+     * <p>getSheetDirection.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public RunDirection getSheetDirection();
+
+    /**
+     * <p>getColumnWidthRatio.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getColumnWidthRatio();
+
+    /**
+     * <p>getUseTimeZone.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getUseTimeZone();
+
+    /**
+     * <p>getFirstPageNumber.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getFirstPageNumber();
+
+    /**
+     * <p>getShowGridLines.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getShowGridLines();
+
+    /**
+     * <p>getImageAnchorType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ImageAnchorType} object.
+     */
+    public ImageAnchorType getImageAnchorType();
+
+    /**
+     * <p>getCreateCustomPalette.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCreateCustomPalette();
+
+    /**
+     * <p>getWorkbookTemplate.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getWorkbookTemplate();
+
+    /**
+     * <p>getKeepWorkbookTemplateSheets.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getKeepWorkbookTemplateSheets();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExporter.java
new file mode 100644
index 0000000..b416f07
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExporter.java
@@ -0,0 +1,103 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.io.Writer;
+
+/**
+ * <p>JasperIExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIExporter extends Serializable {
+
+    /**
+     * <p>getOutputWriter.</p>
+     *
+     * @return a {@link java.io.Writer} object.
+     */
+    public Writer getOutputWriter();
+
+    /**
+     * <p>getOutputStream.</p>
+     *
+     * @return a {@link java.io.OutputStream} object.
+     */
+    public OutputStream getOutputStream();
+
+    /**
+     * <p>getOutputFile.</p>
+     *
+     * @return a {@link java.io.File} object.
+     */
+    public File getOutputFile();
+
+    /**
+     * <p>getOutputFileName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getOutputFileName();
+
+    /**
+     * <p>getPageIndex.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageIndex();
+
+    /**
+     * <p>getStartPageIndex.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getStartPageIndex();
+
+    /**
+     * <p>getEndPageIndex.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getEndPageIndex();
+
+    /**
+     * <p>getCharacterEncoding.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getCharacterEncoding();
+
+    /**
+     * <p>getOffsetX.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getOffsetX();
+
+    /**
+     * <p>getOffsetY.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getOffsetY();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java
new file mode 100644
index 0000000..89bf069
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java
@@ -0,0 +1,155 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+import net.sf.dynamicreports.jasper.constant.SizeUnit;
+
+/**
+ * <p>JasperIHtmlExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIHtmlExporter extends JasperIExporter {
+
+    /**
+     * <p>getOutputImagesToDir.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getOutputImagesToDir();
+
+    /**
+     * <p>getImagesDirName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getImagesDirName();
+
+    /**
+     * <p>getImagesURI.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getImagesURI();
+
+    /**
+     * <p>getHtmlHeader.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getHtmlHeader();
+
+    /**
+     * <p>getBetweenPagesHtml.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getBetweenPagesHtml();
+
+    /**
+     * <p>getHtmlFooter.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getHtmlFooter();
+
+    /**
+     * <p>getRemoveEmptySpaceBetweenRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getRemoveEmptySpaceBetweenRows();
+
+    /**
+     * <p>getWhitePageBackground.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getWhitePageBackground();
+
+    /**
+     * <p>getUsingImagesToAlign.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getUsingImagesToAlign();
+
+    /**
+     * <p>getWrapBreakWord.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getWrapBreakWord();
+
+    /**
+     * <p>getSizeUnit.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.constant.SizeUnit} object.
+     */
+    public SizeUnit getSizeUnit();
+
+    /**
+     * <p>getFramesAsNestedTables.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFramesAsNestedTables();
+
+    /**
+     * <p>getIgnorePageMargins.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnorePageMargins();
+
+    /**
+     * <p>getBorderCollapse.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getBorderCollapse();
+
+    /**
+     * <p>getAccessibleHtml.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getAccessibleHtml();
+
+    /**
+     * <p>getZoomRatio.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getZoomRatio();
+
+    /**
+     * <p>getIgnoreHyperLink.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreHyperLink();
+
+    /**
+     * <p>getFlushOutput.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFlushOutput();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIImageExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIImageExporter.java
new file mode 100644
index 0000000..301ea0b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIImageExporter.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+import net.sf.dynamicreports.jasper.constant.ImageType;
+
+/**
+ * <p>JasperIImageExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIImageExporter extends JasperIExporter {
+
+    /**
+     * <p>getPageGap.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageGap();
+
+    /**
+     * <p>getImageType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     */
+    public ImageType getImageType();
+
+    /**
+     * <p>getZoomRatio.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getZoomRatio();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdsExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdsExporter.java
new file mode 100644
index 0000000..e3bbb9d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdsExporter.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperIOdsExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIOdsExporter extends JasperIExcelExporter {
+
+    /**
+     * <p>getFlexibleRowHeight.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFlexibleRowHeight();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdtExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdtExporter.java
new file mode 100644
index 0000000..96642a6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdtExporter.java
@@ -0,0 +1,41 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperIOdtExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIOdtExporter extends JasperIExporter {
+
+    /**
+     * <p>getFlexibleRowHeight.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFlexibleRowHeight();
+
+    /**
+     * <p>getIgnoreHyperLink.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreHyperLink();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPdfExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPdfExporter.java
new file mode 100644
index 0000000..e024532
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPdfExporter.java
@@ -0,0 +1,223 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+import net.sf.dynamicreports.jasper.constant.PdfPermission;
+import net.sf.dynamicreports.jasper.constant.PdfVersion;
+import net.sf.dynamicreports.report.constant.PdfPrintScaling;
+import net.sf.dynamicreports.report.constant.PdfaConformance;
+
+import java.util.List;
+
+/**
+ * <p>JasperIPdfExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIPdfExporter extends JasperIExporter {
+
+    /**
+     * <p>getCreatingBatchModeBookmarks.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCreatingBatchModeBookmarks();
+
+    /**
+     * <p>getCompressed.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCompressed();
+
+    /**
+     * <p>getEncrypted.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getEncrypted();
+
+    /**
+     * <p>getBitKey128.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getBitKey128();
+
+    /**
+     * <p>getUserPassword.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getUserPassword();
+
+    /**
+     * <p>getOwnerPassword.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getOwnerPassword();
+
+    /**
+     * <p>getPermissions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<PdfPermission> getPermissions();
+
+    /**
+     * <p>getPdfVersion.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.constant.PdfVersion} object.
+     */
+    public PdfVersion getPdfVersion();
+
+    /**
+     * <p>getMetadataTitle.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getMetadataTitle();
+
+    /**
+     * <p>getMetadataAuthor.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getMetadataAuthor();
+
+    /**
+     * <p>getMetadataSubject.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getMetadataSubject();
+
+    /**
+     * <p>getMetadataKeyWords.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getMetadataKeyWords();
+
+    /**
+     * <p>getMetadataCreator.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getMetadataCreator();
+
+    /**
+     * <p>getForceSvgShapes.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getForceSvgShapes();
+
+    /**
+     * <p>getPdfJavaScript.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPdfJavaScript();
+
+    /**
+     * <p>getTagged.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getTagged();
+
+    /**
+     * <p>getTagLanguage.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getTagLanguage();
+
+    /**
+     * <p>getCollapseMissingBookmarkLevels.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCollapseMissingBookmarkLevels();
+
+    /**
+     * <p>getSizePageToContent.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getSizePageToContent();
+
+    /**
+     * <p>getIgnoreHyperLink.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreHyperLink();
+
+    /**
+     * <p>getForceLineBreakPolicy.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getForceLineBreakPolicy();
+
+    /**
+     * <p>getPrintScaling.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.PdfPrintScaling} object.
+     */
+    public PdfPrintScaling getPrintScaling();
+
+    /**
+     * <p>getPdfaConformance.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.PdfaConformance} object.
+     */
+    public PdfaConformance getPdfaConformance();
+
+    /**
+     * <p>getIccProfilePath.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getIccProfilePath();
+
+    /**
+     * <p>getAllowedPermissionsHint.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getAllowedPermissionsHint();
+
+    /**
+     * <p>getDeniedPermissionsHint.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getDeniedPermissionsHint();
+
+    /**
+     * <p>getDisplayMetadataTitle.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getDisplayMetadataTitle();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPptxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPptxExporter.java
new file mode 100644
index 0000000..1e32837
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPptxExporter.java
@@ -0,0 +1,35 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperIPptxExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIPptxExporter extends JasperIExporter {
+
+    /**
+     * <p>getIgnoreHyperLink.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreHyperLink();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIRtfExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIRtfExporter.java
new file mode 100644
index 0000000..6e9836a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIRtfExporter.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperIRtfExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIRtfExporter extends JasperIExporter {
+
+    /**
+     * <p>getIgnoreHyperLink.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreHyperLink();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperITextExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperITextExporter.java
new file mode 100644
index 0000000..f8e03d0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperITextExporter.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperITextExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperITextExporter extends JasperIExporter {
+
+    /**
+     * <p>getCharacterWidth.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getCharacterWidth();
+
+    /**
+     * <p>getCharacterHeight.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getCharacterHeight();
+
+    /**
+     * <p>getPageWidthInChars.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageWidthInChars();
+
+    /**
+     * <p>getPageHeightInChars.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageHeightInChars();
+
+    /**
+     * <p>getPageSeparator.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPageSeparator();
+
+    /**
+     * <p>getLineSeparator.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getLineSeparator();
+
+    /**
+     * <p>getTrimLineRight.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getTrimLineRight();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsExporter.java
new file mode 100644
index 0000000..e31e53b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsExporter.java
@@ -0,0 +1,27 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperIXlsExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIXlsExporter extends JasperIExcelExporter {
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java
new file mode 100644
index 0000000..f747c1f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperIXlsxExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIXlsxExporter extends JasperIExcelExporter {
+
+    /**
+     * <p>getMacroTemplate.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getMacroTemplate();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
new file mode 100644
index 0000000..95e613d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.definition.export;
+
+/**
+ * <p>JasperIXmlExporter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperIXmlExporter extends JasperIExporter {
+
+    /**
+     * <p>getEmbeddingImages.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getEmbeddingImages();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/exception/JasperDesignException.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/exception/JasperDesignException.java
new file mode 100644
index 0000000..6ab05b3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/exception/JasperDesignException.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.exception;
+
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>JasperDesignException class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperDesignException extends RuntimeException {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperDesignException.</p>
+     *
+     * @param message a {@link java.lang.String} object.
+     */
+    public JasperDesignException(String message) {
+        super(message);
+    }
+
+    /**
+     * <p>Constructor for JasperDesignException.</p>
+     *
+     * @param message a {@link java.lang.String} object.
+     * @param cause   a {@link java.lang.Throwable} object.
+     */
+    public JasperDesignException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/AbstractExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/AbstractExpressionTransform.java
new file mode 100644
index 0000000..8b079dc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/AbstractExpressionTransform.java
@@ -0,0 +1,429 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.DRIDesignField;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.DRIDesignSort;
+import net.sf.dynamicreports.design.definition.DRIDesignVariable;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.dynamicreports.jasper.constant.ValueType;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.report.constant.SystemExpression;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRGenericElementParameter;
+import net.sf.jasperreports.engine.JRGroup;
+import net.sf.jasperreports.engine.JRPropertyExpression;
+import net.sf.jasperreports.engine.JRVariable;
+import net.sf.jasperreports.engine.design.JRDesignExpression;
+import net.sf.jasperreports.engine.design.JRDesignField;
+import net.sf.jasperreports.engine.design.JRDesignGenericElementParameter;
+import net.sf.jasperreports.engine.design.JRDesignPropertyExpression;
+import net.sf.jasperreports.engine.design.JRDesignSortField;
+import net.sf.jasperreports.engine.design.JRDesignVariable;
+import net.sf.jasperreports.engine.type.SortFieldTypeEnum;
+
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>Abstract AbstractExpressionTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractExpressionTransform {
+    private static final String VALUE = "$P'{'{0}'}'.getValue(\"{1}\")";
+    private static final String FIELD_VALUE = "$F'{'{0}'}'";
+    private static final String VARIABLE_VALUE = "$V'{'{0}'}'";
+    private static final String PARAMETER_VALUE = "$P'{'{0}'}'";
+    private static final String COMPLEX_VALUE = "$P'{'{0}'}'.getValue(\"{1}\", new Object[]'{'{2}'}')";
+
+    private Map<String, JRDesignExpression> expressions;
+
+    /**
+     * <p>Constructor for AbstractExpressionTransform.</p>
+     */
+    public AbstractExpressionTransform() {
+        this.expressions = new HashMap<String, JRDesignExpression>();
+    }
+
+    /**
+     * <p>transform.</p>
+     */
+    public void transform() {
+        for (DRIDesignField field : getFields()) {
+            addField(field);
+        }
+        for (DRIDesignSystemExpression expression : getSystemExpressions()) {
+            addSystemExpression(expression);
+        }
+        for (DRIDesignJasperExpression expression : getJasperExpressions()) {
+            addJasperExpression(expression);
+        }
+        for (DRIDesignSimpleExpression expression : getSimpleExpressions()) {
+            addSimpleExpression(expression);
+        }
+        for (DRIDesignComplexExpression complexExpression : getComplexExpressions()) {
+            addComplexExpression(complexExpression);
+        }
+        for (DRIDesignVariable variable : getVariables()) {
+            addVariable(variable);
+        }
+        for (DRIDesignSort sort : getSorts()) {
+            addSort(sort);
+        }
+    }
+
+    private void addSystemExpression(DRIDesignSystemExpression systemExpression) {
+        if (systemExpression == null) {
+            return;
+        }
+        getCustomValues().addValueType(systemExpression.getName(), ValueType.SYSTEM_EXPRESSION);
+        addExpression(systemExpression);
+    }
+
+    private void addJasperExpression(DRIDesignJasperExpression jasperExpression) {
+        if (jasperExpression == null) {
+            return;
+        }
+        addExpression(jasperExpression);
+    }
+
+    /**
+     * <p>addSimpleExpression.</p>
+     *
+     * @param simpleExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
+     */
+    protected void addSimpleExpression(DRIDesignSimpleExpression simpleExpression) {
+        if (simpleExpression == null) {
+            return;
+        }
+        getCustomValues().addSimpleExpression(simpleExpression);
+        addExpression(simpleExpression);
+    }
+
+    private void addField(DRIDesignField field) {
+        try {
+            if (!field.isExternal()) {
+                addField(field(field));
+            }
+            getCustomValues().addValueType(field.getName(), ValueType.FIELD);
+            addExpression(field);
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for field \"" + field.getName() + "\"", e);
+        }
+    }
+
+    private void addVariable(DRIDesignVariable variable) {
+        try {
+            addVariable(variable(variable));
+            getCustomValues().addValueType(variable.getName(), ValueType.VARIABLE);
+            addExpression(variable);
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for variable \"" + variable.getName() + "\"", e);
+        }
+    }
+
+    /**
+     * <p>addComplexExpression.</p>
+     *
+     * @param complexExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
+     */
+    protected void addComplexExpression(DRIDesignComplexExpression complexExpression) {
+        if (complexExpression == null) {
+            return;
+        }
+        getCustomValues().addComplexExpression(complexExpression);
+        addExpression(complexExpression);
+    }
+
+    private void addExpression(DRIDesignExpression expression) {
+        if (expressions.containsKey(expression.getName())) {
+            throw new JasperDesignException("Duplicate declaration of expression \"" + expression.getName() + "\"");
+        }
+        expressions.put(expression.getName(), expression(expression));
+    }
+
+    private void addSort(DRIDesignSort sort) {
+        try {
+            addSort(sort(sort));
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for sort \"" + sort.getExpression().getName() + "\"", e);
+        }
+    }
+
+    // field
+    private JRDesignField field(DRIDesignField field) {
+        JRDesignField jrField = new JRDesignField();
+        jrField.setName(field.getName());
+        jrField.setValueClass(field.getValueClass());
+        jrField.setDescription(field.getDescription());
+        return jrField;
+    }
+
+    // variable
+    private JRDesignVariable variable(DRIDesignVariable variable) {
+        JRDesignExpression expression = getExpression(variable.getValueExpression());
+        JRDesignExpression initialValueExpression = getExpression(variable.getInitialValueExpression());
+
+        JRDesignVariable jrVariable = new JRDesignVariable();
+        jrVariable.setName(variable.getName());
+        jrVariable.setExpression(expression);
+        jrVariable.setInitialValueExpression(initialValueExpression);
+        jrVariable.setValueClass(variable.getValueClass());
+        jrVariable.setCalculation(ConstantTransform.calculation(variable.getCalculation()));
+        ResetType resetType = variable.getResetType();
+        jrVariable.setResetType(ConstantTransform.variableResetType(resetType));
+        if (resetType.equals(ResetType.GROUP) && variable.getResetGroup() != null) {
+            jrVariable.setResetGroup(getGroup(variable.getResetGroup()));
+        }
+        return jrVariable;
+    }
+
+    /**
+     * <p>getGroup.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @return a {@link net.sf.jasperreports.engine.JRGroup} object.
+     */
+    protected JRGroup getGroup(DRIDesignGroup group) {
+        return null;
+    }
+
+    // simple expression
+    private JRDesignExpression expression(DRIDesignExpression simpleExpression) {
+        JRDesignExpression expression = new JRDesignExpression();
+        expression.setText(getExpressionText(simpleExpression));
+        return expression;
+    }
+
+    private String getExpressionText(DRIDesignExpression expression) {
+        if (expression instanceof DRIDesignField) {
+            return toFieldValue(expression.getName());
+        } else if (expression instanceof DRIDesignVariable) {
+            return toVariableValue(expression.getName());
+        } else if (expression instanceof DRIDesignComplexExpression) {
+            DRIDesignComplexExpression complexExpression = (DRIDesignComplexExpression) expression;
+            String values = "";
+            for (DRIDesignExpression valueExpression : complexExpression.getExpressions()) {
+                values += ", " + getExpressionText(valueExpression);
+            }
+            if (values.length() > 0) {
+                values = values.substring(2);
+            }
+            String parameterName = getExpressionParameterName(complexExpression.getParameterName());
+            return MessageFormat.format(COMPLEX_VALUE, parameterName, expression.getName(), values);
+        } else if (expression instanceof DRIDesignSimpleExpression) {
+            String parameterName = getExpressionParameterName(((DRIDesignSimpleExpression) expression).getParameterName());
+            return MessageFormat.format(VALUE, parameterName, expression.getName());
+        } else if (expression instanceof DRIDesignSystemExpression) {
+            String name = ((DRIDesignSystemExpression) expression).getName();
+            if (name.equals(SystemExpression.PAGE_NUMBER.name())) {
+                return toVariableValue(JRVariable.PAGE_NUMBER);
+            } else {
+                return toVariableValue(name);
+            }
+            // throw new JasperDesignException("System expression \"" + name + "\" not supported");
+        } else if (expression instanceof DRIDesignJasperExpression) {
+            return ((DRIDesignJasperExpression) expression).getExpression();
+        } else {
+            throw new JasperDesignException("Expression " + expression.getClass().getName() + " not supported");
+        }
+    }
+
+    private String getExpressionParameterName(String parameterName) {
+        if (parameterName == null) {
+            return JasperCustomValues.NAME;
+        } else {
+            return parameterName;
+        }
+    }
+
+    private String toFieldValue(String expression) {
+        return MessageFormat.format(FIELD_VALUE, expression);
+    }
+
+    private String toVariableValue(String expression) {
+        return MessageFormat.format(VARIABLE_VALUE, expression);
+    }
+
+    /**
+     * <p>toParameterValue.</p>
+     *
+     * @param expression a {@link java.lang.String} object.
+     * @return a {@link java.lang.String} object.
+     */
+    protected String toParameterValue(String expression) {
+        return MessageFormat.format(PARAMETER_VALUE, expression);
+    }
+
+    /**
+     * <p>getExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link net.sf.jasperreports.engine.design.JRDesignExpression} object.
+     */
+    public JRDesignExpression getExpression(DRIDesignExpression expression) {
+        if (expression == null) {
+            return null;
+        }
+        if (!expressions.containsKey(expression.getName())) {
+            throw new JasperDesignException("Expression \"" + expression.getName() + "\" is not registered");
+        }
+        return expressions.get(expression.getName());
+    }
+
+    // sort
+    private JRDesignSortField sort(DRIDesignSort sort) {
+        DRIDesignExpression expression = sort.getExpression();
+        String name;
+        SortFieldTypeEnum type;
+        if (expression instanceof DRIDesignField) {
+            name = expression.getName();
+            type = SortFieldTypeEnum.FIELD;
+        } else if (expression instanceof DRIDesignVariable) {
+            name = expression.getName();
+            type = SortFieldTypeEnum.VARIABLE;
+        } else {
+            throw new JasperDesignException("Sort expression \"" + expression.getName() + "\" not supported");
+        }
+
+        JRDesignSortField jrSort = new JRDesignSortField();
+        jrSort.setName(name);
+        jrSort.setOrder(ConstantTransform.orderType(sort.getOrderType()));
+        jrSort.setType(type);
+        return jrSort;
+    }
+
+    /**
+     * <p>getPropertyExpression.</p>
+     *
+     * @param propertyExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression} object.
+     * @return a {@link net.sf.jasperreports.engine.JRPropertyExpression} object.
+     */
+    protected JRPropertyExpression getPropertyExpression(DRIDesignPropertyExpression propertyExpression) {
+        JRDesignPropertyExpression jrPropertyExpression = new JRDesignPropertyExpression();
+        jrPropertyExpression.setName(propertyExpression.getName());
+        jrPropertyExpression.setValueExpression(getExpression(propertyExpression.getValueExpression()));
+        return jrPropertyExpression;
+    }
+
+    /**
+     * <p>getGenericElementParameterExpression.</p>
+     *
+     * @param parameterExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression} object.
+     * @return a {@link net.sf.jasperreports.engine.JRGenericElementParameter} object.
+     */
+    protected JRGenericElementParameter getGenericElementParameterExpression(DRIDesignParameterExpression parameterExpression) {
+        JRDesignGenericElementParameter jrParameterExpression = new JRDesignGenericElementParameter();
+        jrParameterExpression.setName(parameterExpression.getName());
+        jrParameterExpression.setValueExpression(getExpression(parameterExpression.getValueExpression()));
+        return jrParameterExpression;
+    }
+
+    /**
+     * <p>getCustomValues.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.base.JasperCustomValues} object.
+     */
+    protected abstract JasperCustomValues getCustomValues();
+
+    /**
+     * <p>getFields.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    protected abstract Collection<DRIDesignField> getFields();
+
+    /**
+     * <p>getVariables.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    protected abstract Collection<DRIDesignVariable> getVariables();
+
+    /**
+     * <p>getSystemExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    protected abstract Collection<DRIDesignSystemExpression> getSystemExpressions();
+
+    /**
+     * <p>getJasperExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    protected abstract Collection<DRIDesignJasperExpression> getJasperExpressions();
+
+    /**
+     * <p>getSimpleExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    protected abstract Collection<DRIDesignSimpleExpression> getSimpleExpressions();
+
+    /**
+     * <p>getComplexExpressions.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    protected abstract Collection<DRIDesignComplexExpression> getComplexExpressions();
+
+    /**
+     * <p>getSorts.</p>
+     *
+     * @return a {@link java.util.Collection} object.
+     */
+    protected abstract Collection<DRIDesignSort> getSorts();
+
+    /**
+     * <p>addField.</p>
+     *
+     * @param field a {@link net.sf.jasperreports.engine.design.JRDesignField} object.
+     * @throws net.sf.jasperreports.engine.JRException if any.
+     */
+    protected abstract void addField(JRDesignField field) throws JRException;
+
+    /**
+     * <p>addVariable.</p>
+     *
+     * @param variable a {@link net.sf.jasperreports.engine.design.JRDesignVariable} object.
+     * @throws net.sf.jasperreports.engine.JRException if any.
+     */
+    protected abstract void addVariable(JRDesignVariable variable) throws JRException;
+
+    /**
+     * <p>addSort.</p>
+     *
+     * @param sort a {@link net.sf.jasperreports.engine.design.JRDesignSortField} object.
+     * @throws net.sf.jasperreports.engine.JRException if any.
+     */
+    protected abstract void addSort(JRDesignSortField sort) throws JRException;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/BandTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/BandTransform.java
new file mode 100644
index 0000000..13c2bc3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/BandTransform.java
@@ -0,0 +1,144 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.definition.DRIDesignBand;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.DRIDesignReport;
+import net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.jasperreports.engine.JRElement;
+import net.sf.jasperreports.engine.design.JRDesignBand;
+import net.sf.jasperreports.engine.design.JRDesignElement;
+import net.sf.jasperreports.engine.design.JRDesignSection;
+import net.sf.jasperreports.engine.design.JasperDesign;
+
+/**
+ * <p>BandTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BandTransform {
+    private JasperTransformAccessor accessor;
+
+    /**
+     * <p>Constructor for BandTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     */
+    public BandTransform(JasperTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    /**
+     * <p>transform.</p>
+     */
+    public void transform() {
+        DRIDesignReport report = accessor.getReport();
+        JasperDesign design = accessor.getDesign();
+        DRIDesignTemplateDesign templateDesign = report.getTemplateDesign();
+
+        if (templateDesign.getTitleComponentsCount() == 0 && report.getTitleBand() != null) {
+            design.setTitle(band(report.getTitleBand()));
+        }
+        if (templateDesign.getPageHeaderComponentsCount() == 0 && report.getPageHeaderBand() != null) {
+            design.setPageHeader(band(report.getPageHeaderBand()));
+        }
+        if (templateDesign.getPageFooterComponentsCount() == 0 && report.getPageFooterBand() != null) {
+            design.setPageFooter(band(report.getPageFooterBand()));
+        }
+        if (templateDesign.getColumnHeaderComponentsCount() == 0 && report.getColumnHeaderBand() != null) {
+            design.setColumnHeader(band(report.getColumnHeaderBand()));
+        }
+        if (templateDesign.getColumnFooterComponentsCount() == 0 && report.getColumnFooterBand() != null) {
+            design.setColumnFooter(band(report.getColumnFooterBand()));
+        }
+        for (DRIDesignGroup group : report.getGroups()) {
+            if (group.getHeaderBands() != null) {
+                JRDesignBand jrTitleAndValueBand = null;
+                for (DRIDesignBand band : group.getHeaderBands()) {
+                    JRDesignBand jrBand = band(band);
+                    if (band.getName() != null && band.getName().equals("groupHeaderTitleAndValue")) {
+                        jrTitleAndValueBand = jrBand;
+                    }
+                    if (jrBand != null) {
+                        if (band.getName() != null && band.getName().equals("subtotalGroupHeader") && jrTitleAndValueBand != null && group.isHeaderWithSubtotal()) {
+                            if (jrTitleAndValueBand.getHeight() < jrBand.getHeight()) {
+                                jrTitleAndValueBand.setHeight(jrBand.getHeight());
+                            }
+                            for (JRElement jrElement : jrBand.getElements()) {
+                                jrTitleAndValueBand.addElement(jrElement);
+                            }
+                            continue;
+                        }
+                        ((JRDesignSection) accessor.getGroupTransform().getGroup(group).getGroupHeaderSection()).addBand(jrBand);
+                    }
+                }
+            }
+            if (group.getFooterBands() != null) {
+                for (DRIDesignBand band : group.getFooterBands()) {
+                    JRDesignBand jrBand = band(band);
+                    if (jrBand != null) {
+                        ((JRDesignSection) accessor.getGroupTransform().getGroup(group).getGroupFooterSection()).addBand(jrBand);
+                    }
+                }
+            }
+        }
+        for (DRIDesignBand band : report.getDetailBands()) {
+            JRDesignBand jrBand = band(band);
+            if (jrBand != null) {
+                ((JRDesignSection) design.getDetailSection()).addBand(jrBand);
+            }
+        }
+        if (templateDesign.getLastPageFooterComponentsCount() == 0 && report.getLastPageFooterBand() != null) {
+            design.setLastPageFooter(band(report.getLastPageFooterBand()));
+        }
+        if (templateDesign.getSummaryComponentsCount() == 0 && report.getSummaryBand() != null) {
+            design.setSummary(band(report.getSummaryBand()));
+        }
+        if (templateDesign.getNoDataComponentsCount() == 0 && report.getNoDataBand() != null) {
+            design.setNoData(band(report.getNoDataBand()));
+        }
+        if (templateDesign.getBackgroundComponentsCount() == 0 && report.getBackgroundBand() != null) {
+            design.setBackground(band(report.getBackgroundBand()));
+        }
+    }
+
+    // band
+    private JRDesignBand band(DRIDesignBand band) {
+        if (band == null) {
+            return null;
+        }
+        JRDesignBand jrBand = new JRDesignBand();
+        if (band.getBandComponent() != null) {
+            if (band.getPrintWhenExpression() != null) {
+                jrBand.setPrintWhenExpression(accessor.getExpressionTransform().getExpression(band.getPrintWhenExpression()));
+            } else {
+                jrBand.setPrintWhenExpression(accessor.getExpressionTransform().getExpression(band.getBandComponent().getPrintWhenExpression()));
+            }
+            jrBand.setSplitType(ConstantTransform.splitType(band.getSplitType()));
+            JRDesignElement[] jrElements = accessor.getComponentTransform().component(band.getBandComponent(), ListType.VERTICAL);
+            for (JRDesignElement jrElement : jrElements) {
+                jrBand.addElement(jrElement);
+            }
+        }
+        jrBand.setHeight(band.getHeight());
+        return jrBand;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ComponentTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ComponentTransform.java
new file mode 100644
index 0000000..d775bf6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ComponentTransform.java
@@ -0,0 +1,462 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.definition.DRIDesignHyperLink;
+import net.sf.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
+import net.sf.dynamicreports.design.definition.component.DRIDesignBreak;
+import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
+import net.sf.dynamicreports.design.definition.component.DRIDesignEllipse;
+import net.sf.dynamicreports.design.definition.component.DRIDesignFiller;
+import net.sf.dynamicreports.design.definition.component.DRIDesignGenericElement;
+import net.sf.dynamicreports.design.definition.component.DRIDesignImage;
+import net.sf.dynamicreports.design.definition.component.DRIDesignLine;
+import net.sf.dynamicreports.design.definition.component.DRIDesignList;
+import net.sf.dynamicreports.design.definition.component.DRIDesignMap;
+import net.sf.dynamicreports.design.definition.component.DRIDesignRectangle;
+import net.sf.dynamicreports.design.definition.component.DRIDesignSubreport;
+import net.sf.dynamicreports.design.definition.component.DRIDesignTextField;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import net.sf.dynamicreports.design.exception.DRDesignReportException;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.jasper.transformation.expression.JasperSubreportParametersExpression;
+import net.sf.dynamicreports.jasper.transformation.expression.SubreportExpression;
+import net.sf.dynamicreports.jasper.transformation.expression.SubreportParametersExpression;
+import net.sf.dynamicreports.jasper.transformation.expression.SubreportWidthExpression;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.component.CustomComponentTransform;
+import net.sf.dynamicreports.report.component.CustomComponents;
+import net.sf.dynamicreports.report.component.DRIDesignCustomComponent;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.jasperreports.components.ComponentsExtensionsRegistryFactory;
+import net.sf.jasperreports.components.map.StandardMapComponent;
+import net.sf.jasperreports.engine.JRGenericElementType;
+import net.sf.jasperreports.engine.component.ComponentKey;
+import net.sf.jasperreports.engine.design.JRDesignBreak;
+import net.sf.jasperreports.engine.design.JRDesignComponentElement;
+import net.sf.jasperreports.engine.design.JRDesignElement;
+import net.sf.jasperreports.engine.design.JRDesignEllipse;
+import net.sf.jasperreports.engine.design.JRDesignFrame;
+import net.sf.jasperreports.engine.design.JRDesignGenericElement;
+import net.sf.jasperreports.engine.design.JRDesignImage;
+import net.sf.jasperreports.engine.design.JRDesignLine;
+import net.sf.jasperreports.engine.design.JRDesignRectangle;
+import net.sf.jasperreports.engine.design.JRDesignStaticText;
+import net.sf.jasperreports.engine.design.JRDesignStyle;
+import net.sf.jasperreports.engine.design.JRDesignSubreport;
+import net.sf.jasperreports.engine.design.JRDesignTextField;
+import net.sf.jasperreports.engine.type.HyperlinkTargetEnum;
+import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
+import net.sf.jasperreports.engine.type.OnErrorTypeEnum;
+
+/**
+ * <p>ComponentTransform class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ *
+ */
+public class ComponentTransform {
+    private final JasperTransformAccessor accessor;
+
+    /**
+     * <p>Constructor for ComponentTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     */
+    public ComponentTransform(final JasperTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    /**
+     * <p>component.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.design.definition.component.DRIDesignComponent} object.
+     * @param listType  a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @return an array of {@link net.sf.jasperreports.engine.design.JRDesignElement} objects.
+     */
+    protected JRDesignElement[] component(final DRIDesignComponent component, final ListType listType) {
+        final JRDesignElement[] jrElements;
+        if (component instanceof DRIDesignList) {
+            jrElements = this.list((DRIDesignList) component);
+        } else if (component instanceof DRIDesignTextField) {
+            final JRDesignElement jrElement = this.textField((DRIDesignTextField) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignFiller) {
+            final JRDesignElement jrElement = this.filler((DRIDesignFiller) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignImage) {
+            final JRDesignElement jrElement = this.image((DRIDesignImage) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignSubreport) {
+            final JRDesignElement jrElement = this.subreport((DRIDesignSubreport) component, component.getWidth());
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignLine) {
+            final JRDesignElement jrElement = this.line((DRIDesignLine) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignEllipse) {
+            final JRDesignElement jrElement = this.ellipse((DRIDesignEllipse) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignRectangle) {
+            final JRDesignElement jrElement = this.rectangle((DRIDesignRectangle) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignBreak) {
+            final JRDesignElement jrElement = this.breakComponent((DRIDesignBreak) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignGenericElement) {
+            final JRDesignElement jrElement = this.genericElement((DRIDesignGenericElement) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignCrosstab) {
+            final JRDesignElement jrElement =
+                this.accessor.getCrosstabTransform().transform((DRIDesignCrosstab) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignMap) {
+            final JRDesignElement jrElement = this.map((DRIDesignMap) component);
+            jrElements = this.component(jrElement, component, listType);
+        } else if (component instanceof DRIDesignCustomComponent) {
+            final JRDesignElement jrElement = this.customComponent(component);
+            jrElements = this.component(jrElement, component, listType);
+        } else {
+            throw new JasperDesignException("Component " + component.getClass().getName() + " not supported");
+        }
+
+        return jrElements;
+    }
+
+    private JRDesignElement[] component(final JRDesignElement jrElement, final DRIDesignComponent component, final ListType listType) {
+        StretchType stretchType = component.getStretchType();
+        if (stretchType == null) {
+            if (component instanceof DRIDesignSubreport || component instanceof DRIDesignLine || component instanceof DRIDesignBreak || component instanceof DRIDesignCrosstab ||
+                component instanceof DRIDesignList) {
+                stretchType = StretchType.NO_STRETCH;
+            } else {
+                stretchType = this.detectStretchType(listType);
+            }
+        }
+
+        ComponentPositionType positionType = component.getPositionType();
+        if (positionType == null) {
+            positionType = ComponentPositionType.FLOAT;
+        }
+
+        jrElement.setPositionType(ConstantTransform.componentPositionType(positionType));
+        jrElement.setStretchType(ConstantTransform.stretchType(stretchType));
+        jrElement.setPrintInFirstWholeBand(component.isPrintInFirstWholeBand());
+        jrElement.setPrintWhenDetailOverflows(component.isPrintWhenDetailOverflows());
+        if (component.getPrintWhenGroupChanges() != null) {
+            jrElement.setPrintWhenGroupChanges(this.accessor.getGroupTransform().getGroup(component.getPrintWhenGroupChanges()));
+        }
+        jrElement.setKey(component.getUniqueName());
+        jrElement.setX(component.getX());
+        jrElement.setY(component.getY());
+        jrElement.setWidth(component.getWidth());
+        jrElement.setHeight(component.getHeight());
+
+        if (component.getStyle() != null) {
+            jrElement.setStyle(this.accessor.getStyleTransform().getStyle(component.getStyle()));
+        }
+        jrElement.setPrintWhenExpression(this.accessor.getExpressionTransform().getExpression(component.getPrintWhenExpression()));
+        jrElement.setRemoveLineWhenBlank(component.isRemoveLineWhenBlank());
+
+        for (final DRIDesignPropertyExpression propertyExpression : component.getPropertyExpressions()) {
+            jrElement.addPropertyExpression(this.accessor.getExpressionTransform().getPropertyExpression(propertyExpression));
+        }
+
+        final DRIDesignTableOfContentsHeading tocHeading = component.getTableOfContentsHeading();
+        if (tocHeading != null) {
+            final DRDesignTextField referenceField = (DRDesignTextField) tocHeading.getReferenceField();
+            referenceField.setX(component.getX());
+            referenceField.setY(component.getY());
+            final JRDesignElement jrReferenceElement = this.textField(referenceField);
+            this.component(jrReferenceElement, referenceField, listType);
+            return new JRDesignElement[] {jrReferenceElement, jrElement};
+        } else {
+            return new JRDesignElement[] {jrElement};
+        }
+    }
+
+    private StretchType detectStretchType(final ListType listType) {
+        if (listType == null || listType.equals(ListType.VERTICAL)) {
+            return StretchType.NO_STRETCH;
+        }
+
+        return StretchType.ELEMENT_GROUP_HEIGHT;
+    }
+
+    // list
+    private JRDesignElement[] list(final DRIDesignList list) {
+        switch (list.getComponentGroupType()) {
+            case FRAME:
+                final JRDesignFrame frame = new JRDesignFrame();
+                final JRDesignElement[] jrElems = this.component(frame, list, list.getType());
+
+                final DRDesignComponent background = (DRDesignComponent) list.getBackgroundComponent();
+                if (background != null) {
+                    final JRDesignElement jrBackground = this.component(background, list.getType())[0];
+                    frame.addElement(jrBackground);
+                }
+
+                for (final DRIDesignComponent element : list.getComponents()) {
+                    final JRDesignElement[] jrElements = this.component(element, list.getType());
+                    for (final JRDesignElement jrElement : jrElements) {
+                        frame.addElement(jrElement);
+                    }
+                }
+                return jrElems;
+            case NONE:
+                final List<JRDesignElement> jrElementList = new ArrayList<>();
+                for (final DRIDesignComponent element : list.getComponents()) {
+                    final JRDesignElement[] jrElements = this.component(element, list.getType());
+                    for (final JRDesignElement jrElement : jrElements) {
+                        jrElementList.add(jrElement);
+                    }
+                }
+                return jrElementList.toArray(new JRDesignElement[jrElementList.size()]);
+            default:
+                throw new JasperDesignException("ComponentGroupType " + list.getComponentGroupType().getClass().getName() + " not supported");
+        }
+    }
+
+    // textField
+    private JRDesignElement textField(final DRIDesignTextField textField) {
+        final JRDesignTextField jrTextField = new JRDesignTextField();
+
+        jrTextField.setAnchorNameExpression(this.accessor.getExpressionTransform().getExpression(textField.getAnchorNameExpression()));
+        if (textField.getBookmarkLevel() != null) {
+            jrTextField.setBookmarkLevel(textField.getBookmarkLevel());
+        }
+
+        final DRIDesignHyperLink hyperLink = textField.getHyperLink();
+        if (hyperLink != null) {
+            jrTextField.setHyperlinkAnchorExpression(this.accessor.getExpressionTransform().getExpression(hyperLink.getAnchorExpression()));
+            jrTextField.setHyperlinkPageExpression(this.accessor.getExpressionTransform().getExpression(hyperLink.getPageExpression()));
+            jrTextField.setHyperlinkReferenceExpression(this.accessor.getExpressionTransform().getExpression(hyperLink.getReferenceExpression()));
+            jrTextField.setHyperlinkTooltipExpression(this.accessor.getExpressionTransform().getExpression(hyperLink.getTooltipExpression()));
+            if (hyperLink.getType() != null) {
+                final HyperlinkTypeEnum hyperLinkType = ConstantTransform.hyperLinkType(hyperLink.getType());
+                if (hyperLinkType != null) {
+                    jrTextField.setHyperlinkType(hyperLinkType);
+                } else {
+                    jrTextField.setLinkType(hyperLink.getType());
+                }
+            }
+            if (hyperLink.getTarget() != null) {
+                final HyperlinkTargetEnum hyperLinkTarget = ConstantTransform.hyperLinkTarget(hyperLink.getTarget());
+                if (hyperLinkTarget != null) {
+                    jrTextField.setHyperlinkTarget(hyperLinkTarget);
+                } else {
+                    jrTextField.setLinkTarget(hyperLink.getTarget());
+                }
+            }
+        }
+
+        final EvaluationTime evaluationTime = textField.getEvaluationTime();
+        jrTextField.setEvaluationTime(ConstantTransform.evaluationTime(evaluationTime));
+        if (evaluationTime != null && evaluationTime.equals(EvaluationTime.GROUP) && textField.getEvaluationGroup() != null) {
+            jrTextField.setEvaluationGroup(this.accessor.getGroupTransform().getGroup(textField.getEvaluationGroup()));
+        }
+
+        if (textField.getTextAdjust() != null) {
+            jrTextField.setTextAdjust(ConstantTransform.textAdjust(textField.getTextAdjust()));
+        } else {
+            jrTextField.setStretchWithOverflow(textField.isStretchWithOverflow());
+        }
+
+        final String pattern = textField.getPattern();
+        if (!StringUtils.isBlank(pattern)) {
+            jrTextField.setPattern(pattern);
+        }
+        jrTextField.setPatternExpression(this.accessor.getExpressionTransform().getExpression(textField.getPatternExpression()));
+        jrTextField.setHorizontalTextAlign(ConstantTransform.horizontalTextAlignment(textField.getHorizontalTextAlignment()));
+        jrTextField.setExpression(this.accessor.getExpressionTransform().getExpression(textField.getValueExpression()));
+        jrTextField.setPrintRepeatedValues(textField.isPrintRepeatedValues());
+        jrTextField.setMarkup(ConstantTransform.markup(textField.getMarkup()));
+        jrTextField.setBlankWhenNull(true);
+
+        return jrTextField;
+    }
+
+    // filler
+    private JRDesignElement filler(final DRIDesignFiller filler) {
+        final JRDesignStaticText jrDesignStaticText = new JRDesignStaticText();
+        return jrDesignStaticText;
+    }
+
+    // image
+    private JRDesignElement image(final DRIDesignImage image) {
+        final JRDesignImage jrImage = new JRDesignImage(new JRDesignStyle().getDefaultStyleProvider());
+
+        jrImage.setAnchorNameExpression(this.accessor.getExpressionTransform().getExpression(image.getAnchorNameExpression()));
+        if (image.getBookmarkLevel() != null) {
+            jrImage.setBookmarkLevel(image.getBookmarkLevel());
+        }
+
+        final DRIDesignHyperLink hyperLink = image.getHyperLink();
+        if (hyperLink != null) {
+            jrImage.setHyperlinkAnchorExpression(this.accessor.getExpressionTransform().getExpression(hyperLink.getAnchorExpression()));
+            jrImage.setHyperlinkPageExpression(this.accessor.getExpressionTransform().getExpression(hyperLink.getPageExpression()));
+            jrImage.setHyperlinkReferenceExpression(this.accessor.getExpressionTransform().getExpression(hyperLink.getReferenceExpression()));
+            jrImage.setHyperlinkTooltipExpression(this.accessor.getExpressionTransform().getExpression(hyperLink.getTooltipExpression()));
+            if (hyperLink.getType() != null) {
+                final HyperlinkTypeEnum hyperLinkType = ConstantTransform.hyperLinkType(hyperLink.getType());
+                if (hyperLinkType != null) {
+                    jrImage.setHyperlinkType(hyperLinkType);
+                } else {
+                    jrImage.setLinkType(hyperLink.getType());
+                }
+            }
+            if (hyperLink.getTarget() != null) {
+                final HyperlinkTargetEnum hyperLinkTarget = ConstantTransform.hyperLinkTarget(hyperLink.getTarget());
+                if (hyperLinkTarget != null) {
+                    jrImage.setHyperlinkTarget(hyperLinkTarget);
+                } else {
+                    jrImage.setLinkTarget(hyperLink.getTarget());
+                }
+            }
+        }
+
+        jrImage.setOnErrorType(OnErrorTypeEnum.BLANK);
+        jrImage.setScaleImage(ConstantTransform.imageScale(image.getImageScale()));
+        jrImage.setHorizontalImageAlign(ConstantTransform.horizontalImageAlignment(image.getHorizontalImageAlignment()));
+        jrImage.setExpression(this.accessor.getExpressionTransform().getExpression(image.getImageExpression()));
+        if (image.getUsingCache() != null) {
+            jrImage.setUsingCache(image.getUsingCache());
+        }
+        if (image.getLazy() != null) {
+            jrImage.setLazy(image.getLazy());
+        }
+
+        return jrImage;
+    }
+
+    // subreport
+    private JRDesignElement subreport(final DRIDesignSubreport subreport, final Integer width) {
+        final JRDesignSubreport jrSubreport = new JRDesignSubreport(new JRDesignStyle().getDefaultStyleProvider());
+        jrSubreport.setConnectionExpression(this.accessor.getExpressionTransform().getExpression(subreport.getConnectionExpression()));
+        jrSubreport.setDataSourceExpression(this.accessor.getExpressionTransform().getExpression(subreport.getDataSourceExpression()));
+        jrSubreport.setRunToBottom(subreport.getRunToBottom());
+
+        if (ReportBuilder.class.isAssignableFrom(subreport.getReportExpression().getValueClass())) {
+            final SubreportWidthExpression pageWidthExpression = new SubreportWidthExpression(width);
+            this.accessor.getExpressionTransform().addSimpleExpression(pageWidthExpression);
+            final SubreportExpression subreportExpression = new SubreportExpression(pageWidthExpression, subreport.getReportExpression(), width);
+            this.accessor.getExpressionTransform().addComplexExpression(subreportExpression);
+            jrSubreport.setExpression(this.accessor.getExpressionTransform().getExpression(subreportExpression));
+
+            final SubreportParametersExpression parametersExpression = new SubreportParametersExpression(subreportExpression, subreport.getParametersExpression());
+            this.accessor.getExpressionTransform().addComplexExpression(parametersExpression);
+            jrSubreport.setParametersMapExpression(this.accessor.getExpressionTransform().getExpression(parametersExpression));
+        } else {
+            jrSubreport.setExpression(this.accessor.getExpressionTransform().getExpression(subreport.getReportExpression()));
+
+            final JasperSubreportParametersExpression parametersExpression = new JasperSubreportParametersExpression(subreport.getParametersExpression());
+            this.accessor.getExpressionTransform().addComplexExpression(parametersExpression);
+            jrSubreport.setParametersMapExpression(this.accessor.getExpressionTransform().getExpression(parametersExpression));
+        }
+
+        return jrSubreport;
+    }
+
+    // line
+    private JRDesignElement line(final DRIDesignLine line) {
+        final JRDesignLine jrDesignLine = new JRDesignLine();
+        jrDesignLine.setDirection(ConstantTransform.lineDirection(line.getDirection()));
+        this.accessor.getStyleTransform().pen(jrDesignLine.getLinePen(), line.getPen());
+        return jrDesignLine;
+    }
+
+    // ellipse
+    private JRDesignElement ellipse(final DRIDesignEllipse ellipse) {
+        final JRDesignEllipse jrDesignEllipse = new JRDesignEllipse(new JRDesignStyle().getDefaultStyleProvider());
+        this.accessor.getStyleTransform().pen(jrDesignEllipse.getLinePen(), ellipse.getPen());
+        return jrDesignEllipse;
+    }
+
+    // rectangle
+    private JRDesignElement rectangle(final DRIDesignRectangle rectangle) {
+        final JRDesignRectangle jrDesignRectangle = new JRDesignRectangle();
+        jrDesignRectangle.setRadius(rectangle.getRadius());
+        this.accessor.getStyleTransform().pen(jrDesignRectangle.getLinePen(), rectangle.getPen());
+        return jrDesignRectangle;
+    }
+
+    // break
+    private JRDesignElement breakComponent(final DRIDesignBreak breakComponent) {
+        final JRDesignBreak jrDesignBreak = new JRDesignBreak();
+        jrDesignBreak.setType(ConstantTransform.breakType(breakComponent.getType()));
+        return jrDesignBreak;
+    }
+
+    // generic element
+    private JRDesignElement genericElement(final DRIDesignGenericElement genericElement) {
+        final JRDesignGenericElement jrDesignGenericElement = new JRDesignGenericElement(new JRDesignStyle().getDefaultStyleProvider());
+        final JRGenericElementType genericType = new JRGenericElementType(genericElement.getGenericElementNamespace(), genericElement.getGenericElementName());
+        jrDesignGenericElement.setGenericType(genericType);
+        final EvaluationTime evaluationTime = genericElement.getEvaluationTime();
+        jrDesignGenericElement.setEvaluationTime(ConstantTransform.evaluationTime(evaluationTime));
+        if (evaluationTime != null && evaluationTime.equals(EvaluationTime.GROUP) && genericElement.getEvaluationGroup() != null) {
+            jrDesignGenericElement.setEvaluationGroupName(this.accessor.getGroupTransform().getGroup(genericElement.getEvaluationGroup()).getName());
+        }
+        for (final DRIDesignParameterExpression parameterExpression : genericElement.getParameterExpressions()) {
+            jrDesignGenericElement.addParameter(this.accessor.getExpressionTransform().getGenericElementParameterExpression(parameterExpression));
+        }
+        return jrDesignGenericElement;
+    }
+
+    // map
+    private JRDesignElement map(final DRIDesignMap map) {
+        final StandardMapComponent jrMap = new StandardMapComponent();
+        final EvaluationTime evaluationTime = map.getEvaluationTime();
+        jrMap.setEvaluationTime(ConstantTransform.evaluationTime(evaluationTime));
+        if (evaluationTime != null && evaluationTime.equals(EvaluationTime.GROUP) && map.getEvaluationGroup() != null) {
+            jrMap.setEvaluationGroup(this.accessor.getGroupTransform().getGroup(map.getEvaluationGroup()).getName());
+        }
+        jrMap.setLatitudeExpression(this.accessor.getExpressionTransform().getExpression(map.getLatitudeExpression()));
+        jrMap.setLongitudeExpression(this.accessor.getExpressionTransform().getExpression(map.getLongitudeExpression()));
+        jrMap.setZoomExpression(this.accessor.getExpressionTransform().getExpression(map.getZoomExpression()));
+
+        final JRDesignComponentElement jrComponent = new JRDesignComponentElement();
+        jrComponent.setComponent(jrMap);
+        jrComponent.setComponentKey(new ComponentKey(ComponentsExtensionsRegistryFactory.NAMESPACE, "jr", "map"));
+
+        return jrComponent;
+    }
+
+    // custom component
+    private JRDesignElement customComponent(final DRIDesignComponent component) {
+        @SuppressWarnings("rawtypes") final CustomComponentTransform componentTransfom = CustomComponents.getComponentTransform(component);
+        if (componentTransfom == null) {
+            throw new DRDesignReportException("Component " + component.getClass().getName() + " not supported");
+        }
+        @SuppressWarnings("unchecked") final JRDesignComponentElement jrComponent = (JRDesignComponentElement) componentTransfom.jasperComponent(
+            this.accessor, component);
+        return jrComponent;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ConstantTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ConstantTransform.java
new file mode 100644
index 0000000..388d77a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ConstantTransform.java
@@ -0,0 +1,1241 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import java.util.List;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jfree.data.time.Day;
+import org.jfree.data.time.Hour;
+import org.jfree.data.time.Millisecond;
+import org.jfree.data.time.Minute;
+import org.jfree.data.time.Month;
+import org.jfree.data.time.Quarter;
+import org.jfree.data.time.Second;
+import org.jfree.data.time.Week;
+import org.jfree.data.time.Year;
+
+import com.lowagie.text.pdf.PdfWriter;
+
+import net.sf.dynamicreports.design.constant.EvaluationTime;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.jasper.constant.PdfPermission;
+import net.sf.dynamicreports.jasper.constant.PdfVersion;
+import net.sf.dynamicreports.jasper.constant.SizeUnit;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.report.constant.BreakType;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.HyperLinkTarget;
+import net.sf.dynamicreports.report.constant.HyperLinkType;
+import net.sf.dynamicreports.report.constant.ImageAnchorType;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.LineDirection;
+import net.sf.dynamicreports.report.constant.LineSpacing;
+import net.sf.dynamicreports.report.constant.LineStyle;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PdfPrintScaling;
+import net.sf.dynamicreports.report.constant.PdfaConformance;
+import net.sf.dynamicreports.report.constant.RectangleAnchor;
+import net.sf.dynamicreports.report.constant.Rotation;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.constant.TimePeriod;
+import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
+import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.jasperreports.crosstabs.type.CrosstabPercentageEnum;
+import net.sf.jasperreports.crosstabs.type.CrosstabTotalPositionEnum;
+import net.sf.jasperreports.engine.analytics.dataset.BucketOrder;
+import net.sf.jasperreports.engine.export.type.ImageAnchorTypeEnum;
+import net.sf.jasperreports.engine.type.BreakTypeEnum;
+import net.sf.jasperreports.engine.type.CalculationEnum;
+import net.sf.jasperreports.engine.type.DatasetResetTypeEnum;
+import net.sf.jasperreports.engine.type.EvaluationTimeEnum;
+import net.sf.jasperreports.engine.type.FooterPositionEnum;
+import net.sf.jasperreports.engine.type.HorizontalImageAlignEnum;
+import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
+import net.sf.jasperreports.engine.type.HyperlinkTargetEnum;
+import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
+import net.sf.jasperreports.engine.type.LineDirectionEnum;
+import net.sf.jasperreports.engine.type.LineSpacingEnum;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+import net.sf.jasperreports.engine.type.OrientationEnum;
+import net.sf.jasperreports.engine.type.PositionTypeEnum;
+import net.sf.jasperreports.engine.type.PrintOrderEnum;
+import net.sf.jasperreports.engine.type.ResetTypeEnum;
+import net.sf.jasperreports.engine.type.RotationEnum;
+import net.sf.jasperreports.engine.type.RunDirectionEnum;
+import net.sf.jasperreports.engine.type.ScaleImageEnum;
+import net.sf.jasperreports.engine.type.SortOrderEnum;
+import net.sf.jasperreports.engine.type.SplitTypeEnum;
+import net.sf.jasperreports.engine.type.StretchTypeEnum;
+import net.sf.jasperreports.engine.type.TabStopAlignEnum;
+import net.sf.jasperreports.engine.type.TextAdjustEnum;
+import net.sf.jasperreports.engine.type.VerticalImageAlignEnum;
+import net.sf.jasperreports.engine.type.VerticalTextAlignEnum;
+import net.sf.jasperreports.engine.type.WhenNoDataTypeEnum;
+import net.sf.jasperreports.engine.type.WhenResourceMissingTypeEnum;
+import net.sf.jasperreports.export.type.HtmlSizeUnitEnum;
+import net.sf.jasperreports.export.type.PdfPrintScalingEnum;
+import net.sf.jasperreports.export.type.PdfVersionEnum;
+import net.sf.jasperreports.export.type.PdfaConformanceEnum;
+
+
+/**
+ * <p>ConstantTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+public class ConstantTransform
+{
+	
+	/**
+	 * <p>lineStyle.</p>
+	 *
+	 * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.LineStyleEnum} object.
+	 */
+	protected static LineStyleEnum lineStyle(final LineStyle lineStyle)
+	{
+		if(lineStyle == null)
+		{
+			return null;
+		}
+		
+		switch(lineStyle)
+		{
+			case SOLID:
+				return LineStyleEnum.SOLID;
+			case DASHED:
+				return LineStyleEnum.DASHED;
+			case DOTTED:
+				return LineStyleEnum.DOTTED;
+			case DOUBLE:
+				return LineStyleEnum.DOUBLE;
+			default:
+				throw new JasperDesignException("Line style " + lineStyle.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>imageScale.</p>
+	 *
+	 * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.ScaleImageEnum} object.
+	 */
+	@SuppressWarnings("deprecation")
+	protected static ScaleImageEnum imageScale(final ImageScale imageScale)
+	{
+		if(imageScale == null)
+		{
+			return null;
+		}
+		
+		switch(imageScale)
+		{
+			case CLIP:
+			case NO_RESIZE:
+				return ScaleImageEnum.CLIP;
+			case FILL_FRAME:
+			case FILL:
+				return ScaleImageEnum.FILL_FRAME;
+			case RETAIN_SHAPE:
+			case FILL_PROPORTIONALLY:
+				return ScaleImageEnum.RETAIN_SHAPE;
+			case REAL_HEIGHT:
+				return ScaleImageEnum.REAL_HEIGHT;
+			case REAL_SIZE:
+				return ScaleImageEnum.REAL_SIZE;
+			default:
+				throw new JasperDesignException("Image scale " + imageScale.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>imageAnchorType.</p>
+	 *
+	 * @param imageAnchorType a {@link net.sf.dynamicreports.report.constant.ImageAnchorType} object.
+	 * @return a {@link net.sf.jasperreports.engine.export.type.ImageAnchorTypeEnum} object.
+	 */
+	protected static ImageAnchorTypeEnum imageAnchorType(final ImageAnchorType imageAnchorType)
+	{
+		if(imageAnchorType == null)
+		{
+			return null;
+		}
+		
+		switch(imageAnchorType)
+		{
+			case MOVE_SIZE:
+				return ImageAnchorTypeEnum.MOVE_SIZE;
+			case MOVE_NO_SIZE:
+				return ImageAnchorTypeEnum.MOVE_NO_SIZE;
+			case NO_MOVE_NO_SIZE:
+				return ImageAnchorTypeEnum.NO_MOVE_NO_SIZE;
+			default:
+				throw new JasperDesignException("Image anchor type " + imageAnchorType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>horizontalTextAlignment.</p>
+	 *
+	 * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.HorizontalTextAlignEnum} object.
+	 */
+	protected static HorizontalTextAlignEnum horizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment)
+	{
+		if(horizontalTextAlignment == null)
+		{
+			return null;
+		}
+		
+		switch(horizontalTextAlignment)
+		{
+			case LEFT:
+				return HorizontalTextAlignEnum.LEFT;
+			case CENTER:
+				return HorizontalTextAlignEnum.CENTER;
+			case RIGHT:
+				return HorizontalTextAlignEnum.RIGHT;
+			case JUSTIFIED:
+				return HorizontalTextAlignEnum.JUSTIFIED;
+			default:
+				throw new JasperDesignException(
+					"Horizontal text alignment " + horizontalTextAlignment.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>verticalTextAlignment.</p>
+	 *
+	 * @param verticalTextAlignment a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.VerticalTextAlignEnum} object.
+	 */
+	protected static VerticalTextAlignEnum verticalTextAlignment(final VerticalTextAlignment verticalTextAlignment)
+	{
+		if(verticalTextAlignment == null)
+		{
+			return null;
+		}
+		
+		switch(verticalTextAlignment)
+		{
+			case TOP:
+				return VerticalTextAlignEnum.TOP;
+			case MIDDLE:
+				return VerticalTextAlignEnum.MIDDLE;
+			case BOTTOM:
+				return VerticalTextAlignEnum.BOTTOM;
+			case JUSTIFIED:
+				return VerticalTextAlignEnum.JUSTIFIED;
+			default:
+				throw new JasperDesignException(
+					"Vertical text alignment " + verticalTextAlignment.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>horizontalImageAlignment.</p>
+	 *
+	 * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.HorizontalImageAlignEnum} object.
+	 */
+	protected static HorizontalImageAlignEnum horizontalImageAlignment(final HorizontalImageAlignment horizontalImageAlignment)
+	{
+		if(horizontalImageAlignment == null)
+		{
+			return null;
+		}
+		
+		switch(horizontalImageAlignment)
+		{
+			case LEFT:
+				return HorizontalImageAlignEnum.LEFT;
+			case CENTER:
+				return HorizontalImageAlignEnum.CENTER;
+			case RIGHT:
+				return HorizontalImageAlignEnum.RIGHT;
+			default:
+				throw new JasperDesignException(
+					"Horizontal image alignment " + horizontalImageAlignment.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>verticalImageAlignment.</p>
+	 *
+	 * @param verticalImageAlignment a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.VerticalImageAlignEnum} object.
+	 */
+	protected static VerticalImageAlignEnum verticalImageAlignment(final VerticalImageAlignment verticalImageAlignment)
+	{
+		if(verticalImageAlignment == null)
+		{
+			return null;
+		}
+		
+		switch(verticalImageAlignment)
+		{
+			case TOP:
+				return VerticalImageAlignEnum.TOP;
+			case MIDDLE:
+				return VerticalImageAlignEnum.MIDDLE;
+			case BOTTOM:
+				return VerticalImageAlignEnum.BOTTOM;
+			default:
+				throw new JasperDesignException(
+					"Vertical image alignment " + verticalImageAlignment.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>rotation.</p>
+	 *
+	 * @param rotation a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.RotationEnum} object.
+	 */
+	protected static RotationEnum rotation(final Rotation rotation)
+	{
+		if(rotation == null)
+		{
+			return null;
+		}
+		
+		switch(rotation)
+		{
+			case NONE:
+				return RotationEnum.NONE;
+			case LEFT:
+				return RotationEnum.LEFT;
+			case RIGHT:
+				return RotationEnum.RIGHT;
+			case UPSIDE_DOWN:
+				return RotationEnum.UPSIDE_DOWN;
+			default:
+				throw new JasperDesignException("Rotation " + rotation.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>whenNoDataType.</p>
+	 *
+	 * @param whenNoDataType a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.WhenNoDataTypeEnum} object.
+	 */
+	protected static WhenNoDataTypeEnum whenNoDataType(final WhenNoDataType whenNoDataType)
+	{
+		switch(whenNoDataType)
+		{
+			case NO_PAGES:
+				return WhenNoDataTypeEnum.NO_PAGES;
+			case BLANK_PAGE:
+				return WhenNoDataTypeEnum.BLANK_PAGE;
+			case ALL_SECTIONS_NO_DETAIL:
+				return WhenNoDataTypeEnum.ALL_SECTIONS_NO_DETAIL;
+			case NO_DATA_SECTION:
+				return WhenNoDataTypeEnum.NO_DATA_SECTION;
+			default:
+				throw new JasperDesignException("When no data type " + whenNoDataType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>whenNoDataType.</p>
+	 *
+	 * @param whenNoDataType a {@link net.sf.jasperreports.engine.type.WhenNoDataTypeEnum} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 */
+	public static WhenNoDataType whenNoDataType(final WhenNoDataTypeEnum whenNoDataType)
+	{
+		if(whenNoDataType == null)
+		{
+			return null;
+		}
+		switch(whenNoDataType)
+		{
+			case NO_PAGES:
+				return WhenNoDataType.NO_PAGES;
+			case BLANK_PAGE:
+				return WhenNoDataType.BLANK_PAGE;
+			case ALL_SECTIONS_NO_DETAIL:
+				return WhenNoDataType.ALL_SECTIONS_NO_DETAIL;
+			case NO_DATA_SECTION:
+				return WhenNoDataType.NO_DATA_SECTION;
+			default:
+				throw new JasperDesignException("When no data type " + whenNoDataType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>whenResourceMissingType.</p>
+	 *
+	 * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.WhenResourceMissingTypeEnum} object.
+	 */
+	protected static WhenResourceMissingTypeEnum whenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
+	{
+		switch(whenResourceMissingType)
+		{
+			case NULL:
+				return WhenResourceMissingTypeEnum.NULL;
+			case EMPTY:
+				return WhenResourceMissingTypeEnum.EMPTY;
+			case KEY:
+				return WhenResourceMissingTypeEnum.KEY;
+			case ERROR:
+				return WhenResourceMissingTypeEnum.ERROR;
+			default:
+				throw new JasperDesignException(
+					"When resource missing type " + whenResourceMissingType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>whenResourceMissingType.</p>
+	 *
+	 * @param whenResourceMissingType a {@link net.sf.jasperreports.engine.type.WhenResourceMissingTypeEnum} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 */
+	public static WhenResourceMissingType whenResourceMissingType(final WhenResourceMissingTypeEnum whenResourceMissingType)
+	{
+		switch(whenResourceMissingType)
+		{
+			case NULL:
+				return WhenResourceMissingType.NULL;
+			case EMPTY:
+				return WhenResourceMissingType.EMPTY;
+			case KEY:
+				return WhenResourceMissingType.KEY;
+			case ERROR:
+				return WhenResourceMissingType.ERROR;
+			default:
+				throw new JasperDesignException(
+					"When resource missing type " + whenResourceMissingType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>pageOrientation.</p>
+	 *
+	 * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.OrientationEnum} object.
+	 */
+	protected static OrientationEnum pageOrientation(final PageOrientation orientation)
+	{
+		switch(orientation)
+		{
+			case PORTRAIT:
+				return OrientationEnum.PORTRAIT;
+			case LANDSCAPE:
+				return OrientationEnum.LANDSCAPE;
+			default:
+				throw new JasperDesignException("Page orientation " + orientation.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>pageOrientation.</p>
+	 *
+	 * @param orientation a {@link net.sf.jasperreports.engine.type.OrientationEnum} object.
+	 * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 */
+	public static PageOrientation pageOrientation(final OrientationEnum orientation)
+	{
+		switch(orientation)
+		{
+			case PORTRAIT:
+				return PageOrientation.PORTRAIT;
+			case LANDSCAPE:
+				return PageOrientation.LANDSCAPE;
+			default:
+				throw new JasperDesignException("Page orientation " + orientation.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>variableResetType.</p>
+	 *
+	 * @param resetType a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.ResetTypeEnum} object.
+	 */
+	public static ResetTypeEnum variableResetType(final ResetType resetType)
+	{
+		if(resetType == null)
+		{
+			return ResetTypeEnum.NONE;
+		}
+		
+		switch(resetType)
+		{
+			case NONE:
+				return ResetTypeEnum.NONE;
+			case REPORT:
+				return ResetTypeEnum.REPORT;
+			case PAGE:
+				return ResetTypeEnum.PAGE;
+			case COLUMN:
+				return ResetTypeEnum.COLUMN;
+			case GROUP:
+				return ResetTypeEnum.GROUP;
+			default:
+				throw new JasperDesignException("Variable reset type " + resetType.name() + " not supported");
+		}
+	}
+	
+	public static DatasetResetTypeEnum variableDatabaseResetType(final ResetType resetType)
+	{
+		return switch(variableResetType(resetType))
+		{
+			case REPORT -> DatasetResetTypeEnum.REPORT;
+			case PAGE -> DatasetResetTypeEnum.PAGE;
+			case COLUMN -> DatasetResetTypeEnum.COLUMN;
+			case GROUP -> DatasetResetTypeEnum.GROUP;
+			case NONE -> DatasetResetTypeEnum.NONE;
+			default -> throw new IllegalStateException("ResetType " + resetType + " can't be processed");
+		};
+	}
+	
+	/**
+	 * <p>evaluationTime.</p>
+	 *
+	 * @param evaluationTime a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.EvaluationTimeEnum} object.
+	 */
+	public static EvaluationTimeEnum evaluationTime(final EvaluationTime evaluationTime)
+	{
+		if(evaluationTime == null)
+		{
+			return EvaluationTimeEnum.NOW;
+		}
+		
+		switch(evaluationTime)
+		{
+			case NOW:
+				return EvaluationTimeEnum.NOW;
+			case REPORT:
+				return EvaluationTimeEnum.REPORT;
+			case PAGE:
+				return EvaluationTimeEnum.PAGE;
+			case COLUMN:
+				return EvaluationTimeEnum.COLUMN;
+			case GROUP:
+				return EvaluationTimeEnum.GROUP;
+			case BAND:
+				return EvaluationTimeEnum.BAND;
+			case AUTO:
+				return EvaluationTimeEnum.AUTO;
+			default:
+				throw new JasperDesignException("Evaluation time " + evaluationTime.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>splitType.</p>
+	 *
+	 * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.SplitTypeEnum} object.
+	 */
+	protected static SplitTypeEnum splitType(final SplitType splitType)
+	{
+		if(splitType == null)
+		{
+			return null;
+		}
+		switch(splitType)
+		{
+			case IMMEDIATE:
+				return SplitTypeEnum.IMMEDIATE;
+			case PREVENT:
+				return SplitTypeEnum.PREVENT;
+			case STRETCH:
+				return SplitTypeEnum.STRETCH;
+			default:
+				throw new JasperDesignException("Split type " + splitType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>timePeriodType.</p>
+	 *
+	 * @param timePeriodType a {@link net.sf.dynamicreports.report.constant.TimePeriod} object.
+	 * @return a {@link java.lang.Class} object.
+	 */
+	protected static Class<?> timePeriodType(final TimePeriod timePeriodType)
+	{
+		switch(timePeriodType)
+		{
+			case YEAR:
+				return Year.class;
+			case QUARTER:
+				return Quarter.class;
+			case MONTH:
+				return Month.class;
+			case WEEK:
+				return Week.class;
+			case DAY:
+				return Day.class;
+			case HOUR:
+				return Hour.class;
+			case MINUTE:
+				return Minute.class;
+			case SECOND:
+				return Second.class;
+			case MILLISECOND:
+				return Millisecond.class;
+			default:
+				throw new JasperDesignException("Time period type " + timePeriodType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>calculation.</p>
+	 *
+	 * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.CalculationEnum} object.
+	 */
+	protected static CalculationEnum calculation(final Calculation calculation)
+	{
+		switch(calculation)
+		{
+			case NOTHING:
+				return CalculationEnum.NOTHING;
+			case COUNT:
+				return CalculationEnum.COUNT;
+			case SUM:
+				return CalculationEnum.SUM;
+			case AVERAGE:
+				return CalculationEnum.AVERAGE;
+			case LOWEST:
+				return CalculationEnum.LOWEST;
+			case HIGHEST:
+				return CalculationEnum.HIGHEST;
+			case STANDARD_DEVIATION:
+				return CalculationEnum.STANDARD_DEVIATION;
+			case VARIANCE:
+				return CalculationEnum.VARIANCE;
+			case FIRST:
+				return CalculationEnum.FIRST;
+			case DISTINCT_COUNT:
+				return CalculationEnum.DISTINCT_COUNT;
+			default:
+				throw new JasperDesignException("Calculation " + calculation.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>sizeUnit.</p>
+	 *
+	 * @param sizeUnit a {@link net.sf.dynamicreports.jasper.constant.SizeUnit} object.
+	 * @return a {@link net.sf.jasperreports.export.type.HtmlSizeUnitEnum} object.
+	 */
+	protected static HtmlSizeUnitEnum sizeUnit(final SizeUnit sizeUnit)
+	{
+		switch(sizeUnit)
+		{
+			case PIXEL:
+				return HtmlSizeUnitEnum.PIXEL;
+			case POINT:
+				return HtmlSizeUnitEnum.POINT;
+			default:
+				throw new JasperDesignException("SizeUnit " + sizeUnit.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>pdfVersion.</p>
+	 *
+	 * @param pdfVersion a {@link net.sf.dynamicreports.jasper.constant.PdfVersion} object.
+	 * @return a {@link net.sf.jasperreports.export.type.PdfVersionEnum} object.
+	 */
+	protected static PdfVersionEnum pdfVersion(final PdfVersion pdfVersion)
+	{
+		switch(pdfVersion)
+		{
+			case VERION_1_2:
+				return PdfVersionEnum.VERSION_1_2;
+			case VERION_1_3:
+				return PdfVersionEnum.VERSION_1_3;
+			case VERION_1_4:
+				return PdfVersionEnum.VERSION_1_4;
+			case VERION_1_5:
+				return PdfVersionEnum.VERSION_1_5;
+			case VERION_1_6:
+				return PdfVersionEnum.VERSION_1_6;
+			case VERION_1_7:
+				return PdfVersionEnum.VERSION_1_7;
+			default:
+				throw new JasperDesignException("PdfVersion " + pdfVersion.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>pdfPermission.</p>
+	 *
+	 * @param permissions a {@link java.util.List} object.
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	protected static Integer pdfPermission(final List<PdfPermission> permissions)
+	{
+		final int permission = 0;
+		for(final PdfPermission pdfPermission : permissions)
+		{
+			switch(pdfPermission)
+			{
+				case PRINTING:
+					return permission | PdfWriter.ALLOW_PRINTING;
+				case MODIFY_CONTENTS:
+					return permission | PdfWriter.ALLOW_MODIFY_CONTENTS;
+				case COPY:
+					return permission | PdfWriter.ALLOW_COPY;
+				case MODIFY_ANNOTATIONS:
+					return permission | PdfWriter.ALLOW_MODIFY_ANNOTATIONS;
+				case FILL_IN:
+					return permission | PdfWriter.ALLOW_FILL_IN;
+				case SCREEN_READERS:
+					return permission | PdfWriter.ALLOW_SCREENREADERS;
+				case ASSEMBLY:
+					return permission | PdfWriter.ALLOW_ASSEMBLY;
+				case DEGRADED_PRINTING:
+					return permission | PdfWriter.ALLOW_DEGRADED_PRINTING;
+				default:
+					throw new JasperDesignException("PdfPermission " + pdfPermission.name() + " not supported");
+			}
+		}
+		return permission;
+	}
+	
+	/**
+	 * <p>pdfPrintScaling.</p>
+	 *
+	 * @param pdfPrintScaling a {@link net.sf.dynamicreports.report.constant.PdfPrintScaling} object.
+	 * @return a {@link net.sf.jasperreports.export.type.PdfPrintScalingEnum} object.
+	 */
+	protected static PdfPrintScalingEnum pdfPrintScaling(final PdfPrintScaling pdfPrintScaling)
+	{
+		switch(pdfPrintScaling)
+		{
+			case NONE:
+				return PdfPrintScalingEnum.NONE;
+			case DEFAULT:
+				return PdfPrintScalingEnum.DEFAULT;
+			default:
+				throw new JasperDesignException("Pdf print scaling " + pdfPrintScaling.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>pdfaConformance.</p>
+	 *
+	 * @param pdfaConformance a {@link net.sf.dynamicreports.report.constant.PdfaConformance} object.
+	 * @return a {@link net.sf.jasperreports.export.type.PdfaConformanceEnum} object.
+	 */
+	protected static PdfaConformanceEnum pdfaConformance(final PdfaConformance pdfaConformance)
+	{
+		switch(pdfaConformance)
+		{
+			case NONE:
+				return PdfaConformanceEnum.NONE;
+			case PDFA_1A:
+				return PdfaConformanceEnum.PDFA_1A;
+			case PDFA_1B:
+				return PdfaConformanceEnum.PDFA_1B;
+			default:
+				throw new JasperDesignException("Pdfa conformance " + pdfaConformance.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>lineDirection.</p>
+	 *
+	 * @param lineDirection a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.LineDirectionEnum} object.
+	 */
+	public static LineDirectionEnum lineDirection(final LineDirection lineDirection)
+	{
+		if(lineDirection == null)
+		{
+			return null;
+		}
+		
+		switch(lineDirection)
+		{
+			case TOP_DOWN:
+				return LineDirectionEnum.TOP_DOWN;
+			case BOTTOM_UP:
+				return LineDirectionEnum.BOTTOM_UP;
+			default:
+				throw new JasperDesignException("LineDirection " + lineDirection.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>markup.</p>
+	 *
+	 * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+	 * @return a {@link java.lang.String} object.
+	 */
+	public static String markup(final Markup markup)
+	{
+		if(markup == null)
+		{
+			return null;
+		}
+		
+		switch(markup)
+		{
+			case NONE:
+				return "none";
+			case STYLED:
+				return "styled";
+			case RTF:
+				return "rtf";
+			case HTML:
+				return "html";
+			default:
+				throw new JasperDesignException("Markup " + markup.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>lineSpacing.</p>
+	 *
+	 * @param lineSpacing a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.LineSpacingEnum} object.
+	 */
+	public static LineSpacingEnum lineSpacing(final LineSpacing lineSpacing)
+	{
+		if(lineSpacing == null)
+		{
+			return null;
+		}
+		
+		switch(lineSpacing)
+		{
+			case SINGLE:
+				return LineSpacingEnum.SINGLE;
+			case ONE_AND_HALF:
+				return LineSpacingEnum.ONE_AND_HALF;
+			case DOUBLE:
+				return LineSpacingEnum.DOUBLE;
+			case AT_LEAST:
+				return LineSpacingEnum.AT_LEAST;
+			case FIXED:
+				return LineSpacingEnum.FIXED;
+			case PROPORTIONAL:
+				return LineSpacingEnum.PROPORTIONAL;
+			default:
+				throw new JasperDesignException("LineSpacing " + lineSpacing.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>breakType.</p>
+	 *
+	 * @param breakType a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.BreakTypeEnum} object.
+	 */
+	public static BreakTypeEnum breakType(final BreakType breakType)
+	{
+		if(breakType == null)
+		{
+			return null;
+		}
+		
+		switch(breakType)
+		{
+			case PAGE:
+				return BreakTypeEnum.PAGE;
+			case COLUMN:
+				return BreakTypeEnum.COLUMN;
+			default:
+				throw new JasperDesignException("BreakType " + breakType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>runDirection.</p>
+	 *
+	 * @param runDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.RunDirectionEnum} object.
+	 */
+	public static RunDirectionEnum runDirection(final RunDirection runDirection)
+	{
+		if(runDirection == null)
+		{
+			return null;
+		}
+		
+		switch(runDirection)
+		{
+			case LEFT_TO_RIGHT:
+				return RunDirectionEnum.LTR;
+			case RIGHT_TO_LEFT:
+				return RunDirectionEnum.RTL;
+			default:
+				throw new JasperDesignException("RunDirection " + runDirection.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>crosstabTotalPosition.</p>
+	 *
+	 * @param totalPosition a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 * @return a {@link net.sf.jasperreports.crosstabs.type.CrosstabTotalPositionEnum} object.
+	 */
+	public static CrosstabTotalPositionEnum crosstabTotalPosition(final CrosstabTotalPosition totalPosition)
+	{
+		if(totalPosition == null)
+		{
+			return CrosstabTotalPositionEnum.NONE;
+		}
+		
+		switch(totalPosition)
+		{
+			case START:
+				return CrosstabTotalPositionEnum.START;
+			case END:
+				return CrosstabTotalPositionEnum.END;
+			default:
+				throw new JasperDesignException("CrosstabTotalPosition " + totalPosition.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>crosstabPercentageType.</p>
+	 *
+	 * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+	 * @return a {@link net.sf.jasperreports.crosstabs.type.CrosstabPercentageEnum} object.
+	 */
+	public static CrosstabPercentageEnum crosstabPercentageType(final CrosstabPercentageType percentageType)
+	{
+		if(percentageType == null)
+		{
+			return null;
+		}
+		
+		switch(percentageType)
+		{
+			case NONE:
+				return CrosstabPercentageEnum.NONE;
+			case GRAND_TOTAL:
+				return CrosstabPercentageEnum.GRAND_TOTAL;
+			default:
+				throw new JasperDesignException("CrosstabPercentageType " + percentageType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>orderType.</p>
+	 *
+	 * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.SortOrderEnum} object.
+	 */
+	public static SortOrderEnum orderType(final OrderType orderType)
+	{
+		if(orderType == null)
+		{
+			return null;
+		}
+		
+		switch(orderType)
+		{
+			case ASCENDING:
+				return SortOrderEnum.ASCENDING;
+			case DESCENDING:
+				return SortOrderEnum.DESCENDING;
+			default:
+				throw new JasperDesignException("OrderType " + orderType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>bucketOrderType.</p>
+	 *
+	 * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+	 * @return a {@link net.sf.jasperreports.engine.analytics.dataset.BucketOrder} object.
+	 */
+	public static BucketOrder bucketOrderType(final OrderType orderType)
+	{
+		if(orderType == null)
+		{
+			return null;
+		}
+		
+		switch(orderType)
+		{
+			case ASCENDING:
+				return BucketOrder.ASCENDING;
+			case DESCENDING:
+				return BucketOrder.DESCENDING;
+			default:
+				throw new JasperDesignException("OrderType " + orderType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>componentPositionType.</p>
+	 *
+	 * @param componentPositionType a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.PositionTypeEnum} object.
+	 */
+	public static PositionTypeEnum componentPositionType(final ComponentPositionType componentPositionType)
+	{
+		switch(componentPositionType)
+		{
+			case FLOAT:
+				return PositionTypeEnum.FLOAT;
+			case FIX_RELATIVE_TO_TOP:
+				return PositionTypeEnum.FIX_RELATIVE_TO_TOP;
+			case FIX_RELATIVE_TO_BOTTOM:
+				return PositionTypeEnum.FIX_RELATIVE_TO_BOTTOM;
+			default:
+				throw new JasperDesignException(
+					"ComponentPositionType " + componentPositionType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>stretchType.</p>
+	 *
+	 * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.StretchTypeEnum} object.
+	 */
+	@SuppressWarnings("deprecation")
+	public static StretchTypeEnum stretchType(final StretchType stretchType)
+	{
+		if(stretchType == null)
+		{
+			return StretchTypeEnum.NO_STRETCH;
+		}
+		
+		switch(stretchType)
+		{
+			case NO_STRETCH:
+				return StretchTypeEnum.NO_STRETCH;
+			case RELATIVE_TO_BAND_HEIGHT:
+				return StretchTypeEnum.CONTAINER_HEIGHT;
+			case RELATIVE_TO_TALLEST_OBJECT:
+				return StretchTypeEnum.ELEMENT_GROUP_HEIGHT;
+			case ELEMENT_GROUP_HEIGHT:
+				return StretchTypeEnum.ELEMENT_GROUP_HEIGHT;
+			case ELEMENT_GROUP_BOTTOM:
+				return StretchTypeEnum.ELEMENT_GROUP_BOTTOM;
+			case CONTAINER_HEIGHT:
+				return StretchTypeEnum.CONTAINER_HEIGHT;
+			case CONTAINER_BOTTOM:
+				return StretchTypeEnum.CONTAINER_BOTTOM;
+			default:
+				throw new JasperDesignException("StretchType " + stretchType.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>hyperLinkType.</p>
+	 *
+	 * @param hyperLinkType a {@link java.lang.String} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.HyperlinkTypeEnum} object.
+	 */
+	public static HyperlinkTypeEnum hyperLinkType(final String hyperLinkType)
+	{
+		if(hyperLinkType == null || !EnumUtils.isValidEnum(HyperLinkType.class, hyperLinkType))
+		{
+			return null;
+		}
+		
+		final HyperLinkType type = HyperLinkType.valueOf(hyperLinkType);
+		switch(type)
+		{
+			case NONE:
+				return HyperlinkTypeEnum.NONE;
+			case REFERENCE:
+				return HyperlinkTypeEnum.REFERENCE;
+			case LOCAL_ANCHOR:
+				return HyperlinkTypeEnum.LOCAL_ANCHOR;
+			case LOCAL_PAGE:
+				return HyperlinkTypeEnum.LOCAL_PAGE;
+			case REMOTE_ANCHOR:
+				return HyperlinkTypeEnum.REMOTE_ANCHOR;
+			case REMOTE_PAGE:
+				return HyperlinkTypeEnum.REMOTE_PAGE;
+			default:
+				throw new JasperDesignException("HyperLinkType " + type.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>hyperLinkTarget.</p>
+	 *
+	 * @param hyperLinkTarget a {@link java.lang.String} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.HyperlinkTargetEnum} object.
+	 */
+	public static HyperlinkTargetEnum hyperLinkTarget(final String hyperLinkTarget)
+	{
+		if(hyperLinkTarget == null || !EnumUtils.isValidEnum(HyperLinkTarget.class, hyperLinkTarget))
+		{
+			return null;
+		}
+		
+		final HyperLinkTarget target = HyperLinkTarget.valueOf(hyperLinkTarget);
+		switch(target)
+		{
+			case NONE:
+				return HyperlinkTargetEnum.NONE;
+			case SELF:
+				return HyperlinkTargetEnum.SELF;
+			case BLANK:
+				return HyperlinkTargetEnum.BLANK;
+			case PARENT:
+				return HyperlinkTargetEnum.PARENT;
+			case TOP:
+				return HyperlinkTargetEnum.TOP;
+			default:
+				throw new JasperDesignException("HyperLinkTarget " + target.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>groupFooterPosition.</p>
+	 *
+	 * @param footerPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.FooterPositionEnum} object.
+	 */
+	public static FooterPositionEnum groupFooterPosition(final GroupFooterPosition footerPosition)
+	{
+		switch(footerPosition)
+		{
+			case NORMAL:
+				return FooterPositionEnum.NORMAL;
+			case COLLATE_AT_BOTTOM:
+				return FooterPositionEnum.COLLATE_AT_BOTTOM;
+			case FORCE_AT_BOTTOM:
+				return FooterPositionEnum.FORCE_AT_BOTTOM;
+			case STACK_AT_BOTTOM:
+				return FooterPositionEnum.STACK_AT_BOTTOM;
+			default:
+				throw new JasperDesignException("GroupFooterPosition " + footerPosition.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>tabStopAlignment.</p>
+	 *
+	 * @param alignment a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.TabStopAlignEnum} object.
+	 */
+	public static TabStopAlignEnum tabStopAlignment(final TabStopAlignment alignment)
+	{
+		switch(alignment)
+		{
+			case LEFT:
+				return TabStopAlignEnum.LEFT;
+			case CENTER:
+				return TabStopAlignEnum.CENTER;
+			case RIGHT:
+				return TabStopAlignEnum.RIGHT;
+			default:
+				throw new JasperDesignException("TabStopAlignment " + alignment.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>printOrder.</p>
+	 *
+	 * @param printOrder a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.PrintOrderEnum} object.
+	 */
+	protected static PrintOrderEnum printOrder(final Orientation printOrder)
+	{
+		switch(printOrder)
+		{
+			case HORIZONTAL:
+				return PrintOrderEnum.HORIZONTAL;
+			case VERTICAL:
+				return PrintOrderEnum.VERTICAL;
+			default:
+				throw new JasperDesignException("PrintOrder " + printOrder.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>rectangleAnchor.</p>
+	 *
+	 * @param rectangleAnchor a {@link net.sf.dynamicreports.report.constant.RectangleAnchor} object.
+	 * @return a {@link org.jfree.ui.RectangleAnchor} object.
+	 */
+	public static org.jfree.ui.RectangleAnchor rectangleAnchor(final RectangleAnchor rectangleAnchor)
+	{
+		switch(rectangleAnchor)
+		{
+			case CENTER:
+				return org.jfree.ui.RectangleAnchor.CENTER;
+			case TOP:
+				return org.jfree.ui.RectangleAnchor.TOP;
+			case TOP_LEFT:
+				return org.jfree.ui.RectangleAnchor.TOP_LEFT;
+			case TOP_RIGHT:
+				return org.jfree.ui.RectangleAnchor.TOP_RIGHT;
+			case BOTTOM:
+				return org.jfree.ui.RectangleAnchor.BOTTOM;
+			case BOTTOM_LEFT:
+				return org.jfree.ui.RectangleAnchor.BOTTOM_LEFT;
+			case BOTTOM_RIGHT:
+				return org.jfree.ui.RectangleAnchor.BOTTOM_RIGHT;
+			case LEFT:
+				return org.jfree.ui.RectangleAnchor.LEFT;
+			case RIGHT:
+				return org.jfree.ui.RectangleAnchor.RIGHT;
+			default:
+				throw new JasperDesignException("RectangleAnchor " + rectangleAnchor.name() + " not supported");
+		}
+	}
+	
+	/**
+	 * <p>textAdjust.</p>
+	 *
+	 * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+	 * @return a {@link net.sf.jasperreports.engine.type.TextAdjustEnum} object.
+	 */
+	public static TextAdjustEnum textAdjust(final TextAdjust textAdjust)
+	{
+		switch(textAdjust)
+		{
+			case CUT_TEXT:
+				return TextAdjustEnum.CUT_TEXT;
+			case SCALE_FONT:
+				return TextAdjustEnum.SCALE_FONT;
+			case STRETCH_HEIGHT:
+				return TextAdjustEnum.STRETCH_HEIGHT;
+			default:
+				throw new JasperDesignException("TextAdjust " + textAdjust.name() + " not supported");
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/CrosstabTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/CrosstabTransform.java
new file mode 100644
index 0000000..bbea704
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/CrosstabTransform.java
@@ -0,0 +1,289 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import java.util.Map;
+
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCell;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabColumnGroup;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabGroup;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
+import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabRowGroup;
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.jasper.transformation.expression.CrosstabParametersExpression;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.jasperreports.crosstabs.design.JRDesignCellContents;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstab;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabBucket;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabCell;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabColumnGroup;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabDataset;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabGroup;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabMeasure;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabParameter;
+import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabRowGroup;
+import net.sf.jasperreports.crosstabs.type.CrosstabColumnPositionEnum;
+import net.sf.jasperreports.crosstabs.type.CrosstabRowPositionEnum;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.design.JRDesignElement;
+
+
+/**
+ * <p>CrosstabTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+public class CrosstabTransform
+{
+	private final JasperTransformAccessor accessor;
+	
+	/**
+	 * <p>Constructor for CrosstabTransform.</p>
+	 *
+	 * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+	 */
+	public CrosstabTransform(final JasperTransformAccessor accessor)
+	{
+		this.accessor = accessor;
+	}
+	
+	/**
+	 * <p>transform.</p>
+	 *
+	 * @param crosstab a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstab} object.
+	 * @return a {@link net.sf.jasperreports.engine.design.JRDesignElement} object.
+	 */
+	protected JRDesignElement transform(final DRIDesignCrosstab crosstab)
+	{
+		final JRDesignCrosstab jrCrosstab = new JRDesignCrosstab();
+		
+		this.dataset(crosstab.getDataset(), jrCrosstab.getDesignDataset());
+		this.accessor.transformToDataset(crosstab.getDataset().getSubDataset());
+		if(crosstab.isRepeatColumnHeaders() != null)
+		{
+			jrCrosstab.setRepeatColumnHeaders(crosstab.isRepeatColumnHeaders());
+		}
+		if(crosstab.isRepeatRowHeaders() != null)
+		{
+			jrCrosstab.setRepeatRowHeaders(crosstab.isRepeatRowHeaders());
+		}
+		if(crosstab.getColumnBreakOffset() != null)
+		{
+			jrCrosstab.setColumnBreakOffset(crosstab.getColumnBreakOffset());
+		}
+		jrCrosstab.setIgnoreWidth(crosstab.getIgnoreWidth());
+		jrCrosstab.setRunDirection(ConstantTransform.runDirection(crosstab.getRunDirection()));
+		jrCrosstab.setWhenNoDataCell(this.cellContent(crosstab.getWhenNoDataCell()));
+		jrCrosstab.setHeaderCell(this.cellContent(crosstab.getHeaderCell()));
+		for(final DRIDesignCrosstabColumnGroup columnGroup : crosstab.getColumnGroups())
+		{
+			this.addColumnGroup(jrCrosstab, columnGroup);
+		}
+		for(final DRIDesignCrosstabRowGroup rowGroup : crosstab.getRowGroups())
+		{
+			this.addRowGroup(jrCrosstab, rowGroup);
+		}
+		for(final DRIDesignCrosstabCell cell : crosstab.getCells())
+		{
+			this.addCell(jrCrosstab, cell);
+		}
+		for(final DRIDesignCrosstabMeasure measure : crosstab.getMeasures())
+		{
+			this.addMeasure(jrCrosstab, measure);
+		}
+		
+		this.registerScriptletCrosstabParameter(jrCrosstab);
+		this.accessor.transformToMainDataset();
+		
+		final Map<String, Object> crosstabParameters;
+		if(crosstab.getDataset().getSubDataset() == null)
+		{
+			crosstabParameters = this.accessor.getParameters();
+		}
+		else
+		{
+			crosstabParameters =
+				this.accessor.getDatasetTransform().getDatasetParameters(crosstab.getDataset().getSubDataset());
+		}
+		final CrosstabParametersExpression parametersExpression = new CrosstabParametersExpression(crosstabParameters);
+		this.accessor.getExpressionTransform().addSimpleExpression(parametersExpression);
+		jrCrosstab.setParametersMapExpression(this.accessor.getExpressionTransform()
+			.getExpression(parametersExpression));
+		
+		return jrCrosstab;
+	}
+	
+	private void registerScriptletCrosstabParameter(final JRDesignCrosstab jrCrosstab)
+	{
+		final JRDesignCrosstabParameter jrParameter = new JRDesignCrosstabParameter();
+		jrParameter.setName(JasperCustomValues.NAME);
+		jrParameter.setValueClass(JasperCustomValues.class);
+		
+		try
+		{
+			jrCrosstab.addParameter(jrParameter);
+		}
+		catch(final JRException e)
+		{
+			throw new JasperDesignException("Registration failed for scriptlet crosstab parameter", e);
+		}
+	}
+	
+	// dataset
+	private void dataset(final DRIDesignCrosstabDataset dataset, final JRDesignCrosstabDataset jrDataset)
+	{
+		jrDataset.setDatasetRun(this.accessor.getDatasetTransform().datasetRun(dataset.getSubDataset()));
+		if(dataset.getDataPreSorted() != null)
+		{
+			jrDataset.setDataPreSorted(dataset.getDataPreSorted());
+		}
+		final ResetType resetType = dataset.getResetType();
+		jrDataset.setResetType(ConstantTransform.variableDatabaseResetType(resetType));
+		if(resetType.equals(ResetType.GROUP) && dataset.getResetGroup() != null)
+		{
+			jrDataset.setResetGroup(this.accessor.getGroupTransform().getGroup(dataset.getResetGroup()));
+		}
+	}
+	
+	private JRDesignCellContents cellContent(final DRIDesignCrosstabCellContent cellContent)
+	{
+		if(cellContent == null || cellContent.getComponent() == null)
+		{
+			return null;
+		}
+		
+		final JRDesignCellContents jrCellContents = new JRDesignCellContents();
+		final JRDesignElement[] jrElements =
+			this.accessor.getComponentTransform().component(cellContent.getComponent(), ListType.VERTICAL);
+		for(final JRDesignElement jrElement : jrElements)
+		{
+			jrCellContents.addElement(jrElement);
+		}
+		jrCellContents.setStyle(this.accessor.getStyleTransform().getStyle(cellContent.getStyle()));
+		return jrCellContents;
+	}
+	
+	private void group(final JRDesignCrosstabGroup jrGroup, final DRIDesignCrosstabGroup group)
+	{
+		jrGroup.setName(group.getName());
+		jrGroup.setTotalPosition(ConstantTransform.crosstabTotalPosition(group.getTotalPosition()));
+		jrGroup.setBucket(this.bucket(group));
+		jrGroup.setHeader(this.cellContent(group.getHeader()));
+		jrGroup.setTotalHeader(this.cellContent(group.getTotalHeader()));
+	}
+	
+	private JRDesignCrosstabBucket bucket(final DRIDesignCrosstabGroup group)
+	{
+		final JRDesignCrosstabBucket jrBucket = new JRDesignCrosstabBucket();
+		if(group.getOrderType() != null)
+		{
+			jrBucket.setOrder(ConstantTransform.bucketOrderType(group.getOrderType()));
+		}
+		jrBucket.setExpression(this.accessor.getExpressionTransform().getExpression(group.getExpression()));
+		jrBucket.setOrderByExpression(this.accessor.getExpressionTransform()
+			.getExpression(group.getOrderByExpression()));
+		jrBucket.setComparatorExpression(this.accessor.getExpressionTransform()
+			.getExpression(group.getComparatorExpression()));
+		jrBucket.setValueClassName(group.getExpression().getValueClass().getName());
+		return jrBucket;
+	}
+	
+	private void addColumnGroup(final JRDesignCrosstab jrCrosstab, final DRIDesignCrosstabColumnGroup columnGroup)
+	{
+		final JRDesignCrosstabColumnGroup jrColumnGroup = new JRDesignCrosstabColumnGroup();
+		this.group(jrColumnGroup, columnGroup);
+		jrColumnGroup.setHeight(columnGroup.getHeight());
+		jrColumnGroup.setPosition(CrosstabColumnPositionEnum.STRETCH);
+		
+		try
+		{
+			jrCrosstab.addColumnGroup(jrColumnGroup);
+		}
+		catch(final JRException e)
+		{
+			throw new JasperDesignException(
+				"Registration failed for crosstab column group \"" + columnGroup.getName() + "\"",
+				e);
+		}
+	}
+	
+	private void addRowGroup(final JRDesignCrosstab jrCrosstab, final DRIDesignCrosstabRowGroup rowGroup)
+	{
+		final JRDesignCrosstabRowGroup jrRowGroup = new JRDesignCrosstabRowGroup();
+		this.group(jrRowGroup, rowGroup);
+		jrRowGroup.setWidth(rowGroup.getWidth());
+		jrRowGroup.setPosition(CrosstabRowPositionEnum.STRETCH);
+		
+		try
+		{
+			jrCrosstab.addRowGroup(jrRowGroup);
+		}
+		catch(final JRException e)
+		{
+			throw new JasperDesignException(
+				"Registration failed for crosstab row group \"" + rowGroup.getName() + "\"",
+				e);
+		}
+	}
+	
+	private void addCell(final JRDesignCrosstab jrCrosstab, final DRIDesignCrosstabCell cell)
+	{
+		final JRDesignCrosstabCell jrCell = new JRDesignCrosstabCell();
+		jrCell.setWidth(cell.getContent().getWidth());
+		jrCell.setHeight(cell.getContent().getHeight());
+		jrCell.setRowTotalGroup(cell.getRowTotalGroup());
+		jrCell.setColumnTotalGroup(cell.getColumnTotalGroup());
+		jrCell.setContents(this.cellContent(cell.getContent()));
+		
+		try
+		{
+			jrCrosstab.addCell(jrCell);
+		}
+		catch(final JRException e)
+		{
+			throw new JasperDesignException("Registration failed for crosstab cell \"" + cell.getName() + "\"", e);
+		}
+	}
+	
+	private void addMeasure(final JRDesignCrosstab jrCrosstab, final DRIDesignCrosstabMeasure measure)
+	{
+		final JRDesignCrosstabMeasure jrMeasure = new JRDesignCrosstabMeasure();
+		jrMeasure.setName(measure.getName());
+		jrMeasure.setValueExpression(this.accessor.getExpressionTransform()
+			.getExpression(measure.getValueExpression()));
+		jrMeasure.setValueClassName(measure.getValueClass().getName());
+		jrMeasure.setCalculation(ConstantTransform.calculation(measure.getCalculation()));
+		jrMeasure.setPercentageType(ConstantTransform.crosstabPercentageType(measure.getPercentageType()));
+		
+		try
+		{
+			jrCrosstab.addMeasure(jrMeasure);
+		}
+		catch(final JRException e)
+		{
+			throw new JasperDesignException(
+				"Registration failed for crosstab measure \"" + measure.getName() + "\"",
+				e);
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetExpressionTransform.java
new file mode 100644
index 0000000..5c52c48
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetExpressionTransform.java
@@ -0,0 +1,126 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.DRIDesignField;
+import net.sf.dynamicreports.design.definition.DRIDesignSort;
+import net.sf.dynamicreports.design.definition.DRIDesignVariable;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.design.JRDesignDataset;
+import net.sf.jasperreports.engine.design.JRDesignField;
+import net.sf.jasperreports.engine.design.JRDesignSortField;
+import net.sf.jasperreports.engine.design.JRDesignVariable;
+
+import java.util.Collection;
+
+/**
+ * <p>DatasetExpressionTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DatasetExpressionTransform extends AbstractExpressionTransform {
+    private DRIDesignDataset dataset;
+    private JRDesignDataset jrDataset;
+    private JasperCustomValues customValues;
+
+    /**
+     * <p>Constructor for DatasetExpressionTransform.</p>
+     *
+     * @param dataset      a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @param jrDataset    a {@link net.sf.jasperreports.engine.design.JRDesignDataset} object.
+     * @param customValues a {@link net.sf.dynamicreports.jasper.base.JasperCustomValues} object.
+     */
+    public DatasetExpressionTransform(DRIDesignDataset dataset, JRDesignDataset jrDataset, JasperCustomValues customValues) {
+        this.dataset = dataset;
+        this.jrDataset = jrDataset;
+        this.customValues = customValues;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JasperCustomValues getCustomValues() {
+        return customValues;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignField> getFields() {
+        return dataset.getFields();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignVariable> getVariables() {
+        return dataset.getVariables();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignSystemExpression> getSystemExpressions() {
+        return dataset.getSystemExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignJasperExpression> getJasperExpressions() {
+        return dataset.getJasperExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignSimpleExpression> getSimpleExpressions() {
+        return dataset.getSimpleExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignComplexExpression> getComplexExpressions() {
+        return dataset.getComplexExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignSort> getSorts() {
+        return dataset.getSorts();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void addField(JRDesignField field) throws JRException {
+        jrDataset.addField(field);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void addVariable(JRDesignVariable variable) throws JRException {
+        jrDataset.addVariable(variable);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void addSort(JRDesignSortField sort) throws JRException {
+        jrDataset.addSortField(sort);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetTransform.java
new file mode 100644
index 0000000..77fd19b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetTransform.java
@@ -0,0 +1,154 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.dynamicreports.jasper.base.JasperScriptlet;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.jasper.transformation.expression.DatasetParametersExpression;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.design.JRDesignDataset;
+import net.sf.jasperreports.engine.design.JRDesignDatasetRun;
+import net.sf.jasperreports.engine.design.JRDesignParameter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>DatasetTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DatasetTransform {
+    private JasperTransformAccessor accessor;
+    private Map<DRIDesignDataset, Map<String, Object>> datasetParameters;
+    private Map<DRIDesignDataset, DatasetExpressionTransform> datasetExpressions;
+
+    /**
+     * <p>Constructor for DatasetTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     */
+    public DatasetTransform(JasperTransformAccessor accessor) {
+        this.accessor = accessor;
+        datasetParameters = new HashMap<DRIDesignDataset, Map<String, Object>>();
+        datasetExpressions = new HashMap<DRIDesignDataset, DatasetExpressionTransform>();
+    }
+
+    /**
+     * <p>transform.</p>
+     */
+    public void transform() {
+        for (DRIDesignDataset dataset : accessor.getReport().getDatasets()) {
+            addDataset(dataset);
+        }
+    }
+
+    private void addDataset(DRIDesignDataset dataset) {
+        try {
+            accessor.getDesign().addDataset(dataset(dataset));
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for dataset \"" + dataset.getName() + "\"", e);
+        }
+    }
+
+    // dataset
+    private JRDesignDataset dataset(DRIDesignDataset dataset) {
+        Map<String, Object> parameters = new HashMap<String, Object>();
+        datasetParameters.put(dataset, parameters);
+        JRDesignDataset jrDataset = new JRDesignDataset(false);
+        jrDataset.setName(dataset.getName());
+        if (dataset.getQuery() != null) {
+            jrDataset.setQuery(accessor.getReportTransform().query(dataset.getQuery()));
+        }
+        JasperCustomValues customValues = new JasperCustomValues(accessor.getReport().getProperties());
+        DatasetExpressionTransform datasetExpressionTransform = new DatasetExpressionTransform(dataset, jrDataset, customValues);
+        datasetExpressionTransform.transform();
+        datasetExpressions.put(dataset, datasetExpressionTransform);
+        if (!customValues.isEmpty()) {
+            addParameter(jrDataset, parameters, JasperCustomValues.NAME, JasperCustomValues.class, customValues);
+            addScriptlet(jrDataset, parameters, JasperScriptlet.NAME);
+        }
+        jrDataset.setFilterExpression(datasetExpressionTransform.getExpression(dataset.getFilterExpression()));
+        return jrDataset;
+    }
+
+    private <T> void addParameter(JRDesignDataset jrDataset, Map<String, Object> parameters, String name, Class<T> parameterClass, T value) {
+        JRDesignParameter jrParameter = new JRDesignParameter();
+        jrParameter.setName(name);
+        jrParameter.setValueClass(parameterClass);
+        try {
+            jrDataset.addParameter(jrParameter);
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for parameter \"" + name + "\"", e);
+        }
+        parameters.put(jrParameter.getName(), value);
+    }
+
+    private void addScriptlet(JRDesignDataset jrDataset, Map<String, Object> parameters, String name) {
+        try {
+            jrDataset.addScriptlet(accessor.getReportTransform().scriptlet(name, JasperScriptlet.class));
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for scriptlet \"" + name + "\"", e);
+        }
+    }
+
+    /**
+     * <p>datasetRun.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link net.sf.jasperreports.engine.design.JRDesignDatasetRun} object.
+     */
+    public JRDesignDatasetRun datasetRun(DRIDesignDataset dataset) {
+        if (dataset == null) {
+            return null;
+        }
+
+        JRDesignDatasetRun jrDatasetRun = new JRDesignDatasetRun();
+        jrDatasetRun.setDatasetName(dataset.getName());
+        jrDatasetRun.setConnectionExpression(accessor.getExpressionTransform().getExpression(dataset.getConnectionExpression()));
+        jrDatasetRun.setDataSourceExpression(accessor.getExpressionTransform().getExpression(dataset.getDataSourceExpression()));
+        DatasetParametersExpression parametersExpression = new DatasetParametersExpression(datasetParameters.get(dataset));
+        accessor.getExpressionTransform().addSimpleExpression(parametersExpression);
+        jrDatasetRun.setParametersMapExpression(accessor.getExpressionTransform().getExpression(parametersExpression));
+        return jrDatasetRun;
+    }
+
+    /**
+     * <p>Getter for the field <code>datasetParameters</code>.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link java.util.Map} object.
+     */
+    protected Map<String, Object> getDatasetParameters(DRIDesignDataset dataset) {
+        return datasetParameters.get(dataset);
+    }
+
+    /**
+     * <p>getDatasetExpressionTransform.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.DatasetExpressionTransform} object.
+     */
+    public DatasetExpressionTransform getDatasetExpressionTransform(DRIDesignDataset dataset) {
+        return datasetExpressions.get(dataset);
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java
new file mode 100644
index 0000000..1113403
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java
@@ -0,0 +1,746 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.transformation.StyleResolver;
+import net.sf.dynamicreports.jasper.definition.export.JasperICsvExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIDocxExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIExcelExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIHtmlExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIOdsExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIOdtExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIPdfExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIPptxExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIRtfExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperITextExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIXlsExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
+import net.sf.dynamicreports.jasper.definition.export.JasperIXmlExporter;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.report.base.style.DRFont;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.export.FileHtmlResourceHandler;
+import net.sf.jasperreports.engine.export.HtmlExporter;
+import net.sf.jasperreports.engine.export.HtmlResourceHandler;
+import net.sf.jasperreports.engine.export.JRCsvExporter;
+import net.sf.jasperreports.engine.export.JRPdfExporter;
+import net.sf.jasperreports.engine.export.JRRtfExporter;
+import net.sf.jasperreports.engine.export.JRTextExporter;
+import net.sf.jasperreports.engine.export.JRXlsExporter;
+import net.sf.jasperreports.engine.export.JRXmlExporter;
+import net.sf.jasperreports.engine.export.oasis.JROdsExporter;
+import net.sf.jasperreports.engine.export.oasis.JROdtExporter;
+import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
+import net.sf.jasperreports.engine.export.ooxml.JRPptxExporter;
+import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
+import net.sf.jasperreports.export.AbstractXlsExporterConfiguration;
+import net.sf.jasperreports.export.AbstractXlsReportConfiguration;
+import net.sf.jasperreports.export.Exporter;
+import net.sf.jasperreports.export.SimpleCsvExporterConfiguration;
+import net.sf.jasperreports.export.SimpleCsvReportConfiguration;
+import net.sf.jasperreports.export.SimpleDocxExporterConfiguration;
+import net.sf.jasperreports.export.SimpleDocxReportConfiguration;
+import net.sf.jasperreports.export.SimpleExporterConfiguration;
+import net.sf.jasperreports.export.SimpleHtmlExporterConfiguration;
+import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
+import net.sf.jasperreports.export.SimpleHtmlReportConfiguration;
+import net.sf.jasperreports.export.SimpleOdsExporterConfiguration;
+import net.sf.jasperreports.export.SimpleOdsReportConfiguration;
+import net.sf.jasperreports.export.SimpleOdtExporterConfiguration;
+import net.sf.jasperreports.export.SimpleOdtReportConfiguration;
+import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
+import net.sf.jasperreports.export.SimplePdfExporterConfiguration;
+import net.sf.jasperreports.export.SimplePdfReportConfiguration;
+import net.sf.jasperreports.export.SimplePptxExporterConfiguration;
+import net.sf.jasperreports.export.SimplePptxReportConfiguration;
+import net.sf.jasperreports.export.SimpleReportExportConfiguration;
+import net.sf.jasperreports.export.SimpleRtfExporterConfiguration;
+import net.sf.jasperreports.export.SimpleRtfReportConfiguration;
+import net.sf.jasperreports.export.SimpleTextExporterConfiguration;
+import net.sf.jasperreports.export.SimpleTextReportConfiguration;
+import net.sf.jasperreports.export.SimpleWriterExporterOutput;
+import net.sf.jasperreports.export.SimpleXlsExporterConfiguration;
+import net.sf.jasperreports.export.SimpleXlsReportConfiguration;
+import net.sf.jasperreports.export.SimpleXlsxExporterConfiguration;
+import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
+import net.sf.jasperreports.export.SimpleXmlExporterOutput;
+import net.sf.jasperreports.web.util.WebHtmlResourceHandler;
+
+import java.io.File;
+
+/**
+ * <p>ExporterTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ExporterTransform {
+    private JasperIExporter jasperExporter;
+
+    /**
+     * <p>Constructor for ExporterTransform.</p>
+     *
+     * @param jasperExporter a {@link net.sf.dynamicreports.jasper.definition.export.JasperIExporter} object.
+     */
+    public ExporterTransform(JasperIExporter jasperExporter) {
+        this.jasperExporter = jasperExporter;
+    }
+
+    /**
+     * <p>transform.</p>
+     *
+     * @return a {@link net.sf.jasperreports.export.Exporter} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public Exporter<?, ?, ?, ?> transform() throws DRException {
+        Exporter<?, ?, ?, ?> jrExporter;
+
+        if (jasperExporter instanceof JasperICsvExporter) {
+            jrExporter = csv((JasperICsvExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIDocxExporter) {
+            jrExporter = docx((JasperIDocxExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIXlsExporter) {
+            jrExporter = xls((JasperIXlsExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIXlsxExporter) {
+            jrExporter = xlsx((JasperIXlsxExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIHtmlExporter) {
+            jrExporter = html((JasperIHtmlExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIOdsExporter) {
+            jrExporter = ods((JasperIOdsExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIOdtExporter) {
+            jrExporter = odt((JasperIOdtExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIPdfExporter) {
+            jrExporter = pdf((JasperIPdfExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIRtfExporter) {
+            jrExporter = rtf((JasperIRtfExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperITextExporter) {
+            jrExporter = text((JasperITextExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIXmlExporter) {
+            jrExporter = xml((JasperIXmlExporter) jasperExporter);
+        } else if (jasperExporter instanceof JasperIPptxExporter) {
+            jrExporter = pptx((JasperIPptxExporter) jasperExporter);
+        } else {
+            throw new JasperDesignException("Exporter " + jasperExporter.getClass().getName() + " not supported");
+        }
+
+        return jrExporter;
+    }
+
+    private SimpleWriterExporterOutput simpleWriterExporterOutput(JasperIExporter jasperExporter) {
+        if (jasperExporter.getOutputWriter() != null) {
+            return new SimpleWriterExporterOutput(jasperExporter.getOutputWriter());
+        }
+        if (jasperExporter.getOutputStream() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleWriterExporterOutput(jasperExporter.getOutputStream(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleWriterExporterOutput(jasperExporter.getOutputStream());
+            }
+        }
+        if (jasperExporter.getOutputFile() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleWriterExporterOutput(jasperExporter.getOutputFile(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleWriterExporterOutput(jasperExporter.getOutputFile());
+            }
+        }
+        if (jasperExporter.getOutputFileName() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleWriterExporterOutput(jasperExporter.getOutputFileName(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleWriterExporterOutput(jasperExporter.getOutputFileName());
+            }
+        }
+        return null;
+    }
+
+    private SimpleOutputStreamExporterOutput simpleOutputStreamExporterOutput(JasperIExporter jasperExporter) {
+        if (jasperExporter.getOutputStream() != null) {
+            return new SimpleOutputStreamExporterOutput(jasperExporter.getOutputStream());
+        }
+        if (jasperExporter.getOutputFile() != null) {
+            return new SimpleOutputStreamExporterOutput(jasperExporter.getOutputFile());
+        }
+        if (jasperExporter.getOutputFileName() != null) {
+            return new SimpleOutputStreamExporterOutput(jasperExporter.getOutputFileName());
+        }
+        return null;
+    }
+
+    private SimpleHtmlExporterOutput simpleHtmlExporterOutput(JasperIExporter jasperExporter) {
+        if (jasperExporter.getOutputWriter() != null) {
+            return new SimpleHtmlExporterOutput(jasperExporter.getOutputWriter());
+        }
+        if (jasperExporter.getOutputStream() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleHtmlExporterOutput(jasperExporter.getOutputStream(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleHtmlExporterOutput(jasperExporter.getOutputStream());
+            }
+        }
+        if (jasperExporter.getOutputFile() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleHtmlExporterOutput(jasperExporter.getOutputFile(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleHtmlExporterOutput(jasperExporter.getOutputFile());
+            }
+        }
+        if (jasperExporter.getOutputFileName() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleHtmlExporterOutput(jasperExporter.getOutputFileName(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleHtmlExporterOutput(jasperExporter.getOutputFileName());
+            }
+        }
+        return null;
+    }
+
+    private SimpleXmlExporterOutput simpleXmlExporterOutput(JasperIXmlExporter jasperExporter) {
+        if (jasperExporter.getOutputWriter() != null) {
+            return new SimpleXmlExporterOutput(jasperExporter.getOutputWriter());
+        }
+        if (jasperExporter.getOutputStream() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleXmlExporterOutput(jasperExporter.getOutputStream(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleXmlExporterOutput(jasperExporter.getOutputStream());
+            }
+        }
+        if (jasperExporter.getOutputFile() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleXmlExporterOutput(jasperExporter.getOutputFile(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleXmlExporterOutput(jasperExporter.getOutputFile());
+            }
+        }
+        if (jasperExporter.getOutputFileName() != null) {
+            if (jasperExporter.getCharacterEncoding() != null) {
+                return new SimpleXmlExporterOutput(jasperExporter.getOutputFileName(), jasperExporter.getCharacterEncoding());
+            } else {
+                return new SimpleXmlExporterOutput(jasperExporter.getOutputFileName());
+            }
+        }
+        return null;
+    }
+
+    private void reportExportConfiguration(SimpleReportExportConfiguration reportExportConfiguration, JasperIExporter jasperExporter) {
+        if (jasperExporter.getPageIndex() != null) {
+            reportExportConfiguration.setPageIndex(jasperExporter.getPageIndex());
+        }
+        if (jasperExporter.getStartPageIndex() != null) {
+            reportExportConfiguration.setStartPageIndex(jasperExporter.getStartPageIndex());
+        }
+        if (jasperExporter.getEndPageIndex() != null) {
+            reportExportConfiguration.setEndPageIndex(jasperExporter.getEndPageIndex());
+        }
+        if (jasperExporter.getOffsetX() != null) {
+            reportExportConfiguration.setOffsetX(jasperExporter.getOffsetX());
+        }
+        if (jasperExporter.getOffsetY() != null) {
+            reportExportConfiguration.setOffsetY(jasperExporter.getOffsetY());
+        }
+    }
+
+    private JRXmlExporter xml(JasperIXmlExporter jasperExporter) {
+        SimpleXmlExporterOutput exporterOutput = simpleXmlExporterOutput(jasperExporter);
+        if (jasperExporter.getEmbeddingImages() != null) {
+            exporterOutput.setEmbeddingImages(jasperExporter.getEmbeddingImages());
+        }
+        SimpleReportExportConfiguration reportExportConfiguration = new SimpleReportExportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        SimpleExporterConfiguration exporterConfiguration = new SimpleExporterConfiguration();
+
+        JRXmlExporter jrExporter = new JRXmlExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JRPptxExporter pptx(JasperIPptxExporter jasperExporter) {
+        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
+        SimplePptxReportConfiguration reportExportConfiguration = new SimplePptxReportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getIgnoreHyperLink() != null) {
+            reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
+        }
+        SimplePptxExporterConfiguration exporterConfiguration = new SimplePptxExporterConfiguration();
+
+        JRPptxExporter jrExporter = new JRPptxExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JRTextExporter text(JasperITextExporter jasperExporter) {
+        SimpleWriterExporterOutput exporterOutput = simpleWriterExporterOutput(jasperExporter);
+        SimpleTextReportConfiguration reportExportConfiguration = new SimpleTextReportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getCharacterWidth() != null) {
+            reportExportConfiguration.setCharWidth(jasperExporter.getCharacterWidth());
+        } else {
+            DRFont font = Defaults.getDefaults().getFont();
+            reportExportConfiguration.setCharWidth((float) StyleResolver.getFontWidth(font));
+        }
+        if (jasperExporter.getCharacterHeight() != null) {
+            reportExportConfiguration.setCharHeight(jasperExporter.getCharacterHeight());
+        } else {
+            DRFont font = Defaults.getDefaults().getFont();
+            reportExportConfiguration.setCharHeight((float) StyleResolver.getFontHeight(font));
+        }
+        if (jasperExporter.getPageWidthInChars() != null) {
+            reportExportConfiguration.setPageWidthInChars(jasperExporter.getPageWidthInChars());
+        }
+        if (jasperExporter.getPageHeightInChars() != null) {
+            reportExportConfiguration.setPageHeightInChars(jasperExporter.getPageHeightInChars());
+        }
+        SimpleTextExporterConfiguration exporterConfiguration = new SimpleTextExporterConfiguration();
+        if (jasperExporter.getPageSeparator() != null) {
+            exporterConfiguration.setPageSeparator(jasperExporter.getPageSeparator());
+        }
+        if (jasperExporter.getLineSeparator() != null) {
+            exporterConfiguration.setLineSeparator(jasperExporter.getLineSeparator());
+        }
+        if (jasperExporter.getTrimLineRight() != null) {
+            exporterConfiguration.setTrimLineRight(jasperExporter.getTrimLineRight());
+        }
+
+        JRTextExporter jrExporter = new JRTextExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JRRtfExporter rtf(JasperIRtfExporter jasperExporter) {
+        SimpleWriterExporterOutput exporterOutput = simpleWriterExporterOutput(jasperExporter);
+        SimpleRtfReportConfiguration reportExportConfiguration = new SimpleRtfReportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getIgnoreHyperLink() != null) {
+            reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
+        }
+        SimpleRtfExporterConfiguration exporterConfiguration = new SimpleRtfExporterConfiguration();
+
+        JRRtfExporter jrExporter = new JRRtfExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JRPdfExporter pdf(JasperIPdfExporter jasperExporter) {
+        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
+        SimplePdfReportConfiguration reportExportConfiguration = new SimplePdfReportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getForceSvgShapes() != null) {
+            reportExportConfiguration.setForceSvgShapes(jasperExporter.getForceSvgShapes());
+        }
+        if (jasperExporter.getCollapseMissingBookmarkLevels() != null) {
+            reportExportConfiguration.setCollapseMissingBookmarkLevels(jasperExporter.getCollapseMissingBookmarkLevels());
+        }
+        if (jasperExporter.getSizePageToContent() != null) {
+            reportExportConfiguration.setSizePageToContent(jasperExporter.getSizePageToContent());
+        }
+        if (jasperExporter.getIgnoreHyperLink() != null) {
+            reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
+        }
+        if (jasperExporter.getForceLineBreakPolicy() != null) {
+            reportExportConfiguration.setForceLineBreakPolicy(jasperExporter.getForceLineBreakPolicy());
+        }
+        SimplePdfExporterConfiguration exporterConfiguration = new SimplePdfExporterConfiguration();
+        if (jasperExporter.getCreatingBatchModeBookmarks() != null) {
+            exporterConfiguration.setCreatingBatchModeBookmarks(jasperExporter.getCreatingBatchModeBookmarks());
+        }
+        if (jasperExporter.getCompressed() != null) {
+            exporterConfiguration.setCompressed(jasperExporter.getCompressed());
+        }
+        if (jasperExporter.getEncrypted() != null) {
+            exporterConfiguration.setEncrypted(jasperExporter.getEncrypted());
+        }
+        if (jasperExporter.getBitKey128() != null) {
+            exporterConfiguration.set128BitKey(jasperExporter.getBitKey128());
+        }
+        if (jasperExporter.getUserPassword() != null) {
+            exporterConfiguration.setUserPassword(jasperExporter.getUserPassword());
+        }
+        if (jasperExporter.getOwnerPassword() != null) {
+            exporterConfiguration.setOwnerPassword(jasperExporter.getOwnerPassword());
+        }
+        if (jasperExporter.getPermissions() != null && !jasperExporter.getPermissions().isEmpty()) {
+            exporterConfiguration.setPermissions(ConstantTransform.pdfPermission(jasperExporter.getPermissions()));
+        }
+        if (jasperExporter.getPdfVersion() != null) {
+            exporterConfiguration.setPdfVersion(ConstantTransform.pdfVersion(jasperExporter.getPdfVersion()));
+        }
+        if (jasperExporter.getMetadataTitle() != null) {
+            exporterConfiguration.setMetadataTitle(jasperExporter.getMetadataTitle());
+        }
+        if (jasperExporter.getMetadataAuthor() != null) {
+            exporterConfiguration.setMetadataAuthor(jasperExporter.getMetadataAuthor());
+        }
+        if (jasperExporter.getMetadataSubject() != null) {
+            exporterConfiguration.setMetadataSubject(jasperExporter.getMetadataSubject());
+        }
+        if (jasperExporter.getMetadataKeyWords() != null) {
+            exporterConfiguration.setMetadataKeywords(jasperExporter.getMetadataKeyWords());
+        }
+        if (jasperExporter.getMetadataCreator() != null) {
+            exporterConfiguration.setMetadataCreator(jasperExporter.getMetadataCreator());
+        }
+        if (jasperExporter.getPdfJavaScript() != null) {
+            exporterConfiguration.setPdfJavaScript(jasperExporter.getPdfJavaScript());
+        }
+        if (jasperExporter.getTagged() != null) {
+            exporterConfiguration.setTagged(jasperExporter.getTagged());
+        }
+        if (jasperExporter.getTagLanguage() != null) {
+            exporterConfiguration.setTagLanguage(jasperExporter.getTagLanguage());
+        }
+        if (jasperExporter.getPrintScaling() != null) {
+            exporterConfiguration.setPrintScaling(ConstantTransform.pdfPrintScaling(jasperExporter.getPrintScaling()));
+        }
+        if (jasperExporter.getPdfaConformance() != null) {
+            exporterConfiguration.setPdfaConformance(ConstantTransform.pdfaConformance(jasperExporter.getPdfaConformance()));
+        }
+        if (jasperExporter.getIccProfilePath() != null) {
+            exporterConfiguration.setIccProfilePath(jasperExporter.getIccProfilePath());
+        }
+        if (jasperExporter.getAllowedPermissionsHint() != null) {
+            exporterConfiguration.setAllowedPermissionsHint(jasperExporter.getAllowedPermissionsHint());
+        }
+        if (jasperExporter.getDeniedPermissionsHint() != null) {
+            exporterConfiguration.setDeniedPermissionsHint(jasperExporter.getDeniedPermissionsHint());
+        }
+        if (jasperExporter.getDisplayMetadataTitle() != null) {
+            exporterConfiguration.setDisplayMetadataTitle(jasperExporter.getDisplayMetadataTitle());
+        }
+
+        JRPdfExporter jrExporter = new JRPdfExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JROdtExporter odt(JasperIOdtExporter jasperExporter) {
+        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
+        SimpleOdtReportConfiguration reportExportConfiguration = new SimpleOdtReportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getFlexibleRowHeight() != null) {
+            reportExportConfiguration.setFlexibleRowHeight(jasperExporter.getFlexibleRowHeight());
+        }
+        if (jasperExporter.getIgnoreHyperLink() != null) {
+            reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
+        }
+        SimpleOdtExporterConfiguration exporterConfiguration = new SimpleOdtExporterConfiguration();
+
+        JROdtExporter jrExporter = new JROdtExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JROdsExporter ods(JasperIOdsExporter jasperExporter) {
+        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
+        SimpleOdsReportConfiguration reportExportConfiguration = new SimpleOdsReportConfiguration();
+        reportExcelExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getFlexibleRowHeight() != null) {
+            reportExportConfiguration.setFlexibleRowHeight(jasperExporter.getFlexibleRowHeight());
+        }
+        SimpleOdsExporterConfiguration exporterConfiguration = new SimpleOdsExporterConfiguration();
+        reportExcelExporterConfiguration(exporterConfiguration, jasperExporter);
+
+        JROdsExporter jrExporter = new JROdsExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private HtmlExporter html(JasperIHtmlExporter jasperExporter) {
+        SimpleHtmlExporterOutput exporterOutput = simpleHtmlExporterOutput(jasperExporter);
+        Boolean outputImagesToDir = jasperExporter.getOutputImagesToDir();
+        String imagesUri = jasperExporter.getImagesURI();
+        HtmlResourceHandler imageHandler = null;
+        if (outputImagesToDir == null || outputImagesToDir) {
+            File imagesDir = null;
+            String imagesDirName = jasperExporter.getImagesDirName();
+            if (imagesDirName != null) {
+                imagesDir = new File(imagesDirName);
+            }
+            if (imagesDir != null) {
+                imageHandler = new FileHtmlResourceHandler(imagesDir, imagesUri == null ? imagesDir.getName() + "/{0}" : imagesUri + "{0}");
+            }
+        }
+        if (imageHandler == null && imagesUri != null) {
+            imageHandler = new WebHtmlResourceHandler(imagesUri + "{0}");
+        }
+        if (imageHandler != null) {
+            exporterOutput.setImageHandler(imageHandler);
+        }
+        SimpleHtmlReportConfiguration reportExportConfiguration = new SimpleHtmlReportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getRemoveEmptySpaceBetweenRows() != null) {
+            reportExportConfiguration.setRemoveEmptySpaceBetweenRows(jasperExporter.getRemoveEmptySpaceBetweenRows());
+        }
+        if (jasperExporter.getWhitePageBackground() != null) {
+            reportExportConfiguration.setWhitePageBackground(jasperExporter.getWhitePageBackground());
+        }
+        if (jasperExporter.getWrapBreakWord() != null) {
+            reportExportConfiguration.setWrapBreakWord(jasperExporter.getWrapBreakWord());
+        }
+        if (jasperExporter.getSizeUnit() != null) {
+            reportExportConfiguration.setSizeUnit(ConstantTransform.sizeUnit(jasperExporter.getSizeUnit()));
+        }
+        if (jasperExporter.getIgnorePageMargins() != null) {
+            reportExportConfiguration.setIgnorePageMargins(jasperExporter.getIgnorePageMargins());
+        }
+        if (jasperExporter.getBorderCollapse() != null) {
+            reportExportConfiguration.setBorderCollapse(jasperExporter.getBorderCollapse());
+        }
+        if (jasperExporter.getAccessibleHtml() != null) {
+            reportExportConfiguration.setAccessibleHtml(jasperExporter.getAccessibleHtml());
+        }
+        if (jasperExporter.getZoomRatio() != null) {
+            reportExportConfiguration.setZoomRatio(jasperExporter.getZoomRatio());
+        }
+        if (jasperExporter.getIgnoreHyperLink() != null) {
+            reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
+        }
+        SimpleHtmlExporterConfiguration exporterConfiguration = new SimpleHtmlExporterConfiguration();
+        if (jasperExporter.getHtmlHeader() != null) {
+            exporterConfiguration.setHtmlHeader(jasperExporter.getHtmlHeader());
+        }
+        if (jasperExporter.getBetweenPagesHtml() != null) {
+            exporterConfiguration.setBetweenPagesHtml(jasperExporter.getBetweenPagesHtml());
+        }
+        if (jasperExporter.getHtmlFooter() != null) {
+            exporterConfiguration.setHtmlFooter(jasperExporter.getHtmlFooter());
+        }
+        if (jasperExporter.getFlushOutput() != null) {
+            exporterConfiguration.setFlushOutput(jasperExporter.getFlushOutput());
+        }
+
+        HtmlExporter jrExporter = new HtmlExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private void reportExcelExportConfiguration(AbstractXlsReportConfiguration reportExportConfiguration, JasperIExcelExporter jasperExporter) {
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getOnePagePerSheet() != null) {
+            reportExportConfiguration.setOnePagePerSheet(jasperExporter.getOnePagePerSheet());
+        }
+        if (jasperExporter.getRemoveEmptySpaceBetweenRows() != null) {
+            reportExportConfiguration.setRemoveEmptySpaceBetweenRows(jasperExporter.getRemoveEmptySpaceBetweenRows());
+        }
+        if (jasperExporter.getRemoveEmptySpaceBetweenColumns() != null) {
+            reportExportConfiguration.setRemoveEmptySpaceBetweenColumns(jasperExporter.getRemoveEmptySpaceBetweenColumns());
+        }
+        if (jasperExporter.getWhitePageBackground() != null) {
+            reportExportConfiguration.setWhitePageBackground(jasperExporter.getWhitePageBackground());
+        }
+        if (jasperExporter.getDetectCellType() != null) {
+            reportExportConfiguration.setDetectCellType(jasperExporter.getDetectCellType());
+        }
+        if (jasperExporter.getSheetNames() != null && !jasperExporter.getSheetNames().isEmpty()) {
+            String[] sheetNames = jasperExporter.getSheetNames().toArray(new String[jasperExporter.getSheetNames().size()]);
+            reportExportConfiguration.setSheetNames(sheetNames);
+        }
+        if (jasperExporter.getFontSizeFixEnabled() != null) {
+            reportExportConfiguration.setFontSizeFixEnabled(jasperExporter.getFontSizeFixEnabled());
+        }
+        if (jasperExporter.getImageBorderFixEnabled() != null) {
+            reportExportConfiguration.setImageBorderFixEnabled(jasperExporter.getImageBorderFixEnabled());
+        }
+        if (jasperExporter.getMaxRowsPerSheet() != null) {
+            reportExportConfiguration.setMaxRowsPerSheet(jasperExporter.getMaxRowsPerSheet());
+        }
+        if (jasperExporter.getIgnoreGraphics() != null) {
+            reportExportConfiguration.setIgnoreGraphics(jasperExporter.getIgnoreGraphics());
+        }
+        if (jasperExporter.getCollapseRowSpan() != null) {
+            reportExportConfiguration.setCollapseRowSpan(jasperExporter.getCollapseRowSpan());
+        }
+        if (jasperExporter.getIgnoreCellBorder() != null) {
+            reportExportConfiguration.setIgnoreCellBorder(jasperExporter.getIgnoreCellBorder());
+        }
+        if (jasperExporter.getIgnoreCellBackground() != null) {
+            reportExportConfiguration.setIgnoreCellBackground(jasperExporter.getIgnoreCellBackground());
+        }
+        if (jasperExporter.getPassword() != null) {
+            reportExportConfiguration.setPassword(jasperExporter.getPassword());
+        }
+        if (jasperExporter.getIgnorePageMargins() != null) {
+            reportExportConfiguration.setIgnorePageMargins(jasperExporter.getIgnorePageMargins());
+        }
+        if (jasperExporter.getWrapText() != null) {
+            reportExportConfiguration.setWrapText(jasperExporter.getWrapText());
+        }
+        if (jasperExporter.getCellLocked() != null) {
+            reportExportConfiguration.setCellLocked(jasperExporter.getCellLocked());
+        }
+        if (jasperExporter.getCellHidden() != null) {
+            reportExportConfiguration.setCellHidden(jasperExporter.getCellHidden());
+        }
+        if (jasperExporter.getSheetHeaderLeft() != null) {
+            reportExportConfiguration.setSheetHeaderLeft(jasperExporter.getSheetHeaderLeft());
+        }
+        if (jasperExporter.getSheetHeaderCenter() != null) {
+            reportExportConfiguration.setSheetHeaderCenter(jasperExporter.getSheetHeaderCenter());
+        }
+        if (jasperExporter.getSheetHeaderRight() != null) {
+            reportExportConfiguration.setSheetHeaderRight(jasperExporter.getSheetHeaderRight());
+        }
+        if (jasperExporter.getSheetFooterLeft() != null) {
+            reportExportConfiguration.setSheetFooterLeft(jasperExporter.getSheetFooterLeft());
+        }
+        if (jasperExporter.getSheetFooterCenter() != null) {
+            reportExportConfiguration.setSheetFooterCenter(jasperExporter.getSheetFooterCenter());
+        }
+        if (jasperExporter.getSheetFooterRight() != null) {
+            reportExportConfiguration.setSheetFooterRight(jasperExporter.getSheetFooterRight());
+        }
+        if (jasperExporter.getFormatPatternsMap() != null) {
+            reportExportConfiguration.setFormatPatternsMap(jasperExporter.getFormatPatternsMap());
+        }
+        if (jasperExporter.getIgnoreHyperLink() != null) {
+            reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
+        }
+        if (jasperExporter.getIgnoreAnchors() != null) {
+            reportExportConfiguration.setIgnoreAnchors(jasperExporter.getIgnoreAnchors());
+        }
+        if (jasperExporter.getFitWidth() != null) {
+            reportExportConfiguration.setFitWidth(jasperExporter.getFitWidth());
+        }
+        if (jasperExporter.getFitHeight() != null) {
+            reportExportConfiguration.setFitHeight(jasperExporter.getFitHeight());
+        }
+        if (jasperExporter.getPageScale() != null) {
+            reportExportConfiguration.setPageScale(jasperExporter.getPageScale());
+        }
+        if (jasperExporter.getSheetDirection() != null) {
+            reportExportConfiguration.setSheetDirection(ConstantTransform.runDirection(jasperExporter.getSheetDirection()));
+        }
+        if (jasperExporter.getColumnWidthRatio() != null) {
+            reportExportConfiguration.setColumnWidthRatio(jasperExporter.getColumnWidthRatio());
+        }
+        if (jasperExporter.getUseTimeZone() != null) {
+            reportExportConfiguration.setUseTimeZone(jasperExporter.getUseTimeZone());
+        }
+        if (jasperExporter.getFirstPageNumber() != null) {
+            reportExportConfiguration.setFirstPageNumber(jasperExporter.getFirstPageNumber());
+        }
+        if (jasperExporter.getShowGridLines() != null) {
+            reportExportConfiguration.setShowGridLines(jasperExporter.getShowGridLines());
+        }
+        if (jasperExporter.getImageAnchorType() != null) {
+            reportExportConfiguration.setImageAnchorType(ConstantTransform.imageAnchorType(jasperExporter.getImageAnchorType()));
+        }
+    }
+
+    private void reportExcelExporterConfiguration(AbstractXlsExporterConfiguration exporterConfiguration, JasperIExcelExporter jasperExporter) {
+        if (jasperExporter.getCreateCustomPalette() != null) {
+            exporterConfiguration.setCreateCustomPalette(jasperExporter.getCreateCustomPalette());
+        }
+        if (jasperExporter.getWorkbookTemplate() != null) {
+            exporterConfiguration.setWorkbookTemplate(jasperExporter.getWorkbookTemplate());
+        }
+        if (jasperExporter.getKeepWorkbookTemplateSheets() != null) {
+            exporterConfiguration.setKeepWorkbookTemplateSheets(jasperExporter.getKeepWorkbookTemplateSheets());
+        }
+    }
+
+    private JRXlsxExporter xlsx(JasperIXlsxExporter jasperExporter) {
+        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
+        SimpleXlsxReportConfiguration reportExportConfiguration = new SimpleXlsxReportConfiguration();
+        reportExcelExportConfiguration(reportExportConfiguration, jasperExporter);
+        SimpleXlsxExporterConfiguration exporterConfiguration = new SimpleXlsxExporterConfiguration();
+        reportExcelExporterConfiguration(exporterConfiguration, jasperExporter);
+        if (jasperExporter.getMacroTemplate() != null) {
+            exporterConfiguration.setMacroTemplate(jasperExporter.getMacroTemplate());
+        }
+
+        JRXlsxExporter jrExporter = new JRXlsxExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JRXlsExporter xls(JasperIXlsExporter jasperExporter) {
+        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
+        SimpleXlsReportConfiguration reportExportConfiguration = new SimpleXlsReportConfiguration();
+        reportExcelExportConfiguration(reportExportConfiguration, jasperExporter);
+        SimpleXlsExporterConfiguration exporterConfiguration = new SimpleXlsExporterConfiguration();
+        reportExcelExporterConfiguration(exporterConfiguration, jasperExporter);
+
+        JRXlsExporter jrExporter = new JRXlsExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JRDocxExporter docx(JasperIDocxExporter jasperExporter) {
+        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
+        SimpleDocxReportConfiguration reportExportConfiguration = new SimpleDocxReportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if (jasperExporter.getFramesAsNestedTables() != null) {
+            reportExportConfiguration.setFramesAsNestedTables(jasperExporter.getFramesAsNestedTables());
+        }
+        if (jasperExporter.getFlexibleRowHeight() != null) {
+            reportExportConfiguration.setFlexibleRowHeight(jasperExporter.getFlexibleRowHeight());
+        }
+        if (jasperExporter.getIgnoreHyperLink() != null) {
+            reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
+        }
+        SimpleDocxExporterConfiguration exporterConfiguration = new SimpleDocxExporterConfiguration();
+
+        JRDocxExporter jrExporter = new JRDocxExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+
+    private JRCsvExporter csv(JasperICsvExporter jasperExporter) {
+        SimpleWriterExporterOutput exporterOutput = simpleWriterExporterOutput(jasperExporter);
+        SimpleCsvReportConfiguration reportExportConfiguration = new SimpleCsvReportConfiguration();
+        reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        SimpleCsvExporterConfiguration exporterConfiguration = new SimpleCsvExporterConfiguration();
+        if (jasperExporter.getFieldDelimiter() != null) {
+            exporterConfiguration.setFieldDelimiter(jasperExporter.getFieldDelimiter());
+        }
+        if (jasperExporter.getRecordDelimiter() != null) {
+            exporterConfiguration.setRecordDelimiter(jasperExporter.getRecordDelimiter());
+        }
+
+        JRCsvExporter jrExporter = new JRCsvExporter();
+        jrExporter.setExporterOutput(exporterOutput);
+        jrExporter.setConfiguration(reportExportConfiguration);
+        jrExporter.setConfiguration(exporterConfiguration);
+        return jrExporter;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/GroupTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/GroupTransform.java
new file mode 100644
index 0000000..74f6850
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/GroupTransform.java
@@ -0,0 +1,98 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.design.JRDesignGroup;
+
+/**
+ * <p>GroupTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GroupTransform {
+    private JasperTransformAccessor accessor;
+
+    /**
+     * <p>Constructor for GroupTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     */
+    public GroupTransform(JasperTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    /**
+     * <p>transform.</p>
+     */
+    public void transform() {
+        for (DRIDesignGroup group : accessor.getReport().getGroups()) {
+            addGroup(group);
+        }
+    }
+
+    private void addGroup(DRIDesignGroup group) {
+        try {
+            JRDesignGroup jrGroup = group(group);
+            accessor.getDesign().addGroup(jrGroup);
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for group \"" + group.getName() + "\"", e);
+        }
+    }
+
+    private JRDesignGroup group(DRIDesignGroup group) {
+        JRDesignGroup jrGroup = new JRDesignGroup();
+        jrGroup.setName(group.getName());
+        jrGroup.setReprintHeaderOnEachPage(group.isReprintHeaderOnEachPage());
+        jrGroup.setStartNewColumn(group.isStartInNewColumn());
+        jrGroup.setStartNewPage(group.isStartInNewPage());
+        jrGroup.setResetPageNumber(group.isResetPageNumber());
+        if (group.getMinHeightToStartNewPage() != null) {
+            jrGroup.setMinHeightToStartNewPage(group.getMinHeightToStartNewPage());
+        }
+        jrGroup.setFooterPosition(ConstantTransform.groupFooterPosition(group.getFooterPosition()));
+        jrGroup.setKeepTogether(group.isKeepTogether());
+        return jrGroup;
+    }
+
+    /**
+     * <p>transformExpressions.</p>
+     */
+    public void transformExpressions() {
+        for (DRIDesignGroup group : accessor.getReport().getGroups()) {
+            getGroup(group).setExpression(accessor.getExpressionTransform().getExpression(group.getGroupExpression()));
+        }
+    }
+
+    /**
+     * <p>getGroup.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @return a {@link net.sf.jasperreports.engine.design.JRDesignGroup} object.
+     */
+    public JRDesignGroup getGroup(DRIDesignGroup group) {
+        JRDesignGroup jrGroup = (JRDesignGroup) accessor.getDesign().getGroupsMap().get(group.getName());
+        if (jrGroup == null) {
+            throw new JasperDesignException("Group " + group.getName() + " is not registered");
+        }
+        return jrGroup;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransform.java
new file mode 100644
index 0000000..7ecee37
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransform.java
@@ -0,0 +1,198 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import java.util.Map;
+
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.DRIDesignReport;
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.dynamicreports.jasper.base.JasperReportDesign;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.design.JasperDesign;
+
+/**
+ * <p>JasperTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperTransform implements JasperTransformAccessor {
+    private final DRIDesignReport report;
+    private final JasperReportDesign jasperReportDesign;
+    private ReportTransform reportTransform;
+    private MainDatasetExpressionTransform mainDatasetExpressionTransform;
+    private BandTransform bandTransform;
+    private ComponentTransform componentTransform;
+    private GroupTransform groupTransform;
+    private StyleTransform styleTransform;
+    private CrosstabTransform crosstabTransform;
+    private DatasetTransform datasetTransform;
+    private AbstractExpressionTransform expressionTransform;
+
+    /**
+     * <p>Constructor for JasperTransform.</p>
+     *
+     * @param report             a {@link net.sf.dynamicreports.design.definition.DRIDesignReport} object.
+     * @param jasperReportDesign a {@link net.sf.dynamicreports.jasper.base.JasperReportDesign} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public JasperTransform(final DRIDesignReport report, final JasperReportDesign jasperReportDesign) throws DRException {
+        this.report = report;
+        this.jasperReportDesign = jasperReportDesign;
+        this.init();
+    }
+
+    private void init() throws DRException {
+        this.reportTransform = new ReportTransform(this);
+        this.mainDatasetExpressionTransform = new MainDatasetExpressionTransform(this);
+        this.groupTransform = new GroupTransform(this);
+        this.bandTransform = new BandTransform(this);
+        this.componentTransform = new ComponentTransform(this);
+        this.styleTransform = new StyleTransform(this);
+        this.crosstabTransform = new CrosstabTransform(this);
+        this.datasetTransform = new DatasetTransform(this);
+        this.transformToMainDataset();
+    }
+
+    /**
+     * <p>transform.</p>
+     */
+    public void transform() {
+        this.reportTransform.transform();
+        this.datasetTransform.transform();
+        this.groupTransform.transform();
+        this.mainDatasetExpressionTransform.transform();
+        this.reportTransform.transformExpressions();
+        this.groupTransform.transformExpressions();
+        this.styleTransform.transform();
+        this.bandTransform.transform();
+        this.reportTransform.addDependencies();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ReportTransform getReportTransform() {
+        return this.reportTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CrosstabTransform getCrosstabTransform() {
+        return this.crosstabTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentTransform getComponentTransform() {
+        return this.componentTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void transformToMainDataset() {
+        this.transformToDataset(null);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void transformToDataset(final DRIDesignDataset dataset) {
+        if (dataset != null) {
+            this.expressionTransform = this.datasetTransform.getDatasetExpressionTransform(dataset);
+        } else {
+            this.expressionTransform = this.mainDatasetExpressionTransform;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public AbstractExpressionTransform getExpressionTransform() {
+        return this.expressionTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public AbstractExpressionTransform getExpressionTransform(final DRIDesignDataset dataset) {
+        if (dataset == null) {
+            return this.mainDatasetExpressionTransform;
+        } else {
+            return this.getDatasetTransform().getDatasetExpressionTransform(dataset);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public GroupTransform getGroupTransform() {
+        return this.groupTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public StyleTransform getStyleTransform() {
+        return this.styleTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DatasetTransform getDatasetTransform() {
+        return this.datasetTransform;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDesignReport getReport() {
+        return this.report;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperCustomValues getCustomValues() {
+        return this.jasperReportDesign.getCustomValues();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public JasperDesign getDesign() {
+        return this.jasperReportDesign.getDesign();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<String, Object> getParameters() {
+        return this.jasperReportDesign.getParameters();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<String, Object> getParameterValues() {
+        return this.report.getParameterValues();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getStartPageNumber() {
+        return this.jasperReportDesign.getStartPageNumber();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ReportParameters getMasterReportParameters() {
+        return this.jasperReportDesign.getMasterReportParameters();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransformAccessor.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransformAccessor.java
new file mode 100644
index 0000000..21584d7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransformAccessor.java
@@ -0,0 +1,153 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import java.util.Map;
+
+import net.sf.dynamicreports.design.definition.DRIDesignDataset;
+import net.sf.dynamicreports.design.definition.DRIDesignReport;
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.jasperreports.engine.design.JasperDesign;
+
+/**
+ * <p>JasperTransformAccessor interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface JasperTransformAccessor {
+
+    /**
+     * <p>getReport.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignReport} object.
+     */
+    public DRIDesignReport getReport();
+
+    /**
+     * <p>getDesign.</p>
+     *
+     * @return a {@link net.sf.jasperreports.engine.design.JasperDesign} object.
+     */
+    public JasperDesign getDesign();
+
+    /**
+     * <p>getCustomValues.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.base.JasperCustomValues} object.
+     */
+    public JasperCustomValues getCustomValues();
+
+    /**
+     * <p>getParameters.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     */
+    public Map<String, Object> getParameters();
+
+    /**
+     * <p>getParameterValues.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     */
+    public Map<String, Object> getParameterValues();
+
+    /**
+     * <p>getStartPageNumber.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getStartPageNumber();
+
+    /**
+     * <p>getMasterReportParameters.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public ReportParameters getMasterReportParameters();
+
+    /**
+     * <p>getReportTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.ReportTransform} object.
+     */
+    public ReportTransform getReportTransform();
+
+    /**
+     * <p>transformToMainDataset.</p>
+     */
+    public void transformToMainDataset();
+
+    /**
+     * <p>transformToDataset.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     */
+    public void transformToDataset(DRIDesignDataset dataset);
+
+    /**
+     * <p>getExpressionTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.AbstractExpressionTransform} object.
+     */
+    public AbstractExpressionTransform getExpressionTransform();
+
+    /**
+     * <p>getExpressionTransform.</p>
+     *
+     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.AbstractExpressionTransform} object.
+     */
+    public AbstractExpressionTransform getExpressionTransform(DRIDesignDataset dataset);
+
+    /**
+     * <p>getGroupTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.GroupTransform} object.
+     */
+    public GroupTransform getGroupTransform();
+
+    /**
+     * <p>getComponentTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.ComponentTransform} object.
+     */
+    public ComponentTransform getComponentTransform();
+
+    /**
+     * <p>getStyleTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.StyleTransform} object.
+     */
+    public StyleTransform getStyleTransform();
+
+    /**
+     * <p>getCrosstabTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.CrosstabTransform} object.
+     */
+    public CrosstabTransform getCrosstabTransform();
+
+    /**
+     * <p>getDatasetTransform.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.transformation.DatasetTransform} object.
+     */
+    public DatasetTransform getDatasetTransform();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java
new file mode 100644
index 0000000..bda73b2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java
@@ -0,0 +1,126 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.definition.DRIDesignField;
+import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import net.sf.dynamicreports.design.definition.DRIDesignSort;
+import net.sf.dynamicreports.design.definition.DRIDesignVariable;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRGroup;
+import net.sf.jasperreports.engine.design.JRDesignField;
+import net.sf.jasperreports.engine.design.JRDesignSortField;
+import net.sf.jasperreports.engine.design.JRDesignVariable;
+
+import java.util.Collection;
+
+/**
+ * <p>MainDatasetExpressionTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MainDatasetExpressionTransform extends AbstractExpressionTransform {
+    private JasperTransformAccessor accessor;
+
+    /**
+     * <p>Constructor for MainDatasetExpressionTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     */
+    public MainDatasetExpressionTransform(JasperTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JasperCustomValues getCustomValues() {
+        return accessor.getCustomValues();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JRGroup getGroup(DRIDesignGroup group) {
+        return accessor.getGroupTransform().getGroup(group);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignField> getFields() {
+        return accessor.getReport().getFields();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignVariable> getVariables() {
+        return accessor.getReport().getVariables();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignSystemExpression> getSystemExpressions() {
+        return accessor.getReport().getSystemExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignJasperExpression> getJasperExpressions() {
+        return accessor.getReport().getJasperExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignSimpleExpression> getSimpleExpressions() {
+        return accessor.getReport().getSimpleExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignComplexExpression> getComplexExpressions() {
+        return accessor.getReport().getComplexExpressions();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Collection<DRIDesignSort> getSorts() {
+        return accessor.getReport().getSorts();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void addField(JRDesignField field) throws JRException {
+        accessor.getDesign().addField(field);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void addVariable(JRDesignVariable variable) throws JRException {
+        accessor.getDesign().addVariable(variable);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void addSort(JRDesignSortField sort) throws JRException {
+        accessor.getDesign().addSortField(sort);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ReportTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ReportTransform.java
new file mode 100644
index 0000000..1b6e8a4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ReportTransform.java
@@ -0,0 +1,294 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.definition.DRIDesignHyperLink;
+import net.sf.dynamicreports.design.definition.DRIDesignMargin;
+import net.sf.dynamicreports.design.definition.DRIDesignPage;
+import net.sf.dynamicreports.design.definition.DRIDesignParameter;
+import net.sf.dynamicreports.design.definition.DRIDesignQuery;
+import net.sf.dynamicreports.design.definition.DRIDesignReport;
+import net.sf.dynamicreports.jasper.base.CustomScriptlet;
+import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import net.sf.dynamicreports.jasper.base.JasperReportParameters;
+import net.sf.dynamicreports.jasper.base.JasperScriptlet;
+import net.sf.dynamicreports.jasper.base.StartPageNumberScriptlet;
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import net.sf.dynamicreports.jasper.constant.ValueType;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.jasperreports.engine.JRAbstractScriptlet;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JRScriptlet;
+import net.sf.jasperreports.engine.design.JRDesignHyperlink;
+import net.sf.jasperreports.engine.design.JRDesignParameter;
+import net.sf.jasperreports.engine.design.JRDesignQuery;
+import net.sf.jasperreports.engine.design.JRDesignScriptlet;
+import net.sf.jasperreports.engine.design.JasperDesign;
+import net.sf.jasperreports.engine.type.HyperlinkTargetEnum;
+import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * <p>ReportTransform class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ReportTransform {
+    private JasperTransformAccessor accessor;
+
+    /**
+     * <p>Constructor for ReportTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     */
+    public ReportTransform(JasperTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    /**
+     * <p>transform.</p>
+     */
+    public void transform() {
+        DRIDesignReport report = accessor.getReport();
+        JasperDesign design = accessor.getDesign();
+        Map<String, Object> parameters = accessor.getParameters();
+
+        if (report.isTableOfContents()) {
+            Map<String, JasperTocHeading> tocHeadings = report.getTableOfContentsHeadings();
+            if (tocHeadings == null) {
+                tocHeadings = new LinkedHashMap<String, JasperTocHeading>();
+            }
+            accessor.getCustomValues().setTocHeadings(tocHeadings);
+        }
+
+        design.setName(report.getReportName());
+        parameters.put(JRParameter.REPORT_LOCALE, report.getLocale());
+        parameters.put(JRParameter.REPORT_RESOURCE_BUNDLE, report.getResourceBundle());
+        design.setResourceBundle(report.getResourceBundleName());
+        design.setIgnorePagination(report.isIgnorePagination());
+        setProperties(report.getProperties());
+        if (report.getQuery() != null) {
+            design.setQuery(query(report.getQuery()));
+        }
+        page();
+        design.setWhenNoDataType(ConstantTransform.whenNoDataType(report.getWhenNoDataType()));
+        design.setWhenResourceMissingType(ConstantTransform.whenResourceMissingType(report.getWhenResourceMissingType()));
+        design.setTitleNewPage(report.isTitleOnANewPage());
+        design.setSummaryNewPage(report.isSummaryOnANewPage());
+        design.setSummaryWithPageHeaderAndFooter(report.isSummaryWithPageHeaderAndFooter());
+        design.setFloatColumnFooter(report.isFloatColumnFooter());
+        design.setPrintOrder(ConstantTransform.printOrder(report.getPrintOrder()));
+        design.setColumnDirection(ConstantTransform.runDirection(report.getColumnDirection()));
+        design.setLanguage(report.getLanguage());
+
+        for (DRIDesignParameter parameter : report.getParameters()) {
+            addParameter(parameter);
+        }
+
+        if (accessor.getStartPageNumber() != null) {
+            addScriptlet("startPageNumber", StartPageNumberScriptlet.class);
+            accessor.getCustomValues().setStartPageNumber(accessor.getStartPageNumber());
+        }
+
+        for (DRIScriptlet scriptlet : report.getScriptlets()) {
+            addScriptlet(scriptlet);
+        }
+    }
+
+    /**
+     * <p>transformExpressions.</p>
+     */
+    public void transformExpressions() {
+        accessor.getDesign().setFilterExpression(accessor.getExpressionTransform().getExpression(accessor.getReport().getFilterExpression()));
+    }
+
+    /**
+     * <p>addDependencies.</p>
+     */
+    public void addDependencies() {
+        DRIDesignReport report = accessor.getReport();
+        if (!accessor.getCustomValues().isEmpty() || !report.getScriptlets().isEmpty() || accessor.getCustomValues().getStartPageNumber() != null || report.isTableOfContents()) {
+            addParameter(JasperCustomValues.NAME, JasperCustomValues.class, accessor.getCustomValues());
+        }
+        if (accessor.getMasterReportParameters() != null) {
+            addParameter(JasperReportParameters.MASTER_REPORT_PARAMETERS, ReportParameters.class, accessor.getMasterReportParameters());
+        }
+        if (!accessor.getCustomValues().isEmpty() || !report.getScriptlets().isEmpty()) {
+            addScriptlet(JasperScriptlet.NAME, JasperScriptlet.class);
+        }
+    }
+
+    private <T> void addParameter(String name, Class<T> parameterClass, T value) {
+        if (!accessor.getDesign().getParametersMap().containsKey(name)) {
+            try {
+                JRDesignParameter jrParameter = new JRDesignParameter();
+                jrParameter.setName(name);
+                jrParameter.setValueClass(parameterClass);
+                accessor.getDesign().addParameter(jrParameter);
+            } catch (JRException e) {
+                throw new JasperDesignException("Registration failed for parameter \"" + name + "\"", e);
+            }
+        } else {
+            JRParameter jrParameter = accessor.getDesign().getParametersMap().get(name);
+            if (!parameterClass.isAssignableFrom(jrParameter.getValueClass())) {
+                throw new JasperDesignException("Registration failed for parameter \"" + name + "\", parameter is not instance of " + parameterClass.getName());
+            }
+        }
+        if (value != null) {
+            accessor.getParameters().put(name, value);
+        }
+    }
+
+    private void addParameter(DRIDesignParameter parameter) {
+        try {
+            if (!parameter.isExternal()) {
+                accessor.getDesign().addParameter(parameter(parameter));
+            }
+            accessor.getCustomValues().addValueType(parameter.getName(), ValueType.PARAMETER);
+            if (parameter.getValue() != null) {
+                accessor.getParameters().put(parameter.getName(), parameter.getValue());
+            }
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for parameter \"" + parameter.getName() + "\"", e);
+        }
+    }
+
+    private void setProperties(Properties properties) {
+        for (
+            Iterator<Object> iterator = properties.keySet().iterator(); iterator.hasNext(); ) {
+            String key = (String) iterator.next();
+            accessor.getDesign().setProperty(key, properties.getProperty(key));
+        }
+    }
+
+    private void addScriptlet(DRIScriptlet scriptlet) {
+        CustomScriptlet customScriptlet = new CustomScriptlet(scriptlet);
+        addScriptlet(scriptlet.getName(), customScriptlet.getClass());
+        accessor.getParameters().put(scriptlet.getName() + JRScriptlet.SCRIPTLET_PARAMETER_NAME_SUFFIX, customScriptlet);
+    }
+
+    private void addScriptlet(String name, Class<? extends JRAbstractScriptlet> scriptletClass) {
+        try {
+            accessor.getDesign().addScriptlet(scriptlet(name, scriptletClass));
+        } catch (JRException e) {
+            throw new JasperDesignException("Registration failed for scriptlet \"" + name + "\"", e);
+        }
+    }
+
+    /**
+     * <p>hyperLink.</p>
+     *
+     * @param hyperLink a {@link net.sf.dynamicreports.design.definition.DRIDesignHyperLink} object.
+     * @return a {@link net.sf.jasperreports.engine.design.JRDesignHyperlink} object.
+     */
+    public JRDesignHyperlink hyperLink(DRIDesignHyperLink hyperLink) {
+        if (hyperLink == null) {
+            return null;
+        }
+
+        JRDesignHyperlink jrHyperLink = new JRDesignHyperlink();
+        jrHyperLink.setHyperlinkAnchorExpression(accessor.getExpressionTransform().getExpression(hyperLink.getAnchorExpression()));
+        jrHyperLink.setHyperlinkPageExpression(accessor.getExpressionTransform().getExpression(hyperLink.getPageExpression()));
+        jrHyperLink.setHyperlinkReferenceExpression(accessor.getExpressionTransform().getExpression(hyperLink.getReferenceExpression()));
+        jrHyperLink.setHyperlinkTooltipExpression(accessor.getExpressionTransform().getExpression(hyperLink.getTooltipExpression()));
+        if (hyperLink.getType() != null) {
+            HyperlinkTypeEnum hyperLinkType = ConstantTransform.hyperLinkType(hyperLink.getType());
+            if (hyperLinkType != null) {
+                jrHyperLink.setHyperlinkType(hyperLinkType);
+            } else {
+                jrHyperLink.setLinkType(hyperLink.getType());
+            }
+        }
+        if (hyperLink.getTarget() != null) {
+            HyperlinkTargetEnum hyperLinkTarget = ConstantTransform.hyperLinkTarget(hyperLink.getTarget());
+            if (hyperLinkTarget != null) {
+                jrHyperLink.setHyperlinkTarget(hyperLinkTarget);
+            } else {
+                jrHyperLink.setLinkTarget(hyperLink.getTarget());
+            }
+        }
+
+        return jrHyperLink;
+    }
+
+    // page
+    private void page() {
+        DRIDesignPage page = accessor.getReport().getPage();
+        DRIDesignMargin margin = page.getMargin();
+        JasperDesign design = accessor.getDesign();
+
+        design.setPageWidth(page.getWidth());
+        design.setPageHeight(page.getHeight());
+        design.setOrientation(ConstantTransform.pageOrientation(page.getOrientation()));
+        design.setLeftMargin(margin.getLeft());
+        design.setRightMargin(margin.getRight());
+        design.setTopMargin(margin.getTop());
+        design.setBottomMargin(margin.getBottom());
+        design.setColumnCount(page.getColumnsPerPage());
+        design.setColumnSpacing(page.getColumnSpace());
+        design.setColumnWidth(page.getColumnWidth());
+    }
+
+    // parameter
+    private JRDesignParameter parameter(DRIDesignParameter parameter) {
+        JRDesignParameter jrParameter = new JRDesignParameter();
+        jrParameter.setName(parameter.getName());
+        jrParameter.setValueClass(parameter.getValueClass());
+        return jrParameter;
+    }
+
+    // scriptlet
+
+    /**
+     * <p>scriptlet.</p>
+     *
+     * @param name           a {@link java.lang.String} object.
+     * @param scriptletClass a {@link java.lang.Class} object.
+     * @return a {@link net.sf.jasperreports.engine.design.JRDesignScriptlet} object.
+     */
+    protected JRDesignScriptlet scriptlet(String name, Class<? extends JRAbstractScriptlet> scriptletClass) {
+        JRDesignScriptlet jrScriptlet = new JRDesignScriptlet();
+        jrScriptlet.setName(name);
+        jrScriptlet.setValueClass(scriptletClass);
+        return jrScriptlet;
+    }
+
+    // query
+
+    /**
+     * <p>query.</p>
+     *
+     * @param query a {@link net.sf.dynamicreports.design.definition.DRIDesignQuery} object.
+     * @return a {@link net.sf.jasperreports.engine.design.JRDesignQuery} object.
+     */
+    protected JRDesignQuery query(DRIDesignQuery query) {
+        JRDesignQuery jrQuery = new JRDesignQuery();
+        jrQuery.setText(query.getText());
+        jrQuery.setLanguage(query.getLanguage());
+        return jrQuery;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/StyleTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/StyleTransform.java
new file mode 100644
index 0000000..a25ab0b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/StyleTransform.java
@@ -0,0 +1,238 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation;
+
+import net.sf.dynamicreports.design.definition.style.DRIDesignBaseStyle;
+import net.sf.dynamicreports.design.definition.style.DRIDesignBorder;
+import net.sf.dynamicreports.design.definition.style.DRIDesignConditionalStyle;
+import net.sf.dynamicreports.design.definition.style.DRIDesignFont;
+import net.sf.dynamicreports.design.definition.style.DRIDesignPadding;
+import net.sf.dynamicreports.design.definition.style.DRIDesignParagraph;
+import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.design.definition.style.DRIDesignTabStop;
+import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRLineBox;
+import net.sf.jasperreports.engine.JRParagraph;
+import net.sf.jasperreports.engine.JRPen;
+import net.sf.jasperreports.engine.TabStop;
+import net.sf.jasperreports.engine.base.JRBaseFont;
+import net.sf.jasperreports.engine.base.JRBaseStyle;
+import net.sf.jasperreports.engine.design.JRDesignConditionalStyle;
+import net.sf.jasperreports.engine.design.JRDesignExpression;
+import net.sf.jasperreports.engine.design.JRDesignStyle;
+import net.sf.jasperreports.engine.type.ModeEnum;
+
+/**
+ * <p>StyleTransform class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ *
+ */
+public class StyleTransform {
+    private final JasperTransformAccessor accessor;
+
+    /**
+     * <p>Constructor for StyleTransform.</p>
+     *
+     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     */
+    public StyleTransform(final JasperTransformAccessor accessor) {
+        this.accessor = accessor;
+    }
+
+    /**
+     * <p>transform.</p>
+     */
+    public void transform() {
+        for (final DRIDesignStyle style : accessor.getReport().getStyles()) {
+            addStyle(style);
+        }
+    }
+
+    private void addStyle(final DRIDesignStyle style) {
+        try {
+            accessor.getDesign().addStyle(style(style));
+        } catch (final JRException e) {
+            throw new JasperDesignException("Registration failed for style \"" + style.getName() + "\"", e);
+        }
+    }
+
+    // style
+    private JRDesignStyle style(final DRIDesignStyle style) {
+        final JRDesignStyle jrStyle = new JRDesignStyle();
+        abstractStyle(jrStyle, style);
+
+        jrStyle.setName(style.getName());
+        final DRIDesignStyle parentStyle = style.getParentStyle();
+        if (parentStyle != null) {
+            style(parentStyle);
+            jrStyle.setParentStyleNameReference(parentStyle.getName());
+        }
+        for (final DRIDesignConditionalStyle conditionalStyle : style.getConditionalStyles()) {
+            jrStyle.addConditionalStyle(conditionalStyle(conditionalStyle));
+        }
+        return jrStyle;
+    }
+
+    private JRDesignConditionalStyle conditionalStyle(final DRIDesignConditionalStyle conditionalStyle) {
+        final JRDesignConditionalStyle jrConditionalStyle = new JRDesignConditionalStyle();
+        abstractStyle(jrConditionalStyle, conditionalStyle);
+
+        final AbstractExpressionTransform expressionTransform = accessor.getExpressionTransform(conditionalStyle.getDataset());
+        final JRDesignExpression expression = expressionTransform.getExpression(conditionalStyle.getConditionExpression());
+        jrConditionalStyle.setConditionExpression(expression);
+
+        return jrConditionalStyle;
+    }
+
+    private void abstractStyle(final JRBaseStyle baseStyle, final DRIDesignBaseStyle style) {
+        baseStyle.setForecolor(style.getForegroundColor());
+        baseStyle.setBackcolor(style.getBackgroundColor());
+        if (style.getBackgroundColor() != null) {
+            baseStyle.setMode(ModeEnum.OPAQUE);
+        }
+        baseStyle.setRadius(style.getRadius());
+        baseStyle.setScaleImage(ConstantTransform.imageScale(style.getImageScale()));
+        baseStyle.setHorizontalTextAlign(ConstantTransform.horizontalTextAlignment(style.getHorizontalTextAlignment()));
+        baseStyle.setVerticalTextAlign(ConstantTransform.verticalTextAlignment(style.getVerticalTextAlignment()));
+        baseStyle.setHorizontalImageAlign(ConstantTransform.horizontalImageAlignment(style.getHorizontalImageAlignment()));
+        baseStyle.setVerticalImageAlign(ConstantTransform.verticalImageAlignment(style.getVerticalImageAlignment()));
+        border(baseStyle.getLineBox(), style.getBorder());
+        padding(baseStyle.getLineBox(), style.getPadding());
+        font(baseStyle, style.getFont());
+        baseStyle.setRotation(ConstantTransform.rotation(style.getRotation()));
+        baseStyle.setPattern(style.getPattern());
+        baseStyle.setMarkup(ConstantTransform.markup(style.getMarkup()));
+        baseStyle.setBlankWhenNull(Boolean.TRUE);
+        paragraph(baseStyle.getParagraph(), style.getParagraph());
+        pen(baseStyle.getLinePen(), style.getLinePen());
+    }
+
+    private void paragraph(final JRParagraph jrParagraph, final DRIDesignParagraph paragraph) {
+        jrParagraph.setLineSpacing(ConstantTransform.lineSpacing(paragraph.getLineSpacing()));
+        jrParagraph.setLineSpacingSize(paragraph.getLineSpacingSize());
+        jrParagraph.setFirstLineIndent(paragraph.getFirstLineIndent());
+        jrParagraph.setLeftIndent(paragraph.getLeftIndent());
+        jrParagraph.setRightIndent(paragraph.getRightIndent());
+        jrParagraph.setSpacingBefore(paragraph.getSpacingBefore());
+        jrParagraph.setSpacingAfter(paragraph.getSpacingAfter());
+        jrParagraph.setTabStopWidth(paragraph.getTabStopWidth());
+        for (final DRIDesignTabStop tabStop : paragraph.getTabStops()) {
+            final TabStop jrTabStop = new TabStop();
+            jrTabStop.setPosition(tabStop.getPosition());
+            jrTabStop.setAlignment(ConstantTransform.tabStopAlignment(tabStop.getAlignment()));
+            jrParagraph.addTabStop(jrTabStop);
+        }
+    }
+
+    /**
+     * <p>pen.</p>
+     *
+     * @param jrPen a {@link net.sf.jasperreports.engine.JRPen} object.
+     * @param pen   a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     */
+    protected void pen(final JRPen jrPen, final DRIDesignPen pen) {
+        if (pen == null) {
+            return;
+        }
+
+        jrPen.setLineColor(pen.getLineColor());
+        jrPen.setLineStyle(ConstantTransform.lineStyle(pen.getLineStyle()));
+        jrPen.setLineWidth(pen.getLineWidth());
+    }
+
+    private void border(final JRLineBox lineBox, final DRIDesignBorder border) {
+        if (border == null) {
+            return;
+        }
+
+        pen(lineBox.getLeftPen(), border.getLeftPen());
+        pen(lineBox.getRightPen(), border.getRightPen());
+        pen(lineBox.getTopPen(), border.getTopPen());
+        pen(lineBox.getBottomPen(), border.getBottomPen());
+    }
+
+    private void padding(final JRLineBox lineBox, final DRIDesignPadding padding) {
+        if (padding == null) {
+            return;
+        }
+
+        lineBox.setLeftPadding(padding.getLeft());
+        lineBox.setRightPadding(padding.getRight());
+        lineBox.setTopPadding(padding.getTop());
+        lineBox.setBottomPadding(padding.getBottom());
+    }
+
+    private void font(final JRBaseStyle baseStyle, final DRIDesignFont font) {
+        if (font == null) {
+            return;
+        }
+
+        baseStyle.setFontName(font.getFontName());
+        baseStyle.setBold(font.getBold());
+        baseStyle.setItalic(font.getItalic());
+        baseStyle.setFontSize(font.getFontSize() == null ? null : font.getFontSize().floatValue());
+        baseStyle.setStrikeThrough(font.getStrikeThrough());
+        baseStyle.setUnderline(font.getUnderline());
+        baseStyle.setPdfFontName(font.getPdfFontName());
+        baseStyle.setPdfEncoding(font.getPdfEncoding());
+        baseStyle.setPdfEmbedded(font.getPdfEmbedded());
+    }
+
+    /**
+     * <p>font.</p>
+     *
+     * @param font a {@link net.sf.dynamicreports.design.definition.style.DRIDesignFont} object.
+     * @return a {@link net.sf.jasperreports.engine.base.JRBaseFont} object.
+     */
+    protected JRBaseFont font(final DRIDesignFont font) {
+        if (font == null) {
+            return null;
+        }
+
+        final JRBaseFont jrFont = new JRBaseFont();
+        jrFont.setFontName(font.getFontName());
+        jrFont.setBold(font.getBold());
+        jrFont.setItalic(font.getItalic());
+        jrFont.setFontSize(font.getFontSize() == null ? null : font.getFontSize().floatValue());
+        jrFont.setStrikeThrough(font.getStrikeThrough());
+        jrFont.setUnderline(font.getUnderline());
+        jrFont.setPdfFontName(font.getPdfFontName());
+        jrFont.setPdfEncoding(font.getPdfEncoding());
+        jrFont.setPdfEmbedded(font.getPdfEmbedded());
+        return jrFont;
+    }
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @return a {@link net.sf.jasperreports.engine.design.JRDesignStyle} object.
+     */
+    protected JRDesignStyle getStyle(final DRIDesignStyle style) {
+        if (style == null) {
+            return null;
+        }
+        if (!accessor.getDesign().getStylesMap().containsKey(style.getName())) {
+            throw new JasperDesignException("Style \"" + style.getName() + "\" is not registered");
+        }
+        return (JRDesignStyle) accessor.getDesign().getStylesMap().get(style.getName());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java
new file mode 100644
index 0000000..9510fe8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java
@@ -0,0 +1,63 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation.expression;
+
+import net.sf.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
+import net.sf.dynamicreports.jasper.base.JasperReportParameters;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>CrosstabParametersExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabParametersExpression extends AbstractDesignSimpleExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Map<String, Object> parameters;
+
+    /**
+     * <p>Constructor for CrosstabParametersExpression.</p>
+     *
+     * @param parameters a {@link java.util.Map} object.
+     */
+    public CrosstabParametersExpression(Map<String, Object> parameters) {
+        super(ReportUtils.generateUniqueName("crosstabParametersExpression"));
+        this.parameters = parameters;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object evaluate(ReportParameters reportParameters) {
+        Map<String, Object> parameters = new HashMap<String, Object>(this.parameters);
+        parameters.put(JasperReportParameters.MASTER_REPORT_PARAMETERS, reportParameters);
+        return parameters;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return Map.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java
new file mode 100644
index 0000000..5f0a00c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java
@@ -0,0 +1,63 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation.expression;
+
+import net.sf.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
+import net.sf.dynamicreports.jasper.base.JasperReportParameters;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>DatasetParametersExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DatasetParametersExpression extends AbstractDesignSimpleExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Map<String, Object> parameters;
+
+    /**
+     * <p>Constructor for DatasetParametersExpression.</p>
+     *
+     * @param parameters a {@link java.util.Map} object.
+     */
+    public DatasetParametersExpression(Map<String, Object> parameters) {
+        super(ReportUtils.generateUniqueName("datasetParametersExpression"));
+        this.parameters = parameters;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object evaluate(ReportParameters reportParameters) {
+        Map<String, Object> parameters = new HashMap<String, Object>(this.parameters);
+        parameters.put(JasperReportParameters.MASTER_REPORT_PARAMETERS, reportParameters);
+        return parameters;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return Map.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java
new file mode 100644
index 0000000..00f1d2b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java
@@ -0,0 +1,71 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation.expression;
+
+import net.sf.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.jasper.base.JasperReportParameters;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>JasperSubreportParametersExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperSubreportParametersExpression extends AbstractDesignComplexExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for JasperSubreportParametersExpression.</p>
+     *
+     * @param parametersExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public JasperSubreportParametersExpression(DRIDesignExpression parametersExpression) {
+        super(ReportUtils.generateUniqueName("jasperSubreportParametersExpression"));
+        if (parametersExpression != null) {
+            addExpression(parametersExpression);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Object evaluate(List<?> values, ReportParameters reportParameters) {
+        Map<String, Object> parameters = null;
+        if (!values.isEmpty()) {
+            parameters = (Map<String, Object>) values.get(0);
+        } else {
+            parameters = new HashMap<String, Object>();
+        }
+        parameters.put(JasperReportParameters.MASTER_REPORT_PARAMETERS, reportParameters);
+        return parameters;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return Map.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportExpression.java
new file mode 100644
index 0000000..5293c6a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportExpression.java
@@ -0,0 +1,133 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation.expression;
+
+import net.sf.dynamicreports.design.base.DRDesignReport;
+import net.sf.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.DRIDesignReport;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.jasper.base.JasperReportDesign;
+import net.sf.dynamicreports.jasper.transformation.JasperTransform;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRICustomValues;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperReport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>SubreportExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SubreportExpression extends AbstractDesignComplexExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+    private static final Log log = LogFactory.getLog(SubreportExpression.class);
+
+    private String name;
+    private Integer pageWidth;
+    private ReportBuilder<?> reportBuilder;
+    private Map<ReportBuilder<?>, JasperReportDesign> reportDesigns;
+    private Map<ReportBuilder<?>, JasperReport> jasperReports;
+
+    /**
+     * <p>Constructor for SubreportExpression.</p>
+     *
+     * @param pageWidthExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param reportExpression    a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param pageWidthExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param pageWidth           a {@link java.lang.Integer} object.
+     */
+    public SubreportExpression(DRIDesignExpression pageWidthExpression, DRIDesignExpression reportExpression, Integer pageWidth) {
+        addExpression(pageWidthExpression);
+        addExpression(reportExpression);
+        this.pageWidth = pageWidth;
+        this.name = ReportUtils.generateUniqueName("subreportExpression");
+        reportDesigns = new HashMap<ReportBuilder<?>, JasperReportDesign>();
+        jasperReports = new HashMap<ReportBuilder<?>, JasperReport>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object evaluate(List<?> values, ReportParameters reportParameters) {
+        reportBuilder = (ReportBuilder<?>) values.get(1);
+        if (jasperReports.containsKey(reportBuilder)) {
+            return jasperReports.get(reportBuilder);
+        }
+        try {
+            DRICustomValues customValues = (DRICustomValues) reportParameters.getParameterValue(DRICustomValues.NAME);
+            DRIDesignReport report = new DRDesignReport(reportBuilder.build(), pageWidth, customValues.getTocHeadings());
+            JasperReportDesign reportDesign = new JasperReportDesign(report, reportParameters, null);
+            JasperTransform jasperTransform = new JasperTransform(report, reportDesign);
+            jasperTransform.transform();
+            JasperReport jasperReport = JasperCompileManager.compileReport(reportDesign.getDesign());
+            reportDesigns.put(reportBuilder, reportDesign);
+            jasperReports.put(reportBuilder, jasperReport);
+            return jasperReport;
+        } catch (JRException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Error encountered while creating subreport design", e);
+            }
+        } catch (DRException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Error encountered while creating subreport design", e);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * <p>getReportDesign.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.jasper.base.JasperReportDesign} object.
+     */
+    public JasperReportDesign getReportDesign() {
+        return reportDesigns.get(reportBuilder);
+    }
+
+    /**
+     * <p>Getter for the field <code>reportBuilder</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.ReportBuilder} object.
+     */
+    public ReportBuilder<?> getReportBuilder() {
+        return reportBuilder;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return JasperReport.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java
new file mode 100644
index 0000000..db539bd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java
@@ -0,0 +1,77 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation.expression;
+
+import net.sf.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
+import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import net.sf.dynamicreports.jasper.base.JasperReportParameters;
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>SubreportParametersExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SubreportParametersExpression extends AbstractDesignComplexExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private SubreportExpression subreportExpression;
+
+    /**
+     * <p>Constructor for SubreportParametersExpression.</p>
+     *
+     * @param subreportExpression  a {@link net.sf.dynamicreports.jasper.transformation.expression.SubreportExpression} object.
+     * @param parametersExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     */
+    public SubreportParametersExpression(SubreportExpression subreportExpression, DRIDesignExpression parametersExpression) {
+        super(ReportUtils.generateUniqueName("subreportParametersExpression"));
+        this.subreportExpression = subreportExpression;
+        if (parametersExpression != null) {
+            addExpression(parametersExpression);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Object evaluate(List<?> values, ReportParameters reportParameters) {
+        Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.putAll(subreportExpression.getReportDesign().getParameters());
+        if (subreportExpression.getReportBuilder().getReport().getParameterValues() != null) {
+            parameters.putAll(subreportExpression.getReportBuilder().getReport().getParameterValues());
+        }
+        if (!values.isEmpty()) {
+            parameters.putAll((Map<String, Object>) values.get(0));
+        }
+        parameters.put(JasperReportParameters.MASTER_REPORT_PARAMETERS, reportParameters);
+        return parameters;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return Map.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java
new file mode 100644
index 0000000..14e574b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java
@@ -0,0 +1,59 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.transformation.expression;
+
+import net.sf.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRICustomValues;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>SubreportWidthExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SubreportWidthExpression extends AbstractDesignSimpleExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer pageWidth;
+
+    /**
+     * <p>Constructor for SubreportWidthExpression.</p>
+     *
+     * @param pageWidth a {@link java.lang.Integer} object.
+     */
+    public SubreportWidthExpression(Integer pageWidth) {
+        this.pageWidth = pageWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object evaluate(ReportParameters reportParameters) {
+        DRICustomValues customValues = (DRICustomValues) reportParameters.getParameterValue(DRICustomValues.NAME);
+        customValues.setSubreportWidth(pageWidth);
+        return pageWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<?> getValueClass() {
+        return Integer.class;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/ReportUtils.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/ReportUtils.java
new file mode 100644
index 0000000..47cb126
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/ReportUtils.java
@@ -0,0 +1,132 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report;
+
+import net.sf.dynamicreports.report.constant.Calculation;
+
+import java.lang.reflect.ParameterizedType;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * <p>
+ * ReportUtils class.
+ * </p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ReportUtils {
+    private static final Lock LOCK = new ReentrantLock();
+    private static int counter;
+
+    /**
+     * <p>
+     * generateUniqueName.
+     * </p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @return a {@link java.lang.String} object.
+     */
+    public static String generateUniqueName(String name) {
+        try {
+            LOCK.lock();
+            return generateName(name);
+        } finally {
+            LOCK.unlock();
+        }
+    }
+
+    /**
+     * <p>
+     * getVariableValueClass.
+     * </p>
+     *
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @return a {@link java.lang.Class} object.
+     */
+    public static Class<?> getVariableValueClass(Calculation calculation, Class<?> valueClass) {
+        if (calculation.equals(Calculation.COUNT) || calculation.equals(Calculation.DISTINCT_COUNT)) {
+            return Long.class;
+        }
+        if (calculation.equals(Calculation.AVERAGE) || calculation.equals(Calculation.STANDARD_DEVIATION) || calculation.equals(Calculation.VARIANCE)) {
+            return Number.class;
+        }
+        return valueClass;
+    }
+
+    /**
+     * <p>
+     * getGenericClass.
+     * </p>
+     *
+     * @param object a {@link java.lang.Object} object.
+     * @param index  a int.
+     * @return a {@link java.lang.Class} object.
+     */
+    public static Class<?> getGenericClass(Object object, int index) {
+        ParameterizedType genericSuperclass = getParameterizedType(object.getClass());
+        if (genericSuperclass == null) {
+            return String.class;
+        }
+        Class<?> rawType = getRawType(genericSuperclass.getActualTypeArguments()[index]);
+        if (rawType == null) {
+            return String.class;
+        }
+        return rawType;
+    }
+
+    /**
+     * Setter for testing purposes only.
+     *
+     * @param counter the counter value
+     */
+    static void setCounter(int counter) {
+        ReportUtils.counter = counter;
+    }
+
+    private static ParameterizedType getParameterizedType(Class<?> classs) {
+        if (classs == null) {
+            return null;
+        }
+        if (classs.getGenericSuperclass() instanceof ParameterizedType) {
+            return (ParameterizedType) classs.getGenericSuperclass();
+        }
+        return getParameterizedType((Class<?>) classs.getGenericSuperclass());
+    }
+
+    private static Class<?> getRawType(Object typeArgument) {
+        if (typeArgument instanceof ParameterizedType) {
+            return getRawType(((ParameterizedType) typeArgument).getRawType());
+        } else {
+            if (typeArgument instanceof Class<?>) {
+                return (Class<?>) typeArgument;
+            } else {
+                return null;
+            }
+        }
+    }
+
+    private static String generateName(String name) {
+        if (counter == Integer.MAX_VALUE) {
+            counter = 0;
+        }
+        return name + "_" + counter++ + "_";
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractScriptlet.java
new file mode 100644
index 0000000..18362c1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractScriptlet.java
@@ -0,0 +1,106 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract AbstractScriptlet class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractScriptlet implements DRIScriptlet {
+    private String name;
+
+    /**
+     * <p>Constructor for AbstractScriptlet.</p>
+     */
+    public AbstractScriptlet() {
+        this.name = ReportUtils.generateUniqueName("scriptlet");
+    }
+
+    /**
+     * <p>Constructor for AbstractScriptlet.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public AbstractScriptlet(String name) {
+        Validate.notEmpty(name, "name must not be empty");
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterColumnInit(ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterDetailEval(ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterGroupInit(String groupName, ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterPageInit(ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void afterReportInit(ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforeColumnInit(ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforeDetailEval(ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforeGroupInit(String groupName, ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforePageInit(ReportParameters reportParameters) {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void beforeReportInit(ReportParameters reportParameters) {
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractTemplateDesign.java
new file mode 100644
index 0000000..112f7af
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractTemplateDesign.java
@@ -0,0 +1,207 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.DRIMargin;
+import net.sf.dynamicreports.report.definition.DRITemplateDesign;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.List;
+
+/**
+ * <p>Abstract AbstractTemplateDesign class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractTemplateDesign<T> implements DRITemplateDesign<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getReportName() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIField<?>> getFields() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isDefinedParameter(String name) {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getResourceBundleName() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnorePagination() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public WhenNoDataType getWhenNoDataType() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public WhenResourceMissingType getWhenResourceMissingType() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getTitleOnANewPage() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getSummaryOnANewPage() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getSummaryWithPageHeaderAndFooter() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getFloatColumnFooter() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageWidth() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageHeight() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PageOrientation getPageOrientation() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIMargin getPageMargin() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageColumnsPerPage() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageColumnSpace() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageColumnWidth() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getTitleComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPageHeaderComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPageFooterComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnHeaderComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getColumnFooterComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getLastPageFooterComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getSummaryComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getNoDataComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getBackgroundComponentsCount() {
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public T getDesign() throws DRException {
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRBand.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRBand.java
new file mode 100644
index 0000000..df0b71b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRBand.java
@@ -0,0 +1,92 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.base.component.DRComponent;
+import net.sf.dynamicreports.report.base.component.DRList;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.definition.DRIBand;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRBand class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRBand implements DRIBand {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private SplitType splitType;
+    private DRList list;
+    private DRIExpression<Boolean> printWhenExpression;
+
+    /**
+     * <p>Constructor for DRBand.</p>
+     */
+    public DRBand() {
+        this.list = new DRList(ListType.VERTICAL);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public SplitType getSplitType() {
+        return splitType;
+    }
+
+    /**
+     * <p>Setter for the field <code>splitType</code>.</p>
+     *
+     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public void setSplitType(SplitType splitType) {
+        this.splitType = splitType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRList getList() {
+        return list;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public void addComponent(DRComponent component) {
+        list.addComponent(component);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Boolean> getPrintWhenExpression() {
+        return printWhenExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>printWhenExpression</code>.</p>
+     *
+     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
+        this.printWhenExpression = printWhenExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRDataset.java
new file mode 100644
index 0000000..0a5f2f6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRDataset.java
@@ -0,0 +1,199 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIDataset;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRDataset class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDataset implements DRIDataset {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private List<DRField<?>> fields;
+    private List<DRVariable<?>> variables;
+    private List<DRSort> sorts;
+    private DRQuery query;
+    private DRIExpression<Connection> connectionExpression;
+    private DRIExpression<?> dataSourceExpression;
+    private DRIExpression<Boolean> filterExpression;
+
+    /**
+     * <p>Constructor for DRDataset.</p>
+     */
+    public DRDataset() {
+        init();
+    }
+
+    private void init() {
+        this.fields = new ArrayList<DRField<?>>();
+        this.variables = new ArrayList<DRVariable<?>>();
+        this.sorts = new ArrayList<DRSort>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRField<?>> getFields() {
+        return fields;
+    }
+
+    /**
+     * <p>Setter for the field <code>fields</code>.</p>
+     *
+     * @param fields a {@link java.util.List} object.
+     */
+    public void setFields(List<DRField<?>> fields) {
+        Validate.notNull(fields, "fields must not be null");
+        Validate.noNullElements(fields, "fields must not contains null field");
+        this.fields = fields;
+    }
+
+    /**
+     * <p>addField.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.base.DRField} object.
+     */
+    public void addField(DRField<?> field) {
+        Validate.notNull(field, "field must not be null");
+        this.fields.add(field);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRVariable<?>> getVariables() {
+        return variables;
+    }
+
+    /**
+     * <p>Setter for the field <code>variables</code>.</p>
+     *
+     * @param variables a {@link java.util.List} object.
+     */
+    public void setVariables(List<DRVariable<?>> variables) {
+        Validate.notNull(variables, "variables must not be null");
+        Validate.noNullElements(variables, "variables must not contains null variable");
+        this.variables = variables;
+    }
+
+    /**
+     * <p>addVariable.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.base.DRVariable} object.
+     */
+    public void addVariable(DRVariable<?> variable) {
+        Validate.notNull(variable, "variable must not be null");
+        this.variables.add(variable);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRSort> getSorts() {
+        return sorts;
+    }
+
+    /**
+     * <p>Setter for the field <code>sorts</code>.</p>
+     *
+     * @param sorts a {@link java.util.List} object.
+     */
+    public void setSorts(List<DRSort> sorts) {
+        Validate.notNull(sorts, "sorts must not be null");
+        Validate.noNullElements(sorts, "sorts must not contains null sort");
+        this.sorts = sorts;
+    }
+
+    /**
+     * <p>addSort.</p>
+     *
+     * @param sort a {@link net.sf.dynamicreports.report.base.DRSort} object.
+     */
+    public void addSort(DRSort sort) {
+        Validate.notNull(sort, "sort must not be null");
+        this.sorts.add(sort);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRQuery getQuery() {
+        return query;
+    }
+
+    /**
+     * <p>Setter for the field <code>query</code>.</p>
+     *
+     * @param query a {@link net.sf.dynamicreports.report.base.DRQuery} object.
+     */
+    public void setQuery(DRQuery query) {
+        this.query = query;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Connection> getConnectionExpression() {
+        return connectionExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>connectionExpression</code>.</p>
+     *
+     * @param connectionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setConnectionExpression(DRIExpression<Connection> connectionExpression) {
+        this.connectionExpression = connectionExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getDataSourceExpression() {
+        return dataSourceExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataSourceExpression</code>.</p>
+     *
+     * @param dataSourceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setDataSourceExpression(DRIExpression<?> dataSourceExpression) {
+        this.dataSourceExpression = dataSourceExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Boolean> getFilterExpression() {
+        return filterExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>filterExpression</code>.</p>
+     *
+     * @param filterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setFilterExpression(DRIExpression<Boolean> filterExpression) {
+        this.filterExpression = filterExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRField.java
new file mode 100644
index 0000000..b9423b1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRField.java
@@ -0,0 +1,93 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRField class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRField<T> implements DRIField<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private Class<? super T> valueClass;
+    private DRIDataType<? super T, T> dataType;
+    private String description;
+
+    /**
+     * <p>Constructor for DRField.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    public DRField(String name, Class<? super T> valueClass) {
+        Validate.notEmpty(name, "name must not be empty");
+        Validate.notNull(valueClass, "valueClass must not be null");
+        this.name = name;
+        this.valueClass = valueClass;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDataType<? super T, T> getDataType() {
+        return dataType;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataType</code>.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    public void setDataType(DRIDataType<? super T, T> dataType) {
+        this.dataType = dataType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<? super T> getValueClass() {
+        return valueClass;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * <p>Setter for the field <code>description</code>.</p>
+     *
+     * @param description a {@link java.lang.String} object.
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRGroup.java
new file mode 100644
index 0000000..6fe61c0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRGroup.java
@@ -0,0 +1,386 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRGroup class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRGroup implements DRIGroup {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRTextField<?> valueField;
+    private DRIExpression<?> titleExpression;
+    private DRIReportStyle titleStyle;
+    private Integer titleWidth;
+    private GroupHeaderLayout headerLayout;
+    private Boolean hideColumn;
+    private Boolean groupByDataType;
+    private Boolean showColumnHeaderAndFooter;
+    private Boolean addToTableOfContents;
+    private DRIExpression<Boolean> printSubtotalsWhenExpression;
+    private Integer padding;
+    private Boolean startInNewPage;
+    private Boolean startInNewColumn;
+    private Boolean reprintHeaderOnEachPage;
+    private Boolean resetPageNumber;
+    private Integer minHeightToStartNewPage;
+    private GroupFooterPosition footerPosition;
+    private Boolean keepTogether;
+    private Boolean headerWithSubtotal;
+    private DRBand headerBand;
+    private DRBand footerBand;
+
+    /**
+     * <p>Constructor for DRGroup.</p>
+     *
+     * @param valueField a {@link net.sf.dynamicreports.report.base.component.DRTextField} object.
+     */
+    public DRGroup(DRTextField<?> valueField) {
+        this(ReportUtils.generateUniqueName("group"), valueField);
+    }
+
+    /**
+     * <p>Constructor for DRGroup.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param valueField a {@link net.sf.dynamicreports.report.base.component.DRTextField} object.
+     */
+    public DRGroup(String name, DRTextField<?> valueField) {
+        Validate.notEmpty(name, "name must not be empty");
+        Validate.notNull(valueField, "valueField must not be null");
+        this.name = name;
+        this.valueField = valueField;
+        init();
+    }
+
+    private void init() {
+        headerBand = new DRBand();
+        footerBand = new DRBand();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRTextField<?> getValueField() {
+        return valueField;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getTitleExpression() {
+        return titleExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleExpression</code>.</p>
+     *
+     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setTitleExpression(DRIExpression<?> titleExpression) {
+        this.titleExpression = titleExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getTitleStyle() {
+        return titleStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleStyle</code>.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setTitleStyle(DRIReportStyle titleStyle) {
+        this.titleStyle = titleStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTitleWidth() {
+        return titleWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleWidth</code>.</p>
+     *
+     * @param titleWidth a {@link java.lang.Integer} object.
+     */
+    public void setTitleWidth(Integer titleWidth) {
+        this.titleWidth = titleWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public GroupHeaderLayout getHeaderLayout() {
+        return headerLayout;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerLayout</code>.</p>
+     *
+     * @param headerLayout a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+     */
+    public void setHeaderLayout(GroupHeaderLayout headerLayout) {
+        this.headerLayout = headerLayout;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getHideColumn() {
+        return hideColumn;
+    }
+
+    /**
+     * <p>Setter for the field <code>hideColumn</code>.</p>
+     *
+     * @param hideColumn a {@link java.lang.Boolean} object.
+     */
+    public void setHideColumn(Boolean hideColumn) {
+        this.hideColumn = hideColumn;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getGroupByDataType() {
+        return groupByDataType;
+    }
+
+    /**
+     * <p>Setter for the field <code>groupByDataType</code>.</p>
+     *
+     * @param groupByDataType a {@link java.lang.Boolean} object.
+     */
+    public void setGroupByDataType(Boolean groupByDataType) {
+        this.groupByDataType = groupByDataType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getShowColumnHeaderAndFooter() {
+        return showColumnHeaderAndFooter;
+    }
+
+    /**
+     * <p>Setter for the field <code>showColumnHeaderAndFooter</code>.</p>
+     *
+     * @param showColumnHeaderAndFooter a {@link java.lang.Boolean} object.
+     */
+    public void setShowColumnHeaderAndFooter(Boolean showColumnHeaderAndFooter) {
+        this.showColumnHeaderAndFooter = showColumnHeaderAndFooter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getAddToTableOfContents() {
+        return addToTableOfContents;
+    }
+
+    /**
+     * <p>Setter for the field <code>addToTableOfContents</code>.</p>
+     *
+     * @param addToTableOfContents a {@link java.lang.Boolean} object.
+     */
+    public void setAddToTableOfContents(Boolean addToTableOfContents) {
+        this.addToTableOfContents = addToTableOfContents;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Boolean> getPrintSubtotalsWhenExpression() {
+        return printSubtotalsWhenExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>printSubtotalsWhenExpression</code>.</p>
+     *
+     * @param printSubtotalsWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setPrintSubtotalsWhenExpression(DRIExpression<Boolean> printSubtotalsWhenExpression) {
+        this.printSubtotalsWhenExpression = printSubtotalsWhenExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPadding() {
+        return padding;
+    }
+
+    /**
+     * <p>Setter for the field <code>padding</code>.</p>
+     *
+     * @param padding a {@link java.lang.Integer} object.
+     */
+    public void setPadding(Integer padding) {
+        if (padding != null) {
+            Validate.isTrue(padding >= 0, "padding must be >= 0");
+        }
+        this.padding = padding;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getStartInNewPage() {
+        return startInNewPage;
+    }
+
+    /**
+     * <p>Setter for the field <code>startInNewPage</code>.</p>
+     *
+     * @param startInNewPage a {@link java.lang.Boolean} object.
+     */
+    public void setStartInNewPage(Boolean startInNewPage) {
+        this.startInNewPage = startInNewPage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getStartInNewColumn() {
+        return startInNewColumn;
+    }
+
+    /**
+     * <p>Setter for the field <code>startInNewColumn</code>.</p>
+     *
+     * @param startInNewColumn a {@link java.lang.Boolean} object.
+     */
+    public void setStartInNewColumn(Boolean startInNewColumn) {
+        this.startInNewColumn = startInNewColumn;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getReprintHeaderOnEachPage() {
+        return reprintHeaderOnEachPage;
+    }
+
+    /**
+     * <p>Setter for the field <code>reprintHeaderOnEachPage</code>.</p>
+     *
+     * @param reprintHeaderOnEachPage a {@link java.lang.Boolean} object.
+     */
+    public void setReprintHeaderOnEachPage(Boolean reprintHeaderOnEachPage) {
+        this.reprintHeaderOnEachPage = reprintHeaderOnEachPage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getResetPageNumber() {
+        return resetPageNumber;
+    }
+
+    /**
+     * <p>Setter for the field <code>resetPageNumber</code>.</p>
+     *
+     * @param resetPageNumber a {@link java.lang.Boolean} object.
+     */
+    public void setResetPageNumber(Boolean resetPageNumber) {
+        this.resetPageNumber = resetPageNumber;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getMinHeightToStartNewPage() {
+        return minHeightToStartNewPage;
+    }
+
+    /**
+     * <p>Setter for the field <code>minHeightToStartNewPage</code>.</p>
+     *
+     * @param minHeightToStartNewPage a {@link java.lang.Integer} object.
+     */
+    public void setMinHeightToStartNewPage(Integer minHeightToStartNewPage) {
+        this.minHeightToStartNewPage = minHeightToStartNewPage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public GroupFooterPosition getFooterPosition() {
+        return footerPosition;
+    }
+
+    /**
+     * <p>Setter for the field <code>footerPosition</code>.</p>
+     *
+     * @param footerPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     */
+    public void setFooterPosition(GroupFooterPosition footerPosition) {
+        this.footerPosition = footerPosition;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getKeepTogether() {
+        return keepTogether;
+    }
+
+    /**
+     * <p>Setter for the field <code>keepTogether</code>.</p>
+     *
+     * @param keepTogether a {@link java.lang.Boolean} object.
+     */
+    public void setKeepTogether(Boolean keepTogether) {
+        this.keepTogether = keepTogether;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getHeaderWithSubtotal() {
+        return headerWithSubtotal;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerWithSubtotal</code>.</p>
+     *
+     * @param headerWithSubtotal a {@link java.lang.Boolean} object.
+     */
+    public void setHeaderWithSubtotal(Boolean headerWithSubtotal) {
+        this.headerWithSubtotal = headerWithSubtotal;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRBand getHeaderBand() {
+        return headerBand;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRBand getFooterBand() {
+        return footerBand;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRHyperLink.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRHyperLink.java
new file mode 100644
index 0000000..6e9e838
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRHyperLink.java
@@ -0,0 +1,129 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIHyperLink;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRHyperLink class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRHyperLink implements DRIHyperLink {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<String> anchorExpression;
+    private DRIExpression<Integer> pageExpression;
+    private DRIExpression<String> referenceExpression;
+    private DRIExpression<String> tooltipExpression;
+    private String hyperLinkType;
+    private String hyperLinkTarget;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<String> getAnchorExpression() {
+        return anchorExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>anchorExpression</code>.</p>
+     *
+     * @param anchorExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setAnchorExpression(DRIExpression<String> anchorExpression) {
+        this.anchorExpression = anchorExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Integer> getPageExpression() {
+        return pageExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageExpression</code>.</p>
+     *
+     * @param pageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setPageExpression(DRIExpression<Integer> pageExpression) {
+        this.pageExpression = pageExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<String> getReferenceExpression() {
+        return referenceExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>referenceExpression</code>.</p>
+     *
+     * @param referenceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setReferenceExpression(DRIExpression<String> referenceExpression) {
+        this.referenceExpression = referenceExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<String> getTooltipExpression() {
+        return tooltipExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>tooltipExpression</code>.</p>
+     *
+     * @param tooltipExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setTooltipExpression(DRIExpression<String> tooltipExpression) {
+        this.tooltipExpression = tooltipExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getType() {
+        return hyperLinkType;
+    }
+
+    /**
+     * <p>setType.</p>
+     *
+     * @param hyperLinkType a {@link java.lang.String} object.
+     */
+    public void setType(String hyperLinkType) {
+        this.hyperLinkType = hyperLinkType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTarget() {
+        return hyperLinkTarget;
+    }
+
+    /**
+     * <p>setTarget.</p>
+     *
+     * @param hyperLinkTarget a {@link java.lang.String} object.
+     */
+    public void setTarget(String hyperLinkTarget) {
+        this.hyperLinkTarget = hyperLinkTarget;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRMargin.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRMargin.java
new file mode 100644
index 0000000..7ced304
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRMargin.java
@@ -0,0 +1,120 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIMargin;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRMargin class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRMargin implements DRIMargin {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int top;
+    private int left;
+    private int bottom;
+    private int right;
+
+    /**
+     * <p>Constructor for DRMargin.</p>
+     */
+    public DRMargin() {
+    }
+
+    /**
+     * <p>Constructor for DRMargin.</p>
+     *
+     * @param margin a int.
+     */
+    public DRMargin(int margin) {
+        Validate.isTrue(margin >= 0, "margin must be >= 0");
+        top = margin;
+        left = margin;
+        bottom = margin;
+        right = margin;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getTop() {
+        return top;
+    }
+
+    /**
+     * <p>Setter for the field <code>top</code>.</p>
+     *
+     * @param top a int.
+     */
+    public void setTop(int top) {
+        Validate.isTrue(top >= 0, "top must be >= 0");
+        this.top = top;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getLeft() {
+        return left;
+    }
+
+    /**
+     * <p>Setter for the field <code>left</code>.</p>
+     *
+     * @param left a int.
+     */
+    public void setLeft(int left) {
+        Validate.isTrue(left >= 0, "left must be >= 0");
+        this.left = left;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getBottom() {
+        return bottom;
+    }
+
+    /**
+     * <p>Setter for the field <code>bottom</code>.</p>
+     *
+     * @param bottom a int.
+     */
+    public void setBottom(int bottom) {
+        Validate.isTrue(bottom >= 0, "bottom must be >= 0");
+        this.bottom = bottom;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getRight() {
+        return right;
+    }
+
+    /**
+     * <p>Setter for the field <code>right</code>.</p>
+     *
+     * @param right a int.
+     */
+    public void setRight(int right) {
+        Validate.isTrue(right >= 0, "right must be >= 0");
+        this.right = right;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRPage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRPage.java
new file mode 100644
index 0000000..a32a0be
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRPage.java
@@ -0,0 +1,203 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.definition.DRIPage;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRPage class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRPage implements DRIPage {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer width;
+    private Integer height;
+    private PageOrientation orientation;
+    private DRMargin margin;
+    private Integer columnsPerPage;
+    private Integer columnSpace;
+    private Boolean ignorePageWidth;
+
+    /**
+     * <p>setPageFormat.</p>
+     *
+     * @param pageType    a {@link net.sf.dynamicreports.report.constant.PageType} object.
+     * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     */
+    public void setPageFormat(PageType pageType, PageOrientation orientation) {
+        Validate.notNull(pageType, "pageType must not be null");
+        setPageFormat(pageType.getWidth(), pageType.getHeight(), orientation);
+    }
+
+    /**
+     * <p>setPageFormat.</p>
+     *
+     * @param width       a {@link java.lang.Integer} object.
+     * @param height      a {@link java.lang.Integer} object.
+     * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     */
+    public void setPageFormat(Integer width, Integer height, PageOrientation orientation) {
+        Validate.isTrue(width >= 0, "width must be >= 0");
+        Validate.isTrue(height >= 0, "height must be >= 0");
+        Validate.notNull(orientation, "orientation must not be null");
+        if (orientation.equals(PageOrientation.PORTRAIT)) {
+            setWidth(width);
+            setHeight(height);
+        } else {
+            setWidth(height);
+            setHeight(width);
+        }
+        setOrientation(orientation);
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the page width.
+     */
+    @Override
+    public Integer getWidth() {
+        return width;
+    }
+
+    /**
+     * Sets the page width.
+     *
+     * @param width the page width >= 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public void setWidth(Integer width) {
+        if (width != null) {
+            Validate.isTrue(width >= 0, "width must be >= 0");
+        }
+        this.width = width;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the page height.
+     */
+    @Override
+    public Integer getHeight() {
+        return height;
+    }
+
+    /**
+     * Sets the page height.
+     *
+     * @param height the page height >= 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public void setHeight(Integer height) {
+        if (height != null) {
+            Validate.isTrue(height >= 0, "height must be >= 0");
+        }
+        this.height = height;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PageOrientation getOrientation() {
+        return orientation;
+    }
+
+    /**
+     * <p>Setter for the field <code>orientation</code>.</p>
+     *
+     * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     */
+    public void setOrientation(PageOrientation orientation) {
+        this.orientation = orientation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRMargin getMargin() {
+        return margin;
+    }
+
+    /**
+     * <p>Setter for the field <code>margin</code>.</p>
+     *
+     * @param margin a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+     */
+    public void setMargin(DRMargin margin) {
+        this.margin = margin;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getColumnsPerPage() {
+        return columnsPerPage;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnsPerPage</code>.</p>
+     *
+     * @param columnsPerPage a {@link java.lang.Integer} object.
+     */
+    public void setColumnsPerPage(Integer columnsPerPage) {
+        if (columnsPerPage != null) {
+            Validate.isTrue(columnsPerPage >= 1, "columnsPerPage must be >= 1");
+        }
+        this.columnsPerPage = columnsPerPage;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getColumnSpace() {
+        return columnSpace;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnSpace</code>.</p>
+     *
+     * @param columnSpace a {@link java.lang.Integer} object.
+     */
+    public void setColumnSpace(Integer columnSpace) {
+        if (columnSpace != null) {
+            Validate.isTrue(columnSpace >= 0, "columnSpace must be >= 0");
+        }
+        this.columnSpace = columnSpace;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnorePageWidth() {
+        return ignorePageWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignorePageWidth</code>.</p>
+     *
+     * @param ignorePageWidth a {@link java.lang.Boolean} object.
+     */
+    public void setIgnorePageWidth(Boolean ignorePageWidth) {
+        this.ignorePageWidth = ignorePageWidth;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRParameter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRParameter.java
new file mode 100644
index 0000000..e26ec0f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRParameter.java
@@ -0,0 +1,82 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIParameter;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRParameter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRParameter<T> implements DRIParameter<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private Class<T> valueClass;
+    private T value;
+
+    @SuppressWarnings("unchecked")
+    /**
+     * <p>Constructor for DRParameter.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @param value a T object.
+     */
+    public DRParameter(String name, T value) {
+        Validate.notEmpty(name, "name must not be empty");
+        Validate.notNull(value, "value must not be null");
+        this.name = name;
+        this.valueClass = (Class<T>) value.getClass();
+        this.value = value;
+    }
+
+    /**
+     * <p>Constructor for DRParameter.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    public DRParameter(String name, Class<T> valueClass) {
+        Validate.notEmpty(name, "name must not be empty");
+        Validate.notNull(valueClass, "valueClass must not be null");
+        this.name = name;
+        this.valueClass = valueClass;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<T> getValueClass() {
+        return valueClass;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public T getValue() {
+        return value;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRQuery.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRQuery.java
new file mode 100644
index 0000000..b7cbecd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRQuery.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIQuery;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRQuery class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRQuery implements DRIQuery {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String text;
+    private String language;
+
+    /**
+     * <p>Constructor for DRQuery.</p>
+     *
+     * @param text     a {@link java.lang.String} object.
+     * @param language a {@link java.lang.String} object.
+     */
+    public DRQuery(String text, String language) {
+        Validate.notNull(text, "text must not be null");
+        Validate.notNull(language, "language must not be null");
+        this.text = text;
+        this.language = language;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getText() {
+        return text;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getLanguage() {
+        return language;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReport.java
new file mode 100644
index 0000000..803beb3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReport.java
@@ -0,0 +1,1362 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.column.DRColumn;
+import net.sf.dynamicreports.report.base.grid.DRColumnGrid;
+import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
+import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRIReport;
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.definition.DRITemplateDesign;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.style.DRIFont;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+
+
+/**
+ * <p>DRReport class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+public class DRReport implements DRIReport
+{
+	private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+	
+	private DRReportTemplate template;
+	private List<DRIStyle> templateStyles;
+	private DRITemplateDesign<?> templateDesign;
+	private String reportName;
+	private Locale locale;
+	private ResourceBundle resourceBundle;
+	private String resourceBundleName;
+	private Boolean ignorePagination;
+	private Boolean showColumnTitle;
+	private Boolean showColumnValues;
+	private List<DRColumn<?>> columns;
+	private List<DRGroup> groups;
+	private List<DRSubtotal<?>> subtotals;
+	private List<DRField<?>> fields;
+	private List<DRVariable<?>> variables;
+	private List<DRSort> sorts;
+	private List<DRParameter<?>> parameters;
+	private Map<String, Object> parameterValues;
+	private List<DRIScriptlet> scriptlets;
+	private Properties properties;
+	private DRQuery query;
+	private DRPage page;
+	private WhenNoDataType whenNoDataType;
+	private WhenResourceMissingType whenResourceMissingType;
+	private Boolean titleOnANewPage;
+	private Boolean summaryOnANewPage;
+	private Boolean summaryWithPageHeaderAndFooter;
+	private Boolean floatColumnFooter;
+	private Orientation printOrder;
+	private RunDirection columnDirection;
+	private String language;
+	private Boolean useFieldNameAsDescription;
+	private Boolean highlightDetailOddRows;
+	private DRSimpleStyle detailOddRowStyle;
+	private Boolean highlightDetailEvenRows;
+	private DRSimpleStyle detailEvenRowStyle;
+	private List<DRConditionalStyle> detailRowHighlighters;
+	private DRColumnGrid columnGrid;
+	private Boolean tableOfContents;
+	private DRITableOfContentsCustomizer tableOfContentsCustomizer;
+	private DRIExpression<Boolean> filterExpression;
+	
+	private DRIFont defaultFont;
+	private DRIReportStyle textStyle;
+	private DRIReportStyle columnTitleStyle;
+	private DRIReportStyle columnStyle;
+	private DRIReportStyle groupTitleStyle;
+	private DRIReportStyle groupStyle;
+	private DRIReportStyle subtotalStyle;
+	private DRIReportStyle imageStyle;
+	
+	private DRBand titleBand;
+	private DRBand pageHeaderBand;
+	private DRBand pageFooterBand;
+	private DRBand columnHeaderBand;
+	private DRBand columnFooterBand;
+	private DRBand detailBand;
+	private DRBand detailHeaderBand;
+	private DRBand detailFooterBand;
+	private DRBand lastPageFooterBand;
+	private DRBand summaryBand;
+	private DRBand noDataBand;
+	private DRBand backgroundBand;
+	
+	/**
+	 * <p>Constructor for DRReport.</p>
+	 */
+	public DRReport()
+	{
+		this.init();
+	}
+	
+	private void init()
+	{
+		this.template = new DRReportTemplate();
+		this.templateStyles = new ArrayList<>();
+		this.columns = new ArrayList<>();
+		this.groups = new ArrayList<>();
+		this.subtotals = new ArrayList<>();
+		this.fields = new ArrayList<>();
+		this.variables = new ArrayList<>();
+		this.sorts = new ArrayList<>();
+		this.parameters = new ArrayList<>();
+		this.scriptlets = new ArrayList<>();
+		this.detailRowHighlighters = new ArrayList<>();
+		this.properties = new Properties();
+		this.page = new DRPage();
+		
+		this.titleBand = new DRBand();
+		this.pageHeaderBand = new DRBand();
+		this.pageFooterBand = new DRBand();
+		this.columnHeaderBand = new DRBand();
+		this.columnFooterBand = new DRBand();
+		this.detailBand = new DRBand();
+		this.detailHeaderBand = new DRBand();
+		this.detailFooterBand = new DRBand();
+		this.lastPageFooterBand = new DRBand();
+		this.summaryBand = new DRBand();
+		this.noDataBand = new DRBand();
+		this.backgroundBand = new DRBand();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRReportTemplate getTemplate()
+	{
+		return this.template;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>template</code>.</p>
+	 *
+	 * @param template a {@link net.sf.dynamicreports.report.base.DRReportTemplate} object.
+	 */
+	public void setTemplate(final DRReportTemplate template)
+	{
+		Validate.notNull(template, "template must not be null");
+		this.template = template;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRIStyle> getTemplateStyles()
+	{
+		return this.templateStyles;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>templateStyles</code>.</p>
+	 *
+	 * @param templateStyles a {@link java.util.List} object.
+	 */
+	public void setTemplateStyles(final List<DRIStyle> templateStyles)
+	{
+		this.templateStyles = templateStyles;
+	}
+	
+	/**
+	 * <p>addTemplateStyle.</p>
+	 *
+	 * @param templateStyle a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 */
+	public void addTemplateStyle(final DRIStyle templateStyle)
+	{
+		Validate.notNull(templateStyle, "templateStyle must not be null");
+		Validate.notNull(templateStyle.getName(), "templateStyle name must not be null");
+		this.templateStyles.add(templateStyle);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRITemplateDesign<?> getTemplateDesign()
+	{
+		return this.templateDesign;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>templateDesign</code>.</p>
+	 *
+	 * @param templateDesign a {@link net.sf.dynamicreports.report.definition.DRITemplateDesign} object.
+	 */
+	public void setTemplateDesign(final DRITemplateDesign<?> templateDesign)
+	{
+		Validate.notNull(templateDesign, "templateDesign must not be null");
+		this.templateDesign = templateDesign;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getReportName()
+	{
+		return this.reportName;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>reportName</code>.</p>
+	 *
+	 * @param reportName a {@link java.lang.String} object.
+	 */
+	public void setReportName(final String reportName)
+	{
+		this.reportName = reportName;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Locale getLocale()
+	{
+		return this.locale;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>locale</code>.</p>
+	 *
+	 * @param locale a {@link java.util.Locale} object.
+	 */
+	public void setLocale(final Locale locale)
+	{
+		this.locale = locale;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ResourceBundle getResourceBundle()
+	{
+		return this.resourceBundle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>resourceBundle</code>.</p>
+	 *
+	 * @param resourceBundle a {@link java.util.ResourceBundle} object.
+	 */
+	public void setResourceBundle(final ResourceBundle resourceBundle)
+	{
+		this.resourceBundle = resourceBundle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getResourceBundleName()
+	{
+		return this.resourceBundleName;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>resourceBundleName</code>.</p>
+	 *
+	 * @param resourceBundleName a {@link java.lang.String} object.
+	 */
+	public void setResourceBundleName(final String resourceBundleName)
+	{
+		this.resourceBundleName = resourceBundleName;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getShowColumnTitle()
+	{
+		return this.showColumnTitle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>showColumnTitle</code>.</p>
+	 *
+	 * @param showColumnTitle a {@link java.lang.Boolean} object.
+	 */
+	public void setShowColumnTitle(final Boolean showColumnTitle)
+	{
+		this.showColumnTitle = showColumnTitle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getShowColumnValues()
+	{
+		return this.showColumnValues;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>showColumnValues</code>.</p>
+	 *
+	 * @param showColumnValues a {@link java.lang.Boolean} object.
+	 */
+	public void setShowColumnValues(final Boolean showColumnValues)
+	{
+		this.showColumnValues = showColumnValues;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRColumn<?>> getColumns()
+	{
+		return this.columns;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columns</code>.</p>
+	 *
+	 * @param columns a {@link java.util.List} object.
+	 */
+	public void setColumns(final List<DRColumn<?>> columns)
+	{
+		Validate.notNull(columns, "columns must not be null");
+		Validate.noNullElements(columns, "columns must not contains null column");
+		this.columns = columns;
+	}
+	
+	/**
+	 * <p>addColumn.</p>
+	 *
+	 * @param column a {@link net.sf.dynamicreports.report.base.column.DRColumn} object.
+	 */
+	public void addColumn(final DRColumn<?> column)
+	{
+		Validate.notNull(column, "column must not be null");
+		this.columns.add(column);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRGroup> getGroups()
+	{
+		return this.groups;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groups</code>.</p>
+	 *
+	 * @param groups a {@link java.util.List} object.
+	 */
+	public void setGroups(final List<DRGroup> groups)
+	{
+		Validate.notNull(groups, "groups must not be null");
+		Validate.noNullElements(groups, "groups must not contains null group");
+		this.groups = groups;
+	}
+	
+	/**
+	 * <p>addGroup.</p>
+	 *
+	 * @param group a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+	 */
+	public void addGroup(final DRGroup group)
+	{
+		Validate.notNull(group, "group must not be null");
+		this.groups.add(group);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRField<?>> getFields()
+	{
+		return this.fields;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>fields</code>.</p>
+	 *
+	 * @param fields a {@link java.util.List} object.
+	 */
+	public void setFields(final List<DRField<?>> fields)
+	{
+		Validate.notNull(fields, "fields must not be null");
+		Validate.noNullElements(fields, "fields must not contains null field");
+		this.fields = fields;
+	}
+	
+	/**
+	 * <p>addField.</p>
+	 *
+	 * @param field a {@link net.sf.dynamicreports.report.base.DRField} object.
+	 */
+	public void addField(final DRField<?> field)
+	{
+		Validate.notNull(field, "field must not be null");
+		this.fields.add(field);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRVariable<?>> getVariables()
+	{
+		return this.variables;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>variables</code>.</p>
+	 *
+	 * @param variables a {@link java.util.List} object.
+	 */
+	public void setVariables(final List<DRVariable<?>> variables)
+	{
+		Validate.notNull(variables, "variables must not be null");
+		Validate.noNullElements(variables, "variables must not contains null variable");
+		this.variables = variables;
+	}
+	
+	/**
+	 * <p>addVariable.</p>
+	 *
+	 * @param variable a {@link net.sf.dynamicreports.report.base.DRVariable} object.
+	 */
+	public void addVariable(final DRVariable<?> variable)
+	{
+		Validate.notNull(variable, "variable must not be null");
+		this.variables.add(variable);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRSort> getSorts()
+	{
+		return this.sorts;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>sorts</code>.</p>
+	 *
+	 * @param sorts a {@link java.util.List} object.
+	 */
+	public void setSorts(final List<DRSort> sorts)
+	{
+		Validate.notNull(sorts, "sorts must not be null");
+		Validate.noNullElements(sorts, "sorts must not contains null sort");
+		this.sorts = sorts;
+	}
+	
+	/**
+	 * <p>addSort.</p>
+	 *
+	 * @param sort a {@link net.sf.dynamicreports.report.base.DRSort} object.
+	 */
+	public void addSort(final DRSort sort)
+	{
+		Validate.notNull(sort, "sort must not be null");
+		this.sorts.add(sort);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRSubtotal<?>> getSubtotals()
+	{
+		return this.subtotals;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>subtotals</code>.</p>
+	 *
+	 * @param subtotals a {@link java.util.List} object.
+	 */
+	public void setSubtotals(final List<DRSubtotal<?>> subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		this.subtotals = subtotals;
+	}
+	
+	/**
+	 * <p>addSubtotal.</p>
+	 *
+	 * @param subtotal a {@link net.sf.dynamicreports.report.base.DRSubtotal} object.
+	 */
+	public void addSubtotal(final DRSubtotal<?> subtotal)
+	{
+		Validate.notNull(subtotal, "subtotal must not be null");
+		this.subtotals.add(subtotal);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRParameter<?>> getParameters()
+	{
+		return this.parameters;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>parameters</code>.</p>
+	 *
+	 * @param parameters a {@link java.util.List} object.
+	 */
+	public void setParameters(final List<DRParameter<?>> parameters)
+	{
+		Validate.notNull(parameters, "parameters must not be null");
+		Validate.noNullElements(parameters, "parameters must not contains null parameter");
+		this.parameters = parameters;
+	}
+	
+	/**
+	 * <p>addParameter.</p>
+	 *
+	 * @param parameter a {@link net.sf.dynamicreports.report.base.DRParameter} object.
+	 */
+	public void addParameter(final DRParameter<?> parameter)
+	{
+		Validate.notNull(parameter, "parameter must not be null");
+		this.parameters.add(parameter);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Map<String, Object> getParameterValues()
+	{
+		return this.parameterValues;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>parameterValues</code>.</p>
+	 *
+	 * @param parameterValues a {@link java.util.Map} object.
+	 */
+	public void setParameterValues(final Map<String, Object> parameterValues)
+	{
+		this.parameterValues = parameterValues;
+	}
+	
+	/**
+	 * <p>addParameterValue.</p>
+	 *
+	 * @param name  a {@link java.lang.String} object.
+	 * @param value a {@link java.lang.Object} object.
+	 */
+	public void addParameterValue(final String name, final Object value)
+	{
+		Validate.notNull(name, "parameter name must not be null");
+		if(this.parameterValues == null)
+		{
+			this.parameterValues = new HashMap<>();
+		}
+		this.parameterValues.put(name, value);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRIScriptlet> getScriptlets()
+	{
+		return this.scriptlets;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>scriptlets</code>.</p>
+	 *
+	 * @param scriptlets a {@link java.util.List} object.
+	 */
+	public void setScriptlets(final List<DRIScriptlet> scriptlets)
+	{
+		Validate.notNull(scriptlets, "scriptlets must not be null");
+		Validate.noNullElements(scriptlets, "scriptlets must not contains null scriptlet");
+		this.scriptlets = scriptlets;
+	}
+	
+	/**
+	 * <p>addScriptlet.</p>
+	 *
+	 * @param scriptlet a {@link net.sf.dynamicreports.report.definition.DRIScriptlet} object.
+	 */
+	public void addScriptlet(final DRIScriptlet scriptlet)
+	{
+		Validate.notNull(scriptlet, "scriptlet must not be null");
+		this.scriptlets.add(scriptlet);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Properties getProperties()
+	{
+		return this.properties;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>properties</code>.</p>
+	 *
+	 * @param properties a {@link java.util.Properties} object.
+	 */
+	public void setProperties(final Properties properties)
+	{
+		Validate.notNull(properties, "properties must not be null");
+		this.properties = properties;
+	}
+	
+	/**
+	 * <p>addProperty.</p>
+	 *
+	 * @param key   a {@link java.lang.String} object.
+	 * @param value a {@link java.lang.String} object.
+	 */
+	public void addProperty(final String key, final String value)
+	{
+		Validate.notNull(key, "key must not be null");
+		this.properties.setProperty(key, value);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRQuery getQuery()
+	{
+		return this.query;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>query</code>.</p>
+	 *
+	 * @param query a {@link net.sf.dynamicreports.report.base.DRQuery} object.
+	 */
+	public void setQuery(final DRQuery query)
+	{
+		this.query = query;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRPage getPage()
+	{
+		return this.page;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>page</code>.</p>
+	 *
+	 * @param page a {@link net.sf.dynamicreports.report.base.DRPage} object.
+	 */
+	public void setPage(final DRPage page)
+	{
+		Validate.notNull(page, "page must not be null");
+		this.page = page;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getIgnorePagination()
+	{
+		return this.ignorePagination;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>ignorePagination</code>.</p>
+	 *
+	 * @param ignorePagination a {@link java.lang.Boolean} object.
+	 */
+	public void setIgnorePagination(final Boolean ignorePagination)
+	{
+		this.ignorePagination = ignorePagination;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public WhenNoDataType getWhenNoDataType()
+	{
+		return this.whenNoDataType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>whenNoDataType</code>.</p>
+	 *
+	 * @param whenNoDataType a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 */
+	public void setWhenNoDataType(final WhenNoDataType whenNoDataType)
+	{
+		this.whenNoDataType = whenNoDataType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public WhenResourceMissingType getWhenResourceMissingType()
+	{
+		return this.whenResourceMissingType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>whenResourceMissingType</code>.</p>
+	 *
+	 * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 */
+	public void setWhenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
+	{
+		this.whenResourceMissingType = whenResourceMissingType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getTitleOnANewPage()
+	{
+		return this.titleOnANewPage;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>titleOnANewPage</code>.</p>
+	 *
+	 * @param titleOnANewPage a {@link java.lang.Boolean} object.
+	 */
+	public void setTitleOnANewPage(final Boolean titleOnANewPage)
+	{
+		this.titleOnANewPage = titleOnANewPage;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getSummaryOnANewPage()
+	{
+		return this.summaryOnANewPage;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>summaryOnANewPage</code>.</p>
+	 *
+	 * @param summaryOnANewPage a {@link java.lang.Boolean} object.
+	 */
+	public void setSummaryOnANewPage(final Boolean summaryOnANewPage)
+	{
+		this.summaryOnANewPage = summaryOnANewPage;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getSummaryWithPageHeaderAndFooter()
+	{
+		return this.summaryWithPageHeaderAndFooter;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>summaryWithPageHeaderAndFooter</code>.</p>
+	 *
+	 * @param summaryWithPageHeaderAndFooter a {@link java.lang.Boolean} object.
+	 */
+	public void setSummaryWithPageHeaderAndFooter(final Boolean summaryWithPageHeaderAndFooter)
+	{
+		this.summaryWithPageHeaderAndFooter = summaryWithPageHeaderAndFooter;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getFloatColumnFooter()
+	{
+		return this.floatColumnFooter;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>floatColumnFooter</code>.</p>
+	 *
+	 * @param floatColumnFooter a {@link java.lang.Boolean} object.
+	 */
+	public void setFloatColumnFooter(final Boolean floatColumnFooter)
+	{
+		this.floatColumnFooter = floatColumnFooter;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Orientation getPrintOrder()
+	{
+		return this.printOrder;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>printOrder</code>.</p>
+	 *
+	 * @param printOrder a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 */
+	public void setPrintOrder(final Orientation printOrder)
+	{
+		this.printOrder = printOrder;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RunDirection getColumnDirection()
+	{
+		return this.columnDirection;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnDirection</code>.</p>
+	 *
+	 * @param columnDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 */
+	public void setColumnDirection(final RunDirection columnDirection)
+	{
+		this.columnDirection = columnDirection;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getLanguage()
+	{
+		return this.language;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>language</code>.</p>
+	 *
+	 * @param language a {@link java.lang.String} object.
+	 */
+	public void setLanguage(final String language)
+	{
+		this.language = language;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getUseFieldNameAsDescription()
+	{
+		return this.useFieldNameAsDescription;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>useFieldNameAsDescription</code>.</p>
+	 *
+	 * @param useFieldNameAsDescription a {@link java.lang.Boolean} object.
+	 */
+	public void setUseFieldNameAsDescription(final Boolean useFieldNameAsDescription)
+	{
+		this.useFieldNameAsDescription = useFieldNameAsDescription;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIFont getDefaultFont()
+	{
+		return this.defaultFont;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>defaultFont</code>.</p>
+	 *
+	 * @param defaultFont a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+	 */
+	public void setDefaultFont(final DRIFont defaultFont)
+	{
+		this.defaultFont = defaultFont;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getTextStyle()
+	{
+		return this.textStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>textStyle</code>.</p>
+	 *
+	 * @param textStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setTextStyle(final DRIReportStyle textStyle)
+	{
+		this.textStyle = textStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getColumnTitleStyle()
+	{
+		return this.columnTitleStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnTitleStyle</code>.</p>
+	 *
+	 * @param columnTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setColumnTitleStyle(final DRIReportStyle columnTitleStyle)
+	{
+		this.columnTitleStyle = columnTitleStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getColumnStyle()
+	{
+		return this.columnStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnStyle</code>.</p>
+	 *
+	 * @param columnStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setColumnStyle(final DRIReportStyle columnStyle)
+	{
+		this.columnStyle = columnStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getGroupTitleStyle()
+	{
+		return this.groupTitleStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupTitleStyle</code>.</p>
+	 *
+	 * @param groupTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setGroupTitleStyle(final DRIReportStyle groupTitleStyle)
+	{
+		this.groupTitleStyle = groupTitleStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getGroupStyle()
+	{
+		return this.groupStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupStyle</code>.</p>
+	 *
+	 * @param groupStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setGroupStyle(final DRIReportStyle groupStyle)
+	{
+		this.groupStyle = groupStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getSubtotalStyle()
+	{
+		return this.subtotalStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>subtotalStyle</code>.</p>
+	 *
+	 * @param subtotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setSubtotalStyle(final DRIReportStyle subtotalStyle)
+	{
+		this.subtotalStyle = subtotalStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getImageStyle()
+	{
+		return this.imageStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>imageStyle</code>.</p>
+	 *
+	 * @param imageStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setImageStyle(final DRIReportStyle imageStyle)
+	{
+		this.imageStyle = imageStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getHighlightDetailOddRows()
+	{
+		return this.highlightDetailOddRows;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>highlightDetailOddRows</code>.</p>
+	 *
+	 * @param highlightDetailOddRows a {@link java.lang.Boolean} object.
+	 */
+	public void setHighlightDetailOddRows(final Boolean highlightDetailOddRows)
+	{
+		this.highlightDetailOddRows = highlightDetailOddRows;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRSimpleStyle getDetailOddRowStyle()
+	{
+		return this.detailOddRowStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailOddRowStyle</code>.</p>
+	 *
+	 * @param detailOddRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public void setDetailOddRowStyle(final DRSimpleStyle detailOddRowStyle)
+	{
+		this.detailOddRowStyle = detailOddRowStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getHighlightDetailEvenRows()
+	{
+		return this.highlightDetailEvenRows;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>highlightDetailEvenRows</code>.</p>
+	 *
+	 * @param highlightDetailEvenRows a {@link java.lang.Boolean} object.
+	 */
+	public void setHighlightDetailEvenRows(final Boolean highlightDetailEvenRows)
+	{
+		this.highlightDetailEvenRows = highlightDetailEvenRows;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRSimpleStyle getDetailEvenRowStyle()
+	{
+		return this.detailEvenRowStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailEvenRowStyle</code>.</p>
+	 *
+	 * @param detailEvenRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public void setDetailEvenRowStyle(final DRSimpleStyle detailEvenRowStyle)
+	{
+		this.detailEvenRowStyle = detailEvenRowStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRConditionalStyle> getDetailRowHighlighters()
+	{
+		return this.detailRowHighlighters;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailRowHighlighters</code>.</p>
+	 *
+	 * @param detailRowHighlighters a {@link java.util.List} object.
+	 */
+	public void setDetailRowHighlighters(final List<DRConditionalStyle> detailRowHighlighters)
+	{
+		Validate.notNull(detailRowHighlighters, "detailRowHighlighters must not be null");
+		Validate.noNullElements(
+			detailRowHighlighters,
+			"detailRowHighlighters must not contains null detailRowHighlighter");
+		this.detailRowHighlighters = detailRowHighlighters;
+	}
+	
+	/**
+	 * <p>addDetailRowHighlighter.</p>
+	 *
+	 * @param detailRowHighlighter a {@link net.sf.dynamicreports.report.base.style.DRConditionalStyle} object.
+	 */
+	public void addDetailRowHighlighter(final DRConditionalStyle detailRowHighlighter)
+	{
+		Validate.notNull(detailRowHighlighter, "detailRowHighlighter must not be null");
+		this.detailRowHighlighters.add(detailRowHighlighter);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRColumnGrid getColumnGrid()
+	{
+		return this.columnGrid;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnGrid</code>.</p>
+	 *
+	 * @param columnGrid a {@link net.sf.dynamicreports.report.base.grid.DRColumnGrid} object.
+	 */
+	public void setColumnGrid(final DRColumnGrid columnGrid)
+	{
+		this.columnGrid = columnGrid;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getTableOfContents()
+	{
+		return this.tableOfContents;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>tableOfContents</code>.</p>
+	 *
+	 * @param tableOfContents a {@link java.lang.Boolean} object.
+	 */
+	public void setTableOfContents(final Boolean tableOfContents)
+	{
+		this.tableOfContents = tableOfContents;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
+	{
+		return this.tableOfContentsCustomizer;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>tableOfContentsCustomizer</code>.</p>
+	 *
+	 * @param tableOfContentsCustomizer a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer}
+	 *                                  object.
+	 */
+	public void setTableOfContentsCustomizer(final DRITableOfContentsCustomizer tableOfContentsCustomizer)
+	{
+		this.tableOfContentsCustomizer = tableOfContentsCustomizer;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIExpression<Boolean> getFilterExpression()
+	{
+		return this.filterExpression;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>filterExpression</code>.</p>
+	 *
+	 * @param filterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+	 */
+	public void setFilterExpression(final DRIExpression<Boolean> filterExpression)
+	{
+		this.filterExpression = filterExpression;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getTitleBand()
+	{
+		return this.titleBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getPageHeaderBand()
+	{
+		return this.pageHeaderBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getPageFooterBand()
+	{
+		return this.pageFooterBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getColumnHeaderBand()
+	{
+		return this.columnHeaderBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getColumnFooterBand()
+	{
+		return this.columnFooterBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getDetailBand()
+	{
+		return this.detailBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getDetailHeaderBand()
+	{
+		return this.detailHeaderBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getDetailFooterBand()
+	{
+		return this.detailFooterBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getLastPageFooterBand()
+	{
+		return this.lastPageFooterBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getSummaryBand()
+	{
+		return this.summaryBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getNoDataBand()
+	{
+		return this.noDataBand;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRBand getBackgroundBand()
+	{
+		return this.backgroundBand;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReportTemplate.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReportTemplate.java
new file mode 100644
index 0000000..ce5c9ec
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReportTemplate.java
@@ -0,0 +1,2497 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.component.DRComponent;
+import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRIReportTemplate;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.definition.style.DRIFont;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+
+
+/**
+ * <p>DRReportTemplate class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+public class DRReportTemplate implements DRIReportTemplate
+{
+	private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+	// table of contents
+	public Boolean tableOfContents;
+	public DRITableOfContentsCustomizer tableOfContentsCustomizer;
+	private List<DRIStyle> templateStyles;
+	private Locale locale;
+	private Boolean showColumnTitle;
+	private Boolean showColumnValues;
+	private Boolean ignorePagination;
+	private WhenNoDataType whenNoDataType;
+	private WhenResourceMissingType whenResourceMissingType;
+	private Boolean titleOnANewPage;
+	private Boolean summaryOnANewPage;
+	private Boolean summaryWithPageHeaderAndFooter;
+	private Boolean floatColumnFooter;
+	private Orientation printOrder;
+	private RunDirection columnDirection;
+	private String language;
+	private Boolean useFieldNameAsDescription;
+	// style
+	private Boolean highlightDetailOddRows;
+	private DRSimpleStyle detailOddRowStyle;
+	private Boolean highlightDetailEvenRows;
+	private DRSimpleStyle detailEvenRowStyle;
+	private DRIFont defaultFont;
+	private DRIReportStyle textStyle;
+	private DRIReportStyle columnTitleStyle;
+	private DRIReportStyle columnStyle;
+	private DRIReportStyle groupTitleStyle;
+	private DRIReportStyle groupStyle;
+	private DRIReportStyle subtotalStyle;
+	private DRIReportStyle imageStyle;
+	// page
+	private Integer pageWidth;
+	private Integer pageHeight;
+	private PageOrientation pageOrientation;
+	private DRMargin pageMargin;
+	private Integer pageColumnsPerPage;
+	private Integer pageColumnSpace;
+	private Boolean ignorePageWidth;
+	// column
+	private Boolean columnPrintRepeatedDetailValues;
+	private Integer columnWidth;
+	// group
+	private GroupHeaderLayout groupHeaderLayout;
+	private Boolean groupHideColumn;
+	private Boolean groupShowColumnHeaderAndFooter;
+	private Integer groupPadding;
+	private Boolean groupStartInNewPage;
+	private Boolean groupStartInNewColumn;
+	private Boolean groupReprintHeaderOnEachPage;
+	private Boolean groupResetPageNumber;
+	private GroupFooterPosition groupFooterPosition;
+	private Boolean groupKeepTogether;
+	private Boolean groupHeaderWithSubtotal;
+	// subtotal
+	private Position subtotalLabelPosition;
+	// text field
+	private Integer textFieldWidth;
+	// image
+	private Integer imageWidth;
+	private Integer imageHeight;
+	// list
+	private Integer listgap;
+	// multi page list
+	private Integer multiPageListWidth;
+	private Integer multiPageListHeight;
+	// subreport
+	private Integer subreportWidth;
+	private Integer subreportHeight;
+	// crosstab
+	private Integer crosstabWidth;
+	private Integer crosstabHeight;
+	private Boolean crosstabHighlightOddRows;
+	private DRSimpleStyle crosstabOddRowStyle;
+	private Boolean crosstabHighlightEvenRows;
+	private DRSimpleStyle crosstabEvenRowStyle;
+	private DRIReportStyle crosstabGroupStyle;
+	private DRIReportStyle crosstabGroupTotalStyle;
+	private DRIReportStyle crosstabGrandTotalStyle;
+	private DRIReportStyle crosstabCellStyle;
+	private DRIReportStyle crosstabMeasureTitleStyle;
+	// boolean
+	private BooleanComponentType booleanComponentType;
+	private Boolean booleanEmptyWhenNullValue;
+	private Integer booleanImageWidth;
+	private Integer booleanImageHeight;
+	private DRIReportStyle booleanColumnStyle;
+	// split
+	private SplitType defaultSplitType;
+	private SplitType titleSplitType;
+	private SplitType pageHeaderSplitType;
+	private SplitType pageFooterSplitType;
+	private SplitType columnHeaderSplitType;
+	private SplitType columnFooterSplitType;
+	private SplitType groupHeaderSplitType;
+	private SplitType groupFooterSplitType;
+	private SplitType detailHeaderSplitType;
+	private SplitType detailSplitType;
+	private SplitType detailFooterSplitType;
+	private SplitType lastPageFooterSplitType;
+	private SplitType summarySplitType;
+	private SplitType noDataSplitType;
+	private SplitType backgroundSplitType;
+	// band style
+	private DRIReportStyle titleStyle;
+	private DRIReportStyle pageHeaderStyle;
+	private DRIReportStyle pageFooterStyle;
+	private DRIReportStyle columnHeaderStyle;
+	private DRIReportStyle columnFooterStyle;
+	private DRIReportStyle groupHeaderStyle;
+	private DRIReportStyle groupFooterStyle;
+	private DRIReportStyle detailHeaderStyle;
+	private DRIReportStyle detailStyle;
+	private DRIReportStyle detailFooterStyle;
+	private DRIReportStyle lastPageFooterStyle;
+	private DRIReportStyle summaryStyle;
+	private DRIReportStyle noDataStyle;
+	private DRIReportStyle backgroundStyle;
+	// band background component
+	private DRComponent titleBackgroundComponent;
+	private DRComponent pageHeaderBackgroundComponent;
+	private DRComponent pageFooterBackgroundComponent;
+	private DRComponent columnHeaderBackgroundComponent;
+	private DRComponent columnFooterBackgroundComponent;
+	private DRComponent groupHeaderBackgroundComponent;
+	private DRComponent groupFooterBackgroundComponent;
+	private DRComponent detailHeaderBackgroundComponent;
+	private DRComponent detailBackgroundComponent;
+	private DRComponent detailFooterBackgroundComponent;
+	private DRComponent lastPageFooterBackgroundComponent;
+	private DRComponent summaryBackgroundComponent;
+	private DRComponent noDataBackgroundComponent;
+	private DRComponent backgroundBackgroundComponent;
+	
+	/**
+	 * <p>Constructor for DRReportTemplate.</p>
+	 */
+	public DRReportTemplate()
+	{
+		this.templateStyles = new ArrayList<>();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DRIStyle> getTemplateStyles()
+	{
+		return this.templateStyles;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>templateStyles</code>.</p>
+	 *
+	 * @param templateStyles a {@link java.util.List} object.
+	 */
+	public void setTemplateStyles(final List<DRIStyle> templateStyles)
+	{
+		this.templateStyles = templateStyles;
+	}
+	
+	/**
+	 * <p>addTemplateStyle.</p>
+	 *
+	 * @param templateStyle a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 */
+	public void addTemplateStyle(final DRIStyle templateStyle)
+	{
+		Validate.notNull(templateStyle, "templateStyle must not be null");
+		Validate.notNull(templateStyle.getName(), "templateStyle name must not be null");
+		this.templateStyles.add(templateStyle);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Locale getLocale()
+	{
+		return this.locale;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>locale</code>.</p>
+	 *
+	 * @param locale a {@link java.util.Locale} object.
+	 */
+	public void setLocale(final Locale locale)
+	{
+		this.locale = locale;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getShowColumnTitle()
+	{
+		return this.showColumnTitle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>showColumnTitle</code>.</p>
+	 *
+	 * @param showColumnTitle a {@link java.lang.Boolean} object.
+	 */
+	public void setShowColumnTitle(final Boolean showColumnTitle)
+	{
+		this.showColumnTitle = showColumnTitle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getShowColumnValues()
+	{
+		return this.showColumnValues;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>showColumnValues</code>.</p>
+	 *
+	 * @param showColumnValues a {@link java.lang.Boolean} object.
+	 */
+	public void setShowColumnValues(final Boolean showColumnValues)
+	{
+		this.showColumnValues = showColumnValues;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getIgnorePagination()
+	{
+		return this.ignorePagination;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>ignorePagination</code>.</p>
+	 *
+	 * @param ignorePagination a {@link java.lang.Boolean} object.
+	 */
+	public void setIgnorePagination(final Boolean ignorePagination)
+	{
+		this.ignorePagination = ignorePagination;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public WhenNoDataType getWhenNoDataType()
+	{
+		return this.whenNoDataType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>whenNoDataType</code>.</p>
+	 *
+	 * @param whenNoDataType a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 */
+	public void setWhenNoDataType(final WhenNoDataType whenNoDataType)
+	{
+		this.whenNoDataType = whenNoDataType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public WhenResourceMissingType getWhenResourceMissingType()
+	{
+		return this.whenResourceMissingType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>whenResourceMissingType</code>.</p>
+	 *
+	 * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 */
+	public void setWhenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
+	{
+		this.whenResourceMissingType = whenResourceMissingType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getTitleOnANewPage()
+	{
+		return this.titleOnANewPage;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>titleOnANewPage</code>.</p>
+	 *
+	 * @param titleOnANewPage a {@link java.lang.Boolean} object.
+	 */
+	public void setTitleOnANewPage(final Boolean titleOnANewPage)
+	{
+		this.titleOnANewPage = titleOnANewPage;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getSummaryOnANewPage()
+	{
+		return this.summaryOnANewPage;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>summaryOnANewPage</code>.</p>
+	 *
+	 * @param summaryOnANewPage a {@link java.lang.Boolean} object.
+	 */
+	public void setSummaryOnANewPage(final Boolean summaryOnANewPage)
+	{
+		this.summaryOnANewPage = summaryOnANewPage;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getSummaryWithPageHeaderAndFooter()
+	{
+		return this.summaryWithPageHeaderAndFooter;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>summaryWithPageHeaderAndFooter</code>.</p>
+	 *
+	 * @param summaryWithPageHeaderAndFooter a {@link java.lang.Boolean} object.
+	 */
+	public void setSummaryWithPageHeaderAndFooter(final Boolean summaryWithPageHeaderAndFooter)
+	{
+		this.summaryWithPageHeaderAndFooter = summaryWithPageHeaderAndFooter;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getFloatColumnFooter()
+	{
+		return this.floatColumnFooter;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>floatColumnFooter</code>.</p>
+	 *
+	 * @param floatColumnFooter a {@link java.lang.Boolean} object.
+	 */
+	public void setFloatColumnFooter(final Boolean floatColumnFooter)
+	{
+		this.floatColumnFooter = floatColumnFooter;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Orientation getPrintOrder()
+	{
+		return this.printOrder;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>printOrder</code>.</p>
+	 *
+	 * @param printOrder a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 */
+	public void setPrintOrder(final Orientation printOrder)
+	{
+		this.printOrder = printOrder;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RunDirection getColumnDirection()
+	{
+		return this.columnDirection;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnDirection</code>.</p>
+	 *
+	 * @param columnDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 */
+	public void setColumnDirection(final RunDirection columnDirection)
+	{
+		this.columnDirection = columnDirection;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getLanguage()
+	{
+		return this.language;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>language</code>.</p>
+	 *
+	 * @param language a {@link java.lang.String} object.
+	 */
+	public void setLanguage(final String language)
+	{
+		this.language = language;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getUseFieldNameAsDescription()
+	{
+		return this.useFieldNameAsDescription;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>useFieldNameAsDescription</code>.</p>
+	 *
+	 * @param useFieldNameAsDescription a {@link java.lang.Boolean} object.
+	 */
+	public void setUseFieldNameAsDescription(final Boolean useFieldNameAsDescription)
+	{
+		this.useFieldNameAsDescription = useFieldNameAsDescription;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getHighlightDetailOddRows()
+	{
+		return this.highlightDetailOddRows;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>highlightDetailOddRows</code>.</p>
+	 *
+	 * @param highlightDetailOddRows a {@link java.lang.Boolean} object.
+	 */
+	public void setHighlightDetailOddRows(final Boolean highlightDetailOddRows)
+	{
+		this.highlightDetailOddRows = highlightDetailOddRows;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRSimpleStyle getDetailOddRowStyle()
+	{
+		return this.detailOddRowStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailOddRowStyle</code>.</p>
+	 *
+	 * @param detailOddRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public void setDetailOddRowStyle(final DRSimpleStyle detailOddRowStyle)
+	{
+		this.detailOddRowStyle = detailOddRowStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getHighlightDetailEvenRows()
+	{
+		return this.highlightDetailEvenRows;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>highlightDetailEvenRows</code>.</p>
+	 *
+	 * @param highlightDetailEvenRows a {@link java.lang.Boolean} object.
+	 */
+	public void setHighlightDetailEvenRows(final Boolean highlightDetailEvenRows)
+	{
+		this.highlightDetailEvenRows = highlightDetailEvenRows;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRSimpleStyle getDetailEvenRowStyle()
+	{
+		return this.detailEvenRowStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailEvenRowStyle</code>.</p>
+	 *
+	 * @param detailEvenRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public void setDetailEvenRowStyle(final DRSimpleStyle detailEvenRowStyle)
+	{
+		this.detailEvenRowStyle = detailEvenRowStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIFont getDefaultFont()
+	{
+		return this.defaultFont;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>defaultFont</code>.</p>
+	 *
+	 * @param defaultFont a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+	 */
+	public void setDefaultFont(final DRIFont defaultFont)
+	{
+		this.defaultFont = defaultFont;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getTextStyle()
+	{
+		return this.textStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>textStyle</code>.</p>
+	 *
+	 * @param textStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setTextStyle(final DRIReportStyle textStyle)
+	{
+		this.textStyle = textStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getColumnTitleStyle()
+	{
+		return this.columnTitleStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnTitleStyle</code>.</p>
+	 *
+	 * @param columnTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setColumnTitleStyle(final DRIReportStyle columnTitleStyle)
+	{
+		this.columnTitleStyle = columnTitleStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getColumnStyle()
+	{
+		return this.columnStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnStyle</code>.</p>
+	 *
+	 * @param columnStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setColumnStyle(final DRIReportStyle columnStyle)
+	{
+		this.columnStyle = columnStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getGroupTitleStyle()
+	{
+		return this.groupTitleStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupTitleStyle</code>.</p>
+	 *
+	 * @param groupTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setGroupTitleStyle(final DRIReportStyle groupTitleStyle)
+	{
+		this.groupTitleStyle = groupTitleStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getGroupStyle()
+	{
+		return this.groupStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupStyle</code>.</p>
+	 *
+	 * @param groupStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setGroupStyle(final DRIReportStyle groupStyle)
+	{
+		this.groupStyle = groupStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getSubtotalStyle()
+	{
+		return this.subtotalStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>subtotalStyle</code>.</p>
+	 *
+	 * @param subtotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setSubtotalStyle(final DRIReportStyle subtotalStyle)
+	{
+		this.subtotalStyle = subtotalStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getImageStyle()
+	{
+		return this.imageStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>imageStyle</code>.</p>
+	 *
+	 * @param imageStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setImageStyle(final DRIReportStyle imageStyle)
+	{
+		this.imageStyle = imageStyle;
+	}
+	
+	/**
+	 * <p>setPageFormat.</p>
+	 *
+	 * @param pageType    a {@link net.sf.dynamicreports.report.constant.PageType} object.
+	 * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 */
+	public void setPageFormat(final PageType pageType, final PageOrientation orientation)
+	{
+		Validate.notNull(pageType, "pageType must not be null");
+		Validate.notNull(orientation, "orientation must not be null");
+		if(orientation.equals(PageOrientation.PORTRAIT))
+		{
+			this.setPageWidth(pageType.getWidth());
+			this.setPageHeight(pageType.getHeight());
+		}
+		else
+		{
+			this.setPageWidth(pageType.getHeight());
+			this.setPageHeight(pageType.getWidth());
+		}
+		this.setPageOrientation(orientation);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getPageWidth()
+	{
+		return this.pageWidth;
+	}
+	
+	private void setPageWidth(final Integer pageWidth)
+	{
+		if(pageWidth != null)
+		{
+			Validate.isTrue(pageWidth >= 0, "pageWidth must be >= 0");
+		}
+		this.pageWidth = pageWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getPageHeight()
+	{
+		return this.pageHeight;
+	}
+	
+	private void setPageHeight(final Integer pageHeight)
+	{
+		if(pageHeight != null)
+		{
+			Validate.isTrue(pageHeight >= 0, "pageHeight must be >= 0");
+		}
+		this.pageHeight = pageHeight;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PageOrientation getPageOrientation()
+	{
+		return this.pageOrientation;
+	}
+	
+	private void setPageOrientation(final PageOrientation pageOrientation)
+	{
+		this.pageOrientation = pageOrientation;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRMargin getPageMargin()
+	{
+		return this.pageMargin;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageMargin</code>.</p>
+	 *
+	 * @param pageMargin a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+	 */
+	public void setPageMargin(final DRMargin pageMargin)
+	{
+		this.pageMargin = pageMargin;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getPageColumnsPerPage()
+	{
+		return this.pageColumnsPerPage;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageColumnsPerPage</code>.</p>
+	 *
+	 * @param pageColumnsPerPage a {@link java.lang.Integer} object.
+	 */
+	public void setPageColumnsPerPage(final Integer pageColumnsPerPage)
+	{
+		if(pageColumnsPerPage != null)
+		{
+			Validate.isTrue(pageColumnsPerPage >= 1, "pageColumnsPerPage must be >= 1");
+		}
+		this.pageColumnsPerPage = pageColumnsPerPage;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getPageColumnSpace()
+	{
+		return this.pageColumnSpace;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageColumnSpace</code>.</p>
+	 *
+	 * @param pageColumnSpace a {@link java.lang.Integer} object.
+	 */
+	public void setPageColumnSpace(final Integer pageColumnSpace)
+	{
+		if(pageColumnSpace != null)
+		{
+			Validate.isTrue(pageColumnSpace >= 0, "pageColumnSpace must be >= 0");
+		}
+		this.pageColumnSpace = pageColumnSpace;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getIgnorePageWidth()
+	{
+		return this.ignorePageWidth;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>ignorePageWidth</code>.</p>
+	 *
+	 * @param ignorePageWidth a {@link java.lang.Boolean} object.
+	 */
+	public void setIgnorePageWidth(final Boolean ignorePageWidth)
+	{
+		this.ignorePageWidth = ignorePageWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getColumnPrintRepeatedDetailValues()
+	{
+		return this.columnPrintRepeatedDetailValues;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnPrintRepeatedDetailValues</code>.</p>
+	 *
+	 * @param columnPrintRepeatedDetailValues a {@link java.lang.Boolean} object.
+	 */
+	public void setColumnPrintRepeatedDetailValues(final Boolean columnPrintRepeatedDetailValues)
+	{
+		this.columnPrintRepeatedDetailValues = columnPrintRepeatedDetailValues;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getColumnWidth()
+	{
+		return this.columnWidth;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnWidth</code>.</p>
+	 *
+	 * @param columnWidth a {@link java.lang.Integer} object.
+	 */
+	public void setColumnWidth(final Integer columnWidth)
+	{
+		if(columnWidth != null)
+		{
+			Validate.isTrue(columnWidth >= 0, "columnWidth must be >= 0");
+		}
+		this.columnWidth = columnWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public GroupHeaderLayout getGroupHeaderLayout()
+	{
+		return this.groupHeaderLayout;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupHeaderLayout</code>.</p>
+	 *
+	 * @param groupHeaderLayout a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+	 */
+	public void setGroupHeaderLayout(final GroupHeaderLayout groupHeaderLayout)
+	{
+		this.groupHeaderLayout = groupHeaderLayout;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getGroupHideColumn()
+	{
+		return this.groupHideColumn;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupHideColumn</code>.</p>
+	 *
+	 * @param groupHideColumn a {@link java.lang.Boolean} object.
+	 */
+	public void setGroupHideColumn(final Boolean groupHideColumn)
+	{
+		this.groupHideColumn = groupHideColumn;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getGroupShowColumnHeaderAndFooter()
+	{
+		return this.groupShowColumnHeaderAndFooter;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupShowColumnHeaderAndFooter</code>.</p>
+	 *
+	 * @param groupShowColumnHeaderAndFooter a {@link java.lang.Boolean} object.
+	 */
+	public void setGroupShowColumnHeaderAndFooter(final Boolean groupShowColumnHeaderAndFooter)
+	{
+		this.groupShowColumnHeaderAndFooter = groupShowColumnHeaderAndFooter;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getGroupPadding()
+	{
+		return this.groupPadding;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupPadding</code>.</p>
+	 *
+	 * @param groupPadding a {@link java.lang.Integer} object.
+	 */
+	public void setGroupPadding(final Integer groupPadding)
+	{
+		if(groupPadding != null)
+		{
+			Validate.isTrue(groupPadding >= 0, "groupPadding must be >= 0");
+		}
+		this.groupPadding = groupPadding;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getGroupStartInNewPage()
+	{
+		return this.groupStartInNewPage;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupStartInNewPage</code>.</p>
+	 *
+	 * @param groupStartInNewPage a {@link java.lang.Boolean} object.
+	 */
+	public void setGroupStartInNewPage(final Boolean groupStartInNewPage)
+	{
+		this.groupStartInNewPage = groupStartInNewPage;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getGroupStartInNewColumn()
+	{
+		return this.groupStartInNewColumn;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupStartInNewColumn</code>.</p>
+	 *
+	 * @param groupStartInNewColumn a {@link java.lang.Boolean} object.
+	 */
+	public void setGroupStartInNewColumn(final Boolean groupStartInNewColumn)
+	{
+		this.groupStartInNewColumn = groupStartInNewColumn;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getGroupReprintHeaderOnEachPage()
+	{
+		return this.groupReprintHeaderOnEachPage;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupReprintHeaderOnEachPage</code>.</p>
+	 *
+	 * @param groupReprintHeaderOnEachPage a {@link java.lang.Boolean} object.
+	 */
+	public void setGroupReprintHeaderOnEachPage(final Boolean groupReprintHeaderOnEachPage)
+	{
+		this.groupReprintHeaderOnEachPage = groupReprintHeaderOnEachPage;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getGroupResetPageNumber()
+	{
+		return this.groupResetPageNumber;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupResetPageNumber</code>.</p>
+	 *
+	 * @param groupResetPageNumber a {@link java.lang.Boolean} object.
+	 */
+	public void setGroupResetPageNumber(final Boolean groupResetPageNumber)
+	{
+		this.groupResetPageNumber = groupResetPageNumber;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public GroupFooterPosition getGroupFooterPosition()
+	{
+		return this.groupFooterPosition;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupFooterPosition</code>.</p>
+	 *
+	 * @param groupFooterPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 */
+	public void setGroupFooterPosition(final GroupFooterPosition groupFooterPosition)
+	{
+		this.groupFooterPosition = groupFooterPosition;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getGroupKeepTogether()
+	{
+		return this.groupKeepTogether;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupKeepTogether</code>.</p>
+	 *
+	 * @param groupKeepTogether a {@link java.lang.Boolean} object.
+	 */
+	public void setGroupKeepTogether(final Boolean groupKeepTogether)
+	{
+		this.groupKeepTogether = groupKeepTogether;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getGroupHeaderWithSubtotal()
+	{
+		return this.groupHeaderWithSubtotal;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupHeaderWithSubtotal</code>.</p>
+	 *
+	 * @param groupHeaderWithSubtotal a {@link java.lang.Boolean} object.
+	 */
+	public void setGroupHeaderWithSubtotal(final Boolean groupHeaderWithSubtotal)
+	{
+		this.groupHeaderWithSubtotal = groupHeaderWithSubtotal;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Position getSubtotalLabelPosition()
+	{
+		return this.subtotalLabelPosition;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>subtotalLabelPosition</code>.</p>
+	 *
+	 * @param subtotalLabelPosition a {@link net.sf.dynamicreports.report.constant.Position} object.
+	 */
+	public void setSubtotalLabelPosition(final Position subtotalLabelPosition)
+	{
+		this.subtotalLabelPosition = subtotalLabelPosition;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getTableOfContents()
+	{
+		return this.tableOfContents;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>tableOfContents</code>.</p>
+	 *
+	 * @param tableOfContents a {@link java.lang.Boolean} object.
+	 */
+	public void setTableOfContents(final Boolean tableOfContents)
+	{
+		this.tableOfContents = tableOfContents;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
+	{
+		return this.tableOfContentsCustomizer;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>tableOfContentsCustomizer</code>.</p>
+	 *
+	 * @param tableOfContentsCustomizer a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer}
+	 *                                  object.
+	 */
+	public void setTableOfContentsCustomizer(final DRITableOfContentsCustomizer tableOfContentsCustomizer)
+	{
+		this.tableOfContentsCustomizer = tableOfContentsCustomizer;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getTextFieldWidth()
+	{
+		return this.textFieldWidth;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>textFieldWidth</code>.</p>
+	 *
+	 * @param textFieldWidth a {@link java.lang.Integer} object.
+	 */
+	public void setTextFieldWidth(final Integer textFieldWidth)
+	{
+		if(textFieldWidth != null)
+		{
+			Validate.isTrue(textFieldWidth >= 0, "textFieldWidth must be >= 0");
+		}
+		this.textFieldWidth = textFieldWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getImageHeight()
+	{
+		return this.imageHeight;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>imageHeight</code>.</p>
+	 *
+	 * @param imageHeight a {@link java.lang.Integer} object.
+	 */
+	public void setImageHeight(final Integer imageHeight)
+	{
+		if(imageHeight != null)
+		{
+			Validate.isTrue(imageHeight >= 0, "imageHeight must be >= 0");
+		}
+		this.imageHeight = imageHeight;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getImageWidth()
+	{
+		return this.imageWidth;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>imageWidth</code>.</p>
+	 *
+	 * @param imageWidth a {@link java.lang.Integer} object.
+	 */
+	public void setImageWidth(final Integer imageWidth)
+	{
+		if(imageWidth != null)
+		{
+			Validate.isTrue(imageWidth >= 0, "imageWidth must be >= 0");
+		}
+		this.imageWidth = imageWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getListgap()
+	{
+		return this.listgap;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>listgap</code>.</p>
+	 *
+	 * @param listgap a {@link java.lang.Integer} object.
+	 */
+	public void setListgap(final Integer listgap)
+	{
+		if(listgap != null)
+		{
+			Validate.isTrue(listgap >= 0, "listgap must be >= 0");
+		}
+		this.listgap = listgap;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getMultiPageListWidth()
+	{
+		return this.multiPageListWidth;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>multiPageListWidth</code>.</p>
+	 *
+	 * @param multiPageListWidth a {@link java.lang.Integer} object.
+	 */
+	public void setMultiPageListWidth(final Integer multiPageListWidth)
+	{
+		this.multiPageListWidth = multiPageListWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getMultiPageListHeight()
+	{
+		return this.multiPageListHeight;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>multiPageListHeight</code>.</p>
+	 *
+	 * @param multiPageListHeight a {@link java.lang.Integer} object.
+	 */
+	public void setMultiPageListHeight(final Integer multiPageListHeight)
+	{
+		this.multiPageListHeight = multiPageListHeight;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getSubreportHeight()
+	{
+		return this.subreportHeight;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>subreportHeight</code>.</p>
+	 *
+	 * @param subreportHeight a {@link java.lang.Integer} object.
+	 */
+	public void setSubreportHeight(final Integer subreportHeight)
+	{
+		if(subreportHeight != null)
+		{
+			Validate.isTrue(subreportHeight >= 0, "subreportHeight must be >= 0");
+		}
+		this.subreportHeight = subreportHeight;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getSubreportWidth()
+	{
+		return this.subreportWidth;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>subreportWidth</code>.</p>
+	 *
+	 * @param subreportWidth a {@link java.lang.Integer} object.
+	 */
+	public void setSubreportWidth(final Integer subreportWidth)
+	{
+		if(subreportWidth != null)
+		{
+			Validate.isTrue(subreportWidth >= 0, "subreportWidth must be >= 0");
+		}
+		this.subreportWidth = subreportWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getCrosstabHeight()
+	{
+		return this.crosstabHeight;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabHeight</code>.</p>
+	 *
+	 * @param crosstabHeight a {@link java.lang.Integer} object.
+	 */
+	public void setCrosstabHeight(final Integer crosstabHeight)
+	{
+		if(crosstabHeight != null)
+		{
+			Validate.isTrue(crosstabHeight >= 0, "crosstabHeight must be >= 0");
+		}
+		this.crosstabHeight = crosstabHeight;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getCrosstabWidth()
+	{
+		return this.crosstabWidth;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabWidth</code>.</p>
+	 *
+	 * @param crosstabWidth a {@link java.lang.Integer} object.
+	 */
+	public void setCrosstabWidth(final Integer crosstabWidth)
+	{
+		if(crosstabWidth != null)
+		{
+			Validate.isTrue(crosstabWidth >= 0, "crosstabWidth must be >= 0");
+		}
+		this.crosstabWidth = crosstabWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getCrosstabHighlightOddRows()
+	{
+		return this.crosstabHighlightOddRows;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabHighlightOddRows</code>.</p>
+	 *
+	 * @param crosstabHighlightOddRows a {@link java.lang.Boolean} object.
+	 */
+	public void setCrosstabHighlightOddRows(final Boolean crosstabHighlightOddRows)
+	{
+		this.crosstabHighlightOddRows = crosstabHighlightOddRows;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRSimpleStyle getCrosstabOddRowStyle()
+	{
+		return this.crosstabOddRowStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabOddRowStyle</code>.</p>
+	 *
+	 * @param crosstabOddRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public void setCrosstabOddRowStyle(final DRSimpleStyle crosstabOddRowStyle)
+	{
+		this.crosstabOddRowStyle = crosstabOddRowStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getCrosstabHighlightEvenRows()
+	{
+		return this.crosstabHighlightEvenRows;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabHighlightEvenRows</code>.</p>
+	 *
+	 * @param crosstabHighlightEvenRows a {@link java.lang.Boolean} object.
+	 */
+	public void setCrosstabHighlightEvenRows(final Boolean crosstabHighlightEvenRows)
+	{
+		this.crosstabHighlightEvenRows = crosstabHighlightEvenRows;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRSimpleStyle getCrosstabEvenRowStyle()
+	{
+		return this.crosstabEvenRowStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabEvenRowStyle</code>.</p>
+	 *
+	 * @param crosstabEvenRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public void setCrosstabEvenRowStyle(final DRSimpleStyle crosstabEvenRowStyle)
+	{
+		this.crosstabEvenRowStyle = crosstabEvenRowStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getCrosstabGroupStyle()
+	{
+		return this.crosstabGroupStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabGroupStyle</code>.</p>
+	 *
+	 * @param crosstabGroupStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setCrosstabGroupStyle(final DRIReportStyle crosstabGroupStyle)
+	{
+		this.crosstabGroupStyle = crosstabGroupStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getCrosstabGroupTotalStyle()
+	{
+		return this.crosstabGroupTotalStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabGroupTotalStyle</code>.</p>
+	 *
+	 * @param crosstabGroupTotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setCrosstabGroupTotalStyle(final DRIReportStyle crosstabGroupTotalStyle)
+	{
+		this.crosstabGroupTotalStyle = crosstabGroupTotalStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getCrosstabGrandTotalStyle()
+	{
+		return this.crosstabGrandTotalStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabGrandTotalStyle</code>.</p>
+	 *
+	 * @param crosstabGrandTotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setCrosstabGrandTotalStyle(final DRIReportStyle crosstabGrandTotalStyle)
+	{
+		this.crosstabGrandTotalStyle = crosstabGrandTotalStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getCrosstabCellStyle()
+	{
+		return this.crosstabCellStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabCellStyle</code>.</p>
+	 *
+	 * @param crosstabCellStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setCrosstabCellStyle(final DRIReportStyle crosstabCellStyle)
+	{
+		this.crosstabCellStyle = crosstabCellStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getCrosstabMeasureTitleStyle()
+	{
+		return this.crosstabMeasureTitleStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>crosstabMeasureTitleStyle</code>.</p>
+	 *
+	 * @param crosstabMeasureTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setCrosstabMeasureTitleStyle(final DRIReportStyle crosstabMeasureTitleStyle)
+	{
+		this.crosstabMeasureTitleStyle = crosstabMeasureTitleStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public BooleanComponentType getBooleanComponentType()
+	{
+		return this.booleanComponentType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>booleanComponentType</code>.</p>
+	 *
+	 * @param booleanComponentType a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+	 */
+	public void setBooleanComponentType(final BooleanComponentType booleanComponentType)
+	{
+		this.booleanComponentType = booleanComponentType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getBooleanEmptyWhenNullValue()
+	{
+		return this.booleanEmptyWhenNullValue;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>booleanEmptyWhenNullValue</code>.</p>
+	 *
+	 * @param booleanEmptyWhenNullValue a {@link java.lang.Boolean} object.
+	 */
+	public void setBooleanEmptyWhenNullValue(final Boolean booleanEmptyWhenNullValue)
+	{
+		this.booleanEmptyWhenNullValue = booleanEmptyWhenNullValue;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getBooleanImageWidth()
+	{
+		return this.booleanImageWidth;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>booleanImageWidth</code>.</p>
+	 *
+	 * @param booleanImageWidth a {@link java.lang.Integer} object.
+	 */
+	public void setBooleanImageWidth(final Integer booleanImageWidth)
+	{
+		this.booleanImageWidth = booleanImageWidth;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getBooleanImageHeight()
+	{
+		return this.booleanImageHeight;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>booleanImageHeight</code>.</p>
+	 *
+	 * @param booleanImageHeight a {@link java.lang.Integer} object.
+	 */
+	public void setBooleanImageHeight(final Integer booleanImageHeight)
+	{
+		this.booleanImageHeight = booleanImageHeight;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getBooleanColumnStyle()
+	{
+		return this.booleanColumnStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>booleanColumnStyle</code>.</p>
+	 *
+	 * @param booleanColumnStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setBooleanColumnStyle(final DRIReportStyle booleanColumnStyle)
+	{
+		this.booleanColumnStyle = booleanColumnStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getDefaultSplitType()
+	{
+		return this.defaultSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>defaultSplitType</code>.</p>
+	 *
+	 * @param defaultSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setDefaultSplitType(final SplitType defaultSplitType)
+	{
+		this.defaultSplitType = defaultSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getTitleSplitType()
+	{
+		return this.titleSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>titleSplitType</code>.</p>
+	 *
+	 * @param titleSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setTitleSplitType(final SplitType titleSplitType)
+	{
+		this.titleSplitType = titleSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getPageHeaderSplitType()
+	{
+		return this.pageHeaderSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageHeaderSplitType</code>.</p>
+	 *
+	 * @param pageHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setPageHeaderSplitType(final SplitType pageHeaderSplitType)
+	{
+		this.pageHeaderSplitType = pageHeaderSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getPageFooterSplitType()
+	{
+		return this.pageFooterSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageFooterSplitType</code>.</p>
+	 *
+	 * @param pageFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setPageFooterSplitType(final SplitType pageFooterSplitType)
+	{
+		this.pageFooterSplitType = pageFooterSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getColumnHeaderSplitType()
+	{
+		return this.columnHeaderSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnHeaderSplitType</code>.</p>
+	 *
+	 * @param columnHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setColumnHeaderSplitType(final SplitType columnHeaderSplitType)
+	{
+		this.columnHeaderSplitType = columnHeaderSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getColumnFooterSplitType()
+	{
+		return this.columnFooterSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnFooterSplitType</code>.</p>
+	 *
+	 * @param columnFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setColumnFooterSplitType(final SplitType columnFooterSplitType)
+	{
+		this.columnFooterSplitType = columnFooterSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getGroupHeaderSplitType()
+	{
+		return this.groupHeaderSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupHeaderSplitType</code>.</p>
+	 *
+	 * @param groupHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setGroupHeaderSplitType(final SplitType groupHeaderSplitType)
+	{
+		this.groupHeaderSplitType = groupHeaderSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getGroupFooterSplitType()
+	{
+		return this.groupFooterSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupFooterSplitType</code>.</p>
+	 *
+	 * @param groupFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setGroupFooterSplitType(final SplitType groupFooterSplitType)
+	{
+		this.groupFooterSplitType = groupFooterSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getDetailHeaderSplitType()
+	{
+		return this.detailHeaderSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailHeaderSplitType</code>.</p>
+	 *
+	 * @param detailHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setDetailHeaderSplitType(final SplitType detailHeaderSplitType)
+	{
+		this.detailHeaderSplitType = detailHeaderSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getDetailSplitType()
+	{
+		return this.detailSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailSplitType</code>.</p>
+	 *
+	 * @param detailSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setDetailSplitType(final SplitType detailSplitType)
+	{
+		this.detailSplitType = detailSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getDetailFooterSplitType()
+	{
+		return this.detailFooterSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailFooterSplitType</code>.</p>
+	 *
+	 * @param detailFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setDetailFooterSplitType(final SplitType detailFooterSplitType)
+	{
+		this.detailFooterSplitType = detailFooterSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getLastPageFooterSplitType()
+	{
+		return this.lastPageFooterSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>lastPageFooterSplitType</code>.</p>
+	 *
+	 * @param lastPageFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setLastPageFooterSplitType(final SplitType lastPageFooterSplitType)
+	{
+		this.lastPageFooterSplitType = lastPageFooterSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getSummarySplitType()
+	{
+		return this.summarySplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>summarySplitType</code>.</p>
+	 *
+	 * @param summarySplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setSummarySplitType(final SplitType summarySplitType)
+	{
+		this.summarySplitType = summarySplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getNoDataSplitType()
+	{
+		return this.noDataSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>noDataSplitType</code>.</p>
+	 *
+	 * @param noDataSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setNoDataSplitType(final SplitType noDataSplitType)
+	{
+		this.noDataSplitType = noDataSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SplitType getBackgroundSplitType()
+	{
+		return this.backgroundSplitType;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>backgroundSplitType</code>.</p>
+	 *
+	 * @param backgroundSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public void setBackgroundSplitType(final SplitType backgroundSplitType)
+	{
+		this.backgroundSplitType = backgroundSplitType;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getTitleStyle()
+	{
+		return this.titleStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>titleStyle</code>.</p>
+	 *
+	 * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setTitleStyle(final DRIReportStyle titleStyle)
+	{
+		this.titleStyle = titleStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getPageHeaderStyle()
+	{
+		return this.pageHeaderStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageHeaderStyle</code>.</p>
+	 *
+	 * @param pageHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setPageHeaderStyle(final DRIReportStyle pageHeaderStyle)
+	{
+		this.pageHeaderStyle = pageHeaderStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getPageFooterStyle()
+	{
+		return this.pageFooterStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageFooterStyle</code>.</p>
+	 *
+	 * @param pageFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setPageFooterStyle(final DRIReportStyle pageFooterStyle)
+	{
+		this.pageFooterStyle = pageFooterStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getColumnHeaderStyle()
+	{
+		return this.columnHeaderStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnHeaderStyle</code>.</p>
+	 *
+	 * @param columnHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setColumnHeaderStyle(final DRIReportStyle columnHeaderStyle)
+	{
+		this.columnHeaderStyle = columnHeaderStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getColumnFooterStyle()
+	{
+		return this.columnFooterStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnFooterStyle</code>.</p>
+	 *
+	 * @param columnFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setColumnFooterStyle(final DRIReportStyle columnFooterStyle)
+	{
+		this.columnFooterStyle = columnFooterStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getGroupHeaderStyle()
+	{
+		return this.groupHeaderStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupHeaderStyle</code>.</p>
+	 *
+	 * @param groupHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setGroupHeaderStyle(final DRIReportStyle groupHeaderStyle)
+	{
+		this.groupHeaderStyle = groupHeaderStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getGroupFooterStyle()
+	{
+		return this.groupFooterStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupFooterStyle</code>.</p>
+	 *
+	 * @param groupFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setGroupFooterStyle(final DRIReportStyle groupFooterStyle)
+	{
+		this.groupFooterStyle = groupFooterStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getDetailHeaderStyle()
+	{
+		return this.detailHeaderStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailHeaderStyle</code>.</p>
+	 *
+	 * @param detailHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setDetailHeaderStyle(final DRIReportStyle detailHeaderStyle)
+	{
+		this.detailHeaderStyle = detailHeaderStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getDetailStyle()
+	{
+		return this.detailStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailStyle</code>.</p>
+	 *
+	 * @param detailStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setDetailStyle(final DRIReportStyle detailStyle)
+	{
+		this.detailStyle = detailStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getDetailFooterStyle()
+	{
+		return this.detailFooterStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailFooterStyle</code>.</p>
+	 *
+	 * @param detailFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setDetailFooterStyle(final DRIReportStyle detailFooterStyle)
+	{
+		this.detailFooterStyle = detailFooterStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getLastPageFooterStyle()
+	{
+		return this.lastPageFooterStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>lastPageFooterStyle</code>.</p>
+	 *
+	 * @param lastPageFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setLastPageFooterStyle(final DRIReportStyle lastPageFooterStyle)
+	{
+		this.lastPageFooterStyle = lastPageFooterStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getSummaryStyle()
+	{
+		return this.summaryStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>summaryStyle</code>.</p>
+	 *
+	 * @param summaryStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setSummaryStyle(final DRIReportStyle summaryStyle)
+	{
+		this.summaryStyle = summaryStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getNoDataStyle()
+	{
+		return this.noDataStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>noDataStyle</code>.</p>
+	 *
+	 * @param noDataStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setNoDataStyle(final DRIReportStyle noDataStyle)
+	{
+		this.noDataStyle = noDataStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRIReportStyle getBackgroundStyle()
+	{
+		return this.backgroundStyle;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>backgroundStyle</code>.</p>
+	 *
+	 * @param backgroundStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 */
+	public void setBackgroundStyle(final DRIReportStyle backgroundStyle)
+	{
+		this.backgroundStyle = backgroundStyle;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getTitleBackgroundComponent()
+	{
+		return this.titleBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>titleBackgroundComponent</code>.</p>
+	 *
+	 * @param titleBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setTitleBackgroundComponent(final DRComponent titleBackgroundComponent)
+	{
+		this.titleBackgroundComponent = titleBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getPageHeaderBackgroundComponent()
+	{
+		return this.pageHeaderBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageHeaderBackgroundComponent</code>.</p>
+	 *
+	 * @param pageHeaderBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setPageHeaderBackgroundComponent(final DRComponent pageHeaderBackgroundComponent)
+	{
+		this.pageHeaderBackgroundComponent = pageHeaderBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getPageFooterBackgroundComponent()
+	{
+		return this.pageFooterBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>pageFooterBackgroundComponent</code>.</p>
+	 *
+	 * @param pageFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setPageFooterBackgroundComponent(final DRComponent pageFooterBackgroundComponent)
+	{
+		this.pageFooterBackgroundComponent = pageFooterBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getColumnHeaderBackgroundComponent()
+	{
+		return this.columnHeaderBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnHeaderBackgroundComponent</code>.</p>
+	 *
+	 * @param columnHeaderBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setColumnHeaderBackgroundComponent(final DRComponent columnHeaderBackgroundComponent)
+	{
+		this.columnHeaderBackgroundComponent = columnHeaderBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getColumnFooterBackgroundComponent()
+	{
+		return this.columnFooterBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>columnFooterBackgroundComponent</code>.</p>
+	 *
+	 * @param columnFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setColumnFooterBackgroundComponent(final DRComponent columnFooterBackgroundComponent)
+	{
+		this.columnFooterBackgroundComponent = columnFooterBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getGroupHeaderBackgroundComponent()
+	{
+		return this.groupHeaderBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupHeaderBackgroundComponent</code>.</p>
+	 *
+	 * @param groupHeaderBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setGroupHeaderBackgroundComponent(final DRComponent groupHeaderBackgroundComponent)
+	{
+		this.groupHeaderBackgroundComponent = groupHeaderBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getGroupFooterBackgroundComponent()
+	{
+		return this.groupFooterBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>groupFooterBackgroundComponent</code>.</p>
+	 *
+	 * @param groupFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setGroupFooterBackgroundComponent(final DRComponent groupFooterBackgroundComponent)
+	{
+		this.groupFooterBackgroundComponent = groupFooterBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getDetailHeaderBackgroundComponent()
+	{
+		return this.detailHeaderBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailHeaderBackgroundComponent</code>.</p>
+	 *
+	 * @param detailHeaderBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setDetailHeaderBackgroundComponent(final DRComponent detailHeaderBackgroundComponent)
+	{
+		this.detailHeaderBackgroundComponent = detailHeaderBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getDetailBackgroundComponent()
+	{
+		return this.detailBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailBackgroundComponent</code>.</p>
+	 *
+	 * @param detailBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setDetailBackgroundComponent(final DRComponent detailBackgroundComponent)
+	{
+		this.detailBackgroundComponent = detailBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getDetailFooterBackgroundComponent()
+	{
+		return this.detailFooterBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>detailFooterBackgroundComponent</code>.</p>
+	 *
+	 * @param detailFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setDetailFooterBackgroundComponent(final DRComponent detailFooterBackgroundComponent)
+	{
+		this.detailFooterBackgroundComponent = detailFooterBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getLastPageFooterBackgroundComponent()
+	{
+		return this.lastPageFooterBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>lastPageFooterBackgroundComponent</code>.</p>
+	 *
+	 * @param lastPageFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent}
+	 *                                          object.
+	 */
+	public void setLastPageFooterBackgroundComponent(final DRComponent lastPageFooterBackgroundComponent)
+	{
+		this.lastPageFooterBackgroundComponent = lastPageFooterBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getSummaryBackgroundComponent()
+	{
+		return this.summaryBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>summaryBackgroundComponent</code>.</p>
+	 *
+	 * @param summaryBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setSummaryBackgroundComponent(final DRComponent summaryBackgroundComponent)
+	{
+		this.summaryBackgroundComponent = summaryBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getNoDataBackgroundComponent()
+	{
+		return this.noDataBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>noDataBackgroundComponent</code>.</p>
+	 *
+	 * @param noDataBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setNoDataBackgroundComponent(final DRComponent noDataBackgroundComponent)
+	{
+		this.noDataBackgroundComponent = noDataBackgroundComponent;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DRComponent getBackgroundBackgroundComponent()
+	{
+		return this.backgroundBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>backgroundBackgroundComponent</code>.</p>
+	 *
+	 * @param backgroundBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 */
+	public void setBackgroundBackgroundComponent(final DRComponent backgroundBackgroundComponent)
+	{
+		this.backgroundBackgroundComponent = backgroundBackgroundComponent;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSort.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSort.java
new file mode 100644
index 0000000..b934f27
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSort.java
@@ -0,0 +1,67 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.definition.DRISort;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRSort class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRSort implements DRISort {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<?> expression;
+    private OrderType orderType;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getExpression() {
+        return expression;
+    }
+
+    /**
+     * <p>Setter for the field <code>expression</code>.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setExpression(DRIExpression<?> expression) {
+        this.expression = expression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public OrderType getOrderType() {
+        return orderType;
+    }
+
+    /**
+     * <p>Setter for the field <code>orderType</code>.</p>
+     *
+     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     */
+    public void setOrderType(OrderType orderType) {
+        this.orderType = orderType;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSubtotal.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSubtotal.java
new file mode 100644
index 0000000..031ba73
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSubtotal.java
@@ -0,0 +1,204 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.base.column.DRColumn;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.SubtotalPosition;
+import net.sf.dynamicreports.report.definition.DRISubtotal;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRSubtotal class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRSubtotal<T> implements DRISubtotal<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRColumn<?> showInColumn;
+    private DRTextField<T> valueField;
+    private SubtotalPosition position;
+    private DRGroup group;
+
+    private DRIExpression<?> labelExpression;
+    private DRIReportStyle labelStyle;
+    private Position labelPosition;
+    private Integer labelWidth;
+    private ComponentDimensionType labelWidthType;
+
+    /**
+     * <p>Constructor for DRSubtotal.</p>
+     *
+     * @param showInColumn a {@link net.sf.dynamicreports.report.base.column.DRColumn} object.
+     */
+    public DRSubtotal(DRColumn<?> showInColumn) {
+        setShowInColumn(showInColumn);
+        init();
+    }
+
+    private void init() {
+        valueField = new DRTextField<T>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRColumn<?> getShowInColumn() {
+        return showInColumn;
+    }
+
+    /**
+     * <p>Setter for the field <code>showInColumn</code>.</p>
+     *
+     * @param showInColumn a {@link net.sf.dynamicreports.report.base.column.DRColumn} object.
+     */
+    public void setShowInColumn(DRColumn<?> showInColumn) {
+        Validate.notNull(showInColumn, "showInColumn must not be null");
+        this.showInColumn = showInColumn;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRTextField<T> getValueField() {
+        return valueField;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getLabelExpression() {
+        return labelExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>labelExpression</code>.</p>
+     *
+     * @param labelExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setLabelExpression(DRIExpression<?> labelExpression) {
+        this.labelExpression = labelExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getLabelStyle() {
+        return labelStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>labelStyle</code>.</p>
+     *
+     * @param labelStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setLabelStyle(DRIReportStyle labelStyle) {
+        this.labelStyle = labelStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Position getLabelPosition() {
+        return labelPosition;
+    }
+
+    /**
+     * <p>Setter for the field <code>labelPosition</code>.</p>
+     *
+     * @param labelPosition a {@link net.sf.dynamicreports.report.constant.Position} object.
+     */
+    public void setLabelPosition(Position labelPosition) {
+        this.labelPosition = labelPosition;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getLabelWidth() {
+        return labelWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>labelWidth</code>.</p>
+     *
+     * @param labelWidth a {@link java.lang.Integer} object.
+     */
+    public void setLabelWidth(Integer labelWidth) {
+        this.labelWidth = labelWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentDimensionType getLabelWidthType() {
+        return labelWidthType;
+    }
+
+    /**
+     * <p>Setter for the field <code>labelWidthType</code>.</p>
+     *
+     * @param labelWidthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public void setLabelWidthType(ComponentDimensionType labelWidthType) {
+        this.labelWidthType = labelWidthType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public SubtotalPosition getPosition() {
+        return position;
+    }
+
+    /**
+     * <p>Setter for the field <code>position</code>.</p>
+     *
+     * @param position a {@link net.sf.dynamicreports.report.constant.SubtotalPosition} object.
+     */
+    public void setPosition(SubtotalPosition position) {
+        Validate.notNull(position, "position must not be null");
+        this.position = position;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRGroup getGroup() {
+        return group;
+    }
+
+    /**
+     * <p>Setter for the field <code>group</code>.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+     */
+    public void setGroup(DRGroup group) {
+        this.group = group;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return valueField.getValueExpression().getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<? super T> getValueClass() {
+        return valueField.getValueExpression().getValueClass();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRTableOfContentsHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRTableOfContentsHeading.java
new file mode 100644
index 0000000..9a36198
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRTableOfContentsHeading.java
@@ -0,0 +1,82 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsHeading;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRTableOfContentsHeading class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRTableOfContentsHeading implements DRITableOfContentsHeading {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRTableOfContentsHeading parentHeading;
+    private DRIExpression<String> labelExpression;
+    private DRIExpression<?> customValueExpression;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRTableOfContentsHeading getParentHeading() {
+        return parentHeading;
+    }
+
+    /**
+     * <p>Setter for the field <code>parentHeading</code>.</p>
+     *
+     * @param parentHeading a {@link net.sf.dynamicreports.report.base.DRTableOfContentsHeading} object.
+     */
+    public void setParentHeading(DRTableOfContentsHeading parentHeading) {
+        this.parentHeading = parentHeading;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<String> getLabelExpression() {
+        return labelExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>labelExpression</code>.</p>
+     *
+     * @param labelExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setLabelExpression(DRIExpression<String> labelExpression) {
+        this.labelExpression = labelExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getCustomValueExpression() {
+        return customValueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>customValueExpression</code>.</p>
+     *
+     * @param customValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setCustomValueExpression(DRIExpression<?> customValueExpression) {
+        this.customValueExpression = customValueExpression;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRVariable.java
new file mode 100644
index 0000000..d1bdd5c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRVariable.java
@@ -0,0 +1,139 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.definition.DRIVariable;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRVariable class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRVariable<T> implements DRIVariable<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIExpression<?> valueExpression;
+    private DRIExpression<?> initialValueExpression;
+    private Calculation calculation;
+    private Evaluation resetType;
+    private DRGroup resetGroup;
+
+    /**
+     * <p>Constructor for DRVariable.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation     a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public DRVariable(DRIExpression<?> valueExpression, Calculation calculation) {
+        this(ReportUtils.generateUniqueName("variable"), valueExpression, calculation);
+    }
+
+    /**
+     * <p>Constructor for DRVariable.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation     a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public DRVariable(String name, DRIExpression<?> valueExpression, Calculation calculation) {
+        Validate.notEmpty(name, "name must not be empty");
+        Validate.notNull(valueExpression, "valueExpression must not be null");
+        Validate.notNull(calculation, "calculation must not be null");
+        this.name = name;
+        this.valueExpression = valueExpression;
+        this.calculation = calculation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getInitialValueExpression() {
+        return initialValueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>initialValueExpression</code>.</p>
+     *
+     * @param initialValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setInitialValueExpression(DRIExpression<?> initialValueExpression) {
+        this.initialValueExpression = initialValueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Calculation getCalculation() {
+        return calculation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Evaluation getResetType() {
+        return resetType;
+    }
+
+    /**
+     * <p>Setter for the field <code>resetType</code>.</p>
+     *
+     * @param resetType a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     */
+    public void setResetType(Evaluation resetType) {
+        this.resetType = resetType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRGroup getResetGroup() {
+        return resetGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>resetGroup</code>.</p>
+     *
+     * @param resetGroup a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+     */
+    public void setResetGroup(DRGroup resetGroup) {
+        this.resetGroup = resetGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getValueExpression() {
+        return valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Class<? super T> getValueClass() {
+        return (Class<? super T>) ReportUtils.getVariableValueClass(getCalculation(), valueExpression.getValueClass());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRBooleanColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRBooleanColumn.java
new file mode 100644
index 0000000..8abbcbf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRBooleanColumn.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.column;
+
+import net.sf.dynamicreports.report.base.component.DRBooleanField;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
+import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
+
+/**
+ * <p>DRBooleanColumn class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRBooleanColumn extends DRColumn<DRIBooleanField> implements DRIBooleanColumn {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for DRBooleanColumn.</p>
+     *
+     * @param booleanField a {@link net.sf.dynamicreports.report.base.component.DRBooleanField} object.
+     */
+    public DRBooleanColumn(DRBooleanField booleanField) {
+        super(booleanField);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getComponent().getValueExpression().getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<Boolean> getValueClass() {
+        return Boolean.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRColumn.java
new file mode 100644
index 0000000..2abd328
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRColumn.java
@@ -0,0 +1,225 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.column;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.column.DRIColumn;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRColumn class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class DRColumn<T extends DRIComponent> implements DRIColumn<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private final String name;
+    private T component;
+
+    private DRIExpression<?> titleExpression;
+    private DRIReportStyle titleStyle;
+    private Integer titleHeight;
+    private ComponentDimensionType titleHeightType;
+    private Integer titleRows;
+    private Boolean titleStretchWithOverflow;
+    private TextAdjust titleTextAdjust;
+    private List<DRIPropertyExpression> titlePropertyExpressions;
+
+    /**
+     * <p>Constructor for DRColumn.</p>
+     */
+    protected DRColumn() {
+        this.name = ReportUtils.generateUniqueName("column");
+        titlePropertyExpressions = new ArrayList<>();
+    }
+
+    /**
+     * <p>Constructor for DRColumn.</p>
+     *
+     * @param component a T object.
+     */
+    public DRColumn(final T component) {
+        Validate.notNull(component, "component must not be null");
+        this.name = ReportUtils.generateUniqueName("column");
+        this.component = component;
+        titlePropertyExpressions = new ArrayList<>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public T getComponent() {
+        return component;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getTitleExpression() {
+        return titleExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleExpression</code>.</p>
+     *
+     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setTitleExpression(final DRIExpression<?> titleExpression) {
+        this.titleExpression = titleExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getTitleStyle() {
+        return titleStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleStyle</code>.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setTitleStyle(final DRIReportStyle titleStyle) {
+        this.titleStyle = titleStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTitleHeight() {
+        return titleHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleHeight</code>.</p>
+     *
+     * @param titleHeight a {@link java.lang.Integer} object.
+     */
+    public void setTitleHeight(final Integer titleHeight) {
+        if (titleHeight != null) {
+            Validate.isTrue(titleHeight >= 0, "titleHeight must be >= 0");
+        }
+        this.titleHeight = titleHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentDimensionType getTitleHeightType() {
+        return titleHeightType;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleHeightType</code>.</p>
+     *
+     * @param titleHeightType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public void setTitleHeightType(final ComponentDimensionType titleHeightType) {
+        this.titleHeightType = titleHeightType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTitleRows() {
+        return titleRows;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleRows</code>.</p>
+     *
+     * @param titleRows a {@link java.lang.Integer} object.
+     */
+    public void setTitleRows(final Integer titleRows) {
+        if (titleRows != null) {
+            Validate.isTrue(titleRows >= 0, "titleRows must be >= 0");
+        }
+        this.titleRows = titleRows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getTitleStretchWithOverflow() {
+        return titleStretchWithOverflow;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleStretchWithOverflow</code>.</p>
+     *
+     * @param titleStretchWithOverflow a {@link java.lang.Boolean} object.
+     * @deprecated replaced by  {@link #setTitleTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public void setTitleStretchWithOverflow(final Boolean titleStretchWithOverflow) {
+        this.titleStretchWithOverflow = titleStretchWithOverflow;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TextAdjust getTitleTextAdjust() {
+        return titleTextAdjust;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleTextAdjust</code>.</p>
+     *
+     * @param titleStretchWithOverflow a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    public void setTitleTextAdjust(final TextAdjust titleTextAdjust) {
+        this.titleTextAdjust = titleTextAdjust;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIPropertyExpression> getTitlePropertyExpressions() {
+        return titlePropertyExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>titlePropertyExpressions</code>.</p>
+     *
+     * @param titlePropertyExpressions a {@link java.util.List} object.
+     */
+    public void setTitlePropertyExpressions(final List<DRIPropertyExpression> titlePropertyExpressions) {
+        this.titlePropertyExpressions = titlePropertyExpressions;
+    }
+
+    /**
+     * <p>addTitlePropertyExpression.</p>
+     *
+     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     */
+    public void addTitlePropertyExpression(final DRIPropertyExpression propertyExpression) {
+        Validate.notNull(propertyExpression, "propertyExpression must not be null");
+        this.titlePropertyExpressions.add(propertyExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRValueColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRValueColumn.java
new file mode 100644
index 0000000..d5104b4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRValueColumn.java
@@ -0,0 +1,71 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.column;
+
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+
+/**
+ * <p>DRValueColumn class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRValueColumn<T> extends DRColumn<DRITextField<T>> implements DRIValueColumn<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Boolean printRepeatedDetailValues;
+
+    /**
+     * <p>Constructor for DRValueColumn.</p>
+     *
+     * @param valueField a {@link net.sf.dynamicreports.report.base.component.DRTextField} object.
+     */
+    public DRValueColumn(DRTextField<T> valueField) {
+        super(valueField);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getPrintRepeatedDetailValues() {
+        return printRepeatedDetailValues;
+    }
+
+    /**
+     * <p>Setter for the field <code>printRepeatedDetailValues</code>.</p>
+     *
+     * @param printRepeatedDetailValues a {@link java.lang.Boolean} object.
+     */
+    public void setPrintRepeatedDetailValues(Boolean printRepeatedDetailValues) {
+        this.printRepeatedDetailValues = printRepeatedDetailValues;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getComponent().getValueExpression().getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<? super T> getValueClass() {
+        return getComponent().getValueExpression().getValueClass();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBooleanField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBooleanField.java
new file mode 100644
index 0000000..1224b1b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBooleanField.java
@@ -0,0 +1,156 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRBooleanField class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRBooleanField extends DRHyperLinkComponent implements DRIBooleanField {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<Boolean> valueExpression;
+    private BooleanComponentType componentType;
+    private Boolean emptyWhenNullValue;
+    private Integer imageWidth;
+    private Integer imageHeight;
+    private HorizontalImageAlignment horizontalImageAlignment;
+    private HorizontalTextAlignment horizontalTextAlignment;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Boolean> getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setValueExpression(DRIExpression<Boolean> valueExpression) {
+        Validate.notNull(valueExpression, "valueExpression must not be null");
+        this.valueExpression = valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public BooleanComponentType getComponentType() {
+        return componentType;
+    }
+
+    /**
+     * <p>Setter for the field <code>componentType</code>.</p>
+     *
+     * @param componentType a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+     */
+    public void setComponentType(BooleanComponentType componentType) {
+        this.componentType = componentType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getEmptyWhenNullValue() {
+        return emptyWhenNullValue;
+    }
+
+    /**
+     * <p>Setter for the field <code>emptyWhenNullValue</code>.</p>
+     *
+     * @param emptyWhenNullValue a {@link java.lang.Boolean} object.
+     */
+    public void setEmptyWhenNullValue(Boolean emptyWhenNullValue) {
+        this.emptyWhenNullValue = emptyWhenNullValue;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getImageWidth() {
+        return imageWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageWidth</code>.</p>
+     *
+     * @param imageWidth a {@link java.lang.Integer} object.
+     */
+    public void setImageWidth(Integer imageWidth) {
+        if (imageWidth != null) {
+            Validate.isTrue(imageWidth >= 0, "imageWidth must be >= 0");
+        }
+        this.imageWidth = imageWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getImageHeight() {
+        return imageHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageHeight</code>.</p>
+     *
+     * @param imageHeight a {@link java.lang.Integer} object.
+     */
+    public void setImageHeight(Integer imageHeight) {
+        if (imageHeight != null) {
+            Validate.isTrue(imageHeight >= 0, "imageHeight must be >= 0");
+        }
+        this.imageHeight = imageHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalImageAlignment getHorizontalImageAlignment() {
+        return horizontalImageAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        this.horizontalImageAlignment = horizontalImageAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return horizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBreak.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBreak.java
new file mode 100644
index 0000000..e0e6c5b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBreak.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.BreakType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIBreak;
+
+/**
+ * <p>DRBreak class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRBreak extends DRComponent implements DRIBreak {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private BreakType breakType;
+
+    /** {@inheritDoc} */
+    @Override
+    public BreakType getType() {
+        return breakType;
+    }
+
+    /**
+     * <p>setType.</p>
+     *
+     * @param breakType a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     */
+    public void setType(BreakType breakType) {
+        this.breakType = breakType;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRComponent.java
new file mode 100644
index 0000000..d95eb21
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRComponent.java
@@ -0,0 +1,145 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.base.DRTableOfContentsHeading;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>Abstract DRComponent class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRComponent implements DRIComponent {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIReportStyle style;
+    private DRIExpression<Boolean> printWhenExpression;
+    private Boolean removeLineWhenBlank;
+    private List<DRIPropertyExpression> propertyExpressions;
+    private DRTableOfContentsHeading tableOfContentsHeading;
+
+    /**
+     * <p>Constructor for DRComponent.</p>
+     */
+    public DRComponent() {
+        init();
+    }
+
+    /**
+     * <p>init.</p>
+     */
+    protected void init() {
+        propertyExpressions = new ArrayList<DRIPropertyExpression>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <p>Setter for the field <code>style</code>.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setStyle(DRIReportStyle style) {
+        this.style = style;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Boolean> getPrintWhenExpression() {
+        return printWhenExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>printWhenExpression</code>.</p>
+     *
+     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
+        this.printWhenExpression = printWhenExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getRemoveLineWhenBlank() {
+        return removeLineWhenBlank;
+    }
+
+    /**
+     * <p>Setter for the field <code>removeLineWhenBlank</code>.</p>
+     *
+     * @param removeLineWhenBlank a {@link java.lang.Boolean} object.
+     */
+    public void setRemoveLineWhenBlank(Boolean removeLineWhenBlank) {
+        this.removeLineWhenBlank = removeLineWhenBlank;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIPropertyExpression> getPropertyExpressions() {
+        return propertyExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>propertyExpressions</code>.</p>
+     *
+     * @param propertyExpressions a {@link java.util.List} object.
+     */
+    public void setPropertyExpressions(List<DRIPropertyExpression> propertyExpressions) {
+        this.propertyExpressions = propertyExpressions;
+    }
+
+    /**
+     * <p>addPropertyExpression.</p>
+     *
+     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     */
+    public void addPropertyExpression(DRIPropertyExpression propertyExpression) {
+        Validate.notNull(propertyExpression, "propertyExpression must not be null");
+        this.propertyExpressions.add(propertyExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRTableOfContentsHeading getTableOfContentsHeading() {
+        return tableOfContentsHeading;
+    }
+
+    /**
+     * <p>Setter for the field <code>tableOfContentsHeading</code>.</p>
+     *
+     * @param tableOfContentsHeading a {@link net.sf.dynamicreports.report.base.DRTableOfContentsHeading} object.
+     */
+    public void setTableOfContentsHeading(DRTableOfContentsHeading tableOfContentsHeading) {
+        this.tableOfContentsHeading = tableOfContentsHeading;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRCurrentDate.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRCurrentDate.java
new file mode 100644
index 0000000..512f069
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRCurrentDate.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRICurrentDate;
+
+/**
+ * <p>DRCurrentDate class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRCurrentDate extends DRFormatField implements DRICurrentDate {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String pattern;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return pattern;
+    }
+
+    /**
+     * <p>Setter for the field <code>pattern</code>.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     */
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRDimensionComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRDimensionComponent.java
new file mode 100644
index 0000000..4334c60
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRDimensionComponent.java
@@ -0,0 +1,187 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract DRDimensionComponent class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRDimensionComponent extends DRComponent implements DRIDimensionComponent {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer width;
+    private Integer height;
+    private ComponentDimensionType widthType;
+    private ComponentDimensionType heightType;
+    private ComponentPositionType positionType;
+    private StretchType stretchType;
+    private Boolean printInFirstWholeBand;
+    private Boolean printWhenDetailOverflows;
+    private DRIGroup printWhenGroupChanges;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getWidth() {
+        return width;
+    }
+
+    /**
+     * <p>Setter for the field <code>width</code>.</p>
+     *
+     * @param width a {@link java.lang.Integer} object.
+     */
+    public void setWidth(Integer width) {
+        if (width != null) {
+            Validate.isTrue(width >= 0, "width must be >= 0");
+        }
+        this.width = width;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getHeight() {
+        return height;
+    }
+
+    /**
+     * <p>Setter for the field <code>height</code>.</p>
+     *
+     * @param height a {@link java.lang.Integer} object.
+     */
+    public void setHeight(Integer height) {
+        if (height != null) {
+            Validate.isTrue(height >= 0, "height must be >= 0");
+        }
+        this.height = height;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentDimensionType getWidthType() {
+        return widthType;
+    }
+
+    /**
+     * <p>Setter for the field <code>widthType</code>.</p>
+     *
+     * @param widthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public void setWidthType(ComponentDimensionType widthType) {
+        this.widthType = widthType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentDimensionType getHeightType() {
+        return heightType;
+    }
+
+    /**
+     * <p>Setter for the field <code>heightType</code>.</p>
+     *
+     * @param heightType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public void setHeightType(ComponentDimensionType heightType) {
+        this.heightType = heightType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentPositionType getPositionType() {
+        return positionType;
+    }
+
+    /**
+     * <p>Setter for the field <code>positionType</code>.</p>
+     *
+     * @param positionType a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     */
+    public void setPositionType(ComponentPositionType positionType) {
+        this.positionType = positionType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public StretchType getStretchType() {
+        return stretchType;
+    }
+
+    /**
+     * <p>Setter for the field <code>stretchType</code>.</p>
+     *
+     * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     */
+    public void setStretchType(StretchType stretchType) {
+        this.stretchType = stretchType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getPrintInFirstWholeBand() {
+        return printInFirstWholeBand;
+    }
+
+    /**
+     * <p>Setter for the field <code>printInFirstWholeBand</code>.</p>
+     *
+     * @param printInFirstWholeBand a {@link java.lang.Boolean} object.
+     */
+    public void setPrintInFirstWholeBand(Boolean printInFirstWholeBand) {
+        this.printInFirstWholeBand = printInFirstWholeBand;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getPrintWhenDetailOverflows() {
+        return printWhenDetailOverflows;
+    }
+
+    /**
+     * <p>Setter for the field <code>printWhenDetailOverflows</code>.</p>
+     *
+     * @param printWhenDetailOverflows a {@link java.lang.Boolean} object.
+     */
+    public void setPrintWhenDetailOverflows(Boolean printWhenDetailOverflows) {
+        this.printWhenDetailOverflows = printWhenDetailOverflows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIGroup getPrintWhenGroupChanges() {
+        return printWhenGroupChanges;
+    }
+
+    /**
+     * <p>Setter for the field <code>printWhenGroupChanges</code>.</p>
+     *
+     * @param printWhenGroupChanges a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    public void setPrintWhenGroupChanges(DRIGroup printWhenGroupChanges) {
+        this.printWhenGroupChanges = printWhenGroupChanges;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DREllipse.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DREllipse.java
new file mode 100644
index 0000000..4c95743
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DREllipse.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.base.style.DRPen;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIEllipse;
+
+/**
+ * <p>DREllipse class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DREllipse extends DRDimensionComponent implements DRIEllipse {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRPen pen;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPen getPen() {
+        return pen;
+    }
+
+    /**
+     * <p>Setter for the field <code>pen</code>.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public void setPen(DRPen pen) {
+        this.pen = pen;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFiller.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFiller.java
new file mode 100644
index 0000000..dc0a272
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFiller.java
@@ -0,0 +1,31 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIFiller;
+
+/**
+ * <p>DRFiller class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRFiller extends DRDimensionComponent implements DRIFiller {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFormatField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFormatField.java
new file mode 100644
index 0000000..dedb292
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFormatField.java
@@ -0,0 +1,68 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.component.DRIFormatField;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract DRFormatField class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRFormatField extends DRHyperLinkComponent implements DRIFormatField {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<String> formatExpression;
+    private HorizontalTextAlignment horizontalTextAlignment;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<String> getFormatExpression() {
+        return formatExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>formatExpression</code>.</p>
+     *
+     * @param formatExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setFormatExpression(DRIExpression<String> formatExpression) {
+        Validate.notNull(formatExpression, "formatExpression must not be null");
+        this.formatExpression = formatExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return horizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRGenericElement.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRGenericElement.java
new file mode 100644
index 0000000..0ddee36
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRGenericElement.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIGenericElement;
+import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRGenericElement class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRGenericElement extends DRDimensionComponent implements DRIGenericElement {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String genericElementNamespace;
+    private String genericElementName;
+    private List<DRIParameterExpression> parameterExpressions;
+
+    /**
+     * <p>Constructor for DRGenericElement.</p>
+     *
+     * @param namespace a {@link java.lang.String} object.
+     * @param namespace a {@link java.lang.String} object.
+     * @param name      a {@link java.lang.String} object.
+     */
+    public DRGenericElement(String namespace, String name) {
+        Validate.notEmpty(namespace, "namespace must not be empty");
+        Validate.notEmpty(name, "name must not be empty");
+        genericElementNamespace = namespace;
+        genericElementName = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        super.init();
+        parameterExpressions = new ArrayList<DRIParameterExpression>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getGenericElementNamespace() {
+        return genericElementNamespace;
+    }
+
+    /**
+     * <p>Setter for the field <code>genericElementNamespace</code>.</p>
+     *
+     * @param genericElementNamespace a {@link java.lang.String} object.
+     */
+    public void setGenericElementNamespace(String genericElementNamespace) {
+        this.genericElementNamespace = genericElementNamespace;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getGenericElementName() {
+        return genericElementName;
+    }
+
+    /**
+     * <p>Setter for the field <code>genericElementName</code>.</p>
+     *
+     * @param genericElementName a {@link java.lang.String} object.
+     */
+    public void setGenericElementName(String genericElementName) {
+        this.genericElementName = genericElementName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIParameterExpression> getParameterExpressions() {
+        return parameterExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>parameterExpressions</code>.</p>
+     *
+     * @param parameterExpressions a {@link java.util.List} object.
+     */
+    public void setParameterExpressions(List<DRIParameterExpression> parameterExpressions) {
+        this.parameterExpressions = parameterExpressions;
+    }
+
+    /**
+     * <p>addParameterExpression.</p>
+     *
+     * @param parameterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIParameterExpression} object.
+     */
+    public void addParameterExpression(DRIParameterExpression parameterExpression) {
+        Validate.notNull(parameterExpression, "parameterExpression must not be null");
+        this.parameterExpressions.add(parameterExpression);
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRHyperLinkComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRHyperLinkComponent.java
new file mode 100644
index 0000000..001e6ee
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRHyperLinkComponent.java
@@ -0,0 +1,82 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.base.DRHyperLink;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIHyperLinkComponent;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>Abstract DRHyperLinkComponent class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRHyperLinkComponent extends DRDimensionComponent implements DRIHyperLinkComponent {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<String> anchorNameExpression;
+    private Integer bookmarkLevel;
+    private DRHyperLink hyperLink;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<String> getAnchorNameExpression() {
+        return anchorNameExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>anchorNameExpression</code>.</p>
+     *
+     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setAnchorNameExpression(DRIExpression<String> anchorNameExpression) {
+        this.anchorNameExpression = anchorNameExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getBookmarkLevel() {
+        return bookmarkLevel;
+    }
+
+    /**
+     * <p>Setter for the field <code>bookmarkLevel</code>.</p>
+     *
+     * @param bookmarkLevel a {@link java.lang.Integer} object.
+     */
+    public void setBookmarkLevel(Integer bookmarkLevel) {
+        this.bookmarkLevel = bookmarkLevel;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRHyperLink getHyperLink() {
+        return hyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>hyperLink</code>.</p>
+     *
+     * @param hyperLink a {@link net.sf.dynamicreports.report.base.DRHyperLink} object.
+     */
+    public void setHyperLink(DRHyperLink hyperLink) {
+        this.hyperLink = hyperLink;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRImage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRImage.java
new file mode 100644
index 0000000..321690e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRImage.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.definition.component.DRIImage;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRImage class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRImage extends DRHyperLinkComponent implements DRIImage {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private ImageScale imageScale;
+    private DRIExpression<?> imageExpression;
+    private Boolean usingCache;
+    private Boolean lazy;
+    private HorizontalImageAlignment horizontalImageAlignment;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getImageExpression() {
+        return imageExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageExpression</code>.</p>
+     *
+     * @param imageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setImageExpression(DRIExpression<?> imageExpression) {
+        Validate.notNull(imageExpression, "imageExpression must not be null");
+        this.imageExpression = imageExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ImageScale getImageScale() {
+        return imageScale;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageScale</code>.</p>
+     *
+     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     */
+    public void setImageScale(ImageScale imageScale) {
+        this.imageScale = imageScale;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getUsingCache() {
+        return usingCache;
+    }
+
+    /**
+     * <p>Setter for the field <code>usingCache</code>.</p>
+     *
+     * @param usingCache a {@link java.lang.Boolean} object.
+     */
+    public void setUsingCache(Boolean usingCache) {
+        this.usingCache = usingCache;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getLazy() {
+        return lazy;
+    }
+
+    /**
+     * <p>Setter for the field <code>lazy</code>.</p>
+     *
+     * @param lazy a {@link java.lang.Boolean} object.
+     */
+    public void setLazy(Boolean lazy) {
+        this.lazy = lazy;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalImageAlignment getHorizontalImageAlignment() {
+        return horizontalImageAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        this.horizontalImageAlignment = horizontalImageAlignment;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRLine.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRLine.java
new file mode 100644
index 0000000..a83d920
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRLine.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.base.style.DRPen;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.LineDirection;
+import net.sf.dynamicreports.report.definition.component.DRILine;
+
+/**
+ * <p>DRLine class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRLine extends DRDimensionComponent implements DRILine {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private LineDirection direction;
+    private DRPen pen;
+
+    /** {@inheritDoc} */
+    @Override
+    public LineDirection getDirection() {
+        return direction;
+    }
+
+    /**
+     * <p>Setter for the field <code>direction</code>.</p>
+     *
+     * @param direction a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     */
+    public void setDirection(LineDirection direction) {
+        this.direction = direction;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPen getPen() {
+        return pen;
+    }
+
+    /**
+     * <p>Setter for the field <code>pen</code>.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public void setPen(DRPen pen) {
+        this.pen = pen;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRList.java
new file mode 100644
index 0000000..cf29e35
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRList.java
@@ -0,0 +1,152 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.component.DRIList;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRList class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRList extends DRDimensionComponent implements DRIList {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private List<DRListCell> listCells;
+    private ListType type;
+    private Integer gap;
+    private DRComponent backgroundComponent;
+
+    /**
+     * <p>Constructor for DRList.</p>
+     */
+    public DRList() {
+        this(ListType.HORIZONTAL);
+    }
+
+    /**
+     * <p>Constructor for DRList.</p>
+     *
+     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public DRList(ListType type) {
+        setType(type);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        super.init();
+        this.listCells = new ArrayList<DRListCell>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRListCell> getListCells() {
+        return listCells;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public void addComponent(DRComponent component) {
+        listCells.add(new DRListCell(component));
+    }
+
+    /**
+     * <p>addCell.</p>
+     *
+     * @param cell a {@link net.sf.dynamicreports.report.base.component.DRListCell} object.
+     */
+    public void addCell(DRListCell cell) {
+        Validate.notNull(cell, "cell must not be null");
+        listCells.add(cell);
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public void addComponent(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRComponent component) {
+        listCells.add(new DRListCell(horizontalAlignment, verticalAlignment, component));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ListType getType() {
+        return type;
+    }
+
+    /**
+     * <p>Setter for the field <code>type</code>.</p>
+     *
+     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public void setType(ListType type) {
+        Validate.notNull(type, "type must not be null");
+        this.type = type;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getGap() {
+        return gap;
+    }
+
+    /**
+     * <p>Setter for the field <code>gap</code>.</p>
+     *
+     * @param gap a {@link java.lang.Integer} object.
+     */
+    public void setGap(Integer gap) {
+        if (gap != null) {
+            Validate.isTrue(gap >= 0, "gap must be >= 0");
+        }
+        this.gap = gap;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRComponent getBackgroundComponent() {
+        return backgroundComponent;
+    }
+
+    /**
+     * <p>Setter for the field <code>backgroundComponent</code>.</p>
+     *
+     * @param backgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public void setBackgroundComponent(DRComponent backgroundComponent) {
+        this.backgroundComponent = backgroundComponent;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRListCell.java
new file mode 100644
index 0000000..3ea9530
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRListCell.java
@@ -0,0 +1,97 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.component.DRIListCell;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRListCell class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRListCell implements DRIListCell {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private HorizontalCellComponentAlignment horizontalAlignment;
+    private VerticalCellComponentAlignment verticalAlignment;
+    private DRComponent component;
+
+    /**
+     * <p>Constructor for DRListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public DRListCell(DRComponent component) {
+        Validate.notNull(component, "component must not be null");
+        this.component = component;
+    }
+
+    /**
+     * <p>Constructor for DRListCell.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public DRListCell(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRComponent component) {
+        this(component);
+        this.horizontalAlignment = horizontalAlignment;
+        this.verticalAlignment = verticalAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalCellComponentAlignment getHorizontalAlignment() {
+        return horizontalAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalAlignment</code>.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     */
+    public void setHorizontalAlignment(HorizontalCellComponentAlignment horizontalAlignment) {
+        this.horizontalAlignment = horizontalAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public VerticalCellComponentAlignment getVerticalAlignment() {
+        return verticalAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>verticalAlignment</code>.</p>
+     *
+     * @param verticalAlignment a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     */
+    public void setVerticalAlignment(VerticalCellComponentAlignment verticalAlignment) {
+        this.verticalAlignment = verticalAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRComponent getComponent() {
+        return component;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMap.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMap.java
new file mode 100644
index 0000000..64dffe1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMap.java
@@ -0,0 +1,81 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIMap;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRMap class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRMap extends DRDimensionComponent implements DRIMap {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    public DRIExpression<Float> latitudeExpression;
+    public DRIExpression<Float> longitudeExpression;
+    public DRIExpression<Integer> zoomExpression;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Float> getLatitudeExpression() {
+        return latitudeExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>latitudeExpression</code>.</p>
+     *
+     * @param latitudeExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setLatitudeExpression(DRIExpression<Float> latitudeExpression) {
+        this.latitudeExpression = latitudeExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Float> getLongitudeExpression() {
+        return longitudeExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>longitudeExpression</code>.</p>
+     *
+     * @param longitudeExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setLongitudeExpression(DRIExpression<Float> longitudeExpression) {
+        this.longitudeExpression = longitudeExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Integer> getZoomExpression() {
+        return zoomExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>zoomExpression</code>.</p>
+     *
+     * @param zoomExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setZoomExpression(DRIExpression<Integer> zoomExpression) {
+        this.zoomExpression = zoomExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMultiPageList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMultiPageList.java
new file mode 100644
index 0000000..3fdcb66
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMultiPageList.java
@@ -0,0 +1,86 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.component.DRIMultiPageList;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRMultiPageList class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRMultiPageList extends DRDimensionComponent implements DRIMultiPageList {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private List<DRIComponent> components;
+    private SplitType splitType;
+
+    /**
+     * <p>Constructor for DRMultiPageList.</p>
+     */
+    public DRMultiPageList() {
+        components = new ArrayList<DRIComponent>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIComponent> getComponents() {
+        return components;
+    }
+
+    /**
+     * <p>Setter for the field <code>components</code>.</p>
+     *
+     * @param components a {@link java.util.List} object.
+     */
+    public void setComponents(List<DRIComponent> components) {
+        this.components = components;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public void addComponent(DRIComponent component) {
+        components.add(component);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public SplitType getSplitType() {
+        return splitType;
+    }
+
+    /**
+     * <p>Setter for the field <code>splitType</code>.</p>
+     *
+     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public void setSplitType(SplitType splitType) {
+        this.splitType = splitType;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageNumber.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageNumber.java
new file mode 100644
index 0000000..d7d7ab6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageNumber.java
@@ -0,0 +1,32 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIPageNumber;
+
+/**
+ * <p>DRPageNumber class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRPageNumber extends DRFormatField implements DRIPageNumber {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageXofY.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageXofY.java
new file mode 100644
index 0000000..1468e25
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageXofY.java
@@ -0,0 +1,98 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIPageXofY;
+
+/**
+ * <p>DRPageXofY class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRPageXofY extends DRFormatField implements DRIPageXofY {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer pageXWidth;
+    private ComponentDimensionType pageXWidthType;
+    private Integer pageYWidth;
+    private ComponentDimensionType pageYWidthType;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageXWidth() {
+        return pageXWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageXWidth</code>.</p>
+     *
+     * @param pageXWidth a {@link java.lang.Integer} object.
+     */
+    public void setPageXWidth(Integer pageXWidth) {
+        this.pageXWidth = pageXWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentDimensionType getPageXWidthType() {
+        return pageXWidthType;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageXWidthType</code>.</p>
+     *
+     * @param pageXWidthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public void setPageXWidthType(ComponentDimensionType pageXWidthType) {
+        this.pageXWidthType = pageXWidthType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getPageYWidth() {
+        return pageYWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageYWidth</code>.</p>
+     *
+     * @param pageYWidth a {@link java.lang.Integer} object.
+     */
+    public void setPageYWidth(Integer pageYWidth) {
+        this.pageYWidth = pageYWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentDimensionType getPageYWidthType() {
+        return pageYWidthType;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageYWidthType</code>.</p>
+     *
+     * @param pageYWidthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public void setPageYWidthType(ComponentDimensionType pageYWidthType) {
+        this.pageYWidthType = pageYWidthType;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRRectangle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRRectangle.java
new file mode 100644
index 0000000..e3d94e7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRRectangle.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.base.style.DRPen;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIRectangle;
+
+/**
+ * <p>DRRectangle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRRectangle extends DRDimensionComponent implements DRIRectangle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer radius;
+    private DRPen pen;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getRadius() {
+        return radius;
+    }
+
+    /**
+     * <p>Setter for the field <code>radius</code>.</p>
+     *
+     * @param radius a {@link java.lang.Integer} object.
+     */
+    public void setRadius(Integer radius) {
+        this.radius = radius;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPen getPen() {
+        return pen;
+    }
+
+    /**
+     * <p>Setter for the field <code>pen</code>.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public void setPen(DRPen pen) {
+        this.pen = pen;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRSubreport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRSubreport.java
new file mode 100644
index 0000000..54292dd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRSubreport.java
@@ -0,0 +1,118 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRISubreport;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+import java.sql.Connection;
+import java.util.Map;
+
+/**
+ * <p>DRSubreport class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRSubreport extends DRDimensionComponent implements DRISubreport {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<?> reportExpression;
+    private DRIExpression<Map<String, Object>> parametersExpression;
+    private DRIExpression<Connection> connectionExpression;
+    private DRIExpression<?> dataSourceExpression;
+    private Boolean runToBottom;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getReportExpression() {
+        return reportExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>reportExpression</code>.</p>
+     *
+     * @param reportExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setReportExpression(DRIExpression<?> reportExpression) {
+        Validate.notNull(reportExpression, "reportExpression must not be null");
+        this.reportExpression = reportExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Map<String, Object>> getParametersExpression() {
+        return parametersExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>parametersExpression</code>.</p>
+     *
+     * @param parametersExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setParametersExpression(DRIExpression<Map<String, Object>> parametersExpression) {
+        this.parametersExpression = parametersExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Connection> getConnectionExpression() {
+        return connectionExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>connectionExpression</code>.</p>
+     *
+     * @param connectionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setConnectionExpression(DRIExpression<Connection> connectionExpression) {
+        this.connectionExpression = connectionExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getDataSourceExpression() {
+        return dataSourceExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataSourceExpression</code>.</p>
+     *
+     * @param dataSourceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setDataSourceExpression(DRIExpression<?> dataSourceExpression) {
+        this.dataSourceExpression = dataSourceExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getRunToBottom() {
+        return runToBottom;
+    }
+
+    /**
+     * <p>Setter for the field <code>runToBottom</code>.</p>
+     *
+     * @param runToBottom a {@link java.lang.Boolean} object.
+     */
+    public void setRunToBottom(Boolean runToBottom) {
+        this.runToBottom = runToBottom;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTextField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTextField.java
new file mode 100644
index 0000000..d93640f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTextField.java
@@ -0,0 +1,285 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.DRGroup;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+
+/**
+ * <p>DRTextField class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class DRTextField<T> extends DRHyperLinkComponent implements DRITextField<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<T> valueExpression;
+    private String pattern;
+    private DRIExpression<String> patternExpression;
+    private HorizontalTextAlignment horizontalTextAlignment;
+    private DRIValueFormatter<?, ? super T> valueFormatter;
+    private DRIDataType<? super T, T> dataType;
+    private Integer columns;
+    private Integer rows;
+    private Evaluation evaluationTime;
+    private DRGroup evaluationGroup;
+    private Markup markup;
+    private Boolean stretchWithOverflow;
+    private Boolean printRepeatedValues;
+    private TextAdjust textAdjust;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<T> getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setValueExpression(final DRIExpression<T> valueExpression) {
+        Validate.notNull(valueExpression, "valueExpression must not be null");
+        this.valueExpression = valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return pattern;
+    }
+
+    /**
+     * <p>Setter for the field <code>pattern</code>.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     */
+    public void setPattern(final String pattern) {
+        this.pattern = pattern;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<String> getPatternExpression() {
+        return patternExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>patternExpression</code>.</p>
+     *
+     * @param patternExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setPatternExpression(final DRIExpression<String> patternExpression) {
+        this.patternExpression = patternExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return horizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIValueFormatter<?, ? super T> getValueFormatter() {
+        return valueFormatter;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueFormatter</code>.</p>
+     *
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     */
+    public void setValueFormatter(final DRIValueFormatter<?, ? super T> valueFormatter) {
+        this.valueFormatter = valueFormatter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDataType<? super T, T> getDataType() {
+        return dataType;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataType</code>.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    public void setDataType(final DRIDataType<? super T, T> dataType) {
+        this.dataType = dataType;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the number of columns.
+     */
+    @Override
+    public Integer getColumns() {
+        return columns;
+    }
+
+    /**
+     * This method is used to define the width of a column. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
+     *
+     * @param columns the number of columns >= 0
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public void setColumns(final Integer columns) {
+        if (columns != null) {
+            Validate.isTrue(columns >= 0, "columns must be >= 0");
+        }
+        this.columns = columns;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the number of rows.
+     */
+    @Override
+    public Integer getRows() {
+        return rows;
+    }
+
+    /**
+     * This method is used to define the height of a column. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of rows >= 0
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public void setRows(final Integer rows) {
+        if (rows != null) {
+            Validate.isTrue(rows >= 0, "rows must be >= 0");
+        }
+        this.rows = rows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Evaluation getEvaluationTime() {
+        return evaluationTime;
+    }
+
+    /**
+     * <p>Setter for the field <code>evaluationTime</code>.</p>
+     *
+     * @param evaluationTime a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     */
+    public void setEvaluationTime(final Evaluation evaluationTime) {
+        this.evaluationTime = evaluationTime;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRGroup getEvaluationGroup() {
+        return evaluationGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>evaluationGroup</code>.</p>
+     *
+     * @param evaluationGroup a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+     */
+    public void setEvaluationGroup(final DRGroup evaluationGroup) {
+        this.evaluationGroup = evaluationGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Markup getMarkup() {
+        return markup;
+    }
+
+    /**
+     * <p>Setter for the field <code>markup</code>.</p>
+     *
+     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     */
+    public void setMarkup(final Markup markup) {
+        this.markup = markup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getStretchWithOverflow() {
+        return stretchWithOverflow;
+    }
+
+    /**
+     * <p>Setter for the field <code>stretchWithOverflow</code>.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @deprecated replaced {@link #setTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public void setStretchWithOverflow(final Boolean stretchWithOverflow) {
+        this.stretchWithOverflow = stretchWithOverflow;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getPrintRepeatedValues() {
+        return printRepeatedValues;
+    }
+
+    /**
+     * <p>Setter for the field <code>printRepeatedValues</code>.</p>
+     *
+     * @param printRepeatedValues a {@link java.lang.Boolean} object.
+     */
+    public void setPrintRepeatedValues(final Boolean printRepeatedValues) {
+        this.printRepeatedValues = printRepeatedValues;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TextAdjust getTextAdjust() {
+        return this.textAdjust;
+    }
+
+    /**
+     * <p>Setter for the field <code>textAdjust</code>.</p>
+     *
+     * @param setTextAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    public void setTextAdjust(final TextAdjust textAdjust) {
+        this.textAdjust = textAdjust;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTotalPages.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTotalPages.java
new file mode 100644
index 0000000..0fe221b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTotalPages.java
@@ -0,0 +1,32 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRITotalPages;
+
+/**
+ * <p>DRTotalPages class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRTotalPages extends DRFormatField implements DRITotalPages {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyList.java
new file mode 100644
index 0000000..5aaec15
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyList.java
@@ -0,0 +1,72 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIXyList;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRXyList class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRXyList extends DRDimensionComponent implements DRIXyList {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private List<DRXyListCell> xyListCells;
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        super.init();
+        this.xyListCells = new ArrayList<DRXyListCell>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRXyListCell> getXyListCells() {
+        return xyListCells;
+    }
+
+    /**
+     * <p>addCell.</p>
+     *
+     * @param cell a {@link net.sf.dynamicreports.report.base.component.DRXyListCell} object.
+     */
+    public void addCell(DRXyListCell cell) {
+        Validate.notNull(cell, "cell must not be null");
+        xyListCells.add(cell);
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public void addComponent(Integer x, Integer y, DRComponent component) {
+        xyListCells.add(new DRXyListCell(x, y, component));
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyListCell.java
new file mode 100644
index 0000000..b57060a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyListCell.java
@@ -0,0 +1,88 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIXyListCell;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRXyListCell class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRXyListCell implements DRIXyListCell {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer x;
+    private Integer y;
+    private DRComponent component;
+
+    /**
+     * <p>Constructor for DRXyListCell.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public DRXyListCell(Integer x, Integer y, DRComponent component) {
+        Validate.notNull(x, "x must not be null");
+        Validate.notNull(y, "y must not be null");
+        Validate.notNull(component, "component must not be null");
+        this.x = x;
+        this.y = y;
+        this.component = component;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getX() {
+        return x;
+    }
+
+    /**
+     * <p>Setter for the field <code>x</code>.</p>
+     *
+     * @param x a {@link java.lang.Integer} object.
+     */
+    public void setX(Integer x) {
+        this.x = x;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getY() {
+        return y;
+    }
+
+    /**
+     * <p>Setter for the field <code>y</code>.</p>
+     *
+     * @param y a {@link java.lang.Integer} object.
+     */
+    public void setY(Integer y) {
+        this.y = y;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRComponent getComponent() {
+        return component;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstab.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstab.java
new file mode 100644
index 0000000..e39599b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstab.java
@@ -0,0 +1,403 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import net.sf.dynamicreports.report.base.component.DRDimensionComponent;
+import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRCrosstab class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRCrosstab extends DRDimensionComponent implements DRICrosstab {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRCrosstabDataset dataset;
+    private Boolean repeatColumnHeaders;
+    private Boolean repeatRowHeaders;
+    private Integer columnBreakOffset;
+    private Boolean ignoreWidth;
+    private RunDirection runDirection;
+    private Integer cellWidth;
+    private Integer cellHeight;
+    private Boolean highlightOddRows;
+    private DRSimpleStyle oddRowStyle;
+    private Boolean highlightEvenRows;
+    private DRSimpleStyle evenRowStyle;
+    private DRIReportStyle groupStyle;
+    private DRIReportStyle groupTotalStyle;
+    private DRIReportStyle grandTotalStyle;
+    private DRIReportStyle cellStyle;
+    private DRIReportStyle measureTitleStyle;
+    private DRCrosstabCellContent whenNoDataCell;
+    private DRCrosstabCellContent headerCell;
+    private List<DRICrosstabColumnGroup<?>> columnGroups;
+    private List<DRICrosstabRowGroup<?>> rowGroups;
+    private List<DRICrosstabVariable<?>> variables;
+    private List<DRICrosstabMeasure<?>> measures;
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        super.init();
+        dataset = new DRCrosstabDataset();
+        columnGroups = new ArrayList<DRICrosstabColumnGroup<?>>();
+        rowGroups = new ArrayList<DRICrosstabRowGroup<?>>();
+        variables = new ArrayList<DRICrosstabVariable<?>>();
+        measures = new ArrayList<DRICrosstabMeasure<?>>();
+
+        whenNoDataCell = new DRCrosstabCellContent();
+        headerCell = new DRCrosstabCellContent();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRCrosstabDataset getDataset() {
+        return dataset;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean isRepeatColumnHeaders() {
+        return repeatColumnHeaders;
+    }
+
+    /**
+     * <p>Setter for the field <code>repeatColumnHeaders</code>.</p>
+     *
+     * @param repeatColumnHeaders a {@link java.lang.Boolean} object.
+     */
+    public void setRepeatColumnHeaders(Boolean repeatColumnHeaders) {
+        this.repeatColumnHeaders = repeatColumnHeaders;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean isRepeatRowHeaders() {
+        return repeatRowHeaders;
+    }
+
+    /**
+     * <p>Setter for the field <code>repeatRowHeaders</code>.</p>
+     *
+     * @param repeatRowHeaders a {@link java.lang.Boolean} object.
+     */
+    public void setRepeatRowHeaders(Boolean repeatRowHeaders) {
+        this.repeatRowHeaders = repeatRowHeaders;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getColumnBreakOffset() {
+        return columnBreakOffset;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnBreakOffset</code>.</p>
+     *
+     * @param columnBreakOffset a {@link java.lang.Integer} object.
+     */
+    public void setColumnBreakOffset(Integer columnBreakOffset) {
+        this.columnBreakOffset = columnBreakOffset;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getIgnoreWidth() {
+        return ignoreWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>ignoreWidth</code>.</p>
+     *
+     * @param ignoreWidth a {@link java.lang.Boolean} object.
+     */
+    public void setIgnoreWidth(Boolean ignoreWidth) {
+        this.ignoreWidth = ignoreWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public RunDirection getRunDirection() {
+        return runDirection;
+    }
+
+    /**
+     * <p>Setter for the field <code>runDirection</code>.</p>
+     *
+     * @param runDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public void setRunDirection(RunDirection runDirection) {
+        this.runDirection = runDirection;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRCrosstabCellContent getWhenNoDataCell() {
+        return whenNoDataCell;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRCrosstabCellContent getHeaderCell() {
+        return headerCell;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRICrosstabColumnGroup<?>> getColumnGroups() {
+        return columnGroups;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getCellWidth() {
+        return cellWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>cellWidth</code>.</p>
+     *
+     * @param cellWidth a {@link java.lang.Integer} object.
+     */
+    public void setCellWidth(Integer cellWidth) {
+        this.cellWidth = cellWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getCellHeight() {
+        return cellHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>cellHeight</code>.</p>
+     *
+     * @param cellHeight a {@link java.lang.Integer} object.
+     */
+    public void setCellHeight(Integer cellHeight) {
+        this.cellHeight = cellHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getHighlightOddRows() {
+        return highlightOddRows;
+    }
+
+    /**
+     * <p>Setter for the field <code>highlightOddRows</code>.</p>
+     *
+     * @param highlightOddRows a {@link java.lang.Boolean} object.
+     */
+    public void setHighlightOddRows(Boolean highlightOddRows) {
+        this.highlightOddRows = highlightOddRows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRSimpleStyle getOddRowStyle() {
+        return oddRowStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>oddRowStyle</code>.</p>
+     *
+     * @param oddRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+     */
+    public void setOddRowStyle(DRSimpleStyle oddRowStyle) {
+        this.oddRowStyle = oddRowStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getHighlightEvenRows() {
+        return highlightEvenRows;
+    }
+
+    /**
+     * <p>Setter for the field <code>highlightEvenRows</code>.</p>
+     *
+     * @param highlightEvenRows a {@link java.lang.Boolean} object.
+     */
+    public void setHighlightEvenRows(Boolean highlightEvenRows) {
+        this.highlightEvenRows = highlightEvenRows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRSimpleStyle getEvenRowStyle() {
+        return evenRowStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>evenRowStyle</code>.</p>
+     *
+     * @param evenRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+     */
+    public void setEvenRowStyle(DRSimpleStyle evenRowStyle) {
+        this.evenRowStyle = evenRowStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getGroupStyle() {
+        return groupStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>groupStyle</code>.</p>
+     *
+     * @param groupStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setGroupStyle(DRIReportStyle groupStyle) {
+        this.groupStyle = groupStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getGroupTotalStyle() {
+        return groupTotalStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>groupTotalStyle</code>.</p>
+     *
+     * @param groupTotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setGroupTotalStyle(DRIReportStyle groupTotalStyle) {
+        this.groupTotalStyle = groupTotalStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getGrandTotalStyle() {
+        return grandTotalStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>grandTotalStyle</code>.</p>
+     *
+     * @param grandTotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setGrandTotalStyle(DRIReportStyle grandTotalStyle) {
+        this.grandTotalStyle = grandTotalStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getCellStyle() {
+        return cellStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>cellStyle</code>.</p>
+     *
+     * @param cellStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setCellStyle(DRIReportStyle cellStyle) {
+        this.cellStyle = cellStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getMeasureTitleStyle() {
+        return measureTitleStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>measureTitleStyle</code>.</p>
+     *
+     * @param measureTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setMeasureTitleStyle(DRIReportStyle measureTitleStyle) {
+        this.measureTitleStyle = measureTitleStyle;
+    }
+
+    /**
+     * <p>addColumnGroup.</p>
+     *
+     * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+     */
+    public void addColumnGroup(DRICrosstabColumnGroup<?> columnGroup) {
+        Validate.notNull(columnGroup, "columnGroup must not be null");
+        this.columnGroups.add(columnGroup);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRICrosstabRowGroup<?>> getRowGroups() {
+        return rowGroups;
+    }
+
+    /**
+     * <p>addRowGroup.</p>
+     *
+     * @param rowGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+     */
+    public void addRowGroup(DRICrosstabRowGroup<?> rowGroup) {
+        Validate.notNull(rowGroup, "rowGroup must not be null");
+        this.rowGroups.add(rowGroup);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRICrosstabVariable<?>> getVariables() {
+        return variables;
+    }
+
+    /**
+     * <p>addVariable.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable} object.
+     */
+    public void addVariable(DRICrosstabVariable<?> variable) {
+        Validate.notNull(variable, "variable must not be null");
+        this.variables.add(variable);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRICrosstabMeasure<?>> getMeasures() {
+        return measures;
+    }
+
+    /**
+     * <p>addMeasure.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure} object.
+     */
+    public void addMeasure(DRICrosstabMeasure<?> measure) {
+        Validate.notNull(measure, "measure must not be null");
+        this.measures.add(measure);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java
new file mode 100644
index 0000000..cff8ee2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java
@@ -0,0 +1,75 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import net.sf.dynamicreports.report.base.component.DRComponent;
+import net.sf.dynamicreports.report.base.component.DRList;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellContent;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRCrosstabCellContent class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRCrosstabCellContent implements DRICrosstabCellContent {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRList list;
+    private DRIReportStyle style;
+
+    /**
+     * <p>Constructor for DRCrosstabCellContent.</p>
+     */
+    public DRCrosstabCellContent() {
+        this.list = new DRList(ListType.VERTICAL);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRList getList() {
+        return list;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    public void addComponent(DRComponent component) {
+        list.addComponent(component);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <p>Setter for the field <code>style</code>.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setStyle(DRIReportStyle style) {
+        this.style = style;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java
new file mode 100644
index 0000000..ad99af7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java
@@ -0,0 +1,105 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRCrosstabCellStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRCrosstabCellStyle implements DRICrosstabCellStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRICrosstabRowGroup<?> rowGroup;
+    private DRICrosstabColumnGroup<?> columnGroup;
+    private DRIReportStyle style;
+
+    /**
+     * <p>Constructor for DRCrosstabCellStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRCrosstabCellStyle(DRIReportStyle style) {
+        this(style, null, null);
+    }
+
+    /**
+     * <p>Constructor for DRCrosstabCellStyle.</p>
+     *
+     * @param style       a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param rowGroup    a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+     * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+     */
+    public DRCrosstabCellStyle(DRIReportStyle style, DRICrosstabRowGroup<?> rowGroup, DRICrosstabColumnGroup<?> columnGroup) {
+        this.style = style;
+        this.rowGroup = rowGroup;
+        this.columnGroup = columnGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRICrosstabRowGroup<?> getRowGroup() {
+        return rowGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>rowGroup</code>.</p>
+     *
+     * @param rowGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+     */
+    public void setRowGroup(DRICrosstabRowGroup<?> rowGroup) {
+        this.rowGroup = rowGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRICrosstabColumnGroup<?> getColumnGroup() {
+        return columnGroup;
+    }
+
+    /**
+     * <p>Setter for the field <code>columnGroup</code>.</p>
+     *
+     * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+     */
+    public void setColumnGroup(DRICrosstabColumnGroup<?> columnGroup) {
+        this.columnGroup = columnGroup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <p>Setter for the field <code>style</code>.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setStyle(DRIReportStyle style) {
+        this.style = style;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java
new file mode 100644
index 0000000..4260028
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+
+/**
+ * <p>DRCrosstabColumnGroup class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRCrosstabColumnGroup<T> extends DRCrosstabGroup<T> implements DRICrosstabColumnGroup<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer headerHeight;
+    private Integer totalHeaderWidth;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getHeaderHeight() {
+        return headerHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerHeight</code>.</p>
+     *
+     * @param headerHeight a {@link java.lang.Integer} object.
+     */
+    public void setHeaderHeight(Integer headerHeight) {
+        this.headerHeight = headerHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTotalHeaderWidth() {
+        return totalHeaderWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalHeaderWidth</code>.</p>
+     *
+     * @param totalHeaderWidth a {@link java.lang.Integer} object.
+     */
+    public void setTotalHeaderWidth(Integer totalHeaderWidth) {
+        this.totalHeaderWidth = totalHeaderWidth;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabDataset.java
new file mode 100644
index 0000000..ffc814c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabDataset.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import net.sf.dynamicreports.report.base.DRDataset;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabDataset;
+
+/**
+ * <p>DRCrosstabDataset class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRCrosstabDataset implements DRICrosstabDataset {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRDataset subDataset;
+    private Boolean dataPreSorted;
+
+    /** {@inheritDoc} */
+    @Override
+    public DRDataset getSubDataset() {
+        return subDataset;
+    }
+
+    /**
+     * <p>Setter for the field <code>subDataset</code>.</p>
+     *
+     * @param subDataset a {@link net.sf.dynamicreports.report.base.DRDataset} object.
+     */
+    public void setSubDataset(DRDataset subDataset) {
+        this.subDataset = subDataset;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getDataPreSorted() {
+        return dataPreSorted;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataPreSorted</code>.</p>
+     *
+     * @param dataPreSorted a {@link java.lang.Boolean} object.
+     */
+    public void setDataPreSorted(Boolean dataPreSorted) {
+        this.dataPreSorted = dataPreSorted;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabGroup.java
new file mode 100644
index 0000000..3d81f1b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabGroup.java
@@ -0,0 +1,416 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.base.DRHyperLink;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabGroup;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>Abstract DRCrosstabGroup class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public abstract class DRCrosstabGroup<T> implements DRICrosstabGroup<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private final String name;
+    private String headerPattern;
+    private HorizontalTextAlignment headerHorizontalTextAlignment;
+    private DRIValueFormatter<?, ? super T> headerValueFormatter;
+    private Boolean headerStretchWithOverflow;
+    private TextAdjust headerTextAdjust;
+    private DRHyperLink headerHyperLink;
+    private DRIReportStyle headerStyle;
+    private List<DRIPropertyExpression> headerPropertyExpressions;
+    private Boolean showTotal;
+    private CrosstabTotalPosition totalPosition;
+    private DRIExpression<?> totalHeaderExpression;
+    private Boolean totalHeaderStretchWithOverflow;
+    private TextAdjust totalHeaderTextAdjust;
+    private DRIReportStyle totalHeaderStyle;
+    private List<DRIPropertyExpression> totalHeaderPropertyExpressions;
+    private DRIExpression<T> expression;
+    private DRIDataType<? super T, T> dataType;
+    private DRIExpression<? extends Comparable<?>> orderByExpression;
+    private OrderType orderType;
+    private DRIExpression<? extends Comparator<?>> comparatorExpression;
+
+    /**
+     * <p>Constructor for DRCrosstabGroup.</p>
+     */
+    public DRCrosstabGroup() {
+        this.name = ReportUtils.generateUniqueName("crosstabGroup");
+        headerPropertyExpressions = new ArrayList<>();
+        totalHeaderPropertyExpressions = new ArrayList<>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getHeaderPattern() {
+        return headerPattern;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerPattern</code>.</p>
+     *
+     * @param headerPattern a {@link java.lang.String} object.
+     */
+    public void setHeaderPattern(final String headerPattern) {
+        this.headerPattern = headerPattern;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHeaderHorizontalTextAlignment() {
+        return headerHorizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerHorizontalTextAlignment</code>.</p>
+     *
+     * @param headerHorizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHeaderHorizontalTextAlignment(final HorizontalTextAlignment headerHorizontalTextAlignment) {
+        this.headerHorizontalTextAlignment = headerHorizontalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIValueFormatter<?, ? super T> getHeaderValueFormatter() {
+        return headerValueFormatter;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerValueFormatter</code>.</p>
+     *
+     * @param headerValueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     */
+    public void setHeaderValueFormatter(final DRIValueFormatter<?, ? super T> headerValueFormatter) {
+        this.headerValueFormatter = headerValueFormatter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getHeaderStretchWithOverflow() {
+        return headerStretchWithOverflow;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerStretchWithOverflow</code>.</p>
+     *
+     * @param headerStretchWithOverflow a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #setHeaderTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public void setHeaderStretchWithOverflow(final Boolean headerStretchWithOverflow) {
+        this.headerStretchWithOverflow = headerStretchWithOverflow;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TextAdjust getHeaderTextAdjust() {
+        return this.headerTextAdjust;
+    }
+
+    /**
+     * <p>Setter for the field <code>setHeaderTextAdjust</code>.</p>
+     *
+     * @param headerTextAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    public void setHeaderTextAdjust(final TextAdjust headerTextAdjust) {
+        this.headerTextAdjust = headerTextAdjust;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRHyperLink getHeaderHyperLink() {
+        return headerHyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerHyperLink</code>.</p>
+     *
+     * @param headerHyperLink a {@link net.sf.dynamicreports.report.base.DRHyperLink} object.
+     */
+    public void setHeaderHyperLink(final DRHyperLink headerHyperLink) {
+        this.headerHyperLink = headerHyperLink;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getHeaderStyle() {
+        return headerStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerStyle</code>.</p>
+     *
+     * @param headerStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setHeaderStyle(final DRIReportStyle headerStyle) {
+        this.headerStyle = headerStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIPropertyExpression> getHeaderPropertyExpressions() {
+        return headerPropertyExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerPropertyExpressions</code>.</p>
+     *
+     * @param headerPropertyExpressions a {@link java.util.List} object.
+     */
+    public void setHeaderPropertyExpressions(final List<DRIPropertyExpression> headerPropertyExpressions) {
+        this.headerPropertyExpressions = headerPropertyExpressions;
+    }
+
+    /**
+     * <p>addHeaderPropertyExpression.</p>
+     *
+     * @param headerPropertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     */
+    public void addHeaderPropertyExpression(final DRIPropertyExpression headerPropertyExpression) {
+        Validate.notNull(headerPropertyExpression, "headerPropertyExpression must not be null");
+        this.headerPropertyExpressions.add(headerPropertyExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getShowTotal() {
+        return showTotal;
+    }
+
+    /**
+     * <p>Setter for the field <code>showTotal</code>.</p>
+     *
+     * @param showTotal a {@link java.lang.Boolean} object.
+     */
+    public void setShowTotal(final Boolean showTotal) {
+        this.showTotal = showTotal;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CrosstabTotalPosition getTotalPosition() {
+        return totalPosition;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalPosition</code>.</p>
+     *
+     * @param totalPosition a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     */
+    public void setTotalPosition(final CrosstabTotalPosition totalPosition) {
+        this.totalPosition = totalPosition;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getTotalHeaderExpression() {
+        return totalHeaderExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalHeaderExpression</code>.</p>
+     *
+     * @param totalHeaderExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setTotalHeaderExpression(final DRIExpression<?> totalHeaderExpression) {
+        this.totalHeaderExpression = totalHeaderExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getTotalHeaderStretchWithOverflow() {
+        return totalHeaderStretchWithOverflow;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalHeaderStretchWithOverflow</code>.</p>
+     *
+     * @param totalHeaderStretchWithOverflow a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #setTotalHeaderTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public void setTotalHeaderStretchWithOverflow(final Boolean totalHeaderStretchWithOverflow) {
+        this.totalHeaderStretchWithOverflow = totalHeaderStretchWithOverflow;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TextAdjust getTotalHeaderTextAdjust() {
+        return this.totalHeaderTextAdjust;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalHeaderTextAdjust</code>.</p>
+     *
+     * @param headerTextAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    public void setTotalHeaderTextAdjust(final TextAdjust headerTextAdjust) {
+        this.totalHeaderTextAdjust = headerTextAdjust;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getTotalHeaderStyle() {
+        return totalHeaderStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalHeaderStyle</code>.</p>
+     *
+     * @param totalHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setTotalHeaderStyle(final DRIReportStyle totalHeaderStyle) {
+        this.totalHeaderStyle = totalHeaderStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIPropertyExpression> getTotalHeaderPropertyExpressions() {
+        return totalHeaderPropertyExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalHeaderPropertyExpressions</code>.</p>
+     *
+     * @param totalHeaderPropertyExpressions a {@link java.util.List} object.
+     */
+    public void setTotalHeaderPropertyExpressions(final List<DRIPropertyExpression> totalHeaderPropertyExpressions) {
+        this.totalHeaderPropertyExpressions = totalHeaderPropertyExpressions;
+    }
+
+    /**
+     * <p>addTotalHeaderPropertyExpression.</p>
+     *
+     * @param totalHeaderPropertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     */
+    public void addTotalHeaderPropertyExpression(final DRIPropertyExpression totalHeaderPropertyExpression) {
+        Validate.notNull(totalHeaderPropertyExpression, "totalHeaderPropertyExpression must not be null");
+        this.totalHeaderPropertyExpressions.add(totalHeaderPropertyExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<T> getExpression() {
+        return expression;
+    }
+
+    /**
+     * <p>Setter for the field <code>expression</code>.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setExpression(final DRIExpression<T> expression) {
+        Validate.notNull(expression, "expression must not be null");
+        this.expression = expression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDataType<? super T, T> getDataType() {
+        return dataType;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataType</code>.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    public void setDataType(final DRIDataType<? super T, T> dataType) {
+        this.dataType = dataType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<? extends Comparable<?>> getOrderByExpression() {
+        return orderByExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>orderByExpression</code>.</p>
+     *
+     * @param orderByExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setOrderByExpression(final DRIExpression<? extends Comparable<?>> orderByExpression) {
+        this.orderByExpression = orderByExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public OrderType getOrderType() {
+        return orderType;
+    }
+
+    /**
+     * <p>Setter for the field <code>orderType</code>.</p>
+     *
+     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     */
+    public void setOrderType(final OrderType orderType) {
+        this.orderType = orderType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<? extends Comparator<?>> getComparatorExpression() {
+        return comparatorExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>comparatorExpression</code>.</p>
+     *
+     * @param comparatorExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setComparatorExpression(final DRIExpression<? extends Comparator<?>> comparatorExpression) {
+        this.comparatorExpression = comparatorExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<? super T> getValueClass() {
+        return getExpression().getValueClass();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java
new file mode 100644
index 0000000..da1f5ac
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java
@@ -0,0 +1,262 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.base.DRHyperLink;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRCrosstabMeasure class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class DRCrosstabMeasure<T> implements DRICrosstabMeasure<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private final String name;
+    private final DRIExpression<?> expression;
+    private DRIDataType<? super T, T> dataType;
+    private String pattern;
+    private HorizontalTextAlignment horizontalTextAlignment;
+    private DRIValueFormatter<?, ? super T> valueFormatter;
+    private Boolean stretchWithOverflow;
+    private TextAdjust textAdjust;
+    private DRHyperLink hyperLink;
+    private List<DRIPropertyExpression> propertyExpressions;
+    private List<DRICrosstabCellStyle> styles;
+    private DRIExpression<?> titleExpression;
+    private DRIReportStyle titleStyle;
+
+    /**
+     * <p>Constructor for DRCrosstabMeasure.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRCrosstabMeasure(final DRIExpression<?> expression) {
+        Validate.notNull(expression, "expression must not be null");
+        this.expression = expression;
+        this.name = ReportUtils.generateUniqueName("crosstabMeasure");
+        this.styles = new ArrayList<>();
+        propertyExpressions = new ArrayList<>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getExpression() {
+        return expression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIDataType<? super T, T> getDataType() {
+        return dataType;
+    }
+
+    /**
+     * <p>Setter for the field <code>dataType</code>.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    public void setDataType(final DRIDataType<? super T, T> dataType) {
+        this.dataType = dataType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return pattern;
+    }
+
+    /**
+     * <p>Setter for the field <code>pattern</code>.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     */
+    public void setPattern(final String pattern) {
+        this.pattern = pattern;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return horizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIValueFormatter<?, ? super T> getValueFormatter() {
+        return valueFormatter;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueFormatter</code>.</p>
+     *
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     */
+    public void setValueFormatter(final DRIValueFormatter<?, ? super T> valueFormatter) {
+        this.valueFormatter = valueFormatter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getStretchWithOverflow() {
+        return stretchWithOverflow;
+    }
+
+    /**
+     * <p>Setter for the field <code>stretchWithOverflow</code>.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #setTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public void setStretchWithOverflow(final Boolean stretchWithOverflow) {
+        this.stretchWithOverflow = stretchWithOverflow;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TextAdjust getTextAdjust() {
+        return this.textAdjust;
+    }
+
+    /**
+     * <p>Setter for the field <code>textAdjust</code>.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    public void setTextAdjust(final TextAdjust textAdjust) {
+        this.textAdjust = textAdjust;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRHyperLink getHyperLink() {
+        return hyperLink;
+    }
+
+    /**
+     * <p>Setter for the field <code>hyperLink</code>.</p>
+     *
+     * @param hyperLink a {@link net.sf.dynamicreports.report.base.DRHyperLink} object.
+     */
+    public void setHyperLink(final DRHyperLink hyperLink) {
+        this.hyperLink = hyperLink;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIPropertyExpression> getPropertyExpressions() {
+        return propertyExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>propertyExpressions</code>.</p>
+     *
+     * @param propertyExpressions a {@link java.util.List} object.
+     */
+    public void setPropertyExpressions(final List<DRIPropertyExpression> propertyExpressions) {
+        this.propertyExpressions = propertyExpressions;
+    }
+
+    /**
+     * <p>addPropertyExpression.</p>
+     *
+     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     */
+    public void addPropertyExpression(final DRIPropertyExpression propertyExpression) {
+        Validate.notNull(propertyExpression, "propertyExpression must not be null");
+        this.propertyExpressions.add(propertyExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRICrosstabCellStyle> getStyles() {
+        return styles;
+    }
+
+    /**
+     * <p>setStyle.</p>
+     *
+     * @param styles a {@link java.util.List} object.
+     */
+    public void setStyle(final List<DRICrosstabCellStyle> styles) {
+        this.styles = styles;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getTitleExpression() {
+        return titleExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleExpression</code>.</p>
+     *
+     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setTitleExpression(final DRIExpression<?> titleExpression) {
+        this.titleExpression = titleExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getTitleStyle() {
+        return titleStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleStyle</code>.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setTitleStyle(final DRIReportStyle titleStyle) {
+        this.titleStyle = titleStyle;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java
new file mode 100644
index 0000000..bed6616
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+
+/**
+ * <p>DRCrosstabRowGroup class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRCrosstabRowGroup<T> extends DRCrosstabGroup<T> implements DRICrosstabRowGroup<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer headerWidth;
+    private Integer totalHeaderHeight;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getHeaderWidth() {
+        return headerWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>headerWidth</code>.</p>
+     *
+     * @param headerWidth a {@link java.lang.Integer} object.
+     */
+    public void setHeaderWidth(Integer headerWidth) {
+        this.headerWidth = headerWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTotalHeaderHeight() {
+        return totalHeaderHeight;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalHeaderHeight</code>.</p>
+     *
+     * @param totalHeaderHeight a {@link java.lang.Integer} object.
+     */
+    public void setTotalHeaderHeight(Integer totalHeaderHeight) {
+        this.totalHeaderHeight = totalHeaderHeight;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabVariable.java
new file mode 100644
index 0000000..4625d15
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabVariable.java
@@ -0,0 +1,98 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.crosstab;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRCrosstabVariable class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRCrosstabVariable<T> implements DRICrosstabVariable<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIExpression<?> valueExpression;
+    private Calculation calculation;
+    private CrosstabPercentageType percentageType;
+
+    /**
+     * <p>Constructor for DRCrosstabVariable.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation     a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public DRCrosstabVariable(DRIExpression<?> valueExpression, Calculation calculation) {
+        Validate.notNull(valueExpression, "valueExpression must not be null");
+        Validate.notNull(calculation, "calculation must not be null");
+        this.valueExpression = valueExpression;
+        this.calculation = calculation;
+        this.name = ReportUtils.generateUniqueName("crosstabMeasure");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getValueExpression() {
+        return valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Calculation getCalculation() {
+        return calculation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CrosstabPercentageType getPercentageType() {
+        return percentageType;
+    }
+
+    /**
+     * <p>Setter for the field <code>percentageType</code>.</p>
+     *
+     * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     */
+    public void setPercentageType(CrosstabPercentageType percentageType) {
+        this.percentageType = percentageType;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Class<? super T> getValueClass() {
+        if (percentageType != null && percentageType.equals(CrosstabPercentageType.GRAND_TOTAL) && !calculation.equals(Calculation.COUNT) && !calculation.equals(Calculation.DISTINCT_COUNT)) {
+            return (Class<? super T>) Double.class;
+        }
+        return (Class<? super T>) ReportUtils.getVariableValueClass(getCalculation(), valueExpression.getValueClass());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/AbstractDataType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/AbstractDataType.java
new file mode 100644
index 0000000..d0ac9c7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/AbstractDataType.java
@@ -0,0 +1,104 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.datatype;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.Locale;
+
+/**
+ * <p>Abstract AbstractDataType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractDataType<U, T extends U> implements DRIDataType<U, T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIValueFormatter<?, ? extends U> getValueFormatter() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String valueToString(U value, Locale locale) {
+        if (value != null) {
+            return value.toString();
+        }
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String valueToString(DRIValue<? extends U> value, ReportParameters reportParameters) {
+        return valueToString(reportParameters.getValue(value), reportParameters.getLocale());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public String valueToString(String name, ReportParameters reportParameters) {
+        return valueToString((U) reportParameters.getValue(name), reportParameters.getLocale());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public T stringToValue(String value, Locale locale) throws DRException {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public T stringToValue(DRIValue<String> value, ReportParameters reportParameters) throws DRException {
+        return stringToValue(reportParameters.getValue(value), reportParameters.getLocale());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public T stringToValue(String name, ReportParameters reportParameters) throws DRException {
+        return stringToValue((String) reportParameters.getValue(name), reportParameters.getLocale());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Class<T> getValueClass() {
+        return (Class<T>) ReportUtils.getGenericClass(this, 1);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/DRDataType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/DRDataType.java
new file mode 100644
index 0000000..2228a96
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/DRDataType.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+
+/**
+ * <p>DRDataType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDataType<U, T extends U> extends AbstractDataType<U, T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String pattern;
+    private HorizontalTextAlignment horizontalTextAlignment;
+    private DRIValueFormatter<?, ? extends U> valueFormatter;
+
+    /**
+     * <p>Constructor for DRDataType.</p>
+     */
+    public DRDataType() {
+    }
+
+    /**
+     * <p>Constructor for DRDataType.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     */
+    public DRDataType(String pattern) {
+        this.pattern = pattern;
+    }
+
+    /**
+     * <p>Constructor for DRDataType.</p>
+     *
+     * @param pattern                 a {@link java.lang.String} object.
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public DRDataType(String pattern, HorizontalTextAlignment horizontalTextAlignment) {
+        this.pattern = pattern;
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return pattern;
+    }
+
+    /**
+     * <p>Setter for the field <code>pattern</code>.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     */
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return horizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIValueFormatter<?, ? extends U> getValueFormatter() {
+        return valueFormatter;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueFormatter</code>.</p>
+     *
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     */
+    public void setValueFormatter(DRIValueFormatter<?, ? extends U> valueFormatter) {
+        this.valueFormatter = valueFormatter;
+    }
+
+    /**
+     * <p>toString.</p>
+     *
+     * @param value a T object.
+     * @return a {@link java.lang.String} object.
+     */
+    public String toString(T value) {
+        return String.valueOf(value);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSimpleExpression.java
new file mode 100644
index 0000000..3e67960
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSimpleExpression.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.expression;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract AbstractSimpleExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractSimpleExpression<T> implements DRISimpleExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+
+    /**
+     * <p>Constructor for AbstractSimpleExpression.</p>
+     */
+    protected AbstractSimpleExpression() {
+        this.name = ReportUtils.generateUniqueName("simpleExpression");
+    }
+
+    /**
+     * <p>Constructor for AbstractSimpleExpression.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    protected AbstractSimpleExpression(String name) {
+        Validate.notEmpty(name, "name must not be empty");
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Class<? super T> getValueClass() {
+        return (Class<T>) ReportUtils.getGenericClass(this, 0);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSystemExpression.java
new file mode 100644
index 0000000..40d041f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSystemExpression.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.expression;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract AbstractSystemExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractSystemExpression<T> implements DRISystemExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+
+    /**
+     * <p>Constructor for AbstractSystemExpression.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    protected AbstractSystemExpression(String name) {
+        Validate.notEmpty(name, "name must not be empty");
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Class<? super T> getValueClass() {
+        return (Class<T>) ReportUtils.getGenericClass(this, 0);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractValueFormatter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractValueFormatter.java
new file mode 100644
index 0000000..e38ca6c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractValueFormatter.java
@@ -0,0 +1,68 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.expression;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract AbstractValueFormatter class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractValueFormatter<T, U> implements DRIValueFormatter<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+
+    /**
+     * <p>Constructor for AbstractValueFormatter.</p>
+     */
+    protected AbstractValueFormatter() {
+        this.name = ReportUtils.generateUniqueName("valueFormatter");
+    }
+
+    /**
+     * <p>Constructor for AbstractValueFormatter.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    protected AbstractValueFormatter(String name) {
+        Validate.notEmpty(name, "name must not be empty");
+        this.name = name;
+    }
+
+    /**
+     * <p>Getter for the field <code>name</code>.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Class<T> getValueClass() {
+        return (Class<T>) ReportUtils.getGenericClass(this, 0);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGrid.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGrid.java
new file mode 100644
index 0000000..8b3ba6e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGrid.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.grid;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGrid;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+
+/**
+ * <p>DRColumnGrid class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRColumnGrid implements DRIColumnGrid {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRColumnGridList list;
+
+    /**
+     * <p>Constructor for DRColumnGrid.</p>
+     */
+    public DRColumnGrid() {
+        this(ListType.HORIZONTAL);
+    }
+
+    /**
+     * <p>Constructor for DRColumnGrid.</p>
+     *
+     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public DRColumnGrid(ListType type) {
+        this.list = new DRColumnGridList(type);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRColumnGridList getList() {
+        return list;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     */
+    public void addComponent(DRIColumnGridComponent component) {
+        list.addComponent(component);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridList.java
new file mode 100644
index 0000000..e5fcbf6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridList.java
@@ -0,0 +1,128 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.grid;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridList;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRColumnGridList class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRColumnGridList implements DRIColumnGridList {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private List<DRColumnGridListCell> listCells;
+    private ListType type;
+    private int gap;
+
+    /**
+     * <p>Constructor for DRColumnGridList.</p>
+     */
+    public DRColumnGridList() {
+        this(ListType.HORIZONTAL);
+    }
+
+    /**
+     * <p>Constructor for DRColumnGridList.</p>
+     *
+     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public DRColumnGridList(ListType type) {
+        setType(type);
+        this.listCells = new ArrayList<DRColumnGridListCell>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRColumnGridListCell> getListCells() {
+        return listCells;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     */
+    public void addComponent(DRIColumnGridComponent component) {
+        listCells.add(new DRColumnGridListCell(component));
+    }
+
+    /**
+     * <p>addCell.</p>
+     *
+     * @param cell a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridListCell} object.
+     */
+    public void addCell(DRColumnGridListCell cell) {
+        Validate.notNull(cell, "cell must not be null");
+        listCells.add(cell);
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     */
+    public void addComponent(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRIColumnGridComponent component) {
+        listCells.add(new DRColumnGridListCell(horizontalAlignment, verticalAlignment, component));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ListType getType() {
+        return type;
+    }
+
+    /**
+     * <p>Setter for the field <code>type</code>.</p>
+     *
+     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public void setType(ListType type) {
+        Validate.notNull(type, "type must not be null");
+        this.type = type;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getGap() {
+        return gap;
+    }
+
+    /**
+     * <p>Setter for the field <code>gap</code>.</p>
+     *
+     * @param gap a int.
+     */
+    public void setGap(int gap) {
+        Validate.notNull(gap < 0, "gap must be >= 0");
+        this.gap = gap;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridListCell.java
new file mode 100644
index 0000000..91b02b8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridListCell.java
@@ -0,0 +1,98 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.grid;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridListCell;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRColumnGridListCell class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRColumnGridListCell implements DRIColumnGridListCell {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private HorizontalCellComponentAlignment horizontalAlignment;
+    private VerticalCellComponentAlignment verticalAlignment;
+    private DRIColumnGridComponent component;
+
+    /**
+     * <p>Constructor for DRColumnGridListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     */
+    public DRColumnGridListCell(DRIColumnGridComponent component) {
+        Validate.notNull(component, "component must not be null");
+        this.component = component;
+    }
+
+    /**
+     * <p>Constructor for DRColumnGridListCell.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     */
+    public DRColumnGridListCell(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRIColumnGridComponent component) {
+        this(component);
+        this.horizontalAlignment = horizontalAlignment;
+        this.verticalAlignment = verticalAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalCellComponentAlignment getHorizontalAlignment() {
+        return horizontalAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalAlignment</code>.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     */
+    public void setHorizontalAlignment(HorizontalCellComponentAlignment horizontalAlignment) {
+        this.horizontalAlignment = horizontalAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public VerticalCellComponentAlignment getVerticalAlignment() {
+        return verticalAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>verticalAlignment</code>.</p>
+     *
+     * @param verticalAlignment a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     */
+    public void setVerticalAlignment(VerticalCellComponentAlignment verticalAlignment) {
+        this.verticalAlignment = verticalAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIColumnGridComponent getComponent() {
+        return component;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnTitleGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnTitleGroup.java
new file mode 100644
index 0000000..329d446
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnTitleGroup.java
@@ -0,0 +1,291 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.grid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnTitleGroup;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRColumnTitleGroup class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class DRColumnTitleGroup implements DRIColumnTitleGroup {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private final DRColumnGridList list;
+
+    private DRIExpression<?> titleExpression;
+    private DRIReportStyle titleStyle;
+    private Integer titleWidth;
+    private ComponentDimensionType titleWidthType;
+    private Integer titleColumns;
+    private Integer titleHeight;
+    private ComponentDimensionType titleHeightType;
+    private Integer titleRows;
+    private Boolean titleStretchWithOverflow;
+    private TextAdjust titleTextAdjust;
+    private List<DRIPropertyExpression> titlePropertyExpressions;
+
+    /**
+     * <p>Constructor for DRColumnTitleGroup.</p>
+     */
+    public DRColumnTitleGroup() {
+        this.list = new DRColumnGridList(ListType.HORIZONTAL);
+        titlePropertyExpressions = new ArrayList<>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRColumnGridList getList() {
+        return list;
+    }
+
+    /**
+     * <p>addComponent.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     */
+    public void addComponent(final DRIColumnGridComponent component) {
+        list.addComponent(component);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getTitleExpression() {
+        return titleExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleExpression</code>.</p>
+     *
+     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setTitleExpression(final DRIExpression<?> titleExpression) {
+        this.titleExpression = titleExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getTitleStyle() {
+        return titleStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleStyle</code>.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setTitleStyle(final DRIReportStyle titleStyle) {
+        this.titleStyle = titleStyle;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the column title width.
+     */
+    @Override
+    public Integer getTitleWidth() {
+        return titleWidth;
+    }
+
+    /**
+     * Sets the column title width.
+     *
+     * @param titleWidth the column title width >= 0
+     * @throws java.lang.IllegalArgumentException if <code>titleWidth</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public void setTitleWidth(final Integer titleWidth) {
+        if (titleWidth != null) {
+            Validate.isTrue(titleWidth >= 0, "titleWidth must be >= 0");
+        }
+        this.titleWidth = titleWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentDimensionType getTitleWidthType() {
+        return titleWidthType;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleWidthType</code>.</p>
+     *
+     * @param titleWidthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public void setTitleWidthType(final ComponentDimensionType titleWidthType) {
+        this.titleWidthType = titleWidthType;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the number of title columns.
+     */
+    @Override
+    public Integer getTitleColumns() {
+        return titleColumns;
+    }
+
+    /**
+     * This method is used to define the width of a column title. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
+     *
+     * @param titleColumns the number of columns >= 0
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public void setTitleColumns(final Integer titleColumns) {
+        if (titleColumns != null) {
+            Validate.isTrue(titleColumns >= 0, "titleColumns must be >= 0");
+        }
+        this.titleColumns = titleColumns;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the column title height.
+     */
+    @Override
+    public Integer getTitleHeight() {
+        return titleHeight;
+    }
+
+    /**
+     * Sets the column title height.
+     *
+     * @param titleHeight the column title height >= 0
+     * @throws java.lang.IllegalArgumentException if <code>titleHeight</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public void setTitleHeight(final Integer titleHeight) {
+        if (titleHeight != null) {
+            Validate.isTrue(titleHeight >= 0, "titleHeight must be >= 0");
+        }
+        this.titleHeight = titleHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ComponentDimensionType getTitleHeightType() {
+        return titleHeightType;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleHeightType</code>.</p>
+     *
+     * @param titleHeightType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public void setTitleHeightType(final ComponentDimensionType titleHeightType) {
+        this.titleHeightType = titleHeightType;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the number of title rows.
+     */
+    @Override
+    public Integer getTitleRows() {
+        return titleRows;
+    }
+
+    /**
+     * This method is used to define the height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param titleRows the number of rows >= 0
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public void setTitleRows(final Integer titleRows) {
+        if (titleRows != null) {
+            Validate.isTrue(titleRows >= 0, "titleRows must be >= 0");
+        }
+        this.titleRows = titleRows;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getTitleStretchWithOverflow() {
+        return titleStretchWithOverflow;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleStretchWithOverflow</code>.</p>
+     *
+     * @param titleStretchWithOverflow a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #getTitleTextAdjust()}
+     */
+    @Deprecated
+    public void setTitleStretchWithOverflow(final Boolean titleStretchWithOverflow) {
+        this.titleStretchWithOverflow = titleStretchWithOverflow;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TextAdjust getTitleTextAdjust() {
+        return this.titleTextAdjust;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleTextAdjust</code>.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    public void setTitleTextAdjust(final TextAdjust textAdjust) {
+        this.titleTextAdjust = textAdjust;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIPropertyExpression> getTitlePropertyExpressions() {
+        return titlePropertyExpressions;
+    }
+
+    /**
+     * <p>Setter for the field <code>titlePropertyExpressions</code>.</p>
+     *
+     * @param titlePropertyExpressions a {@link java.util.List} object.
+     */
+    public void setTitlePropertyExpressions(final List<DRIPropertyExpression> titlePropertyExpressions) {
+        this.titlePropertyExpressions = titlePropertyExpressions;
+    }
+
+    /**
+     * <p>addTitlePropertyExpression.</p>
+     *
+     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     */
+    public void addTitlePropertyExpression(final DRIPropertyExpression propertyExpression) {
+        Validate.notNull(propertyExpression, "propertyExpression must not be null");
+        this.titlePropertyExpressions.add(propertyExpression);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBaseStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBaseStyle.java
new file mode 100644
index 0000000..e60afeb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBaseStyle.java
@@ -0,0 +1,316 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.Rotation;
+import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
+import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+import net.sf.dynamicreports.report.definition.style.DRIBaseStyle;
+
+import java.awt.Color;
+
+/**
+ * <p>Abstract DRBaseStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class DRBaseStyle implements DRIBaseStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Color foregroundColor;
+    private Color backgroundColor;
+    private Integer radius;
+    private ImageScale imageScale;
+    private HorizontalImageAlignment horizontalImageAlignment;
+    private VerticalImageAlignment verticalImageAlignment;
+    private HorizontalTextAlignment horizontalTextAlignment;
+    private VerticalTextAlignment verticalTextAlignment;
+    private DRBorder border;
+    private DRPadding padding;
+    private DRFont font;
+    private Rotation rotation;
+    private String pattern;
+    private Markup markup;
+    private DRParagraph paragraph;
+    private DRPen linePen;
+
+    /**
+     * <p>Constructor for DRBaseStyle.</p>
+     */
+    public DRBaseStyle() {
+        init();
+    }
+
+    /**
+     * <p>init.</p>
+     */
+    protected void init() {
+        font = new DRFont();
+        border = new DRBorder();
+        padding = new DRPadding();
+        paragraph = new DRParagraph();
+        linePen = new DRPen();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Color getForegroundColor() {
+        return foregroundColor;
+    }
+
+    /**
+     * <p>Setter for the field <code>foregroundColor</code>.</p>
+     *
+     * @param foregroundColor a {@link java.awt.Color} object.
+     */
+    public void setForegroundColor(Color foregroundColor) {
+        this.foregroundColor = foregroundColor;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Color getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    /**
+     * <p>Setter for the field <code>backgroundColor</code>.</p>
+     *
+     * @param backgroundColor a {@link java.awt.Color} object.
+     */
+    public void setBackgroundColor(Color backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getRadius() {
+        return radius;
+    }
+
+    /**
+     * <p>Setter for the field <code>radius</code>.</p>
+     *
+     * @param radius a {@link java.lang.Integer} object.
+     */
+    public void setRadius(Integer radius) {
+        this.radius = radius;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ImageScale getImageScale() {
+        return imageScale;
+    }
+
+    /**
+     * <p>Setter for the field <code>imageScale</code>.</p>
+     *
+     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     */
+    public void setImageScale(ImageScale imageScale) {
+        this.imageScale = imageScale;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalImageAlignment getHorizontalImageAlignment() {
+        return horizontalImageAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        this.horizontalImageAlignment = horizontalImageAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public VerticalImageAlignment getVerticalImageAlignment() {
+        return verticalImageAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>verticalImageAlignment</code>.</p>
+     *
+     * @param verticalImageAlignment a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     */
+    public void setVerticalImageAlignment(VerticalImageAlignment verticalImageAlignment) {
+        this.verticalImageAlignment = verticalImageAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return horizontalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        this.horizontalTextAlignment = horizontalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public VerticalTextAlignment getVerticalTextAlignment() {
+        return verticalTextAlignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>verticalTextAlignment</code>.</p>
+     *
+     * @param verticalTextAlignment a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     */
+    public void setVerticalTextAlignment(VerticalTextAlignment verticalTextAlignment) {
+        this.verticalTextAlignment = verticalTextAlignment;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRBorder getBorder() {
+        return border;
+    }
+
+    /**
+     * <p>Setter for the field <code>border</code>.</p>
+     *
+     * @param border a {@link net.sf.dynamicreports.report.base.style.DRBorder} object.
+     */
+    public void setBorder(DRBorder border) {
+        this.border = border;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPadding getPadding() {
+        return padding;
+    }
+
+    /**
+     * <p>Setter for the field <code>padding</code>.</p>
+     *
+     * @param padding a {@link net.sf.dynamicreports.report.base.style.DRPadding} object.
+     */
+    public void setPadding(DRPadding padding) {
+        this.padding = padding;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRFont getFont() {
+        return font;
+    }
+
+    /**
+     * <p>Setter for the field <code>font</code>.</p>
+     *
+     * @param font a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+     */
+    public void setFont(DRFont font) {
+        this.font = font;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Rotation getRotation() {
+        return rotation;
+    }
+
+    /**
+     * <p>Setter for the field <code>rotation</code>.</p>
+     *
+     * @param rotation a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     */
+    public void setRotation(Rotation rotation) {
+        this.rotation = rotation;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return pattern;
+    }
+
+    /**
+     * <p>Setter for the field <code>pattern</code>.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     */
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Markup getMarkup() {
+        return markup;
+    }
+
+    /**
+     * <p>Setter for the field <code>markup</code>.</p>
+     *
+     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     */
+    public void setMarkup(Markup markup) {
+        this.markup = markup;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRParagraph getParagraph() {
+        return paragraph;
+    }
+
+    /**
+     * <p>Setter for the field <code>paragraph</code>.</p>
+     *
+     * @param paragraph a {@link net.sf.dynamicreports.report.base.style.DRParagraph} object.
+     */
+    public void setParagraph(DRParagraph paragraph) {
+        this.paragraph = paragraph;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPen getLinePen() {
+        return linePen;
+    }
+
+    /**
+     * <p>Setter for the field <code>linePen</code>.</p>
+     *
+     * @param linePen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public void setLinePen(DRPen linePen) {
+        this.linePen = linePen;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBorder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBorder.java
new file mode 100644
index 0000000..8a7ca4d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBorder.java
@@ -0,0 +1,118 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.style.DRIBorder;
+
+/**
+ * <p>DRBorder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRBorder implements DRIBorder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRPen topPen;
+    private DRPen leftPen;
+    private DRPen bottomPen;
+    private DRPen rightPen;
+
+    /**
+     * <p>Constructor for DRBorder.</p>
+     */
+    public DRBorder() {
+        topPen = new DRPen();
+        leftPen = new DRPen();
+        bottomPen = new DRPen();
+        rightPen = new DRPen();
+    }
+
+    /**
+     * <p>Constructor for DRBorder.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public DRBorder(DRPen pen) {
+        topPen = pen;
+        leftPen = pen;
+        bottomPen = pen;
+        rightPen = pen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPen getTopPen() {
+        return topPen;
+    }
+
+    /**
+     * <p>Setter for the field <code>topPen</code>.</p>
+     *
+     * @param topPen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public void setTopPen(DRPen topPen) {
+        this.topPen = topPen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPen getLeftPen() {
+        return leftPen;
+    }
+
+    /**
+     * <p>Setter for the field <code>leftPen</code>.</p>
+     *
+     * @param leftPen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public void setLeftPen(DRPen leftPen) {
+        this.leftPen = leftPen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPen getBottomPen() {
+        return bottomPen;
+    }
+
+    /**
+     * <p>Setter for the field <code>bottomPen</code>.</p>
+     *
+     * @param bottomPen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public void setBottomPen(DRPen bottomPen) {
+        this.bottomPen = bottomPen;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRPen getRightPen() {
+        return rightPen;
+    }
+
+    /**
+     * <p>Setter for the field <code>rightPen</code>.</p>
+     *
+     * @param rightPen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public void setRightPen(DRPen rightPen) {
+        this.rightPen = rightPen;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRConditionalStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRConditionalStyle.java
new file mode 100644
index 0000000..72d5169
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRConditionalStyle.java
@@ -0,0 +1,51 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRConditionalStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRConditionalStyle extends DRBaseStyle implements DRIConditionalStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<Boolean> conditionExpression;
+
+    /**
+     * <p>Constructor for DRConditionalStyle.</p>
+     *
+     * @param conditionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRConditionalStyle(DRIExpression<Boolean> conditionExpression) {
+        Validate.notNull(conditionExpression, "conditionExpression must not be null");
+        this.conditionExpression = conditionExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<Boolean> getConditionExpression() {
+        return conditionExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRFont.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRFont.java
new file mode 100644
index 0000000..505af7e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRFont.java
@@ -0,0 +1,215 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.style.DRIFont;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRFont class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRFont implements DRIFont {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String fontName;
+    private Integer fontSize;
+    private Boolean bold;
+    private Boolean italic;
+    private Boolean underline;
+    private Boolean strikeThrough;
+    private String pdfFontName;
+    private String pdfEncoding;
+    private Boolean pdfEmbedded;
+
+    /**
+     * <p>Constructor for DRFont.</p>
+     */
+    public DRFont() {
+    }
+
+    /**
+     * <p>Constructor for DRFont.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     * @param fontSize a int.
+     */
+    public DRFont(String fontName, int fontSize) {
+        this.fontName = fontName;
+        this.setFontSize(fontSize);
+    }
+
+    /**
+     * <p>Constructor for DRFont.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     * @param bold     a boolean.
+     * @param italic   a boolean.
+     * @param fontSize a int.
+     */
+    public DRFont(String fontName, boolean bold, boolean italic, int fontSize) {
+        this.fontName = fontName;
+        this.bold = bold;
+        this.italic = italic;
+        this.setFontSize(fontSize);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getFontName() {
+        return fontName;
+    }
+
+    /**
+     * <p>Setter for the field <code>fontName</code>.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     */
+    public void setFontName(String fontName) {
+        this.fontName = fontName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getBold() {
+        return bold;
+    }
+
+    /**
+     * <p>Setter for the field <code>bold</code>.</p>
+     *
+     * @param bold a {@link java.lang.Boolean} object.
+     */
+    public void setBold(Boolean bold) {
+        this.bold = bold;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getItalic() {
+        return italic;
+    }
+
+    /**
+     * <p>Setter for the field <code>italic</code>.</p>
+     *
+     * @param italic a {@link java.lang.Boolean} object.
+     */
+    public void setItalic(Boolean italic) {
+        this.italic = italic;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getUnderline() {
+        return underline;
+    }
+
+    /**
+     * <p>Setter for the field <code>underline</code>.</p>
+     *
+     * @param underline a {@link java.lang.Boolean} object.
+     */
+    public void setUnderline(Boolean underline) {
+        this.underline = underline;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getStrikeThrough() {
+        return strikeThrough;
+    }
+
+    /**
+     * <p>Setter for the field <code>strikeThrough</code>.</p>
+     *
+     * @param strikeThrough a {@link java.lang.Boolean} object.
+     */
+    public void setStrikeThrough(Boolean strikeThrough) {
+        this.strikeThrough = strikeThrough;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getFontSize() {
+        return fontSize;
+    }
+
+    /**
+     * <p>Setter for the field <code>fontSize</code>.</p>
+     *
+     * @param fontSize a {@link java.lang.Integer} object.
+     */
+    public void setFontSize(Integer fontSize) {
+        if (fontSize != null) {
+            Validate.isTrue(fontSize >= 0, "fontSize must be >= 0");
+        }
+        this.fontSize = fontSize;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPdfFontName() {
+        return pdfFontName;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfFontName</code>.</p>
+     *
+     * @param pdfFontName a {@link java.lang.String} object.
+     */
+    @Deprecated
+    public void setPdfFontName(String pdfFontName) {
+        this.pdfFontName = pdfFontName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPdfEncoding() {
+        return pdfEncoding;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfEncoding</code>.</p>
+     *
+     * @param pdfEncoding a {@link java.lang.String} object.
+     */
+    @Deprecated
+    public void setPdfEncoding(String pdfEncoding) {
+        this.pdfEncoding = pdfEncoding;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean getPdfEmbedded() {
+        return pdfEmbedded;
+    }
+
+    /**
+     * <p>Setter for the field <code>pdfEmbedded</code>.</p>
+     *
+     * @param pdfEmbedded a {@link java.lang.Boolean} object.
+     */
+    @Deprecated
+    public void setPdfEmbedded(Boolean pdfEmbedded) {
+        this.pdfEmbedded = pdfEmbedded;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPadding.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPadding.java
new file mode 100644
index 0000000..065797b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPadding.java
@@ -0,0 +1,130 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.style.DRIPadding;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>DRPadding class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRPadding implements DRIPadding {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Integer top;
+    private Integer left;
+    private Integer bottom;
+    private Integer right;
+
+    /**
+     * <p>Constructor for DRPadding.</p>
+     */
+    public DRPadding() {
+    }
+
+    /**
+     * <p>Constructor for DRPadding.</p>
+     *
+     * @param padding a {@link java.lang.Integer} object.
+     */
+    public DRPadding(Integer padding) {
+        if (padding != null) {
+            Validate.isTrue(padding >= 0, "padding must be >= 0");
+        }
+        top = padding;
+        left = padding;
+        bottom = padding;
+        right = padding;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTop() {
+        return top;
+    }
+
+    /**
+     * <p>Setter for the field <code>top</code>.</p>
+     *
+     * @param top a {@link java.lang.Integer} object.
+     */
+    public void setTop(Integer top) {
+        if (top != null) {
+            Validate.isTrue(top >= 0, "top must be >= 0");
+        }
+        this.top = top;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getLeft() {
+        return left;
+    }
+
+    /**
+     * <p>Setter for the field <code>left</code>.</p>
+     *
+     * @param left a {@link java.lang.Integer} object.
+     */
+    public void setLeft(Integer left) {
+        if (left != null) {
+            Validate.isTrue(left >= 0, "left must be >= 0");
+        }
+        this.left = left;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getBottom() {
+        return bottom;
+    }
+
+    /**
+     * <p>Setter for the field <code>bottom</code>.</p>
+     *
+     * @param bottom a {@link java.lang.Integer} object.
+     */
+    public void setBottom(Integer bottom) {
+        if (bottom != null) {
+            Validate.isTrue(bottom >= 0, "bottom must be >= 0");
+        }
+        this.bottom = bottom;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getRight() {
+        return right;
+    }
+
+    /**
+     * <p>Setter for the field <code>right</code>.</p>
+     *
+     * @param right a {@link java.lang.Integer} object.
+     */
+    public void setRight(Integer right) {
+        if (right != null) {
+            Validate.isTrue(right >= 0, "right must be >= 0");
+        }
+        this.right = right;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRParagraph.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRParagraph.java
new file mode 100644
index 0000000..9939e1f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRParagraph.java
@@ -0,0 +1,188 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.LineSpacing;
+import net.sf.dynamicreports.report.definition.style.DRIParagraph;
+import net.sf.dynamicreports.report.definition.style.DRITabStop;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRParagraph class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRParagraph implements DRIParagraph {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private LineSpacing lineSpacing;
+    private Float lineSpacingSize;
+    private Integer firstLineIndent;
+    private Integer leftIndent;
+    private Integer rightIndent;
+    private Integer spacingBefore;
+    private Integer spacingAfter;
+    private Integer tabStopWidth;
+    private List<DRITabStop> tabStops;
+
+    /**
+     * <p>Constructor for DRParagraph.</p>
+     */
+    public DRParagraph() {
+        tabStops = new ArrayList<DRITabStop>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public LineSpacing getLineSpacing() {
+        return lineSpacing;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineSpacing</code>.</p>
+     *
+     * @param lineSpacing a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     */
+    public void setLineSpacing(LineSpacing lineSpacing) {
+        this.lineSpacing = lineSpacing;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getLineSpacingSize() {
+        return lineSpacingSize;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineSpacingSize</code>.</p>
+     *
+     * @param lineSpacingSize a {@link java.lang.Float} object.
+     */
+    public void setLineSpacingSize(Float lineSpacingSize) {
+        this.lineSpacingSize = lineSpacingSize;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getFirstLineIndent() {
+        return firstLineIndent;
+    }
+
+    /**
+     * <p>Setter for the field <code>firstLineIndent</code>.</p>
+     *
+     * @param firstLineIndent a {@link java.lang.Integer} object.
+     */
+    public void setFirstLineIndent(Integer firstLineIndent) {
+        this.firstLineIndent = firstLineIndent;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getLeftIndent() {
+        return leftIndent;
+    }
+
+    /**
+     * <p>Setter for the field <code>leftIndent</code>.</p>
+     *
+     * @param leftIndent a {@link java.lang.Integer} object.
+     */
+    public void setLeftIndent(Integer leftIndent) {
+        this.leftIndent = leftIndent;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getRightIndent() {
+        return rightIndent;
+    }
+
+    /**
+     * <p>Setter for the field <code>rightIndent</code>.</p>
+     *
+     * @param rightIndent a {@link java.lang.Integer} object.
+     */
+    public void setRightIndent(Integer rightIndent) {
+        this.rightIndent = rightIndent;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getSpacingBefore() {
+        return spacingBefore;
+    }
+
+    /**
+     * <p>Setter for the field <code>spacingBefore</code>.</p>
+     *
+     * @param spacingBefore a {@link java.lang.Integer} object.
+     */
+    public void setSpacingBefore(Integer spacingBefore) {
+        this.spacingBefore = spacingBefore;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getSpacingAfter() {
+        return spacingAfter;
+    }
+
+    /**
+     * <p>Setter for the field <code>spacingAfter</code>.</p>
+     *
+     * @param spacingAfter a {@link java.lang.Integer} object.
+     */
+    public void setSpacingAfter(Integer spacingAfter) {
+        this.spacingAfter = spacingAfter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer getTabStopWidth() {
+        return tabStopWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>tabStopWidth</code>.</p>
+     *
+     * @param tabStopWidth a {@link java.lang.Integer} object.
+     */
+    public void setTabStopWidth(Integer tabStopWidth) {
+        this.tabStopWidth = tabStopWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRITabStop> getTabStops() {
+        return tabStops;
+    }
+
+    /**
+     * <p>Setter for the field <code>tabStops</code>.</p>
+     *
+     * @param tabStops a {@link java.util.List} object.
+     */
+    public void setTabStops(List<DRITabStop> tabStops) {
+        this.tabStops = tabStops;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPen.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPen.java
new file mode 100644
index 0000000..0216d84
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPen.java
@@ -0,0 +1,104 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.LineStyle;
+import net.sf.dynamicreports.report.definition.style.DRIPen;
+import org.apache.commons.lang3.Validate;
+
+import java.awt.Color;
+
+/**
+ * <p>DRPen class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRPen implements DRIPen {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private Float lineWidth;
+    private LineStyle lineStyle;
+    private Color lineColor;
+
+    /**
+     * <p>Constructor for DRPen.</p>
+     */
+    public DRPen() {
+    }
+
+    /**
+     * <p>Constructor for DRPen.</p>
+     *
+     * @param lineWidth a {@link java.lang.Float} object.
+     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     */
+    public DRPen(Float lineWidth, LineStyle lineStyle) {
+        this.setLineWidth(lineWidth);
+        this.lineStyle = lineStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Float getLineWidth() {
+        return lineWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineWidth</code>.</p>
+     *
+     * @param lineWidth a {@link java.lang.Float} object.
+     */
+    public void setLineWidth(Float lineWidth) {
+        if (lineWidth != null) {
+            Validate.isTrue(lineWidth >= 0, "lineWidth must be >= 0");
+        }
+        this.lineWidth = lineWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public LineStyle getLineStyle() {
+        return lineStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineStyle</code>.</p>
+     *
+     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     */
+    public void setLineStyle(LineStyle lineStyle) {
+        this.lineStyle = lineStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Color getLineColor() {
+        return lineColor;
+    }
+
+    /**
+     * <p>Setter for the field <code>lineColor</code>.</p>
+     *
+     * @param lineColor a {@link java.awt.Color} object.
+     */
+    public void setLineColor(Color lineColor) {
+        this.lineColor = lineColor;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRSimpleStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRSimpleStyle.java
new file mode 100644
index 0000000..ce65ee5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRSimpleStyle.java
@@ -0,0 +1,32 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+
+/**
+ * <p>DRSimpleStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRSimpleStyle extends DRBaseStyle implements DRISimpleStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRStyle.java
new file mode 100644
index 0000000..0f5f322
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRStyle.java
@@ -0,0 +1,104 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>DRStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRStyle extends DRBaseStyle implements DRIStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIReportStyle parentStyle;
+    private List<DRConditionalStyle> conditionalStyles;
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        super.init();
+        conditionalStyles = new ArrayList<DRConditionalStyle>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIReportStyle getParentStyle() {
+        return parentStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>parentStyle</code>.</p>
+     *
+     * @param parentStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public void setParentStyle(DRIReportStyle parentStyle) {
+        this.parentStyle = parentStyle;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRConditionalStyle> getConditionalStyles() {
+        return conditionalStyles;
+    }
+
+    /**
+     * <p>Setter for the field <code>conditionalStyles</code>.</p>
+     *
+     * @param conditionalStyles a {@link java.util.List} object.
+     */
+    public void setConditionalStyles(List<DRConditionalStyle> conditionalStyles) {
+        Validate.notNull(conditionalStyles, "conditionalStyles must not be null");
+        Validate.noNullElements(conditionalStyles, "conditionalStyles must not contains null conditionalStyle");
+        this.conditionalStyles = conditionalStyles;
+    }
+
+    /**
+     * <p>addConditionalStyle.</p>
+     *
+     * @param conditionalStyle a {@link net.sf.dynamicreports.report.base.style.DRConditionalStyle} object.
+     */
+    public void addConditionalStyle(DRConditionalStyle conditionalStyle) {
+        Validate.notNull(conditionalStyle, "conditionalStyle must not be null");
+        this.conditionalStyles.add(conditionalStyle);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTabStop.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTabStop.java
new file mode 100644
index 0000000..e779036
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTabStop.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import net.sf.dynamicreports.report.definition.style.DRITabStop;
+
+/**
+ * <p>DRTabStop class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRTabStop implements DRITabStop {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int position;
+    private TabStopAlignment alignment;
+
+    /** {@inheritDoc} */
+    @Override
+    public int getPosition() {
+        return position;
+    }
+
+    /**
+     * <p>Setter for the field <code>position</code>.</p>
+     *
+     * @param position a int.
+     */
+    public void setPosition(int position) {
+        this.position = position;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TabStopAlignment getAlignment() {
+        return alignment;
+    }
+
+    /**
+     * <p>Setter for the field <code>alignment</code>.</p>
+     *
+     * @param alignment a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     */
+    public void setAlignment(TabStopAlignment alignment) {
+        this.alignment = alignment;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTemplateStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTemplateStyle.java
new file mode 100644
index 0000000..2fd6b1d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTemplateStyle.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.base.style;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.style.DRITemplateStyle;
+
+/**
+ * <p>DRTemplateStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRTemplateStyle implements DRITemplateStyle {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+
+    /**
+     * <p>Constructor for DRTemplateStyle.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public DRTemplateStyle(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/AbstractBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/AbstractBuilder.java
new file mode 100644
index 0000000..c84e5e1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/AbstractBuilder.java
@@ -0,0 +1,72 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.constant.Constants;
+
+import java.io.Serializable;
+
+/**
+ * <p>Abstract AbstractBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractBuilder<T extends AbstractBuilder<T, U>, U> implements Serializable {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+    protected boolean builded;
+    private U object;
+
+    /**
+     * <p>Constructor for AbstractBuilder.</p>
+     *
+     * @param object a U object.
+     */
+    protected AbstractBuilder(U object) {
+        this.object = object;
+        this.builded = false;
+    }
+
+    /**
+     * <p>build.</p>
+     *
+     * @return a U object.
+     */
+    public U build() {
+        if (!builded) {
+            configure();
+            builded = true;
+        }
+        return object;
+    }
+
+    /**
+     * <p>Getter for the field <code>object</code>.</p>
+     *
+     * @return a U object.
+     */
+    protected U getObject() {
+        return object;
+    }
+
+    /**
+     * <p>configure.</p>
+     */
+    protected void configure() {
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DatasetBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DatasetBuilder.java
new file mode 100644
index 0000000..e2445ed
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DatasetBuilder.java
@@ -0,0 +1,292 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.base.DRDataset;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.QueryLanguage;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+import org.apache.commons.lang3.Validate;
+
+import java.sql.Connection;
+
+/**
+ * <p>DatasetBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DatasetBuilder extends AbstractBuilder<DatasetBuilder, DRDataset> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for DatasetBuilder.</p>
+     */
+    protected DatasetBuilder() {
+        super(new DRDataset());
+    }
+
+    // field
+
+    /**
+     * <p>fields.</p>
+     *
+     * @param fields a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder fields(FieldBuilder<?>... fields) {
+        return addField(fields);
+    }
+
+    /**
+     * <p>addField.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder addField(String name, Class<?> valueClass) {
+        return addField(DynamicReports.field(name, valueClass));
+    }
+
+    /**
+     * <p>addField.</p>
+     *
+     * @param name     a {@link java.lang.String} object.
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param <U>      a U object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public <U> DatasetBuilder addField(String name, DRIDataType<? super U, U> dataType) {
+        return addField(DynamicReports.field(name, dataType));
+    }
+
+    /**
+     * <p>addField.</p>
+     *
+     * @param fields a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder addField(FieldBuilder<?>... fields) {
+        Validate.notNull(fields, "fields must not be null");
+        Validate.noNullElements(fields, "fields must not contains null field");
+        for (FieldBuilder<?> field : fields) {
+            getObject().addField(field.build());
+        }
+        return this;
+    }
+
+    // variable
+
+    /**
+     * <p>variables.</p>
+     *
+     * @param variables a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder variables(VariableBuilder<?>... variables) {
+        return addVariable(variables);
+    }
+
+    /**
+     * <p>addVariable.</p>
+     *
+     * @param variables a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder addVariable(VariableBuilder<?>... variables) {
+        Validate.notNull(variables, "variables must not be null");
+        Validate.noNullElements(variables, "variables must not contains null variable");
+        for (VariableBuilder<?> variable : variables) {
+            getObject().addVariable(variable.getVariable());
+        }
+        return this;
+    }
+
+    // sort
+
+    /**
+     * <p>sortBy.</p>
+     *
+     * @param sortColumns a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder sortBy(TextColumnBuilder<?>... sortColumns) {
+        Validate.notNull(sortColumns, "sortColumns must not be null");
+        Validate.noNullElements(sortColumns, "sortColumns must not contains null sortColumn");
+        for (TextColumnBuilder<?> sortColumn : sortColumns) {
+            sortBy(DynamicReports.asc(sortColumn));
+        }
+        return this;
+    }
+
+    /**
+     * <p>sortBy.</p>
+     *
+     * @param sorts a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder sortBy(SortBuilder... sorts) {
+        return addSort(sorts);
+    }
+
+    /**
+     * <p>addSort.</p>
+     *
+     * @param sorts a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder addSort(SortBuilder... sorts) {
+        Validate.notNull(sorts, "sorts must not be null");
+        Validate.noNullElements(sorts, "sorts must not contains null sort");
+        for (SortBuilder sort : sorts) {
+            getObject().addSort(sort.build());
+        }
+        return this;
+    }
+
+    // query
+
+    /**
+     * <p>setQuery.</p>
+     *
+     * @param text     a {@link java.lang.String} object.
+     * @param language a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setQuery(String text, String language) {
+        Validate.notNull(text, "text must not be null");
+        Validate.notNull(language, "language must not be null");
+        return setQuery(DynamicReports.query(text, language));
+    }
+
+    /**
+     * <p>setQuery.</p>
+     *
+     * @param sql a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setQuery(String sql) {
+        Validate.notNull(sql, "sql must not be null");
+        return setQuery(DynamicReports.query(sql, QueryLanguage.SQL));
+    }
+
+    /**
+     * <p>setQuery.</p>
+     *
+     * @param query a {@link net.sf.dynamicreports.report.builder.QueryBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setQuery(QueryBuilder query) {
+        Validate.notNull(query, "query must not be null");
+        getObject().setQuery(query.build());
+        return this;
+    }
+
+    // connection
+
+    /**
+     * <p>setConnection.</p>
+     *
+     * @param connection a {@link java.sql.Connection} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setConnection(Connection connection) {
+        getObject().setConnectionExpression(Expressions.value(connection));
+        return this;
+    }
+
+    /**
+     * <p>setConnection.</p>
+     *
+     * @param connectionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setConnection(DRIExpression<Connection> connectionExpression) {
+        getObject().setConnectionExpression(connectionExpression);
+        return this;
+    }
+
+    // datasource
+
+    /**
+     * <p>setDataSource.</p>
+     *
+     * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setDataSource(JRDataSource dataSource) {
+        getObject().setDataSourceExpression(Expressions.dataSource(dataSource));
+        return this;
+    }
+
+    /**
+     * <p>setDataSource.</p>
+     *
+     * @param dataSourceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setDataSource(DRIExpression<JRDataSource> dataSourceExpression) {
+        getObject().setDataSourceExpression(dataSourceExpression);
+        return this;
+    }
+
+    // filter
+
+    /**
+     * <p>setFilterExpression.</p>
+     *
+     * @param filterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setFilterExpression(DRIExpression<Boolean> filterExpression) {
+        getObject().setFilterExpression(filterExpression);
+        return this;
+    }
+
+    /**
+     * <p>setDataSource.</p>
+     *
+     * @param sql        a {@link java.lang.String} object.
+     * @param connection a {@link java.sql.Connection} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setDataSource(String sql, Connection connection) {
+        Validate.notNull(sql, "sql must not be null");
+        return setDataSource(DynamicReports.query(sql, QueryLanguage.SQL), connection);
+    }
+
+    /**
+     * <p>setDataSource.</p>
+     *
+     * @param query      a {@link net.sf.dynamicreports.report.builder.QueryBuilder} object.
+     * @param connection a {@link java.sql.Connection} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public DatasetBuilder setDataSource(QueryBuilder query, Connection connection) {
+        Validate.notNull(query, "query must not be null");
+        Validate.notNull(connection, "connection must not be null");
+        setQuery(query);
+        setConnection(connection);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DynamicReports.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DynamicReports.java
new file mode 100644
index 0000000..58034a1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DynamicReports.java
@@ -0,0 +1,549 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.builder.export.ExporterBuilders;
+import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
+import net.sf.dynamicreports.report.builder.column.ColumnBuilders;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilders;
+import net.sf.dynamicreports.report.builder.condition.ConditionBuilders;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilders;
+import net.sf.dynamicreports.report.builder.datatype.DataTypeBuilders;
+import net.sf.dynamicreports.report.builder.datatype.DataTypes;
+import net.sf.dynamicreports.report.builder.expression.ExpressionBuilders;
+import net.sf.dynamicreports.report.builder.grid.GridBuilders;
+import net.sf.dynamicreports.report.builder.group.GroupBuilders;
+import net.sf.dynamicreports.report.builder.style.StyleBuilders;
+import net.sf.dynamicreports.report.builder.subtotal.SubtotalBuilders;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * <p>DynamicReports class.</p>
+ *
+ * @author Ricardo Mariaca
+ *
+ */
+public class DynamicReports {
+    /**
+     * A set of methods of creating report columns.<br/> It is used to display data in a multi-column layout.
+     */
+    public static final ColumnBuilders col = new ColumnBuilders();
+    /**
+     * A set of methods of customizing columns layout.
+     */
+    public static final GridBuilders grid = new GridBuilders();
+    /**
+     * A set of methods of creating report groups.
+     */
+    public static final GroupBuilders grp = new GroupBuilders();
+    /**
+     * A set of methods of creating column subtotals.
+     */
+    public static final SubtotalBuilders sbt = new SubtotalBuilders();
+    /**
+     * A set of methods of creating and customizing styles.
+     */
+    public static final StyleBuilders stl = new StyleBuilders();
+    /**
+     * A set of methods of creating components.
+     */
+    public static final ComponentBuilders cmp = new ComponentBuilders();
+    /**
+     * A set of build in expressions.<br/> Expressions are used to define various calculations, conditions, text field content, specific report groups, etc.
+     */
+    public static final ExpressionBuilders exp = new ExpressionBuilders();
+    /**
+     * A set of build in condition expressions.
+     */
+    public static final ConditionBuilders cnd = new ConditionBuilders();
+    /**
+     * A set of build in data types.
+     */
+    public static final DataTypeBuilders type = new DataTypeBuilders();
+    /**
+     * A set of methods of creating exporters.
+     */
+    public static final ExporterBuilders export = new ExporterBuilders();
+    /**
+     * A set of methods of creating and customizing crosstabs.
+     */
+    public static final CrosstabBuilders ctab = new CrosstabBuilders();
+
+    /**
+     * Creates a new report builder. The most used report builder for creating reports. It allows constructing and customizing the whole report content.
+     *
+     * @return a report builder
+     */
+    public static JasperReportBuilder report() {
+        return new JasperReportBuilder();
+    }
+
+    /**
+     * Creates a new concatenated report builder. This report builder allows concatenating several separated reports into one single document.
+     *
+     * @return a report builder
+     */
+    public static JasperConcatenatedReportBuilder concatenatedReport() {
+        return new JasperConcatenatedReportBuilder();
+    }
+
+    /**
+     * Creates a new concatenated report builder. This report builder allows concatenating several separated reports into one single document.
+     *
+     * @param jasperReportHandler a {@link net.sf.dynamicreports.jasper.definition.JasperReportHandler} object.
+     * @return a report builder
+     */
+    public static JasperConcatenatedReportBuilder concatenatedReport(final JasperReportHandler jasperReportHandler) {
+        return new JasperConcatenatedReportBuilder(jasperReportHandler);
+    }
+
+    // field
+
+    /**
+     * <p>field.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public static <T> FieldBuilder<T> field(final String name, final Class valueClass) {
+        final FieldBuilder<T> fieldBuilder = new FieldBuilder<>(name, valueClass);
+        try {
+            final DRIDataType<? super T, T> dataType = DataTypes.detectType(valueClass);
+            fieldBuilder.setDataType(dataType);
+        } catch (final DRException e) {
+        }
+        return fieldBuilder;
+    }
+
+    /**
+     * <p>field.</p>
+     *
+     * @param name     a {@link java.lang.String} object.
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param <T>      a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public static <T> FieldBuilder<T> field(final String name, final DRIDataType dataType) {
+        Validate.notNull(dataType, "dataType must not be null");
+        final FieldBuilder<T> fieldBuilder = new FieldBuilder<T>(name, dataType.getValueClass());
+        fieldBuilder.setDataType(dataType);
+        return fieldBuilder;
+    }
+
+    // variable
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public static <T> VariableBuilder<T> variable(final ValueColumnBuilder<?, ?> column, final Calculation calculation) {
+        Validate.notNull(column, "column must not be null");
+        return new VariableBuilder<>(column, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public static <T> VariableBuilder<T> variable(final String name, final ValueColumnBuilder<?, ?> column, final Calculation calculation) {
+        Validate.notNull(column, "column must not be null");
+        return new VariableBuilder<>(name, column, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public static <T> VariableBuilder<T> variable(final FieldBuilder<T> field, final Calculation calculation) {
+        Validate.notNull(field, "field must not be null");
+        return new VariableBuilder<>(field, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public static <T> VariableBuilder<T> variable(final String name, final FieldBuilder<T> field, final Calculation calculation) {
+        return new VariableBuilder<>(name, field, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param fieldName   a {@link java.lang.String} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public static <T> VariableBuilder<T> variable(final String fieldName, final Class<?> valueClass, final Calculation calculation) {
+        return new VariableBuilder<>(field(fieldName, valueClass), calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param fieldName   a {@link java.lang.String} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public static <T> VariableBuilder<T> variable(final String name, final String fieldName, final Class<?> valueClass, final Calculation calculation) {
+        return new VariableBuilder<>(name, field(fieldName, valueClass), calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public static <T> VariableBuilder<T> variable(final DRIExpression<?> expression, final Calculation calculation) {
+        return new VariableBuilder<>(expression, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public static <T> VariableBuilder<T> variable(final String name, final DRIExpression<?> expression, final Calculation calculation) {
+        return new VariableBuilder<>(name, expression, calculation);
+    }
+
+    // sort
+
+    /**
+     * <p>asc.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder asc(final TextColumnBuilder<?> column) {
+        return new SortBuilder(column).setOrderType(OrderType.ASCENDING);
+    }
+
+    /**
+     * <p>asc.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder asc(final FieldBuilder<?> field) {
+        return new SortBuilder(field).setOrderType(OrderType.ASCENDING);
+    }
+
+    /**
+     * <p>asc.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder asc(final String fieldName, final Class<?> valueClass) {
+        return new SortBuilder(field(fieldName, valueClass)).setOrderType(OrderType.ASCENDING);
+    }
+
+    /**
+     * <p>asc.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder asc(final VariableBuilder<?> variable) {
+        return new SortBuilder(variable).setOrderType(OrderType.ASCENDING);
+    }
+
+    /**
+     * <p>asc.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder asc(final DRIExpression<?> expression) {
+        return new SortBuilder(expression).setOrderType(OrderType.ASCENDING);
+    }
+
+    /**
+     * <p>desc.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder desc(final TextColumnBuilder<?> column) {
+        return new SortBuilder(column).setOrderType(OrderType.DESCENDING);
+    }
+
+    /**
+     * <p>desc.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder desc(final FieldBuilder<?> field) {
+        return new SortBuilder(field).setOrderType(OrderType.DESCENDING);
+    }
+
+    /**
+     * <p>desc.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder desc(final String fieldName, final Class<?> valueClass) {
+        return new SortBuilder(field(fieldName, valueClass)).setOrderType(OrderType.DESCENDING);
+    }
+
+    /**
+     * <p>desc.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder desc(final VariableBuilder<?> variable) {
+        return new SortBuilder(variable).setOrderType(OrderType.DESCENDING);
+    }
+
+    /**
+     * <p>desc.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public static SortBuilder desc(final DRIExpression<?> expression) {
+        return new SortBuilder(expression).setOrderType(OrderType.DESCENDING);
+    }
+
+    // hyperLink
+
+    /**
+     * <p>hyperLink.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public static HyperLinkBuilder hyperLink() {
+        return new HyperLinkBuilder();
+    }
+
+    /**
+     * <p>hyperLink.</p>
+     *
+     * @param link a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public static HyperLinkBuilder hyperLink(final String link) {
+        return new HyperLinkBuilder(link);
+    }
+
+    /**
+     * <p>hyperLink.</p>
+     *
+     * @param linkExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public static HyperLinkBuilder hyperLink(final DRIExpression<String> linkExpression) {
+        return new HyperLinkBuilder(linkExpression);
+    }
+
+    // margin
+
+    /**
+     * <p>margin.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     */
+    public static MarginBuilder margin() {
+        return new MarginBuilder();
+    }
+
+    /**
+     * <p>margin.</p>
+     *
+     * @param margin a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     */
+    public static MarginBuilder margin(final int margin) {
+        return new MarginBuilder(margin);
+    }
+
+    // parameter
+
+    /**
+     * <p>parameter.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a T object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.ParameterBuilder} object.
+     */
+    public static <T> ParameterBuilder<T> parameter(final String name, final T value) {
+        return new ParameterBuilder<>(name, value);
+    }
+
+    /**
+     * <p>parameter.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.ParameterBuilder} object.
+     */
+    public static <T> ParameterBuilder<T> parameter(final String name, final Class<T> valueClass) {
+        return new ParameterBuilder<>(name, valueClass);
+    }
+
+    // query
+
+    /**
+     * <p>query.</p>
+     *
+     * @param text     a {@link java.lang.String} object.
+     * @param language a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.QueryBuilder} object.
+     */
+    public static QueryBuilder query(final String text, final String language) {
+        return new QueryBuilder(text, language);
+    }
+
+    // units
+
+    /**
+     * <p>cm.</p>
+     *
+     * @param value a {@link java.lang.Number} object.
+     * @return a int.
+     */
+    public static int cm(final Number value) {
+        return Units.cm(value);
+    }
+
+    /**
+     * <p>inch.</p>
+     *
+     * @param value a {@link java.lang.Number} object.
+     * @return a int.
+     */
+    public static int inch(final Number value) {
+        return Units.inch(value);
+    }
+
+    /**
+     * <p>mm.</p>
+     *
+     * @param value a {@link java.lang.Number} object.
+     * @return a int.
+     */
+    public static int mm(final Number value) {
+        return Units.mm(value);
+    }
+
+    // template
+
+    /**
+     * <p>template.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+     */
+    public static ReportTemplateBuilder template() {
+        return new ReportTemplateBuilder();
+    }
+
+    // table of contents
+
+    /**
+     * <p>tableOfContentsCustomizer.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     */
+    public static TableOfContentsCustomizerBuilder tableOfContentsCustomizer() {
+        return new TableOfContentsCustomizerBuilder();
+    }
+
+    /**
+     * <p>tableOfContentsHeading.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     */
+    public static TableOfContentsHeadingBuilder tableOfContentsHeading() {
+        return new TableOfContentsHeadingBuilder();
+    }
+
+    /**
+     * <p>tableOfContentsHeading.</p>
+     *
+     * @param label a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     */
+    public static TableOfContentsHeadingBuilder tableOfContentsHeading(final String label) {
+        return new TableOfContentsHeadingBuilder().setLabel(label);
+    }
+
+    // dataset
+
+    /**
+     * <p>dataset.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     */
+    public static DatasetBuilder dataset() {
+        return new DatasetBuilder();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/FieldBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/FieldBuilder.java
new file mode 100644
index 0000000..e8c558c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/FieldBuilder.java
@@ -0,0 +1,80 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.base.DRField;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+
+/**
+ * <p>FieldBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class FieldBuilder<T> extends AbstractBuilder<FieldBuilder<T>, DRField<T>> implements DRIValue<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for FieldBuilder.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    protected FieldBuilder(String name, Class<? super T> valueClass) {
+        super(new DRField<T>(name, valueClass));
+    }
+
+    /**
+     * <p>setDataType.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    public FieldBuilder<T> setDataType(DRIDataType<? super T, T> dataType) {
+        getObject().setDataType(dataType);
+        return this;
+    }
+
+    /**
+     * <p>setDescription.</p>
+     *
+     * @param description a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    public FieldBuilder<T> setDescription(String description) {
+        getObject().setDescription(description);
+        return this;
+    }
+
+    /**
+     * <p>getField.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRField} object.
+     */
+    public DRField<T> getField() {
+        return build();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getField().getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/HyperLinkBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/HyperLinkBuilder.java
new file mode 100644
index 0000000..8731b31
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/HyperLinkBuilder.java
@@ -0,0 +1,228 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.base.DRHyperLink;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HyperLinkTarget;
+import net.sf.dynamicreports.report.constant.HyperLinkType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>HyperLinkBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class HyperLinkBuilder extends AbstractBuilder<HyperLinkBuilder, DRHyperLink> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for HyperLinkBuilder.</p>
+     */
+    protected HyperLinkBuilder() {
+        super(new DRHyperLink());
+    }
+
+    /**
+     * <p>Constructor for HyperLinkBuilder.</p>
+     *
+     * @param link a {@link java.lang.String} object.
+     */
+    protected HyperLinkBuilder(String link) {
+        super(new DRHyperLink());
+        setLink(link);
+    }
+
+    /**
+     * <p>Constructor for HyperLinkBuilder.</p>
+     *
+     * @param linkExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected HyperLinkBuilder(DRIExpression<String> linkExpression) {
+        super(new DRHyperLink());
+        setLink(linkExpression);
+    }
+
+    /**
+     * <p>setLink.</p>
+     *
+     * @param link a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setLink(String link) {
+        Validate.notNull(link, "link must not be null");
+        return setLink(Expressions.text(link));
+    }
+
+    /**
+     * <p>setLink.</p>
+     *
+     * @param linkExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setLink(DRIExpression<String> linkExpression) {
+        Validate.notNull(linkExpression, "linkExpression must not be null");
+        getObject().setReferenceExpression(linkExpression);
+        getObject().setType(HyperLinkType.REFERENCE.name());
+        return this;
+    }
+
+    /**
+     * <p>setAnchor.</p>
+     *
+     * @param anchor a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setAnchor(String anchor) {
+        getObject().setAnchorExpression(Expressions.text(anchor));
+        return this;
+    }
+
+    /**
+     * <p>setAnchor.</p>
+     *
+     * @param anchorExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setAnchor(DRIExpression<String> anchorExpression) {
+        getObject().setAnchorExpression(anchorExpression);
+        return this;
+    }
+
+    /**
+     * <p>setPage.</p>
+     *
+     * @param page a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setPage(Integer page) {
+        getObject().setPageExpression(Expressions.value(page));
+        return this;
+    }
+
+    /**
+     * <p>setPage.</p>
+     *
+     * @param pageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setPage(DRIExpression<Integer> pageExpression) {
+        getObject().setPageExpression(pageExpression);
+        return this;
+    }
+
+    /**
+     * <p>setReference.</p>
+     *
+     * @param reference a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setReference(String reference) {
+        getObject().setReferenceExpression(Expressions.text(reference));
+        return this;
+    }
+
+    /**
+     * <p>setReference.</p>
+     *
+     * @param referenceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setReference(DRIExpression<String> referenceExpression) {
+        getObject().setReferenceExpression(referenceExpression);
+        return this;
+    }
+
+    /**
+     * <p>setTooltip.</p>
+     *
+     * @param tooltip a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setTooltip(String tooltip) {
+        getObject().setTooltipExpression(Expressions.text(tooltip));
+        return this;
+    }
+
+    /**
+     * <p>setTooltip.</p>
+     *
+     * @param tooltipExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setTooltip(DRIExpression<String> tooltipExpression) {
+        getObject().setTooltipExpression(tooltipExpression);
+        return this;
+    }
+
+    /**
+     * <p>setType.</p>
+     *
+     * @param hyperLinkType a {@link net.sf.dynamicreports.report.constant.HyperLinkType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setType(HyperLinkType hyperLinkType) {
+        getObject().setType(hyperLinkType.name());
+        return this;
+    }
+
+    /**
+     * <p>setType.</p>
+     *
+     * @param hyperLinkType a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setType(String hyperLinkType) {
+        getObject().setType(hyperLinkType);
+        return this;
+    }
+
+    /**
+     * <p>setTarget.</p>
+     *
+     * @param hyperLinkTarget a {@link net.sf.dynamicreports.report.constant.HyperLinkTarget} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setTarget(HyperLinkTarget hyperLinkTarget) {
+        getObject().setTarget(hyperLinkTarget.name());
+        return this;
+    }
+
+    /**
+     * <p>setTarget.</p>
+     *
+     * @param hyperLinkTarget a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     */
+    public HyperLinkBuilder setTarget(String hyperLinkTarget) {
+        getObject().setTarget(hyperLinkTarget);
+        return this;
+    }
+
+    /**
+     * <p>getHyperLink.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRHyperLink} object.
+     */
+    public DRHyperLink getHyperLink() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/MarginBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/MarginBuilder.java
new file mode 100644
index 0000000..f3ae376
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/MarginBuilder.java
@@ -0,0 +1,100 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.base.DRMargin;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>MarginBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MarginBuilder extends AbstractBuilder<MarginBuilder, DRMargin> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for MarginBuilder.</p>
+     */
+    protected MarginBuilder() {
+        super(new DRMargin());
+    }
+
+    /**
+     * <p>Constructor for MarginBuilder.</p>
+     *
+     * @param margin a int.
+     */
+    protected MarginBuilder(int margin) {
+        super(new DRMargin(margin));
+    }
+
+    /**
+     * <p>setTop.</p>
+     *
+     * @param top a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     */
+    public MarginBuilder setTop(int top) {
+        getObject().setTop(top);
+        return this;
+    }
+
+    /**
+     * <p>setLeft.</p>
+     *
+     * @param left a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     */
+    public MarginBuilder setLeft(int left) {
+        getObject().setLeft(left);
+        return this;
+    }
+
+    /**
+     * <p>setBottom.</p>
+     *
+     * @param bottom a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     */
+    public MarginBuilder setBottom(int bottom) {
+        getObject().setBottom(bottom);
+        return this;
+    }
+
+    /**
+     * <p>setRight.</p>
+     *
+     * @param right a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     */
+    public MarginBuilder setRight(int right) {
+        getObject().setRight(right);
+        return this;
+    }
+
+    /**
+     * <p>getMargin.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+     */
+    public DRMargin getMargin() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ParameterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ParameterBuilder.java
new file mode 100644
index 0000000..f33bdaa
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ParameterBuilder.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.base.DRParameter;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>ParameterBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ParameterBuilder<T> extends AbstractBuilder<ParameterBuilder<T>, DRParameter<T>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for ParameterBuilder.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a T object.
+     */
+    protected ParameterBuilder(String name, T value) {
+        super(new DRParameter<T>(name, value));
+    }
+
+    /**
+     * <p>Constructor for ParameterBuilder.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    protected ParameterBuilder(String name, Class<T> valueClass) {
+        super(new DRParameter<T>(name, valueClass));
+    }
+
+    /**
+     * <p>getParameter.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRParameter} object.
+     */
+    public DRParameter<T> getParameter() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/QueryBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/QueryBuilder.java
new file mode 100644
index 0000000..ca652f4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/QueryBuilder.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.base.DRQuery;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>QueryBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class QueryBuilder extends AbstractBuilder<QueryBuilder, DRQuery> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for QueryBuilder.</p>
+     *
+     * @param text     a {@link java.lang.String} object.
+     * @param language a {@link java.lang.String} object.
+     */
+    protected QueryBuilder(String text, String language) {
+        super(new DRQuery(text, language));
+    }
+
+    /**
+     * <p>getQuery.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRQuery} object.
+     */
+    public DRQuery getQuery() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportBuilder.java
new file mode 100644
index 0000000..24fcf34
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportBuilder.java
@@ -0,0 +1,2198 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.DRGroup;
+import net.sf.dynamicreports.report.base.DRReport;
+import net.sf.dynamicreports.report.base.grid.DRColumnGrid;
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
+import net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.builder.group.Groups;
+import net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder;
+import net.sf.dynamicreports.report.builder.style.FontBuilder;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.SubtotalBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.QueryLanguage;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.SubtotalPosition;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+
+/**
+ * <p>ReportBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+@SuppressWarnings("unchecked")
+public class ReportBuilder<T extends ReportBuilder<T>> extends AbstractBuilder<T, DRReport>
+{
+	private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+	
+	public ReportBuilder()
+	{
+		super(new DRReport());
+	}
+	
+	public T setReportName(final String reportName)
+	{
+		this.getObject().setReportName(reportName);
+		return (T)this;
+	}
+	
+	public T setLocale(final Locale locale)
+	{
+		this.getObject().setLocale(locale);
+		return (T)this;
+	}
+	
+	public T setResourceBundle(final ResourceBundle resourceBundle)
+	{
+		this.getObject().setResourceBundle(resourceBundle);
+		return (T)this;
+	}
+	
+	public T setResourceBundle(final String resourceBundleName)
+	{
+		this.getObject().setResourceBundleName(resourceBundleName);
+		return (T)this;
+	}
+	
+	public T setShowColumnTitle(final Boolean showColumnTitle)
+	{
+		this.getObject().setShowColumnTitle(showColumnTitle);
+		return (T)this;
+	}
+	
+	public T setShowColumnValues(final Boolean showColumnValues)
+	{
+		this.getObject().setShowColumnValues(showColumnValues);
+		return (T)this;
+	}
+	
+	public T setPageFormat(final PageType pageType)
+	{
+		return this.setPageFormat(pageType, PageOrientation.PORTRAIT);
+	}
+	
+	public T setPageFormat(final PageType pageType, final PageOrientation orientation)
+	{
+		this.getObject().getPage().setPageFormat(pageType, orientation);
+		return (T)this;
+	}
+	
+	public T setPageFormat(final Integer width, final Integer height, final PageOrientation orientation)
+	{
+		this.getObject().getPage().setPageFormat(width, height, orientation);
+		return (T)this;
+	}
+	
+	public T setPageMargin(final MarginBuilder margin)
+	{
+		Validate.notNull(margin, "margin must not be null");
+		this.getObject().getPage().setMargin(margin.build());
+		return (T)this;
+	}
+	
+	public T setPageColumnsPerPage(final Integer columnsPerPage)
+	{
+		this.getObject().getPage().setColumnsPerPage(columnsPerPage);
+		return (T)this;
+	}
+	
+	public T setPageColumnSpace(final Integer columnSpace)
+	{
+		this.getObject().getPage().setColumnSpace(columnSpace);
+		return (T)this;
+	}
+	
+	public T ignorePageWidth()
+	{
+		return this.setIgnorePageWidth(true);
+	}
+	
+	public T setIgnorePageWidth(final Boolean ignorePageWidth)
+	{
+		this.getObject().getPage().setIgnorePageWidth(ignorePageWidth);
+		return (T)this;
+	}
+	
+	public T ignorePagination()
+	{
+		return this.setIgnorePagination(true);
+	}
+	
+	public T setIgnorePagination(final Boolean ignorePagination)
+	{
+		this.getObject().setIgnorePagination(ignorePagination);
+		return (T)this;
+	}
+	
+	public T setWhenNoDataType(final WhenNoDataType whenNoDataType)
+	{
+		this.getObject().setWhenNoDataType(whenNoDataType);
+		return (T)this;
+	}
+	
+	public T setWhenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
+	{
+		this.getObject().setWhenResourceMissingType(whenResourceMissingType);
+		return (T)this;
+	}
+	
+	/**
+	 * Prints the title band on a separate page.
+	 *
+	 * @return a report builder
+	 */
+	public T titleOnANewPage()
+	{
+		return this.setTitleOnANewPage(true);
+	}
+	
+	/**
+	 * Sets whether or not the title band is printed on a separate page.
+	 *
+	 * @param titleOnANewPage print the title band on a separate page
+	 * @return a report builder
+	 */
+	public T setTitleOnANewPage(final Boolean titleOnANewPage)
+	{
+		this.getObject().setTitleOnANewPage(titleOnANewPage);
+		return (T)this;
+	}
+	
+	/**
+	 * Prints the summary band on a separate page.
+	 *
+	 * @return a report builder
+	 */
+	public T summaryOnANewPage()
+	{
+		return this.setSummaryOnANewPage(true);
+	}
+	
+	/**
+	 * Sets whether or not the summary band is printed on a separate page.
+	 *
+	 * @param summaryOnANewPage print the summary band on a separate page
+	 * @return a report builder
+	 */
+	public T setSummaryOnANewPage(final Boolean summaryOnANewPage)
+	{
+		this.getObject().setSummaryOnANewPage(summaryOnANewPage);
+		return (T)this;
+	}
+	
+	/**
+	 * Prints the summary band with the page header and footer.
+	 *
+	 * @return a report builder
+	 */
+	public T summaryWithPageHeaderAndFooter()
+	{
+		return this.setSummaryWithPageHeaderAndFooter(true);
+	}
+	
+	/**
+	 * Sets whether or not the summary band is printed with the page header and footer.
+	 *
+	 * @param summaryWithPageHeaderAndFooter print the summary band with the page header and footer
+	 * @return a report builder
+	 */
+	public T setSummaryWithPageHeaderAndFooter(final Boolean summaryWithPageHeaderAndFooter)
+	{
+		this.getObject().setSummaryWithPageHeaderAndFooter(summaryWithPageHeaderAndFooter);
+		return (T)this;
+	}
+	
+	/**
+	 * Prints the column footer band at the bottom of the column.
+	 *
+	 * @return a report builder
+	 */
+	public T floatColumnFooter()
+	{
+		return this.setFloatColumnFooter(true);
+	}
+	
+	/**
+	 * Sets whether or not the column footer band is printed at the bottom of the column
+	 *
+	 * @param floatColumnFooter print the column footer at the bottom of the column
+	 * @return a report builder
+	 */
+	public T setFloatColumnFooter(final Boolean floatColumnFooter)
+	{
+		this.getObject().setFloatColumnFooter(floatColumnFooter);
+		return (T)this;
+	}
+	
+	public T setPrintOrder(final Orientation printOrder)
+	{
+		this.getObject().setPrintOrder(printOrder);
+		return (T)this;
+	}
+	
+	public T setColumnDirection(final RunDirection columnDirection)
+	{
+		this.getObject().setColumnDirection(columnDirection);
+		return (T)this;
+	}
+	
+	public T setLanguage(final String language)
+	{
+		this.getObject().setLanguage(language);
+		return (T)this;
+	}
+	
+	public T setUseFieldNameAsDescription(final Boolean useFieldNameAsDescription)
+	{
+		this.getObject().setUseFieldNameAsDescription(useFieldNameAsDescription);
+		return (T)this;
+	}
+	
+	public T scriptlets(final DRIScriptlet... scriptlets)
+	{
+		return this.addScriptlet(scriptlets);
+	}
+	
+	public T addScriptlet(final DRIScriptlet... scriptlets)
+	{
+		Validate.notNull(scriptlets, "scriptlets must not be null");
+		Validate.noNullElements(scriptlets, "scriptlets must not contains null scriptlet");
+		for(final DRIScriptlet scriptlet : scriptlets)
+		{
+			this.getObject().addScriptlet(scriptlet);
+		}
+		return (T)this;
+	}
+	
+	public T setProperties(final Properties properties)
+	{
+		this.getObject().setProperties(properties);
+		return (T)this;
+	}
+	
+	public T addProperty(final String key, final String value)
+	{
+		this.getObject().addProperty(key, value);
+		return (T)this;
+	}
+	
+	public T setQuery(final String text, final String language)
+	{
+		Validate.notNull(text, "text must not be null");
+		Validate.notNull(language, "language must not be null");
+		return this.setQuery(DynamicReports.query(text, language));
+	}
+	
+	public T setQuery(final String sql)
+	{
+		Validate.notNull(sql, "sql must not be null");
+		return this.setQuery(DynamicReports.query(sql, QueryLanguage.SQL));
+	}
+	
+	public T setQuery(final QueryBuilder query)
+	{
+		Validate.notNull(query, "query must not be null");
+		this.getObject().setQuery(query.build());
+		return (T)this;
+	}
+	
+	public T columnGrid(final ListType type)
+	{
+		this.getObject().setColumnGrid(new DRColumnGrid(type));
+		return (T)this;
+	}
+	
+	public T columnGrid(final ColumnGridComponentBuilder... components)
+	{
+		return this.columnGrid(ListType.HORIZONTAL, components);
+	}
+	
+	public T columnGrid(final ListType type, final ColumnGridComponentBuilder... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		final DRColumnGrid columnGrid = new DRColumnGrid(type);
+		for(final ColumnGridComponentBuilder component : components)
+		{
+			columnGrid.addComponent(component.build());
+		}
+		this.getObject().setColumnGrid(columnGrid);
+		return (T)this;
+	}
+	
+	// template
+	public T setTemplate(final ReportTemplateBuilder template)
+	{
+		Validate.notNull(template, "template must not be null");
+		this.getObject().setTemplate(template.build());
+		return (T)this;
+	}
+	
+	// template style
+	public T templateStyles(final TemplateStylesBuilder... templateStyles)
+	{
+		return this.addTemplateStyle(templateStyles);
+	}
+	
+	public T addTemplateStyle(final TemplateStylesBuilder... templateStyles)
+	{
+		Validate.notNull(templateStyles, "templateStyles must not be null");
+		Validate.noNullElements(templateStyles, "templateStyles must not contains null templateStyle");
+		for(final TemplateStylesBuilder templateStyle : templateStyles)
+		{
+			for(final StyleBuilder style : templateStyle.getStyles())
+			{
+				this.addTemplateStyle(style);
+			}
+		}
+		return (T)this;
+	}
+	
+	public T templateStyles(final StyleBuilder... templateStyles)
+	{
+		return this.addTemplateStyle(templateStyles);
+	}
+	
+	public T addTemplateStyle(final StyleBuilder... templateStyles)
+	{
+		Validate.notNull(templateStyles, "templateStyles must not be null");
+		Validate.noNullElements(templateStyles, "templateStyles must not contains null templateStyle");
+		for(final StyleBuilder templateStyle : templateStyles)
+		{
+			this.getObject().addTemplateStyle(templateStyle.build());
+		}
+		return (T)this;
+	}
+	
+	// parameter
+	public T parameters(final ParameterBuilder<?>... parameters)
+	{
+		return this.addParameter(parameters);
+	}
+	
+	public T addParameter(final String name, final Object value)
+	{
+		return this.addParameter(DynamicReports.parameter(name, value));
+	}
+	
+	public T addParameter(final String name, final Class<?> valueClass)
+	{
+		return this.addParameter(DynamicReports.parameter(name, valueClass));
+	}
+	
+	public T addParameter(final ParameterBuilder<?>... parameters)
+	{
+		Validate.notNull(parameters, "parameters must not be null");
+		Validate.noNullElements(parameters, "parameters must not contains null parameter");
+		for(final ParameterBuilder<?> parameter : parameters)
+		{
+			this.getObject().addParameter(parameter.build());
+		}
+		return (T)this;
+	}
+	
+	public T setParameter(final String name, final Object value)
+	{
+		this.getObject().addParameterValue(name, value);
+		return (T)this;
+	}
+	
+	public T setParameters(final Map<String, Object> parameters)
+	{
+		this.getObject().setParameterValues(parameters);
+		return (T)this;
+	}
+	
+	// field
+	public T fields(final FieldBuilder<?>... fields)
+	{
+		return this.addField(fields);
+	}
+	
+	public T addField(final String name, final Class<?> valueClass)
+	{
+		return this.addField(DynamicReports.field(name, valueClass));
+	}
+	
+	public <U> T addField(final String name, final DRIDataType<? super U, U> dataType)
+	{
+		return this.addField(DynamicReports.field(name, dataType));
+	}
+	
+	public T addField(final FieldBuilder<?>... fields)
+	{
+		Validate.notNull(fields, "fields must not be null");
+		Validate.noNullElements(fields, "fields must not contains null field");
+		for(final FieldBuilder<?> field : fields)
+		{
+			this.getObject().addField(field.build());
+		}
+		return (T)this;
+	}
+	
+	// variable
+	public T variables(final VariableBuilder<?>... variables)
+	{
+		return this.addVariable(variables);
+	}
+	
+	public T addVariable(final VariableBuilder<?>... variables)
+	{
+		Validate.notNull(variables, "variables must not be null");
+		Validate.noNullElements(variables, "variables must not contains null variable");
+		for(final VariableBuilder<?> variable : variables)
+		{
+			this.getObject().addVariable(variable.getVariable());
+		}
+		return (T)this;
+	}
+	
+	/**
+	 * Adds a sort field to the dataset
+	 *
+	 * @param sortColumns columns to be sorted
+	 * @return a report builder
+	 */
+	public T sortBy(final TextColumnBuilder<?>... sortColumns)
+	{
+		Validate.notNull(sortColumns, "sortColumns must not be null");
+		Validate.noNullElements(sortColumns, "sortColumns must not contains null sortColumn");
+		for(final TextColumnBuilder<?> sortColumn : sortColumns)
+		{
+			this.sortBy(DynamicReports.asc(sortColumn));
+		}
+		return (T)this;
+	}
+	
+	/**
+	 * Adds a sort field to the dataset
+	 *
+	 * @param sorts the sort definitions
+	 * @return a report builder
+	 */
+	public T sortBy(final SortBuilder... sorts)
+	{
+		return this.addSort(sorts);
+	}
+	
+	/**
+	 * Adds a sort field to the dataset
+	 *
+	 * @param sorts the sort definitions
+	 * @return a report builder
+	 */
+	public T addSort(final SortBuilder... sorts)
+	{
+		Validate.notNull(sorts, "sorts must not be null");
+		Validate.noNullElements(sorts, "sorts must not contains null sort");
+		for(final SortBuilder sort : sorts)
+		{
+			this.getObject().addSort(sort.build());
+		}
+		return (T)this;
+	}
+	
+	// column
+	public T columns(final ColumnBuilder<?, ?>... columns)
+	{
+		return this.addColumn(columns);
+	}
+	
+	public T addColumn(final ColumnBuilder<?, ?>... columns)
+	{
+		Validate.notNull(columns, "columns must not be null");
+		Validate.noNullElements(columns, "columns must not contains null column");
+		for(final ColumnBuilder<?, ?> column : columns)
+		{
+			this.getObject().addColumn(column.build());
+		}
+		return (T)this;
+	}
+	
+	// style
+	public T setDefaultFont(final FontBuilder defaultFont)
+	{
+		if(defaultFont != null)
+		{
+			this.getObject().setDefaultFont(defaultFont.build());
+		}
+		else
+		{
+			this.getObject().setDefaultFont(null);
+		}
+		return (T)this;
+	}
+	
+	public T setTextStyle(final ReportStyleBuilder textStyle)
+	{
+		if(textStyle != null)
+		{
+			this.getObject().setTextStyle(textStyle.build());
+		}
+		else
+		{
+			this.getObject().setTextStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setColumnTitleStyle(final ReportStyleBuilder columnTitleStyle)
+	{
+		if(columnTitleStyle != null)
+		{
+			this.getObject().setColumnTitleStyle(columnTitleStyle.build());
+		}
+		else
+		{
+			this.getObject().setColumnTitleStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setColumnStyle(final ReportStyleBuilder columnStyle)
+	{
+		if(columnStyle != null)
+		{
+			this.getObject().setColumnStyle(columnStyle.build());
+		}
+		else
+		{
+			this.getObject().setColumnStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setGroupTitleStyle(final ReportStyleBuilder groupTitleStyle)
+	{
+		if(groupTitleStyle != null)
+		{
+			this.getObject().setGroupTitleStyle(groupTitleStyle.build());
+		}
+		else
+		{
+			this.getObject().setGroupTitleStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setGroupStyle(final ReportStyleBuilder groupStyle)
+	{
+		if(groupStyle != null)
+		{
+			this.getObject().setGroupStyle(groupStyle.build());
+		}
+		else
+		{
+			this.getObject().setGroupStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setSubtotalStyle(final ReportStyleBuilder subtotalStyle)
+	{
+		if(subtotalStyle != null)
+		{
+			this.getObject().setSubtotalStyle(subtotalStyle.build());
+		}
+		else
+		{
+			this.getObject().setSubtotalStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setImageStyle(final ReportStyleBuilder imageStyle)
+	{
+		if(imageStyle != null)
+		{
+			this.getObject().setImageStyle(imageStyle.build());
+		}
+		else
+		{
+			this.getObject().setImageStyle(null);
+		}
+		return (T)this;
+	}
+	
+	// row highlighter
+	public T highlightDetailOddRows()
+	{
+		return this.setHighlightDetailOddRows(true);
+	}
+	
+	public T setHighlightDetailOddRows(final Boolean highlightDetailOddRows)
+	{
+		this.getObject().setHighlightDetailOddRows(highlightDetailOddRows);
+		return (T)this;
+	}
+	
+	public T setDetailOddRowStyle(final SimpleStyleBuilder detailOddRowStyle)
+	{
+		if(detailOddRowStyle != null)
+		{
+			this.getObject().setDetailOddRowStyle(detailOddRowStyle.build());
+		}
+		else
+		{
+			this.getObject().setDetailOddRowStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T highlightDetailEvenRows()
+	{
+		return this.setHighlightDetailEvenRows(true);
+	}
+	
+	public T setHighlightDetailEvenRows(final Boolean highlightDetailEvenRows)
+	{
+		this.getObject().setHighlightDetailEvenRows(highlightDetailEvenRows);
+		return (T)this;
+	}
+	
+	public T setDetailEvenRowStyle(final SimpleStyleBuilder detailEvenRowStyle)
+	{
+		if(detailEvenRowStyle != null)
+		{
+			this.getObject().setDetailEvenRowStyle(detailEvenRowStyle.build());
+		}
+		else
+		{
+			this.getObject().setDetailEvenRowStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T detailRowHighlighters(final ConditionalStyleBuilder... detailRowHighlighters)
+	{
+		return this.addDetailRowHighlighter(detailRowHighlighters);
+	}
+	
+	public T addDetailRowHighlighter(final ConditionalStyleBuilder... detailRowHighlighters)
+	{
+		Validate.notNull(detailRowHighlighters, "detailRowHighlighters must not be null");
+		Validate.noNullElements(
+			detailRowHighlighters,
+			"detailRowHighlighters must not contains null detailRowHighlighter");
+		for(final ConditionalStyleBuilder conditionalStyleBuilder : detailRowHighlighters)
+		{
+			this.getObject().addDetailRowHighlighter(conditionalStyleBuilder.build());
+		}
+		return (T)this;
+	}
+	
+	// subtotal
+	public T subtotalsAtTitle(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtTitle(subtotals);
+	}
+	
+	public T addSubtotalAtTitle(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.TITLE).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtPageHeader(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtPageHeader(subtotals);
+	}
+	
+	public T addSubtotalAtPageHeader(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.PAGE_HEADER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtPageFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtPageFooter(subtotals);
+	}
+	
+	public T addSubtotalAtPageFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.PAGE_FOOTER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtColumnHeader(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtColumnHeader(subtotals);
+	}
+	
+	public T addSubtotalAtColumnHeader(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.COLUMN_HEADER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtColumnFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtColumnFooter(subtotals);
+	}
+	
+	public T addSubtotalAtColumnFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.COLUMN_FOOTER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtGroupHeader(final GroupBuilder<?> group, final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtGroupHeader(group, subtotals);
+	}
+	
+	public T addSubtotalAtGroupHeader(final GroupBuilder<?> group, final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(group, "group must not be null");
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.GROUP_HEADER).setGroup(group).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtGroupFooter(final GroupBuilder<?> group, final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtGroupFooter(group, subtotals);
+	}
+	
+	public T addSubtotalAtGroupFooter(final GroupBuilder<?> group, final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(group, "group must not be null");
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.GROUP_FOOTER).setGroup(group).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtFirstGroupHeader(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtFirstGroupHeader(subtotals);
+	}
+	
+	public T addSubtotalAtFirstGroupHeader(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.FIRST_GROUP_HEADER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtFirstGroupFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtFirstGroupFooter(subtotals);
+	}
+	
+	public T addSubtotalAtFirstGroupFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.FIRST_GROUP_FOOTER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtLastGroupHeader(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtLastGroupHeader(subtotals);
+	}
+	
+	public T addSubtotalAtLastGroupHeader(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.LAST_GROUP_HEADER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtLastGroupFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtLastGroupFooter(subtotals);
+	}
+	
+	public T addSubtotalAtLastGroupFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.LAST_GROUP_FOOTER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtLastPageFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtLastPageFooter(subtotals);
+	}
+	
+	public T addSubtotalAtLastPageFooter(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.LAST_PAGE_FOOTER).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsAtSummary(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		return this.addSubtotalAtSummary(subtotals);
+	}
+	
+	public T addSubtotalAtSummary(final SubtotalBuilder<?, ?>... subtotals)
+	{
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final SubtotalBuilder<?, ?> subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.SUMMARY).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsOfPercentageAtGroupHeader(final GroupBuilder<?> group, final PercentageSubtotalBuilder... subtotals)
+	{
+		return this.addSubtotalOfPercentageAtGroupHeader(group, subtotals);
+	}
+	
+	public T addSubtotalOfPercentageAtGroupHeader(final GroupBuilder<?> group, final PercentageSubtotalBuilder... subtotals)
+	{
+		Validate.notNull(group, "group must not be null");
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final PercentageSubtotalBuilder subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.GROUP_HEADER).setGroup(group).build());
+		}
+		return (T)this;
+	}
+	
+	public T subtotalsOfPercentageAtGroupFooter(final GroupBuilder<?> group, final PercentageSubtotalBuilder... subtotals)
+	{
+		return this.addSubtotalOfPercentageAtGroupFooter(group, subtotals);
+	}
+	
+	public T addSubtotalOfPercentageAtGroupFooter(final GroupBuilder<?> group, final PercentageSubtotalBuilder... subtotals)
+	{
+		Validate.notNull(group, "group must not be null");
+		Validate.notNull(subtotals, "subtotals must not be null");
+		Validate.noNullElements(subtotals, "subtotals must not contains null subtotal");
+		for(final PercentageSubtotalBuilder subtotal : subtotals)
+		{
+			this.getObject().addSubtotal(subtotal.setPosition(SubtotalPosition.GROUP_FOOTER).setGroup(group).build());
+		}
+		return (T)this;
+	}
+	
+	// group
+	public T groupBy(final ValueColumnBuilder<?, ?>... groupColumns)
+	{
+		Validate.notNull(groupColumns, "groupColumns must not be null");
+		Validate.noNullElements(groupColumns, "groupColumns must not contains null groupColumn");
+		for(final ValueColumnBuilder<?, ?> groupColumn : groupColumns)
+		{
+			this.addGroup(Groups.group(groupColumn));
+		}
+		return (T)this;
+	}
+	
+	public T groupBy(final GroupBuilder<?>... groups)
+	{
+		return this.addGroup(groups);
+	}
+	
+	public T addGroup(final GroupBuilder<?>... groups)
+	{
+		Validate.notNull(groups, "groups must not be null");
+		Validate.noNullElements(groups, "groups must not contains null group");
+		for(final GroupBuilder<?> group : groups)
+		{
+			this.getObject().addGroup(group.build());
+		}
+		return (T)this;
+	}
+	
+	// table of contents
+	public T tableOfContents()
+	{
+		return this.setTableOfContents(true);
+	}
+	
+	public T tableOfContents(final TableOfContentsCustomizerBuilder tableOfContentsCustomizer)
+	{
+		return this.setTableOfContents(tableOfContentsCustomizer);
+	}
+	
+	public T tableOfContents(final DRITableOfContentsCustomizer tableOfContentsCustomizer)
+	{
+		return this.setTableOfContents(tableOfContentsCustomizer);
+	}
+	
+	public T setTableOfContents(final Boolean tableOfContents)
+	{
+		this.getObject().setTableOfContents(tableOfContents);
+		return (T)this;
+	}
+	
+	public T setTableOfContents(final TableOfContentsCustomizerBuilder tableOfContentsCustomizer)
+	{
+		this.getObject().setTableOfContentsCustomizer(tableOfContentsCustomizer.build());
+		return this.setTableOfContents(true);
+	}
+	
+	public T setTableOfContents(final DRITableOfContentsCustomizer tableOfContentsCustomizer)
+	{
+		this.getObject().setTableOfContentsCustomizer(tableOfContentsCustomizer);
+		return this.setTableOfContents(true);
+	}
+	
+	/**
+	 * Sets a dataset filter expression. The expression must be a type of Boolean
+	 *
+	 * @param filterExpression the filter expression
+	 * @return a report builder
+	 */
+	public T setFilterExpression(final DRIExpression<Boolean> filterExpression)
+	{
+		this.getObject().setFilterExpression(filterExpression);
+		return (T)this;
+	}
+	
+	// title
+	
+	/**
+	 * Sets the title band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the title split type
+	 * @return a report builder
+	 */
+	public T setTitleSplitType(final SplitType splitType)
+	{
+		this.getObject().getTitleBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setTitlePrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getTitleBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a title band style
+	 *
+	 * @param style the title band style
+	 * @return a report builder
+	 */
+	public T setTitleStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getTitleBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getTitleBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setTitleBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getTitleBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the title band. The band is printed on the first page and only once.
+	 *
+	 * @param components the title components
+	 * @return a report builder
+	 */
+	public T title(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addTitle(components);
+	}
+	
+	/**
+	 * Adds components to the title band. The band is printed on the first page and only once.
+	 *
+	 * @param components the title components
+	 * @return a report builder
+	 */
+	public T addTitle(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getTitleBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// page header band
+	
+	/**
+	 * Sets the page header band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the page header split type
+	 * @return a report builder
+	 */
+	public T setPageHeaderSplitType(final SplitType splitType)
+	{
+		this.getObject().getPageHeaderBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setPageHeaderPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getPageHeaderBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a page header band style
+	 *
+	 * @param style the page header band style
+	 * @return a report builder
+	 */
+	public T setPageHeaderStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getPageHeaderBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getPageHeaderBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setPageHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getPageHeaderBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the page header band. The band is printed on each page at the top of the page.
+	 *
+	 * @param components the page header components
+	 * @return a report builder
+	 */
+	public T pageHeader(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addPageHeader(components);
+	}
+	
+	/**
+	 * Adds components to the page header band. The band is printed on each page at the top of the page.
+	 *
+	 * @param components the page header components
+	 * @return a report builder
+	 */
+	public T addPageHeader(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getPageHeaderBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// page footer band
+	
+	/**
+	 * Sets the page footer band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the page footer split type
+	 * @return a report builder
+	 */
+	public T setPageFooterSplitType(final SplitType splitType)
+	{
+		this.getObject().getPageFooterBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setPageFooterPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getPageFooterBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a page footer band style
+	 *
+	 * @param style the page footer band style
+	 * @return a report builder
+	 */
+	public T setPageFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getPageFooterBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getPageFooterBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setPageFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getPageFooterBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the page footer band. The band is printed on each page at the bottom of the page.
+	 *
+	 * @param components the page footer components
+	 * @return a report builder
+	 */
+	public T pageFooter(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addPageFooter(components);
+	}
+	
+	/**
+	 * Adds components to the page footer band. The band is printed on each page at the bottom of the page.
+	 *
+	 * @param components the page footer components
+	 * @return a report builder
+	 */
+	public T addPageFooter(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getPageFooterBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// column header band
+	
+	/**
+	 * Sets the column header band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the column header split type
+	 * @return a report builder
+	 */
+	public T setColumnHeaderSplitType(final SplitType splitType)
+	{
+		this.getObject().getColumnHeaderBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setColumnHeaderPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getColumnHeaderBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a column header band style
+	 *
+	 * @param style the column header band style
+	 * @return a report builder
+	 */
+	public T setColumnHeaderStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getColumnHeaderBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getColumnHeaderBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setColumnHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getColumnHeaderBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the column header band. The band is printed on each page at the top of the page and it's
+	 * placed below the page header band.
+	 *
+	 * @param components the column header components
+	 * @return a report builder
+	 */
+	public T columnHeader(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addColumnHeader(components);
+	}
+	
+	/**
+	 * Adds components to the column header band. The band is printed on each page at the top of the page and it's
+	 * placed below the page header band.
+	 *
+	 * @param components the column header components
+	 * @return a report builder
+	 */
+	public T addColumnHeader(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getColumnHeaderBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// column footer band
+	
+	/**
+	 * Sets the column footer band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the column footer split type
+	 * @return a report builder
+	 */
+	public T setColumnFooterSplitType(final SplitType splitType)
+	{
+		this.getObject().getColumnFooterBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setColumnFooterPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getColumnFooterBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a column footer band style
+	 *
+	 * @param style the column footer band style
+	 * @return a report builder
+	 */
+	public T setColumnFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getColumnFooterBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getColumnFooterBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setColumnFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getColumnFooterBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the column footer band. The band is printed on each page at the bottom of the page and it's
+	 * placed above the page footer band.
+	 *
+	 * @param components the column footer components
+	 * @return a report builder
+	 */
+	public T columnFooter(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addColumnFooter(components);
+	}
+	
+	/**
+	 * Adds components to the column footer band. The band is printed on each page at the bottom of the page and it's
+	 * placed above the page footer band.
+	 *
+	 * @param components the column footer components
+	 * @return a report builder
+	 */
+	public T addColumnFooter(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getColumnFooterBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// group header band
+	
+	/**
+	 * Sets the group header band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param group     the group to which to apply the split type
+	 * @param splitType the group header split type
+	 * @return a report builder
+	 */
+	public T setGroupHeaderSplitType(final GroupBuilder<?> group, final SplitType splitType)
+	{
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		drGroup.getHeaderBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setGroupHeaderPrintWhenExpression(final GroupBuilder<?> group, final DRIExpression<Boolean> printWhenExpression)
+	{
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		drGroup.getHeaderBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a group header band style
+	 *
+	 * @param group the group to which to apply the style
+	 * @param style the group header band style
+	 * @return a report builder
+	 */
+	public T setGroupHeaderStyle(final GroupBuilder<?> group, final ReportStyleBuilder style)
+	{
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		if(style != null)
+		{
+			drGroup.getHeaderBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			drGroup.getHeaderBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setGroupHeaderBackgroundComponent(final GroupBuilder<?> group, final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		drGroup.getHeaderBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the group header band. The band is printed for each data group. It's placed above the grouped
+	 * data and between the column header and footer.
+	 *
+	 * @param group      the group to which to add the components
+	 * @param components the group header components
+	 * @return a report builder
+	 */
+	public T groupHeader(final GroupBuilder<?> group, final ComponentBuilder<?, ?>... components)
+	{
+		return this.addGroupHeader(group, components);
+	}
+	
+	/**
+	 * Adds components to the group header band. The band is printed for each data group. It's placed above the grouped
+	 * data and between the column header and footer.
+	 *
+	 * @param group      the group to which to add the components
+	 * @param components the group header components
+	 * @return a report builder
+	 */
+	public T addGroupHeader(final GroupBuilder<?> group, final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			drGroup.getHeaderBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// group footer band
+	
+	/**
+	 * Sets the group footer band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param group     the group to which to apply the split type
+	 * @param splitType the group footer split type
+	 * @return a report builder
+	 */
+	public T setGroupFooterSplitType(final GroupBuilder<?> group, final SplitType splitType)
+	{
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		drGroup.getFooterBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setGroupFooterPrintWhenExpression(final GroupBuilder<?> group, final DRIExpression<Boolean> printWhenExpression)
+	{
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		drGroup.getFooterBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a group footer band style
+	 *
+	 * @param group the group to which to apply the style
+	 * @param style the group footer band style
+	 * @return a report builder
+	 */
+	public T setGroupFooterStyle(final GroupBuilder<?> group, final ReportStyleBuilder style)
+	{
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		if(style != null)
+		{
+			drGroup.getFooterBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			drGroup.getFooterBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setGroupFooterBackgroundComponent(final GroupBuilder<?> group, final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		drGroup.getFooterBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the group footer band. The band is printed for each data group. It's placed below the grouped
+	 * data and between the column header and footer.
+	 *
+	 * @param group      the group to which to add the components
+	 * @param components the group footer components
+	 * @return a report builder
+	 */
+	public T groupFooter(final GroupBuilder<?> group, final ComponentBuilder<?, ?>... components)
+	{
+		return this.addGroupFooter(group, components);
+	}
+	
+	/**
+	 * Adds components to the group footer band. The band is printed for each data group. It's placed below the grouped
+	 * data and between the column header and footer.
+	 *
+	 * @param group      the group to which to add the components
+	 * @param components the group footer components
+	 * @return a report builder
+	 */
+	public T addGroupFooter(final GroupBuilder<?> group, final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(group, "group must not be null");
+		final int index = this.getObject().getGroups().indexOf(group.getGroup());
+		Validate.isTrue(index >= 0, "group must be registered");
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		final DRGroup drGroup = this.getObject().getGroups().get(index);
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			drGroup.getFooterBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// detail band
+	
+	/**
+	 * Sets the detail band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the detail split type
+	 * @return a report builder
+	 */
+	public T setDetailSplitType(final SplitType splitType)
+	{
+		this.getObject().getDetailBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setDetailPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getDetailBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a detail band style
+	 *
+	 * @param style the detail band style
+	 * @return a report builder
+	 */
+	public T setDetailStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getDetailBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getDetailBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setDetailBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getDetailBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the detail band. The band is printed for each record row in the data source and it's placed
+	 * between the column header and footer band.
+	 *
+	 * @param components the detail components
+	 * @return a report builder
+	 */
+	public T detail(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addDetail(components);
+	}
+	
+	/**
+	 * Adds components to the detail band. The band is printed for each record row in the data source and it's placed
+	 * between the column header and footer band.
+	 *
+	 * @param components the detail components
+	 * @return a report builder
+	 */
+	public T addDetail(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getDetailBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// detail header band
+	
+	/**
+	 * Sets the detail header band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the detail header split type
+	 * @return a report builder
+	 */
+	public T setDetailHeaderSplitType(final SplitType splitType)
+	{
+		this.getObject().getDetailHeaderBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setDetailHeaderPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getDetailHeaderBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a detail header band style
+	 *
+	 * @param style the detail header band style
+	 * @return a report builder
+	 */
+	public T setDetailHeaderStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getDetailHeaderBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getDetailHeaderBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setDetailHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getDetailHeaderBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the detail header band. The band is printed for each record row in the data source and it's
+	 * placed above the detail band.
+	 *
+	 * @param components the detail header components
+	 * @return a report builder
+	 */
+	public T detailHeader(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addDetailHeader(components);
+	}
+	
+	/**
+	 * Adds components to the detail header band. The band is printed for each record row in the data source and it's
+	 * placed above the detail band.
+	 *
+	 * @param components the detail header components
+	 * @return a report builder
+	 */
+	public T addDetailHeader(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getDetailHeaderBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// detail footer band
+	
+	/**
+	 * Sets the detail footer band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the detail footer split type
+	 * @return a report builder
+	 */
+	public T setDetailFooterSplitType(final SplitType splitType)
+	{
+		this.getObject().getDetailFooterBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setDetailFooterPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getDetailFooterBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a detail footer band style
+	 *
+	 * @param style the detail footer band style
+	 * @return a report builder
+	 */
+	public T setDetailFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getDetailFooterBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getDetailFooterBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setDetailFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getDetailFooterBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the detail footer band. The band is printed for each record row in the data source and it's
+	 * placed below the detail band.
+	 *
+	 * @param components the detail footer components
+	 * @return a report builder
+	 */
+	public T detailFooter(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addDetailFooter(components);
+	}
+	
+	/**
+	 * Adds components to the detail footer band. The band is printed for each record row in the data source and it's
+	 * placed below the detail band.
+	 *
+	 * @param components the detail footer components
+	 * @return a report builder
+	 */
+	public T addDetailFooter(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getDetailFooterBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// last page footer band
+	
+	/**
+	 * Sets the last page footer band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the last page footer split type
+	 * @return a report builder
+	 */
+	public T setLastPageFooterSplitType(final SplitType splitType)
+	{
+		this.getObject().getLastPageFooterBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setLastPageFooterPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getLastPageFooterBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a last page footer band style
+	 *
+	 * @param style the last page footer band style
+	 * @return a report builder
+	 */
+	public T setLastPageFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getLastPageFooterBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getLastPageFooterBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setLastPageFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getLastPageFooterBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the last page footer band. The band is printed only on the last page at the bottom of the
+	 * page.
+	 *
+	 * @param components the last page footer components
+	 * @return a report builder
+	 */
+	public T lastPageFooter(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addLastPageFooter(components);
+	}
+	
+	/**
+	 * Adds components to the last page footer band. The band is printed only on the last page at the bottom of the
+	 * page.
+	 *
+	 * @param components the last page footer components
+	 * @return a report builder
+	 */
+	public T addLastPageFooter(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getLastPageFooterBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// summary band
+	
+	/**
+	 * Sets the summary band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the summary split type
+	 * @return a report builder
+	 */
+	public T setSummarySplitType(final SplitType splitType)
+	{
+		this.getObject().getSummaryBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setSummaryPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getSummaryBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a summary band style
+	 *
+	 * @param style the summary band style
+	 * @return a report builder
+	 */
+	public T setSummaryStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getSummaryBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getSummaryBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setSummaryBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getSummaryBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the summary band. The band is printed on the last page and only once.
+	 *
+	 * @param components the summary components
+	 * @return a report builder
+	 */
+	public T summary(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addSummary(components);
+	}
+	
+	/**
+	 * Adds components to the summary band. The band is printed on the last page and only once.
+	 *
+	 * @param components the summary components
+	 * @return a report builder
+	 */
+	public T addSummary(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getSummaryBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// no data band
+	
+	/**
+	 * Sets the no data band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the no data split type
+	 * @return a report builder
+	 */
+	public T setNoDataSplitType(final SplitType splitType)
+	{
+		this.getObject().getNoDataBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setNoDataPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getNoDataBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a no data band style
+	 *
+	 * @param style the no data band style
+	 * @return a report builder
+	 */
+	public T setNoDataStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getNoDataBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getNoDataBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setNoDataBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getNoDataBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the no data band. The band is printed only when the data source is empty. It's used to show
+	 * the information that there are not any data in the report.
+	 *
+	 * @param components the no data components
+	 * @return a report builder
+	 */
+	public T noData(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addNoData(components);
+	}
+	
+	/**
+	 * Adds components to the no data band. The band is printed only when the data source is empty. It's used to show
+	 * the information that there are not any data in the report.
+	 *
+	 * @param components the no data components
+	 * @return a report builder
+	 */
+	public T addNoData(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getNoDataBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	// background band
+	
+	/**
+	 * Sets the background band split type.<br/>
+	 * <i>SplitType.PREVENT</i> - prevents the band from splitting<br/>
+	 * <i>SplitType.STRETCH</i> - the band can be split, but never within its declared height<br/>
+	 * <i>SplitType.IMMEDIATE</i> - the band can be split
+	 *
+	 * @param splitType the background split type
+	 * @return a report builder
+	 */
+	public T setBackgroundSplitType(final SplitType splitType)
+	{
+		this.getObject().getBackgroundBand().setSplitType(splitType);
+		return (T)this;
+	}
+	
+	public T setBackgroundPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression)
+	{
+		this.getObject().getBackgroundBand().setPrintWhenExpression(printWhenExpression);
+		return (T)this;
+	}
+	
+	/**
+	 * Sets a background band style
+	 *
+	 * @param style the background band style
+	 * @return a report builder
+	 */
+	public T setBackgroundStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().getBackgroundBand().getList().setStyle(style.build());
+		}
+		else
+		{
+			this.getObject().getBackgroundBand().getList().setStyle(null);
+		}
+		return (T)this;
+	}
+	
+	public T setBackgroundBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().getBackgroundBand().getList().setBackgroundComponent(backgroundComponent.build());
+		return (T)this;
+	}
+	
+	/**
+	 * Adds components to the background band. The band is printed on each page. It's mostly used for adding watermarks
+	 * to the report.
+	 *
+	 * @param components the background components
+	 * @return a report builder
+	 */
+	public T background(final ComponentBuilder<?, ?>... components)
+	{
+		return this.addBackground(components);
+	}
+	
+	/**
+	 * Adds components to the background band. The band is printed on each page. It's mostly used for adding watermarks
+	 * to the report.
+	 *
+	 * @param components the background components
+	 * @return a report builder
+	 */
+	public T addBackground(final ComponentBuilder<?, ?>... components)
+	{
+		Validate.notNull(components, "components must not be null");
+		Validate.noNullElements(components, "components must not contains null component");
+		for(final ComponentBuilder<?, ?> component : components)
+		{
+			this.getObject().getBackgroundBand().addComponent(component.build());
+		}
+		return (T)this;
+	}
+	
+	public DRReport getReport()
+	{
+		return this.build();
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportTemplateBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportTemplateBuilder.java
new file mode 100644
index 0000000..1cd62ec
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportTemplateBuilder.java
@@ -0,0 +1,1910 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import java.util.Locale;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.DRReportTemplate;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
+import net.sf.dynamicreports.report.builder.style.FontBuilder;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+
+
+/**
+ * <p>ReportTemplateBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ */
+public class ReportTemplateBuilder extends AbstractBuilder<ReportTemplateBuilder, DRReportTemplate>
+{
+	private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+	
+	/**
+	 * <p>Constructor for ReportTemplateBuilder.</p>
+	 */
+	protected ReportTemplateBuilder()
+	{
+		super(new DRReportTemplate());
+	}
+	
+	// template style
+	
+	/**
+	 * <p>templateStyles.</p>
+	 *
+	 * @param templateStyles a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder templateStyles(final TemplateStylesBuilder... templateStyles)
+	{
+		return this.addTemplateStyle(templateStyles);
+	}
+	
+	/**
+	 * <p>addTemplateStyle.</p>
+	 *
+	 * @param templateStyles a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder addTemplateStyle(final TemplateStylesBuilder... templateStyles)
+	{
+		Validate.notNull(templateStyles, "templateStyles must not be null");
+		Validate.noNullElements(templateStyles, "templateStyles must not contains null templateStyle");
+		for(final TemplateStylesBuilder templateStyle : templateStyles)
+		{
+			for(final StyleBuilder style : templateStyle.getStyles())
+			{
+				this.addTemplateStyle(style);
+			}
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>templateStyles.</p>
+	 *
+	 * @param templateStyles a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder templateStyles(final StyleBuilder... templateStyles)
+	{
+		return this.addTemplateStyle(templateStyles);
+	}
+	
+	/**
+	 * <p>addTemplateStyle.</p>
+	 *
+	 * @param templateStyles a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder addTemplateStyle(final StyleBuilder... templateStyles)
+	{
+		Validate.notNull(templateStyles, "templateStyles must not be null");
+		Validate.noNullElements(templateStyles, "templateStyles must not contains null templateStyle");
+		for(final StyleBuilder templateStyle : templateStyles)
+		{
+			this.getObject().addTemplateStyle(templateStyle.build());
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setLocale.</p>
+	 *
+	 * @param locale a {@link java.util.Locale} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setLocale(final Locale locale)
+	{
+		this.getObject().setLocale(locale);
+		return this;
+	}
+	
+	/**
+	 * <p>setShowColumnTitle.</p>
+	 *
+	 * @param showColumnTitle a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setShowColumnTitle(final Boolean showColumnTitle)
+	{
+		this.getObject().setShowColumnTitle(showColumnTitle);
+		return this;
+	}
+	
+	/**
+	 * <p>setShowColumnValues.</p>
+	 *
+	 * @param showColumnValues a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setShowColumnValues(final Boolean showColumnValues)
+	{
+		this.getObject().setShowColumnValues(showColumnValues);
+		return this;
+	}
+	
+	/**
+	 * <p>ignorePagination.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder ignorePagination()
+	{
+		return this.setIgnorePagination(true);
+	}
+	
+	/**
+	 * <p>setIgnorePagination.</p>
+	 *
+	 * @param ignorePagination a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setIgnorePagination(final Boolean ignorePagination)
+	{
+		this.getObject().setIgnorePagination(ignorePagination);
+		return this;
+	}
+	
+	/**
+	 * <p>setWhenNoDataType.</p>
+	 *
+	 * @param whenNoDataType a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setWhenNoDataType(final WhenNoDataType whenNoDataType)
+	{
+		this.getObject().setWhenNoDataType(whenNoDataType);
+		return this;
+	}
+	
+	/**
+	 * <p>setWhenResourceMissingType.</p>
+	 *
+	 * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setWhenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
+	{
+		this.getObject().setWhenResourceMissingType(whenResourceMissingType);
+		return this;
+	}
+	
+	/**
+	 * <p>titleOnANewPage.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder titleOnANewPage()
+	{
+		return this.setTitleOnANewPage(true);
+	}
+	
+	/**
+	 * <p>setTitleOnANewPage.</p>
+	 *
+	 * @param titleOnANewPage a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTitleOnANewPage(final Boolean titleOnANewPage)
+	{
+		this.getObject().setTitleOnANewPage(titleOnANewPage);
+		return this;
+	}
+	
+	/**
+	 * <p>summaryOnANewPage.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder summaryOnANewPage()
+	{
+		return this.setSummaryOnANewPage(true);
+	}
+	
+	/**
+	 * <p>setSummaryOnANewPage.</p>
+	 *
+	 * @param summaryOnANewPage a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSummaryOnANewPage(final Boolean summaryOnANewPage)
+	{
+		this.getObject().setSummaryOnANewPage(summaryOnANewPage);
+		return this;
+	}
+	
+	/**
+	 * <p>summaryWithPageHeaderAndFooter.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder summaryWithPageHeaderAndFooter()
+	{
+		return this.setSummaryWithPageHeaderAndFooter(true);
+	}
+	
+	/**
+	 * <p>setSummaryWithPageHeaderAndFooter.</p>
+	 *
+	 * @param summaryWithPageHeaderAndFooter a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSummaryWithPageHeaderAndFooter(final Boolean summaryWithPageHeaderAndFooter)
+	{
+		this.getObject().setSummaryWithPageHeaderAndFooter(summaryWithPageHeaderAndFooter);
+		return this;
+	}
+	
+	/**
+	 * <p>floatColumnFooter.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder floatColumnFooter()
+	{
+		return this.setFloatColumnFooter(true);
+	}
+	
+	/**
+	 * <p>setFloatColumnFooter.</p>
+	 *
+	 * @param floatColumnFooter a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setFloatColumnFooter(final Boolean floatColumnFooter)
+	{
+		this.getObject().setFloatColumnFooter(floatColumnFooter);
+		return this;
+	}
+	
+	/**
+	 * <p>setPrintOrder.</p>
+	 *
+	 * @param printOrder a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPrintOrder(final Orientation printOrder)
+	{
+		this.getObject().setPrintOrder(printOrder);
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnDirection.</p>
+	 *
+	 * @param columnDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnDirection(final RunDirection columnDirection)
+	{
+		this.getObject().setColumnDirection(columnDirection);
+		return this;
+	}
+	
+	/**
+	 * <p>setLanguage.</p>
+	 *
+	 * @param language a {@link java.lang.String} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setLanguage(final String language)
+	{
+		this.getObject().setLanguage(language);
+		return this;
+	}
+	
+	/**
+	 * <p>setUseFieldNameAsDescription.</p>
+	 *
+	 * @param useFieldNameAsDescription a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setUseFieldNameAsDescription(final Boolean useFieldNameAsDescription)
+	{
+		this.getObject().setUseFieldNameAsDescription(useFieldNameAsDescription);
+		return this;
+	}
+	
+	/**
+	 * <p>highlightDetailOddRows.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder highlightDetailOddRows()
+	{
+		return this.setHighlightDetailOddRows(true);
+	}
+	
+	/**
+	 * <p>setHighlightDetailOddRows.</p>
+	 *
+	 * @param highlightDetailOddRows a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setHighlightDetailOddRows(final Boolean highlightDetailOddRows)
+	{
+		this.getObject().setHighlightDetailOddRows(highlightDetailOddRows);
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailOddRowStyle.</p>
+	 *
+	 * @param detailOddRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailOddRowStyle(final SimpleStyleBuilder detailOddRowStyle)
+	{
+		if(detailOddRowStyle != null)
+		{
+			this.getObject().setDetailOddRowStyle(detailOddRowStyle.build());
+		}
+		else
+		{
+			this.getObject().setDetailOddRowStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>highlightDetailEvenRows.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder highlightDetailEvenRows()
+	{
+		return this.setHighlightDetailEvenRows(true);
+	}
+	
+	/**
+	 * <p>setHighlightDetailEvenRows.</p>
+	 *
+	 * @param highlightDetailEvenRows a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setHighlightDetailEvenRows(final Boolean highlightDetailEvenRows)
+	{
+		this.getObject().setHighlightDetailEvenRows(highlightDetailEvenRows);
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailEvenRowStyle.</p>
+	 *
+	 * @param detailEvenRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailEvenRowStyle(final SimpleStyleBuilder detailEvenRowStyle)
+	{
+		if(detailEvenRowStyle != null)
+		{
+			this.getObject().setDetailEvenRowStyle(detailEvenRowStyle.build());
+		}
+		else
+		{
+			this.getObject().setDetailEvenRowStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setDefaultFont.</p>
+	 *
+	 * @param defaultFont a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDefaultFont(final FontBuilder defaultFont)
+	{
+		if(defaultFont != null)
+		{
+			this.getObject().setDefaultFont(defaultFont.build());
+		}
+		else
+		{
+			this.getObject().setDefaultFont(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setTextStyle.</p>
+	 *
+	 * @param textStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTextStyle(final ReportStyleBuilder textStyle)
+	{
+		if(textStyle != null)
+		{
+			this.getObject().setTextStyle(textStyle.build());
+		}
+		else
+		{
+			this.getObject().setTextStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnTitleStyle.</p>
+	 *
+	 * @param columnTitleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnTitleStyle(final ReportStyleBuilder columnTitleStyle)
+	{
+		if(columnTitleStyle != null)
+		{
+			this.getObject().setColumnTitleStyle(columnTitleStyle.build());
+		}
+		else
+		{
+			this.getObject().setColumnTitleStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnStyle.</p>
+	 *
+	 * @param columnStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnStyle(final ReportStyleBuilder columnStyle)
+	{
+		if(columnStyle != null)
+		{
+			this.getObject().setColumnStyle(columnStyle.build());
+		}
+		else
+		{
+			this.getObject().setColumnStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupTitleStyle.</p>
+	 *
+	 * @param groupTitleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupTitleStyle(final ReportStyleBuilder groupTitleStyle)
+	{
+		if(groupTitleStyle != null)
+		{
+			this.getObject().setGroupTitleStyle(groupTitleStyle.build());
+		}
+		else
+		{
+			this.getObject().setGroupTitleStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupStyle.</p>
+	 *
+	 * @param groupStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupStyle(final ReportStyleBuilder groupStyle)
+	{
+		if(groupStyle != null)
+		{
+			this.getObject().setGroupStyle(groupStyle.build());
+		}
+		else
+		{
+			this.getObject().setGroupStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setSubtotalStyle.</p>
+	 *
+	 * @param subtotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSubtotalStyle(final ReportStyleBuilder subtotalStyle)
+	{
+		if(subtotalStyle != null)
+		{
+			this.getObject().setSubtotalStyle(subtotalStyle.build());
+		}
+		else
+		{
+			this.getObject().setSubtotalStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setImageStyle.</p>
+	 *
+	 * @param imageStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setImageStyle(final ReportStyleBuilder imageStyle)
+	{
+		if(imageStyle != null)
+		{
+			this.getObject().setImageStyle(imageStyle.build());
+		}
+		else
+		{
+			this.getObject().setImageStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setPageFormat.</p>
+	 *
+	 * @param pageType a {@link net.sf.dynamicreports.report.constant.PageType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageFormat(final PageType pageType)
+	{
+		return this.setPageFormat(pageType, PageOrientation.PORTRAIT);
+	}
+	
+	/**
+	 * <p>setPageFormat.</p>
+	 *
+	 * @param pageType    a {@link net.sf.dynamicreports.report.constant.PageType} object.
+	 * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageFormat(final PageType pageType, final PageOrientation orientation)
+	{
+		this.getObject().setPageFormat(pageType, orientation);
+		return this;
+	}
+	
+	/**
+	 * <p>setPageMargin.</p>
+	 *
+	 * @param pageMargin a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageMargin(final MarginBuilder pageMargin)
+	{
+		if(pageMargin != null)
+		{
+			this.getObject().setPageMargin(pageMargin.build());
+		}
+		else
+		{
+			this.getObject().setPageMargin(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setPageColumnsPerPage.</p>
+	 *
+	 * @param pageColumnsPerPage a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageColumnsPerPage(final Integer pageColumnsPerPage)
+	{
+		this.getObject().setPageColumnsPerPage(pageColumnsPerPage);
+		return this;
+	}
+	
+	/**
+	 * <p>setPageColumnSpace.</p>
+	 *
+	 * @param pageColumnSpace a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageColumnSpace(final Integer pageColumnSpace)
+	{
+		this.getObject().setPageColumnSpace(pageColumnSpace);
+		return this;
+	}
+	
+	/**
+	 * <p>setIgnorePageWidth.</p>
+	 *
+	 * @param ignorePageWidth a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setIgnorePageWidth(final Boolean ignorePageWidth)
+	{
+		this.getObject().setIgnorePageWidth(ignorePageWidth);
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnPrintRepeatedDetailValues.</p>
+	 *
+	 * @param columnPrintRepeatedDetailValues a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnPrintRepeatedDetailValues(final Boolean columnPrintRepeatedDetailValues)
+	{
+		this.getObject().setColumnPrintRepeatedDetailValues(columnPrintRepeatedDetailValues);
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnWidth.</p>
+	 *
+	 * @param columnWidth a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnWidth(final Integer columnWidth)
+	{
+		this.getObject().setColumnWidth(columnWidth);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupHeaderLayout.</p>
+	 *
+	 * @param groupHeaderLayout a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupHeaderLayout(final GroupHeaderLayout groupHeaderLayout)
+	{
+		this.getObject().setGroupHeaderLayout(groupHeaderLayout);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupHideColumn.</p>
+	 *
+	 * @param groupHideColumn a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupHideColumn(final Boolean groupHideColumn)
+	{
+		this.getObject().setGroupHideColumn(groupHideColumn);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupShowColumnHeaderAndFooter.</p>
+	 *
+	 * @param groupShowColumnHeaderAndFooter a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupShowColumnHeaderAndFooter(final Boolean groupShowColumnHeaderAndFooter)
+	{
+		this.getObject().setGroupShowColumnHeaderAndFooter(groupShowColumnHeaderAndFooter);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupPadding.</p>
+	 *
+	 * @param groupPadding a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupPadding(final Integer groupPadding)
+	{
+		this.getObject().setGroupPadding(groupPadding);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupStartInNewPage.</p>
+	 *
+	 * @param groupStartInNewPage a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupStartInNewPage(final Boolean groupStartInNewPage)
+	{
+		this.getObject().setGroupStartInNewPage(groupStartInNewPage);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupStartInNewColumn.</p>
+	 *
+	 * @param groupStartInNewColumn a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupStartInNewColumn(final Boolean groupStartInNewColumn)
+	{
+		this.getObject().setGroupStartInNewColumn(groupStartInNewColumn);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupReprintHeaderOnEachPage.</p>
+	 *
+	 * @param groupReprintHeaderOnEachPage a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupReprintHeaderOnEachPage(final Boolean groupReprintHeaderOnEachPage)
+	{
+		this.getObject().setGroupReprintHeaderOnEachPage(groupReprintHeaderOnEachPage);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupResetPageNumber.</p>
+	 *
+	 * @param groupResetPageNumber a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupResetPageNumber(final Boolean groupResetPageNumber)
+	{
+		this.getObject().setGroupResetPageNumber(groupResetPageNumber);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupFooterPosition.</p>
+	 *
+	 * @param groupFooterPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupFooterPosition(final GroupFooterPosition groupFooterPosition)
+	{
+		this.getObject().setGroupFooterPosition(groupFooterPosition);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupKeepTogether.</p>
+	 *
+	 * @param groupKeepTogether a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupKeepTogether(final Boolean groupKeepTogether)
+	{
+		this.getObject().setGroupKeepTogether(groupKeepTogether);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupHeaderWithSubtotal.</p>
+	 *
+	 * @param groupHeaderWithSubtotal a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupHeaderWithSubtotal(final Boolean groupHeaderWithSubtotal)
+	{
+		this.getObject().setGroupHeaderWithSubtotal(groupHeaderWithSubtotal);
+		return this;
+	}
+	
+	/**
+	 * <p>setSubtotalLabelPosition.</p>
+	 *
+	 * @param subtotalLabelPosition a {@link net.sf.dynamicreports.report.constant.Position} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSubtotalLabelPosition(final Position subtotalLabelPosition)
+	{
+		this.getObject().setSubtotalLabelPosition(subtotalLabelPosition);
+		return this;
+	}
+	
+	/**
+	 * <p>tableOfContents.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder tableOfContents()
+	{
+		return this.setTableOfContents(true);
+	}
+	
+	/**
+	 * <p>setTableOfContents.</p>
+	 *
+	 * @param tableOfContents a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTableOfContents(final Boolean tableOfContents)
+	{
+		this.getObject().setTableOfContents(tableOfContents);
+		return this;
+	}
+	
+	/**
+	 * <p>setTableOfContentsCustomizer.</p>
+	 *
+	 * @param tableOfContentsCustomizer a
+	 *                                  {@link
+	 *
+	 *
+	 *
+	 *
+	 *
+	 *
+	 *
+	 *                           net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder}
+	 *                                  object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTableOfContentsCustomizer(final TableOfContentsCustomizerBuilder tableOfContentsCustomizer)
+	{
+		this.getObject().setTableOfContentsCustomizer(tableOfContentsCustomizer.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setTableOfContentsCustomizer.</p>
+	 *
+	 * @param tableOfContentsCustomizer a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer}
+	 *                                  object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTableOfContentsCustomizer(final DRITableOfContentsCustomizer tableOfContentsCustomizer)
+	{
+		this.getObject().setTableOfContentsCustomizer(tableOfContentsCustomizer);
+		return this;
+	}
+	
+	/**
+	 * <p>setTextFieldWidth.</p>
+	 *
+	 * @param textFieldWidth a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTextFieldWidth(final Integer textFieldWidth)
+	{
+		this.getObject().setTextFieldWidth(textFieldWidth);
+		return this;
+	}
+	
+	/**
+	 * <p>setImageHeight.</p>
+	 *
+	 * @param imageHeight a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setImageHeight(final Integer imageHeight)
+	{
+		this.getObject().setImageHeight(imageHeight);
+		return this;
+	}
+	
+	/**
+	 * <p>setImageWidth.</p>
+	 *
+	 * @param imageWidth a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setImageWidth(final Integer imageWidth)
+	{
+		this.getObject().setImageWidth(imageWidth);
+		return this;
+	}
+	
+	/**
+	 * <p>setListgap.</p>
+	 *
+	 * @param listgap a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setListgap(final Integer listgap)
+	{
+		this.getObject().setListgap(listgap);
+		return this;
+	}
+	
+	/**
+	 * <p>setMultiPageListHeight.</p>
+	 *
+	 * @param multiPageListHeight a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setMultiPageListHeight(final Integer multiPageListHeight)
+	{
+		this.getObject().setMultiPageListHeight(multiPageListHeight);
+		return this;
+	}
+	
+	/**
+	 * <p>setMultiPageListWidth.</p>
+	 *
+	 * @param multiPageListWidth a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setMultiPageListWidth(final Integer multiPageListWidth)
+	{
+		this.getObject().setMultiPageListWidth(multiPageListWidth);
+		return this;
+	}
+	
+	/**
+	 * <p>setSubreportHeight.</p>
+	 *
+	 * @param subreportHeight a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSubreportHeight(final Integer subreportHeight)
+	{
+		this.getObject().setSubreportHeight(subreportHeight);
+		return this;
+	}
+	
+	/**
+	 * <p>setSubreportWidth.</p>
+	 *
+	 * @param subreportWidth a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSubreportWidth(final Integer subreportWidth)
+	{
+		this.getObject().setSubreportWidth(subreportWidth);
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabHeight.</p>
+	 *
+	 * @param crosstabHeight a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabHeight(final Integer crosstabHeight)
+	{
+		this.getObject().setCrosstabHeight(crosstabHeight);
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabWidth.</p>
+	 *
+	 * @param crosstabWidth a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabWidth(final Integer crosstabWidth)
+	{
+		this.getObject().setCrosstabWidth(crosstabWidth);
+		return this;
+	}
+	
+	/**
+	 * <p>crosstabHighlightOddRows.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder crosstabHighlightOddRows()
+	{
+		return this.setCrosstabHighlightOddRows(true);
+	}
+	
+	/**
+	 * <p>setCrosstabHighlightOddRows.</p>
+	 *
+	 * @param crosstabHighlightOddRows a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabHighlightOddRows(final Boolean crosstabHighlightOddRows)
+	{
+		this.getObject().setCrosstabHighlightOddRows(crosstabHighlightOddRows);
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabOddRowStyle.</p>
+	 *
+	 * @param crosstabOddRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabOddRowStyle(final SimpleStyleBuilder crosstabOddRowStyle)
+	{
+		if(crosstabOddRowStyle != null)
+		{
+			this.getObject().setCrosstabOddRowStyle(crosstabOddRowStyle.build());
+		}
+		else
+		{
+			this.getObject().setCrosstabOddRowStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>crosstabHighlightEvenRows.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder crosstabHighlightEvenRows()
+	{
+		return this.setCrosstabHighlightEvenRows(true);
+	}
+	
+	/**
+	 * <p>setCrosstabHighlightEvenRows.</p>
+	 *
+	 * @param crosstabHighlightEvenRows a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabHighlightEvenRows(final Boolean crosstabHighlightEvenRows)
+	{
+		this.getObject().setCrosstabHighlightEvenRows(crosstabHighlightEvenRows);
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabEvenRowStyle.</p>
+	 *
+	 * @param crosstabEvenRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabEvenRowStyle(final SimpleStyleBuilder crosstabEvenRowStyle)
+	{
+		if(crosstabEvenRowStyle != null)
+		{
+			this.getObject().setCrosstabEvenRowStyle(crosstabEvenRowStyle.build());
+		}
+		else
+		{
+			this.getObject().setCrosstabEvenRowStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabGroupStyle.</p>
+	 *
+	 * @param crosstabGroupStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabGroupStyle(final ReportStyleBuilder crosstabGroupStyle)
+	{
+		if(crosstabGroupStyle != null)
+		{
+			this.getObject().setCrosstabGroupStyle(crosstabGroupStyle.build());
+		}
+		else
+		{
+			this.getObject().setCrosstabGroupStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabGroupTotalStyle.</p>
+	 *
+	 * @param crosstabGroupTotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabGroupTotalStyle(final ReportStyleBuilder crosstabGroupTotalStyle)
+	{
+		if(crosstabGroupTotalStyle != null)
+		{
+			this.getObject().setCrosstabGroupTotalStyle(crosstabGroupTotalStyle.build());
+		}
+		else
+		{
+			this.getObject().setCrosstabGroupTotalStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabGrandTotalStyle.</p>
+	 *
+	 * @param crosstabGrandTotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabGrandTotalStyle(final ReportStyleBuilder crosstabGrandTotalStyle)
+	{
+		if(crosstabGrandTotalStyle != null)
+		{
+			this.getObject().setCrosstabGrandTotalStyle(crosstabGrandTotalStyle.build());
+		}
+		else
+		{
+			this.getObject().setCrosstabGrandTotalStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabCellStyle.</p>
+	 *
+	 * @param crosstabCellStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabCellStyle(final ReportStyleBuilder crosstabCellStyle)
+	{
+		if(crosstabCellStyle != null)
+		{
+			this.getObject().setCrosstabCellStyle(crosstabCellStyle.build());
+		}
+		else
+		{
+			this.getObject().setCrosstabCellStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setCrosstabMeasureTitleStyle.</p>
+	 *
+	 * @param crosstabMeasureTitleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setCrosstabMeasureTitleStyle(final ReportStyleBuilder crosstabMeasureTitleStyle)
+	{
+		if(crosstabMeasureTitleStyle != null)
+		{
+			this.getObject().setCrosstabMeasureTitleStyle(crosstabMeasureTitleStyle.build());
+		}
+		else
+		{
+			this.getObject().setCrosstabMeasureTitleStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setBooleanComponentType.</p>
+	 *
+	 * @param booleanComponentType a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setBooleanComponentType(final BooleanComponentType booleanComponentType)
+	{
+		this.getObject().setBooleanComponentType(booleanComponentType);
+		return this;
+	}
+	
+	/**
+	 * <p>setBooleanEmptyWhenNullValue.</p>
+	 *
+	 * @param booleanEmptyWhenNullValue a {@link java.lang.Boolean} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setBooleanEmptyWhenNullValue(final Boolean booleanEmptyWhenNullValue)
+	{
+		this.getObject().setBooleanEmptyWhenNullValue(booleanEmptyWhenNullValue);
+		return this;
+	}
+	
+	/**
+	 * Use setBooleanImageWidth(Integer booleanImageWidth)
+	 *
+	 * @param booleanColumnImageWidth a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	@Deprecated
+	public ReportTemplateBuilder setBooleanColumnImageWidth(final Integer booleanColumnImageWidth)
+	{
+		return this.setBooleanImageWidth(booleanColumnImageWidth);
+	}
+	
+	/**
+	 * <p>setBooleanImageWidth.</p>
+	 *
+	 * @param booleanImageWidth a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setBooleanImageWidth(final Integer booleanImageWidth)
+	{
+		this.getObject().setBooleanImageWidth(booleanImageWidth);
+		return this;
+	}
+	
+	/**
+	 * Use setBooleanImageHeight(Integer booleanImageHeight)
+	 *
+	 * @param booleanColumnImageHeight a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	@Deprecated
+	public ReportTemplateBuilder setBooleanColumnImageHeight(final Integer booleanColumnImageHeight)
+	{
+		return this.setBooleanImageHeight(booleanColumnImageHeight);
+	}
+	
+	/**
+	 * <p>setBooleanImageHeight.</p>
+	 *
+	 * @param booleanImageHeight a {@link java.lang.Integer} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setBooleanImageHeight(final Integer booleanImageHeight)
+	{
+		this.getObject().setBooleanImageHeight(booleanImageHeight);
+		return this;
+	}
+	
+	/**
+	 * <p>setBooleanColumnStyle.</p>
+	 *
+	 * @param cooleanColumnStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setBooleanColumnStyle(final ReportStyleBuilder cooleanColumnStyle)
+	{
+		if(cooleanColumnStyle != null)
+		{
+			this.getObject().setBooleanColumnStyle(cooleanColumnStyle.build());
+		}
+		else
+		{
+			this.getObject().setBooleanColumnStyle(null);
+		}
+		return this;
+	}
+	
+	// band split type
+	
+	/**
+	 * <p>setDefaultSplitType.</p>
+	 *
+	 * @param defaultSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDefaultSplitType(final SplitType defaultSplitType)
+	{
+		this.getObject().setDefaultSplitType(defaultSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setTitleSplitType.</p>
+	 *
+	 * @param titleSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTitleSplitType(final SplitType titleSplitType)
+	{
+		this.getObject().setTitleSplitType(titleSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setPageHeaderSplitType.</p>
+	 *
+	 * @param pageHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageHeaderSplitType(final SplitType pageHeaderSplitType)
+	{
+		this.getObject().setPageHeaderSplitType(pageHeaderSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setPageFooterSplitType.</p>
+	 *
+	 * @param pageFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageFooterSplitType(final SplitType pageFooterSplitType)
+	{
+		this.getObject().setPageFooterSplitType(pageFooterSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnHeaderSplitType.</p>
+	 *
+	 * @param columnHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnHeaderSplitType(final SplitType columnHeaderSplitType)
+	{
+		this.getObject().setColumnHeaderSplitType(columnHeaderSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnFooterSplitType.</p>
+	 *
+	 * @param columnFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnFooterSplitType(final SplitType columnFooterSplitType)
+	{
+		this.getObject().setColumnFooterSplitType(columnFooterSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupHeaderSplitType.</p>
+	 *
+	 * @param groupHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupHeaderSplitType(final SplitType groupHeaderSplitType)
+	{
+		this.getObject().setGroupHeaderSplitType(groupHeaderSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupFooterSplitType.</p>
+	 *
+	 * @param groupFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupFooterSplitType(final SplitType groupFooterSplitType)
+	{
+		this.getObject().setGroupFooterSplitType(groupFooterSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailHeaderSplitType.</p>
+	 *
+	 * @param detailHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailHeaderSplitType(final SplitType detailHeaderSplitType)
+	{
+		this.getObject().setDetailHeaderSplitType(detailHeaderSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailSplitType.</p>
+	 *
+	 * @param detailSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailSplitType(final SplitType detailSplitType)
+	{
+		this.getObject().setDetailSplitType(detailSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailFooterSplitType.</p>
+	 *
+	 * @param detailFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailFooterSplitType(final SplitType detailFooterSplitType)
+	{
+		this.getObject().setDetailFooterSplitType(detailFooterSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setLastPageFooterSplitType.</p>
+	 *
+	 * @param lastPageFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setLastPageFooterSplitType(final SplitType lastPageFooterSplitType)
+	{
+		this.getObject().setLastPageFooterSplitType(lastPageFooterSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setSummarySplitType.</p>
+	 *
+	 * @param summarySplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSummarySplitType(final SplitType summarySplitType)
+	{
+		this.getObject().setSummarySplitType(summarySplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setNoDataSplitType.</p>
+	 *
+	 * @param noDataSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setNoDataSplitType(final SplitType noDataSplitType)
+	{
+		this.getObject().setNoDataSplitType(noDataSplitType);
+		return this;
+	}
+	
+	/**
+	 * <p>setBackgroundSplitType.</p>
+	 *
+	 * @param backgroundSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setBackgroundSplitType(final SplitType backgroundSplitType)
+	{
+		this.getObject().setBackgroundSplitType(backgroundSplitType);
+		return this;
+	}
+	
+	// band style
+	
+	/**
+	 * <p>setTitleStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTitleStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setTitleStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setTitleStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setPageHeaderStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageHeaderStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setPageHeaderStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setPageHeaderStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setPageFooterStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setPageFooterStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setPageFooterStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnHeaderStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnHeaderStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setColumnHeaderStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setColumnHeaderStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnFooterStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setColumnFooterStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setColumnFooterStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupHeaderStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupHeaderStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setGroupHeaderStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setGroupHeaderStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupFooterStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setGroupFooterStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setGroupFooterStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailHeaderStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailHeaderStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setDetailHeaderStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setDetailHeaderStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setDetailStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setDetailStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailFooterStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setDetailFooterStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setDetailFooterStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setLastPageFooterStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setLastPageFooterStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setLastPageFooterStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setLastPageFooterStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setSummaryStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSummaryStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setSummaryStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setSummaryStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setNoDataStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setNoDataStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setNoDataStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setNoDataStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setBackgroundStyle.</p>
+	 *
+	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setBackgroundStyle(final ReportStyleBuilder style)
+	{
+		if(style != null)
+		{
+			this.getObject().setBackgroundStyle(style.build());
+		}
+		else
+		{
+			this.getObject().setBackgroundStyle(null);
+		}
+		return this;
+	}
+	
+	/**
+	 * <p>setTitleBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setTitleBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setTitleBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setPageHeaderBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setPageHeaderBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setPageFooterBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setPageFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setPageFooterBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnHeaderBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setColumnHeaderBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setColumnFooterBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setColumnFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setColumnFooterBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupHeaderBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setGroupHeaderBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setGroupFooterBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setGroupFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setGroupFooterBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailHeaderBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setDetailHeaderBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setDetailBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setDetailFooterBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setDetailFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setDetailFooterBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setLastPageFooterBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setLastPageFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setLastPageFooterBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setSummaryBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setSummaryBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setSummaryBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setNoDataBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setNoDataBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setNoDataBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>setBackgroundBackgroundComponent.</p>
+	 *
+	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 */
+	public ReportTemplateBuilder setBackgroundBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
+	{
+		Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+		this.getObject().setBackgroundBackgroundComponent(backgroundComponent.build());
+		return this;
+	}
+	
+	/**
+	 * <p>getReportTemplate.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.DRReportTemplate} object.
+	 */
+	public DRReportTemplate getReportTemplate()
+	{
+		return this.build();
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/SortBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/SortBuilder.java
new file mode 100644
index 0000000..a168d22
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/SortBuilder.java
@@ -0,0 +1,89 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.base.DRSort;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>SortBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SortBuilder extends AbstractBuilder<SortBuilder, DRSort> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for SortBuilder.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     */
+    protected SortBuilder(TextColumnBuilder<?> column) {
+        super(new DRSort());
+        Validate.notNull(column, "column must not be null");
+        getObject().setExpression(column.build());
+    }
+
+    /**
+     * <p>Constructor for SortBuilder.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected SortBuilder(FieldBuilder<?> field) {
+        super(new DRSort());
+        Validate.notNull(field, "field must not be null");
+        getObject().setExpression(field.build());
+    }
+
+    /**
+     * <p>Constructor for SortBuilder.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    protected SortBuilder(VariableBuilder<?> variable) {
+        super(new DRSort());
+        Validate.notNull(variable, "variable must not be null");
+        getObject().setExpression(variable.build());
+    }
+
+    /**
+     * <p>Constructor for SortBuilder.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected SortBuilder(DRIExpression<?> expression) {
+        super(new DRSort());
+        getObject().setExpression(expression);
+    }
+
+    /**
+     * <p>setOrderType.</p>
+     *
+     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     */
+    public SortBuilder setOrderType(OrderType orderType) {
+        getObject().setOrderType(orderType);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/Units.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/Units.java
new file mode 100644
index 0000000..3d841fe
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/Units.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+/**
+ * A set of methods of converting unit values to pixels.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Units {
+
+    /**
+     * Converts a value in centimeters to pixels.
+     *
+     * @param value - the value in centimeters
+     * @return pixels
+     */
+    public static int cm(Number value) {
+        return unit(value, 28.3464);
+    }
+
+    /**
+     * Converts a value in inches to pixels.
+     *
+     * @param value - the value in inches
+     * @return pixels
+     */
+    public static int inch(Number value) {
+        return unit(value, 72);
+    }
+
+    /**
+     * Converts a value in milimeters to pixels.
+     *
+     * @param value - the value in milimeters
+     * @return pixels
+     */
+    public static int mm(Number value) {
+        return unit(value, 2.83464);
+    }
+
+    private static int unit(Number value, double unitValue) {
+        if (value != null) {
+            return (int) ((value.doubleValue()) * unitValue);
+        }
+        return 0;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/VariableBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/VariableBuilder.java
new file mode 100644
index 0000000..7010788
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/VariableBuilder.java
@@ -0,0 +1,160 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder;
+
+import net.sf.dynamicreports.report.base.DRVariable;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
+
+/**
+ * <p>VariableBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class VariableBuilder<T> extends AbstractBuilder<VariableBuilder<T>, DRVariable<T>> implements DRIValue<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    // column
+
+    /**
+     * <p>Constructor for VariableBuilder.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected VariableBuilder(ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        super(new DRVariable<T>(column.build(), calculation));
+    }
+
+    /**
+     * <p>Constructor for VariableBuilder.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected VariableBuilder(String name, ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        super(new DRVariable<T>(name, column.build(), calculation));
+    }
+
+    // field
+
+    /**
+     * <p>Constructor for VariableBuilder.</p>
+     *
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected VariableBuilder(FieldBuilder<?> field, Calculation calculation) {
+        super(new DRVariable<T>(field.getField(), calculation));
+    }
+
+    /**
+     * <p>Constructor for VariableBuilder.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected VariableBuilder(String name, FieldBuilder<?> field, Calculation calculation) {
+        super(new DRVariable<T>(name, field.getField(), calculation));
+    }
+
+    // simple expression
+
+    /**
+     * <p>Constructor for VariableBuilder.</p>
+     *
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected VariableBuilder(DRIExpression<?> expression, Calculation calculation) {
+        super(new DRVariable<T>(expression, calculation));
+    }
+
+    /**
+     * <p>Constructor for VariableBuilder.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected VariableBuilder(String name, DRIExpression<?> expression, Calculation calculation) {
+        super(new DRVariable<T>(name, expression, calculation));
+    }
+
+    /**
+     * <p>setInitialValueExpression.</p>
+     *
+     * @param initialValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIJasperExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public VariableBuilder<T> setInitialValueExpression(DRIJasperExpression<?> initialValueExpression) {
+        getObject().setInitialValueExpression(initialValueExpression);
+        return this;
+    }
+
+    /**
+     * <p>setResetType.</p>
+     *
+     * @param resetType a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public VariableBuilder<T> setResetType(Evaluation resetType) {
+        getObject().setResetType(resetType);
+        return this;
+    }
+
+    /**
+     * <p>setResetGroup.</p>
+     *
+     * @param resetGroup a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    public VariableBuilder<T> setResetGroup(GroupBuilder<?> resetGroup) {
+        if (resetGroup != null) {
+            getObject().setResetGroup(resetGroup.getGroup());
+            setResetType(Evaluation.GROUP);
+        } else {
+            getObject().setResetGroup(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>getVariable.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRVariable} object.
+     */
+    public DRVariable<T> getVariable() {
+        return build();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getVariable().getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/BooleanColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/BooleanColumnBuilder.java
new file mode 100644
index 0000000..e852d9b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/BooleanColumnBuilder.java
@@ -0,0 +1,248 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.column;
+
+import net.sf.dynamicreports.report.base.column.DRBooleanColumn;
+import net.sf.dynamicreports.report.base.component.DRBooleanField;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * It shows a boolean value either as a text or as an image.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("deprecation")
+public class BooleanColumnBuilder extends ColumnBuilder<BooleanColumnBuilder, DRBooleanColumn> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for BooleanColumnBuilder.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected BooleanColumnBuilder(FieldBuilder<Boolean> field) {
+        super(new DRBooleanColumn(new DRBooleanField()));
+        Validate.notNull(field, "field must not be null");
+        getComponent().setValueExpression(field.getField());
+    }
+
+    /**
+     * <p>Constructor for BooleanColumnBuilder.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected BooleanColumnBuilder(DRIExpression<Boolean> valueExpression) {
+        super(new DRBooleanColumn(new DRBooleanField()));
+        getComponent().setValueExpression(valueExpression);
+    }
+
+    /**
+     * Sets the preferred width of a column.
+     *
+     * @param width the column preferred width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public BooleanColumnBuilder setWidth(Integer width) {
+        getComponent().setWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the fixed width of a column.
+     *
+     * @param width the column fixed width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public BooleanColumnBuilder setFixedWidth(Integer width) {
+        getComponent().setWidth(width);
+        getComponent().setWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the minimum width of a column.
+     *
+     * @param width the column minimum width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public BooleanColumnBuilder setMinWidth(Integer width) {
+        getComponent().setWidth(width);
+        getComponent().setWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * Sets the preferred height of a column.
+     *
+     * @param height the column preferred height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public BooleanColumnBuilder setHeight(Integer height) {
+        getComponent().setHeight(height);
+        return this;
+    }
+
+    /**
+     * Sets the fixed height of a column.
+     *
+     * @param height the column fixed height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public BooleanColumnBuilder setFixedHeight(Integer height) {
+        getComponent().setHeight(height);
+        getComponent().setHeightType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the minimum height of a column.
+     *
+     * @param height the column minimum height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public BooleanColumnBuilder setMinHeight(Integer height) {
+        getComponent().setHeight(height);
+        getComponent().setHeightType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * Sets the boolean presentation type.<br/>
+     * <i>BooleanComponentType.TEXT_*</i> - shows a text value<br/>
+     * <i>BooleanComponentType.IMAGE_*</i> - shows an image
+     *
+     * @param booleanComponentType the component type
+     * @return a column builder
+     */
+    public BooleanColumnBuilder setComponentType(BooleanComponentType booleanComponentType) {
+        getComponent().setComponentType(booleanComponentType);
+        return this;
+    }
+
+    /**
+     * <p>setEmptyWhenNullValue.</p>
+     *
+     * @param emptyWhenNullValue a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.column.BooleanColumnBuilder} object.
+     */
+    public BooleanColumnBuilder setEmptyWhenNullValue(Boolean emptyWhenNullValue) {
+        getComponent().setEmptyWhenNullValue(emptyWhenNullValue);
+        return this;
+    }
+
+    /**
+     * Sets the boolean image dimension. Has effect only when the boolean value is presented as an image.
+     *
+     * @param width  the image width
+     * @param height the image height
+     * @return a column builder
+     */
+    public BooleanColumnBuilder setImageDimension(Integer width, Integer height) {
+        getComponent().setImageWidth(width);
+        getComponent().setImageHeight(height);
+        return this;
+    }
+
+    /**
+     * Sets the boolean image width. Has effect only when the boolean value is presented as an image.
+     *
+     * @param width the image width
+     * @return a column builder
+     */
+    public BooleanColumnBuilder setImageWidth(Integer width) {
+        getComponent().setImageWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the boolean image height. Has effect only when the boolean value is presented as an image.
+     *
+     * @param height the image height
+     * @return a column builder
+     */
+    public BooleanColumnBuilder setImageHeight(Integer height) {
+        getComponent().setImageHeight(height);
+        return this;
+    }
+
+    /**
+     * Sets the column value horizontal alignment.
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a column builder
+     * @deprecated use setHorizontalImageAlignment instead
+     */
+    @Deprecated
+    public BooleanColumnBuilder setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getComponent().setHorizontalImageAlignment(HorizontalImageAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getComponent().setHorizontalImageAlignment(null);
+        }
+        return this;
+    }
+
+    /**
+     * Sets the column value horizontal image alignment.
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a column builder
+     */
+    public BooleanColumnBuilder setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        getComponent().setHorizontalImageAlignment(horizontalImageAlignment);
+        return this;
+    }
+
+    /**
+     * Sets the column value horizontal text alignment.
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a column builder
+     */
+    public BooleanColumnBuilder setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        getComponent().setHorizontalTextAlignment(horizontalTextAlignment);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected DRBooleanField getComponent() {
+        return (DRBooleanField) getObject().getComponent();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilder.java
new file mode 100644
index 0000000..fd20c13
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilder.java
@@ -0,0 +1,269 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.column;
+
+import net.sf.dynamicreports.report.base.column.DRColumn;
+import net.sf.dynamicreports.report.base.component.DRComponent;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+
+/**
+ * <p>Abstract ColumnBuilder class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+@SuppressWarnings("unchecked")
+public abstract class ColumnBuilder<T extends ColumnBuilder<T, U>, U extends DRColumn<?>> extends AbstractBuilder<T, U> implements ColumnGridComponentBuilder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for ColumnBuilder.</p>
+     *
+     * @param column a U object.
+     */
+    protected ColumnBuilder(final U column) {
+        super(column);
+    }
+
+    /**
+     * Sets the column title.
+     *
+     * @param titleExpression the title expression
+     * @return a column builder
+     */
+    public T setTitle(final DRIExpression<?> titleExpression) {
+        getObject().setTitleExpression(titleExpression);
+        return (T) this;
+    }
+
+    /**
+     * Sets the column title.
+     *
+     * @param title the title
+     * @return a column builder
+     */
+    public T setTitle(final String title) {
+        getObject().setTitleExpression(Expressions.text(title));
+        return (T) this;
+    }
+
+    /**
+     * Sets the column title style.
+     *
+     * @param titleStyle the title style
+     * @return a column builder
+     */
+    public T setTitleStyle(final ReportStyleBuilder titleStyle) {
+        if (titleStyle != null) {
+            getObject().setTitleStyle(titleStyle.getStyle());
+        } else {
+            getObject().setTitleStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * Sets the column value style.
+     *
+     * @param style the value style
+     * @return a column builder
+     */
+    public T setStyle(final ReportStyleBuilder style) {
+        if (style != null) {
+            getComponent().setStyle(style.getStyle());
+        } else {
+            getComponent().setStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * Sets the print when expression. The expression must be a type of Boolean and it decides whether or not a column value will be printed.
+     *
+     * @param printWhenExpression the print expression
+     * @return a column builder
+     */
+    public T setPrintWhenExpression(final DRIExpression<Boolean> printWhenExpression) {
+        getComponent().setPrintWhenExpression(printWhenExpression);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the preferred height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of preferred rows >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public T setTitleRows(final Integer rows) {
+        getObject().setTitleRows(rows);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the fixed height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of fixed rows >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public T setTitleFixedRows(final Integer rows) {
+        getObject().setTitleRows(rows);
+        getObject().setTitleHeightType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the minimum height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of minimum rows >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public T setTitleMinRows(final Integer rows) {
+        getObject().setTitleRows(rows);
+        getObject().setTitleHeightType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * Sets the preferred height of a column title.
+     *
+     * @param height the column title preferred height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setTitleHeight(final Integer height) {
+        getObject().setTitleHeight(height);
+        return (T) this;
+    }
+
+    /**
+     * Sets the fixed height of a column title.
+     *
+     * @param height the column title fixed height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setTitleFixedHeight(final Integer height) {
+        getObject().setTitleHeight(height);
+        getObject().setTitleHeightType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * Sets the minimum height of a column title.
+     *
+     * @param height the column title minimum height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setTitleMinHeight(final Integer height) {
+        getObject().setTitleHeight(height);
+        getObject().setTitleHeightType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTitleStretchWithOverflow.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @return a T object.
+     * @deprecated replaced by {@link #setTitleTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public T setTitleStretchWithOverflow(final Boolean stretchWithOverflow) {
+        getObject().setTitleStretchWithOverflow(stretchWithOverflow);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTitleTextAdjust.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a T object.
+     */
+    public T setTitleTextAdjust(final TextAdjust textAdjust) {
+        getObject().setTitleTextAdjust(textAdjust);
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the column title.
+     *
+     * @param propertyExpression the property expression
+     * @return a column builder
+     */
+    public T addTitleProperty(final DRIPropertyExpression propertyExpression) {
+        getObject().addTitlePropertyExpression(propertyExpression);
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the column title.
+     *
+     * @param name            the property name
+     * @param valueExpression the property value expression
+     * @return a column builder
+     */
+    public T addTitleProperty(final String name, final DRIExpression<String> valueExpression) {
+        getObject().addTitlePropertyExpression(Expressions.property(name, valueExpression));
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the column title.
+     *
+     * @param name  the property name
+     * @param value the property value
+     * @return a column builder
+     */
+    public T addTitleProperty(final String name, final String value) {
+        getObject().addTitlePropertyExpression(Expressions.property(name, value));
+        return (T) this;
+    }
+
+    /**
+     * <p>getComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     */
+    protected DRComponent getComponent() {
+        return (DRComponent) getObject().getComponent();
+    }
+
+    /**
+     * <p>getColumn.</p>
+     *
+     * @return a U object.
+     */
+    public U getColumn() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilders.java
new file mode 100644
index 0000000..1d3bd93
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilders.java
@@ -0,0 +1,380 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.column;
+
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * A set of methods of creating report columns.<br/> It is used to display data in a multi-column layout.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ColumnBuilders {
+
+    // text
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param fieldName  the name of the field
+     * @param valueClass the field value class
+     * @param <T>        a T object.
+     * @return a column builder
+     */
+    public <T> TextColumnBuilder<T> column(String fieldName, Class<T> valueClass) {
+        return Columns.column(fieldName, valueClass);
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param title      the column title
+     * @param fieldName  the name of the field
+     * @param valueClass the field value class
+     * @param <T>        a T object.
+     * @return a column builder
+     */
+    public <T> TextColumnBuilder<T> column(String title, String fieldName, Class<T> valueClass) {
+        return Columns.column(title, fieldName, valueClass);
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param fieldName the name of the field
+     * @param dataType  the field data type
+     * @param <T>       a T object.
+     * @return a column builder
+     */
+    public <T> TextColumnBuilder<T> column(String fieldName, DRIDataType<? super T, T> dataType) {
+        return Columns.column(fieldName, dataType);
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param title     the column title
+     * @param fieldName the name of the field
+     * @param dataType  the field data type
+     * @param <T>       a T object.
+     * @return a column builder
+     */
+    public <T> TextColumnBuilder<T> column(String title, String fieldName, DRIDataType<? super T, T> dataType) {
+        return Columns.column(title, fieldName, dataType);
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param field the field definition
+     * @param <T>   a T object.
+     * @return a column builder
+     */
+    public <T> TextColumnBuilder<T> column(FieldBuilder<T> field) {
+        return Columns.column(field);
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param title the column title
+     * @param field the field definition
+     * @param <T>   a T object.
+     * @return a column builder
+     */
+    public <T> TextColumnBuilder<T> column(String title, FieldBuilder<T> field) {
+        return Columns.column(title, field);
+    }
+
+    // expression
+
+    /**
+     * Creates a new expression column.<br/> The column values are defined in an expression.
+     *
+     * @param expression the value expression
+     * @param <T>        a T object.
+     * @return a column builder
+     */
+    public <T> TextColumnBuilder<T> column(DRIExpression<T> expression) {
+        return Columns.column(expression);
+    }
+
+    /**
+     * Creates a new expression column.<br/> The column values are defined in an expression.
+     *
+     * @param title      the column title
+     * @param expression the value expression
+     * @param <T>        a T object.
+     * @return a column builder
+     */
+    public <T> TextColumnBuilder<T> column(String title, DRIExpression<T> expression) {
+        return Columns.column(title, expression);
+    }
+
+    // percentage
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from column values.
+     *
+     * @param column the column definition
+     * @return a column builder
+     */
+    public PercentageColumnBuilder percentageColumn(ValueColumnBuilder<?, ? extends Number> column) {
+        return Columns.percentageColumn(column);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from column values.
+     *
+     * @param title  the column title
+     * @param column the column definition
+     * @return a column builder
+     */
+    public PercentageColumnBuilder percentageColumn(String title, ValueColumnBuilder<?, ? extends Number> column) {
+        return Columns.percentageColumn(title, column);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from field values.
+     *
+     * @param fieldName  the name of the field
+     * @param valueClass the field value class
+     * @return a column builder
+     */
+    public PercentageColumnBuilder percentageColumn(String fieldName, Class<? extends Number> valueClass) {
+        return Columns.percentageColumn(fieldName, valueClass);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from field values.
+     *
+     * @param title      the column title
+     * @param fieldName  the name of the field
+     * @param valueClass the field value class
+     * @return a column builder
+     */
+    public PercentageColumnBuilder percentageColumn(String title, String fieldName, Class<? extends Number> valueClass) {
+        return Columns.percentageColumn(title, fieldName, valueClass);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from field values.
+     *
+     * @param field the field definition
+     * @return a column builder
+     */
+    public PercentageColumnBuilder percentageColumn(FieldBuilder<? extends Number> field) {
+        return Columns.percentageColumn(field);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from field values.
+     *
+     * @param title the column title
+     * @param field the field definition
+     * @return a column builder
+     */
+    public PercentageColumnBuilder percentageColumn(String title, FieldBuilder<? extends Number> field) {
+        return Columns.percentageColumn(title, field);
+    }
+
+    /*public PercentageColumnBuilder percentageColumn(DRISimpleExpression<? extends Number> expression) {
+        return Columns.percentageColumn(expression);
+    }
+
+    public PercentageColumnBuilder percentageColumn(String title, DRISimpleExpression<? extends Number> expression) {
+        return Columns.percentageColumn(title, expression);
+    }*/
+
+    // column row number
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers, the row number is reset on each new column.
+     *
+     * @return a column builder
+     */
+    public TextColumnBuilder<Integer> columnRowNumberColumn() {
+        return Columns.columnRowNumberColumn();
+    }
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers, the row number is reset on each new column.
+     *
+     * @param title the column title
+     * @return a column builder
+     */
+    public TextColumnBuilder<Integer> columnRowNumberColumn(String title) {
+        return Columns.columnRowNumberColumn(title);
+    }
+
+    // page row number
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers, the row number is reset on each new page.
+     *
+     * @return a column builder
+     */
+    public TextColumnBuilder<Integer> pageRowNumberColumn() {
+        return Columns.pageRowNumberColumn();
+    }
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers, the row number is reset on each new page.
+     *
+     * @param title the column title
+     * @return a column builder
+     */
+    public TextColumnBuilder<Integer> pageRowNumberColumn(String title) {
+        return Columns.pageRowNumberColumn(title);
+    }
+
+    // report row number
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers.
+     *
+     * @return a column builder
+     */
+    public TextColumnBuilder<Integer> reportRowNumberColumn() {
+        return Columns.reportRowNumberColumn();
+    }
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers.
+     *
+     * @param title the column title
+     * @return a column builder
+     */
+    public TextColumnBuilder<Integer> reportRowNumberColumn(String title) {
+        return Columns.reportRowNumberColumn(title);
+    }
+
+    // component
+
+    /**
+     * Creates a new component column.<br/> It is used to display custom components (e.g. images or complex content) in columns.
+     *
+     * @param component the component definition
+     * @return a column builder
+     */
+    public ComponentColumnBuilder componentColumn(ComponentBuilder<?, ?> component) {
+        return Columns.componentColumn(component);
+    }
+
+    /**
+     * Creates a new component column.<br/> It is used to display custom components (e.g. images or complex content) in columns.
+     *
+     * @param title     the column title
+     * @param component the component definition
+     * @return a column builder
+     */
+    public ComponentColumnBuilder componentColumn(String title, ComponentBuilder<?, ?> component) {
+        return Columns.componentColumn(title, component);
+    }
+
+    // boolean
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param fieldName the name of the field
+     * @return a column builder
+     */
+    public BooleanColumnBuilder booleanColumn(String fieldName) {
+        return Columns.booleanColumn(fieldName);
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param title     the column title
+     * @param fieldName the name of the field
+     * @return a column builder
+     */
+    public BooleanColumnBuilder booleanColumn(String title, String fieldName) {
+        return Columns.booleanColumn(title, fieldName);
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param field the field definition
+     * @return a column builder
+     */
+    public BooleanColumnBuilder booleanColumn(FieldBuilder<Boolean> field) {
+        return Columns.booleanColumn(field);
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param title the column title
+     * @param field the field definition
+     * @return a column builder
+     */
+    public BooleanColumnBuilder booleanColumn(String title, FieldBuilder<Boolean> field) {
+        return Columns.booleanColumn(title, field);
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param expression the boolean value expression
+     * @return a column builder
+     */
+    public BooleanColumnBuilder booleanColumn(DRIExpression<Boolean> expression) {
+        return Columns.booleanColumn(expression);
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param title      the column title
+     * @param expression the boolean value expression
+     * @return a column builder
+     */
+    public BooleanColumnBuilder booleanColumn(String title, DRIExpression<Boolean> expression) {
+        return Columns.booleanColumn(title, expression);
+    }
+
+    // empty column
+
+    /**
+     * Creates a new empty column.<br/>
+     *
+     * @return a column builder
+     */
+    public TextColumnBuilder<String> emptyColumn() {
+        return Columns.emptyColumn();
+    }
+
+    /**
+     * Creates a new empty column.<br/>
+     *
+     * @param showTitle      show column title
+     * @param showDetailRows show detail rows
+     * @return a column builder
+     */
+    public TextColumnBuilder<String> emptyColumn(boolean showTitle, boolean showDetailRows) {
+        return Columns.emptyColumn(showTitle, showDetailRows);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/Columns.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/Columns.java
new file mode 100644
index 0000000..bcee4d2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/Columns.java
@@ -0,0 +1,408 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.column;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * A set of methods of creating report columns.<br/> It is used to display data in a multi-column layout.
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ *
+ */
+public class Columns {
+
+    // text
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param fieldName  the name of the field
+     * @param valueClass the field value class
+     * @param <T>        a T object.
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> TextColumnBuilder<T> column(final String fieldName, final Class<T> valueClass) {
+        return (TextColumnBuilder<T>) column(DynamicReports.field(fieldName, valueClass));
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param title      the column title
+     * @param fieldName  the name of the field
+     * @param valueClass the field value class
+     * @param <T>        a T object.
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> TextColumnBuilder<T> column(final String title, final String fieldName, final Class<T> valueClass) {
+        return (TextColumnBuilder<T>) column(title, DynamicReports.field(fieldName, valueClass));
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param fieldName the name of the field
+     * @param dataType  the field data type
+     * @param <T>       a T object.
+     * @return a column builder
+     */
+    public static <T> TextColumnBuilder<T> column(final String fieldName, final DRIDataType<? super T, T> dataType) {
+        Validate.notNull(dataType, "dataType must not be null");
+        final TextColumnBuilder<T> textColumnBuilder = new TextColumnBuilder<>(DynamicReports.<T>field(fieldName, dataType.getValueClass()));
+        textColumnBuilder.setDataType(dataType);
+        return textColumnBuilder;
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param title     the column title
+     * @param fieldName the name of the field
+     * @param dataType  the field data type
+     * @param <T>       a T object.
+     * @return a column builder
+     */
+    public static <T> TextColumnBuilder<T> column(final String title, final String fieldName, final DRIDataType<? super T, T> dataType) {
+        final TextColumnBuilder<T> textColumnBuilder = column(fieldName, dataType);
+        textColumnBuilder.setTitle(title);
+        return textColumnBuilder;
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param field the field definition
+     * @param <T>   a T object.
+     * @return a column builder
+     */
+    public static <T> TextColumnBuilder<T> column(final FieldBuilder<T> field) {
+        final TextColumnBuilder<T> textColumnBuilder = new TextColumnBuilder<>(field);
+        if (field.getField().getDataType() != null) {
+            textColumnBuilder.setDataType(field.getField().getDataType());
+        }
+        return textColumnBuilder;
+    }
+
+    /**
+     * Creates a new column.<br/> It is used to show values from the data source.
+     *
+     * @param title the column title
+     * @param field the field definition
+     * @param <T>   a T object.
+     * @return a column builder
+     */
+    public static <T> TextColumnBuilder<T> column(final String title, final FieldBuilder<T> field) {
+        return column(field).setTitle(title);
+    }
+
+    // expression
+
+    /**
+     * Creates a new expression column.<br/> The column values are defined in an expression.
+     *
+     * @param expression the value expression
+     * @param <T>        a T object.
+     * @return a column builder
+     */
+    public static <T> TextColumnBuilder<T> column(final DRIExpression<T> expression) {
+        final TextColumnBuilder<T> textColumnBuilder = new TextColumnBuilder<>(expression);
+        if (expression instanceof DRIField && ((DRIField<T>) expression).getDataType() != null) {
+            textColumnBuilder.setDataType(((DRIField<T>) expression).getDataType());
+        }
+        return textColumnBuilder;
+    }
+
+    /**
+     * Creates a new expression column.<br/> The column values are defined in an expression.
+     *
+     * @param title      the column title
+     * @param expression the value expression
+     * @param <T>        a T object.
+     * @return a column builder
+     */
+    public static <T> TextColumnBuilder<T> column(final String title, final DRIExpression<T> expression) {
+        return column(expression).setTitle(title);
+    }
+
+    // percentage
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from column values.
+     *
+     * @param column the column definition
+     * @return a column builder
+     */
+    public static PercentageColumnBuilder percentageColumn(final ValueColumnBuilder<?, ? extends Number> column) {
+        return new PercentageColumnBuilder(column);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from column values.
+     *
+     * @param title  the column title
+     * @param column the column definition
+     * @return a column builder
+     */
+    public static PercentageColumnBuilder percentageColumn(final String title, final ValueColumnBuilder<?, ? extends Number> column) {
+        return percentageColumn(column).setTitle(title);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from field values.
+     *
+     * @param fieldName  the name of the field
+     * @param valueClass the field value class
+     * @return a column builder
+     */
+    public static PercentageColumnBuilder percentageColumn(final String fieldName, final Class<? extends Number> valueClass) {
+        return percentageColumn(DynamicReports.<Number>field(fieldName, valueClass));
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from field values.
+     *
+     * @param title      the column title
+     * @param fieldName  the name of the field
+     * @param valueClass the field value class
+     * @return a column builder
+     */
+    public static PercentageColumnBuilder percentageColumn(final String title, final String fieldName, final Class<? extends Number> valueClass) {
+        return percentageColumn(fieldName, valueClass).setTitle(title);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from field values.
+     *
+     * @param field the field definition
+     * @return a column builder
+     */
+    public static PercentageColumnBuilder percentageColumn(final FieldBuilder<? extends Number> field) {
+        return new PercentageColumnBuilder(field);
+    }
+
+    /**
+     * Creates a new percentage column.<br/> It calculates percentage values from field values.
+     *
+     * @param title the column title
+     * @param field the field definition
+     * @return a column builder
+     */
+    public static PercentageColumnBuilder percentageColumn(final String title, final FieldBuilder<? extends Number> field) {
+        return percentageColumn(field).setTitle(title);
+    }
+
+    /*public static PercentageColumnBuilder percentageColumn(DRISimpleExpression<? extends Number> expression) {
+        return new PercentageColumnBuilder(expression);
+    }
+
+    public static PercentageColumnBuilder percentageColumn(String title, DRISimpleExpression<? extends Number> expression) {
+        return percentageColumn(expression).setTitle(title);
+    }*/
+
+    // column row number
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers, the row number is reset on each new column.
+     *
+     * @return a column builder
+     */
+    public static TextColumnBuilder<Integer> columnRowNumberColumn() {
+        return column(Expressions.columnRowNumber());
+    }
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers, the row number is reset on each new column.
+     *
+     * @param title the column title
+     * @return a column builder
+     */
+    public static TextColumnBuilder<Integer> columnRowNumberColumn(final String title) {
+        return columnRowNumberColumn().setTitle(title);
+    }
+
+    // page row number
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers, the row number is reset on each new page.
+     *
+     * @return a column builder
+     */
+    public static TextColumnBuilder<Integer> pageRowNumberColumn() {
+        return column(Expressions.pageRowNumber());
+    }
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers, the row number is reset on each new page.
+     *
+     * @param title the column title
+     * @return a column builder
+     */
+    public static TextColumnBuilder<Integer> pageRowNumberColumn(final String title) {
+        return pageRowNumberColumn().setTitle(title);
+    }
+
+    // report row number
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers.
+     *
+     * @return a column builder
+     */
+    public static TextColumnBuilder<Integer> reportRowNumberColumn() {
+        return column(Expressions.reportRowNumber());
+    }
+
+    /**
+     * Creates a new row number column.<br/> It displays row numbers.
+     *
+     * @param title the column title
+     * @return a column builder
+     */
+    public static TextColumnBuilder<Integer> reportRowNumberColumn(final String title) {
+        return reportRowNumberColumn().setTitle(title);
+    }
+
+    // component
+
+    /**
+     * Creates a new component column.<br/> It is used to display custom components (e.g. images or complex content) in columns.
+     *
+     * @param component the component definition
+     * @return a column builder
+     */
+    public static ComponentColumnBuilder componentColumn(final ComponentBuilder<?, ?> component) {
+        Validate.notNull(component, "component must not be null");
+        return new ComponentColumnBuilder(component);
+    }
+
+    /**
+     * Creates a new component column.<br/> It is used to display custom components (e.g. images or complex content) in columns.
+     *
+     * @param title     the column title
+     * @param component the component definition
+     * @return a column builder
+     */
+    public static ComponentColumnBuilder componentColumn(final String title, final ComponentBuilder<?, ?> component) {
+        return componentColumn(component).setTitle(title);
+    }
+
+    // boolean
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param fieldName the name of the field
+     * @return a column builder
+     */
+    public static BooleanColumnBuilder booleanColumn(final String fieldName) {
+        return booleanColumn(DynamicReports.<Boolean>field(fieldName, Boolean.class));
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param title     the column title
+     * @param fieldName the name of the field
+     * @return a column builder
+     */
+    public static BooleanColumnBuilder booleanColumn(final String title, final String fieldName) {
+        return booleanColumn(title, DynamicReports.<Boolean>field(fieldName, Boolean.class));
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param field the field definition
+     * @return a column builder
+     */
+    public static BooleanColumnBuilder booleanColumn(final FieldBuilder<Boolean> field) {
+        return new BooleanColumnBuilder(field);
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param title the column title
+     * @param field the field definition
+     * @return a column builder
+     */
+    public static BooleanColumnBuilder booleanColumn(final String title, final FieldBuilder<Boolean> field) {
+        return booleanColumn(field).setTitle(title);
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param expression the boolean value expression
+     * @return a column builder
+     */
+    public static BooleanColumnBuilder booleanColumn(final DRIExpression<Boolean> expression) {
+        return new BooleanColumnBuilder(expression);
+    }
+
+    /**
+     * Creates a new boolean column.<br/> It shows a boolean value either as a text or as an image.
+     *
+     * @param title      the column title
+     * @param expression the boolean value expression
+     * @return a column builder
+     */
+    public static BooleanColumnBuilder booleanColumn(final String title, final DRIExpression<Boolean> expression) {
+        return booleanColumn(expression).setTitle(title);
+    }
+
+    // empty column
+
+    /**
+     * Creates a new empty column.<br/>
+     *
+     * @return a column builder
+     */
+    public static TextColumnBuilder<String> emptyColumn() {
+        return emptyColumn(false, false);
+    }
+
+    /**
+     * Creates a new empty column.<br/>
+     *
+     * @param showTitle      show column title
+     * @param showDetailRows show detail rows
+     * @return a column builder
+     */
+    public static TextColumnBuilder<String> emptyColumn(final boolean showTitle, final boolean showDetailRows) {
+        final TextColumnBuilder<String> column = column(Expressions.text(null));
+        if (showTitle) {
+            column.setTitle("");
+        }
+        if (!showDetailRows) {
+            column.setPrintWhenExpression(Expressions.value(false));
+        }
+        return column;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ComponentColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ComponentColumnBuilder.java
new file mode 100644
index 0000000..be5b031
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ComponentColumnBuilder.java
@@ -0,0 +1,135 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.column;
+
+import net.sf.dynamicreports.report.base.column.DRColumn;
+import net.sf.dynamicreports.report.base.component.DRComponent;
+import net.sf.dynamicreports.report.base.component.DRDimensionComponent;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+import net.sf.dynamicreports.report.exception.DRReportException;
+
+/**
+ * It is used to display custom components (e.g. images or complex content) in columns.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ComponentColumnBuilder extends ColumnBuilder<ComponentColumnBuilder, DRColumn<DRComponent>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for ComponentColumnBuilder.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     */
+    protected ComponentColumnBuilder(ComponentBuilder<?, ?> component) {
+        super(new DRColumn<DRComponent>(component.getComponent()));
+    }
+
+    /**
+     * Sets the preferred width of a column.
+     *
+     * @param width the column preferred width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ComponentColumnBuilder setWidth(Integer width) {
+        getDimensionComponent().setWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the fixed width of a column.
+     *
+     * @param width the column fixed width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ComponentColumnBuilder setFixedWidth(Integer width) {
+        getDimensionComponent().setWidth(width);
+        getDimensionComponent().setWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the minimum width of a column.
+     *
+     * @param width the column minimum width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ComponentColumnBuilder setMinWidth(Integer width) {
+        getDimensionComponent().setWidth(width);
+        getDimensionComponent().setWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * Sets the preferred height of a column.
+     *
+     * @param height the column preferred height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ComponentColumnBuilder setHeight(Integer height) {
+        getDimensionComponent().setHeight(height);
+        return this;
+    }
+
+    /**
+     * Sets the fixed height of a column.
+     *
+     * @param height the column fixed height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ComponentColumnBuilder setFixedHeight(Integer height) {
+        getDimensionComponent().setHeight(height);
+        getDimensionComponent().setHeightType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the minimum height of a column.
+     *
+     * @param height the column minimum height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ComponentColumnBuilder setMinHeight(Integer height) {
+        getDimensionComponent().setHeight(height);
+        getDimensionComponent().setHeightType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    private DRDimensionComponent getDimensionComponent() {
+        if (!(getObject().getComponent() instanceof DRIDimensionComponent)) {
+            throw new DRReportException("Column component" + getObject().getComponent().getClass().getName() + "is not a dimension component.");
+        }
+        return (DRDimensionComponent) getObject().getComponent();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/PercentageColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/PercentageColumnBuilder.java
new file mode 100644
index 0000000..634fb39
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/PercentageColumnBuilder.java
@@ -0,0 +1,133 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.column;
+
+import net.sf.dynamicreports.report.base.DRGroup;
+import net.sf.dynamicreports.report.base.DRVariable;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.datatype.DataTypes;
+import net.sf.dynamicreports.report.builder.expression.PercentageExpression;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.constant.PercentageTotalType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRReportException;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * It calculates percentage values from the field or column values.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PercentageColumnBuilder extends ValueColumnBuilder<PercentageColumnBuilder, Double> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<? extends Number> actualExpression;
+    private PercentageTotalType totalType;
+    private DRGroup totalGroup;
+
+    /**
+     * <p>Constructor for PercentageColumnBuilder.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     */
+    protected PercentageColumnBuilder(ValueColumnBuilder<?, ? extends Number> column) {
+        Validate.notNull(column, "column must not be null");
+        this.actualExpression = column.build();
+    }
+
+    /**
+     * <p>Constructor for PercentageColumnBuilder.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected PercentageColumnBuilder(FieldBuilder<? extends Number> field) {
+        Validate.notNull(field, "field must not be null");
+        this.actualExpression = field.getField();
+    }
+
+    /*protected PercentageColumnBuilder(DRISimpleExpression<? extends Number> valueExpression) {
+        Validate.notNull(valueExpression, "valueExpression must not be null");
+        this.actualExpression = valueExpression;
+    }*/
+
+    /**
+     * Sets the total type. Has effect only when the report contains at least one group.
+     *
+     * @param totalType the total type
+     * @return a column builder
+     */
+    public PercentageColumnBuilder setTotalType(PercentageTotalType totalType) {
+        this.totalType = totalType;
+        return this;
+    }
+
+    /**
+     * Sets the total group. Has effect only when the report contains at least one group.
+     *
+     * @param totalGroup the total group
+     * @return a column builder
+     */
+    public PercentageColumnBuilder setTotalGroup(GroupBuilder<?> totalGroup) {
+        if (totalGroup != null) {
+            this.totalGroup = totalGroup.getGroup();
+            setTotalType(PercentageTotalType.GROUP);
+        } else {
+            this.totalGroup = null;
+        }
+
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        if (getComponent().getDataType() == null) {
+            getComponent().setDataType(DataTypes.percentageType());
+        }
+
+        DRVariable<Number> totalExpression = new DRVariable<Number>(actualExpression, Calculation.SUM);
+        if (totalType != null) {
+            switch (totalType) {
+                case REPORT:
+                    totalExpression.setResetType(Evaluation.REPORT);
+                    break;
+                case GROUP:
+                    totalExpression.setResetType(Evaluation.GROUP);
+                    break;
+                case FIRST_GROUP:
+                    totalExpression.setResetType(Evaluation.FIRST_GROUP);
+                    break;
+                case LAST_GROUP:
+                    totalExpression.setResetType(Evaluation.LAST_GROUP);
+                    break;
+                default:
+                    throw new DRReportException("Percentage total type " + totalType.name() + " not supported.");
+            }
+        } else {
+            totalExpression.setResetType(Evaluation.LAST_GROUP);
+        }
+        totalExpression.setResetGroup(totalGroup);
+
+        setValueExpression(new PercentageExpression(actualExpression, totalExpression));
+        super.configure();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/TextColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/TextColumnBuilder.java
new file mode 100644
index 0000000..d47f153
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/TextColumnBuilder.java
@@ -0,0 +1,199 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.column;
+
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.expression.AddExpression;
+import net.sf.dynamicreports.report.builder.expression.DivideExpression;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.builder.expression.MultiplyExpression;
+import net.sf.dynamicreports.report.builder.expression.SubtractExpression;
+import net.sf.dynamicreports.report.builder.expression.ValueExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+import java.math.BigDecimal;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * It is used to show values from the data source.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TextColumnBuilder<T> extends ValueColumnBuilder<TextColumnBuilder<T>, T> implements DRIValue<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for TextColumnBuilder.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected TextColumnBuilder(FieldBuilder<T> field) {
+        Validate.notNull(field, "field must not be null");
+        setValueExpression(field.getField());
+    }
+
+    /**
+     * <p>Constructor for TextColumnBuilder.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected TextColumnBuilder(DRIExpression<T> valueExpression) {
+        setValueExpression(valueExpression);
+    }
+
+    // add
+
+    /**
+     * Creates a new column by adding a column value to this column instance.
+     *
+     * @param column the column builder
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public TextColumnBuilder<BigDecimal> add(TextColumnBuilder<? extends Number> column) {
+        Validate.isTrue(Number.class.isAssignableFrom(getObject().getValueClass()), "Only Number column can multiply");
+        DRIExpression<? extends Number> value1Expression = (DRIExpression<? extends Number>) this.getComponent().getValueExpression();
+        DRIExpression<? extends Number> value2Expression = column.getComponent().getValueExpression();
+        AddExpression exp = new AddExpression(value1Expression, value2Expression);
+        return new TextColumnBuilder<BigDecimal>(exp).setDataType(type.bigDecimalType());
+    }
+
+    /**
+     * Creates a new column by adding a value to this column instance.
+     *
+     * @param number the value
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public TextColumnBuilder<BigDecimal> add(Number number) {
+        Validate.isTrue(Number.class.isAssignableFrom(getObject().getValueClass()), "Only Number column can multiply");
+        DRIExpression<? extends Number> value1Expression = (DRIExpression<? extends Number>) this.getComponent().getValueExpression();
+        ValueExpression<Number> value2Expression = Expressions.number(number);
+        AddExpression exp = new AddExpression(value1Expression, value2Expression);
+        return new TextColumnBuilder<BigDecimal>(exp).setDataType(type.bigDecimalType());
+    }
+
+    // subtract
+
+    /**
+     * Creates a new column by subtracting a column value from this column instance.
+     *
+     * @param column the column builder
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public TextColumnBuilder<BigDecimal> subtract(TextColumnBuilder<? extends Number> column) {
+        Validate.isTrue(Number.class.isAssignableFrom(getObject().getValueClass()), "Only Number column can subtract");
+        DRIExpression<? extends Number> value1Expression = (DRIExpression<? extends Number>) this.getComponent().getValueExpression();
+        DRIExpression<? extends Number> value2Expression = column.getComponent().getValueExpression();
+        SubtractExpression exp = new SubtractExpression(value1Expression, value2Expression);
+        return new TextColumnBuilder<BigDecimal>(exp).setDataType(type.bigDecimalType());
+    }
+
+    /**
+     * Creates a new column by subtracting a value from this column instance.
+     *
+     * @param number the value
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public TextColumnBuilder<BigDecimal> subtract(Number number) {
+        Validate.isTrue(Number.class.isAssignableFrom(getObject().getValueClass()), "Only Number column can subtract");
+        DRIExpression<? extends Number> value1Expression = (DRIExpression<? extends Number>) this.getComponent().getValueExpression();
+        ValueExpression<Number> value2Expression = Expressions.number(number);
+        SubtractExpression exp = new SubtractExpression(value1Expression, value2Expression);
+        return new TextColumnBuilder<BigDecimal>(exp).setDataType(type.bigDecimalType());
+    }
+
+    // multiply
+
+    /**
+     * Creates a new column by multiplying this column instance with a column value.
+     *
+     * @param column the column builder
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public TextColumnBuilder<BigDecimal> multiply(TextColumnBuilder<? extends Number> column) {
+        Validate.isTrue(Number.class.isAssignableFrom(getObject().getValueClass()), "Only Number column can multiply");
+        DRIExpression<? extends Number> value1Expression = (DRIExpression<? extends Number>) this.getComponent().getValueExpression();
+        DRIExpression<? extends Number> value2Expression = column.getComponent().getValueExpression();
+        MultiplyExpression exp = new MultiplyExpression(value1Expression, value2Expression);
+        return new TextColumnBuilder<BigDecimal>(exp).setDataType(type.bigDecimalType());
+    }
+
+    /**
+     * Creates a new column by multiplying this column instance with a value.
+     *
+     * @param number the value
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public TextColumnBuilder<BigDecimal> multiply(Number number) {
+        Validate.isTrue(Number.class.isAssignableFrom(getObject().getValueClass()), "Only Number column can multiply");
+        DRIExpression<? extends Number> value1Expression = (DRIExpression<? extends Number>) this.getComponent().getValueExpression();
+        ValueExpression<Number> value2Expression = Expressions.number(number);
+        MultiplyExpression exp = new MultiplyExpression(value1Expression, value2Expression);
+        return new TextColumnBuilder<BigDecimal>(exp).setDataType(type.bigDecimalType());
+    }
+
+    // divide
+
+    /**
+     * Creates a new column by dividing this column instance with a column value.
+     *
+     * @param column the column builder
+     * @param scale  a int.
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public TextColumnBuilder<BigDecimal> divide(int scale, TextColumnBuilder<? extends Number> column) {
+        Validate.isTrue(Number.class.isAssignableFrom(getObject().getValueClass()), "Only Number column can divide");
+        DRIExpression<? extends Number> value1Expression = (DRIExpression<? extends Number>) this.getComponent().getValueExpression();
+        DRIExpression<? extends Number> value2Expression = column.getComponent().getValueExpression();
+        DivideExpression exp = new DivideExpression(scale, value1Expression, value2Expression);
+        return new TextColumnBuilder<BigDecimal>(exp).setDataType(type.bigDecimalType());
+    }
+
+    /**
+     * Creates a new column by dividing this column instance with a value.
+     *
+     * @param number the value
+     * @param scale  a int.
+     * @return a column builder
+     */
+    @SuppressWarnings("unchecked")
+    public TextColumnBuilder<BigDecimal> divide(int scale, Number number) {
+        Validate.isTrue(Number.class.isAssignableFrom(getObject().getValueClass()), "Only Number column can divide");
+        DRIExpression<? extends Number> value1Expression = (DRIExpression<? extends Number>) this.getComponent().getValueExpression();
+        ValueExpression<Number> value2Expression = Expressions.number(number);
+        DivideExpression exp = new DivideExpression(scale, value1Expression, value2Expression);
+        return new TextColumnBuilder<BigDecimal>(exp).setDataType(type.bigDecimalType());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getObject().getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ValueColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ValueColumnBuilder.java
new file mode 100644
index 0000000..5e83095
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ValueColumnBuilder.java
@@ -0,0 +1,454 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.column;
+
+import net.sf.dynamicreports.report.base.column.DRValueColumn;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+
+/**
+ * <p>Abstract ValueColumnBuilder class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+@SuppressWarnings( {"unchecked", "deprecation"})
+public abstract class ValueColumnBuilder<T extends ValueColumnBuilder<T, U>, U> extends ColumnBuilder<T, DRValueColumn<U>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for ValueColumnBuilder.</p>
+     */
+    protected ValueColumnBuilder() {
+        super(new DRValueColumn<>(new DRTextField<U>()));
+    }
+
+    /**
+     * <p>setValueExpression.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected void setValueExpression(final DRIExpression<U> valueExpression) {
+        getComponent().setValueExpression(valueExpression);
+    }
+
+    /**
+     * Specifies whether or not print a value if the value is the same as the previous value.
+     *
+     * @param printRepeatedDetailValues print repeated detail values
+     * @return a column builder
+     */
+    public T setPrintRepeatedDetailValues(final Boolean printRepeatedDetailValues) {
+        getObject().setPrintRepeatedDetailValues(printRepeatedDetailValues);
+        return (T) this;
+    }
+
+    /**
+     * Sets the column value horizontal alignment.
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a column builder
+     * @deprecated use setHorizontalTextAlignment instead
+     */
+    @Deprecated
+    public T setHorizontalAlignment(final HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getComponent().setHorizontalTextAlignment(HorizontalTextAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getComponent().setHorizontalTextAlignment(null);
+        }
+
+        return (T) this;
+    }
+
+    /**
+     * Sets the column value horizontal text alignment.
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a column builder
+     */
+    public T setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
+        getComponent().setHorizontalTextAlignment(horizontalTextAlignment);
+        return (T) this;
+    }
+
+    /**
+     * Sets the column value format pattern.
+     *
+     * @param pattern the format pattern
+     * @return a column builder
+     */
+    public T setPattern(final String pattern) {
+        getComponent().setPattern(pattern);
+        return (T) this;
+    }
+
+    /**
+     * Sets the column value format pattern. The expression must be a type of String.
+     *
+     * @param patternExpression the format pattern expression
+     * @return a column builder
+     */
+    public T setPattern(final DRIExpression<String> patternExpression) {
+        getComponent().setPatternExpression(patternExpression);
+        return (T) this;
+    }
+
+    /**
+     * Sets the column value formatter expression.
+     *
+     * @param valueFormatter the value formatter expression
+     * @return a column builder
+     */
+    public T setValueFormatter(final DRIValueFormatter<?, ? super U> valueFormatter) {
+        getComponent().setValueFormatter(valueFormatter);
+        return (T) this;
+    }
+
+    /**
+     * Sets the column data type.
+     *
+     * @param dataType the data type
+     * @return a column builder
+     */
+    public T setDataType(final DRIDataType<? super U, U> dataType) {
+        getComponent().setDataType(dataType);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the preferred width of a column. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
+     *
+     * @param columns the number of preferred columns >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public T setColumns(final Integer columns) {
+        getComponent().setColumns(columns);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the fixed width of a column. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
+     *
+     * @param columns the number of fixed columns >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public T setFixedColumns(final Integer columns) {
+        getComponent().setColumns(columns);
+        getComponent().setWidthType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the minimum width of a column. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
+     *
+     * @param columns the number of minimum columns >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public T setMinColumns(final Integer columns) {
+        getComponent().setColumns(columns);
+        getComponent().setWidthType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the preferred height of a column. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of preferred rows >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public T setRows(final Integer rows) {
+        getComponent().setRows(rows);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the fixed height of a column. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of fixed rows >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public T setFixedRows(final Integer rows) {
+        getComponent().setRows(rows);
+        getComponent().setHeightType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * This method is used to define the minimum height of a column. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of minimum rows >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public T setMinRows(final Integer rows) {
+        getComponent().setRows(rows);
+        getComponent().setHeightType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * <p>setAnchorName.</p>
+     *
+     * @param anchorName a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setAnchorName(final String anchorName) {
+        getComponent().setAnchorNameExpression(Expressions.text(anchorName));
+        return (T) this;
+    }
+
+    /**
+     * <p>setAnchorName.</p>
+     *
+     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setAnchorName(final DRIExpression<String> anchorNameExpression) {
+        getComponent().setAnchorNameExpression(anchorNameExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setBookmarkLevel.</p>
+     *
+     * @param bookmarkLevel a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setBookmarkLevel(final Integer bookmarkLevel) {
+        getComponent().setBookmarkLevel(bookmarkLevel);
+        return (T) this;
+    }
+
+    /**
+     * Sets the column value hyperlink.
+     *
+     * @param hyperLink the value hyperlink
+     * @return a column builder
+     */
+    public T setHyperLink(final HyperLinkBuilder hyperLink) {
+        if (hyperLink != null) {
+            getComponent().setHyperLink(hyperLink.getHyperLink());
+        } else {
+            getComponent().setHyperLink(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * Sets the preferred width of a column.
+     *
+     * @param width the column preferred width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setWidth(final Integer width) {
+        getComponent().setWidth(width);
+        return (T) this;
+    }
+
+    /**
+     * Sets the fixed width of a column.
+     *
+     * @param width the column fixed width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setFixedWidth(final Integer width) {
+        getComponent().setWidth(width);
+        getComponent().setWidthType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * Sets the minimum width of a column.
+     *
+     * @param width the column minimum width >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setMinWidth(final Integer width) {
+        getComponent().setWidth(width);
+        getComponent().setWidthType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * Sets the preferred height of a column.
+     *
+     * @param height the column preferred height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setHeight(final Integer height) {
+        getComponent().setHeight(height);
+        return (T) this;
+    }
+
+    /**
+     * Sets the fixed height of a column.
+     *
+     * @param height the column fixed height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setFixedHeight(final Integer height) {
+        getComponent().setHeight(height);
+        getComponent().setHeightType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * Sets the minimum height of a column.
+     *
+     * @param height the column minimum height >= 0
+     * @return a column builder
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setMinHeight(final Integer height) {
+        getComponent().setHeight(height);
+        getComponent().setHeightType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * <p>setStretchWithOverflow.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @return a T object.
+     * @deprecated replaced by {@link #setTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public T setStretchWithOverflow(final Boolean stretchWithOverflow) {
+        getComponent().setStretchWithOverflow(stretchWithOverflow);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTextAdjust.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a T object.
+     */
+    public T setTextAdjust(final TextAdjust textAdjust) {
+        getComponent().setTextAdjust(textAdjust);
+        return (T) this;
+    }
+
+    /**
+     * <p>printInFirstWholeBand.</p>
+     *
+     * @return a T object.
+     */
+    public T printInFirstWholeBand() {
+        return setPrintInFirstWholeBand(true);
+    }
+
+    /**
+     * <p>setPrintInFirstWholeBand.</p>
+     *
+     * @param printInFirstWholeBand a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setPrintInFirstWholeBand(final Boolean printInFirstWholeBand) {
+        getComponent().setPrintInFirstWholeBand(printInFirstWholeBand);
+        return (T) this;
+    }
+
+    /**
+     * <p>printWhenDetailOverflows.</p>
+     *
+     * @return a T object.
+     */
+    public T printWhenDetailOverflows() {
+        return setPrintWhenDetailOverflows(true);
+    }
+
+    /**
+     * <p>setPrintWhenDetailOverflows.</p>
+     *
+     * @param printWhenDetailOverflows a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setPrintWhenDetailOverflows(final Boolean printWhenDetailOverflows) {
+        getComponent().setPrintWhenDetailOverflows(printWhenDetailOverflows);
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the column value.
+     *
+     * @param propertyExpression the property expression
+     * @return a column builder
+     */
+    public T addProperty(final DRIPropertyExpression propertyExpression) {
+        getComponent().addPropertyExpression(propertyExpression);
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the column value.
+     *
+     * @param name            the property name
+     * @param valueExpression the property value expression
+     * @return a column builder
+     */
+    public T addProperty(final String name, final DRIExpression<String> valueExpression) {
+        getComponent().addPropertyExpression(Expressions.property(name, valueExpression));
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the column value.
+     *
+     * @param name  the property name
+     * @param value the property value
+     * @return a column builder
+     */
+    public T addProperty(final String name, final String value) {
+        getComponent().addPropertyExpression(Expressions.property(name, value));
+        return (T) this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected DRTextField<U> getComponent() {
+        return (DRTextField<U>) getObject().getComponent();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java
new file mode 100644
index 0000000..1a1ccc5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java
@@ -0,0 +1,95 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRFormatField;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>Abstract AbstractFormatFieldBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings( {"unchecked", "deprecation"})
+public abstract class AbstractFormatFieldBuilder<T extends AbstractFormatFieldBuilder<T, U>, U extends DRFormatField> extends HyperLinkComponentBuilder<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for AbstractFormatFieldBuilder.</p>
+     *
+     * @param formatField a U object.
+     */
+    protected AbstractFormatFieldBuilder(U formatField) {
+        super(formatField);
+    }
+
+    /**
+     * <p>setFormatExpression.</p>
+     *
+     * @param format a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setFormatExpression(String format) {
+        getObject().setFormatExpression(Expressions.text(format));
+        return (T) this;
+    }
+
+    /**
+     * <p>setFormatExpression.</p>
+     *
+     * @param formatExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setFormatExpression(DRIExpression<String> formatExpression) {
+        getObject().setFormatExpression(formatExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHorizontalAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a T object.
+     * @deprecated use setHorizontalTextAlignment instead
+     */
+    @Deprecated
+    public T setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().setHorizontalTextAlignment(HorizontalTextAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().setHorizontalTextAlignment(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setHorizontalTextAlignment.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a T object.
+     */
+    public T setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        getObject().setHorizontalTextAlignment(horizontalTextAlignment);
+        return (T) this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BooleanFieldBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BooleanFieldBuilder.java
new file mode 100644
index 0000000..65020d3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BooleanFieldBuilder.java
@@ -0,0 +1,177 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRBooleanField;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>BooleanFieldBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("deprecation")
+public class BooleanFieldBuilder extends HyperLinkComponentBuilder<BooleanFieldBuilder, DRBooleanField> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for BooleanFieldBuilder.</p>
+     */
+    protected BooleanFieldBuilder() {
+        super(new DRBooleanField());
+    }
+
+    /**
+     * <p>setValue.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder setValue(FieldBuilder<Boolean> field) {
+        Validate.notNull(field, "field must not be null");
+        getObject().setValueExpression(field.getField());
+        return this;
+    }
+
+    /**
+     * <p>setValue.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder setValue(DRIExpression<Boolean> valueExpression) {
+        getObject().setValueExpression(valueExpression);
+        return this;
+    }
+
+    /**
+     * <p>setValue.</p>
+     *
+     * @param value a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder setValue(Boolean value) {
+        getObject().setValueExpression(Expressions.value(value));
+        return this;
+    }
+
+    /**
+     * <p>setComponentType.</p>
+     *
+     * @param booleanComponentType a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder setComponentType(BooleanComponentType booleanComponentType) {
+        getObject().setComponentType(booleanComponentType);
+        return this;
+    }
+
+    /**
+     * <p>setEmptyWhenNullValue.</p>
+     *
+     * @param emptyWhenNullValue a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder setEmptyWhenNullValue(Boolean emptyWhenNullValue) {
+        getObject().setEmptyWhenNullValue(emptyWhenNullValue);
+        return this;
+    }
+
+    /**
+     * Sets the boolean image dimension. Has effect only when the boolean value is presented as an image.
+     *
+     * @param width  the image width
+     * @param height the image height
+     * @return a column builder
+     */
+    public BooleanFieldBuilder setImageDimension(Integer width, Integer height) {
+        getObject().setImageWidth(width);
+        getObject().setImageHeight(height);
+        return this;
+    }
+
+    /**
+     * Sets the boolean image width. Has effect only when the boolean value is presented as an image.
+     *
+     * @param width the image width
+     * @return a column builder
+     */
+    public BooleanFieldBuilder setImageWidth(Integer width) {
+        getObject().setImageWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the boolean image height. Has effect only when the boolean value is presented as an image.
+     *
+     * @param height the image height
+     * @return a column builder
+     */
+    public BooleanFieldBuilder setImageHeight(Integer height) {
+        getObject().setImageHeight(height);
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalImageAlignment.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        getObject().setHorizontalImageAlignment(horizontalImageAlignment);
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @deprecated use setHorizontalImageAlignment instead
+     */
+    @Deprecated
+    public BooleanFieldBuilder setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().setHorizontalImageAlignment(HorizontalImageAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().setHorizontalImageAlignment(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalTextAlignment.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        getObject().setHorizontalTextAlignment(horizontalTextAlignment);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BreakBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BreakBuilder.java
new file mode 100644
index 0000000..87c0f1c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BreakBuilder.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRBreak;
+import net.sf.dynamicreports.report.constant.BreakType;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>BreakBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BreakBuilder extends ComponentBuilder<BreakBuilder, DRBreak> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for BreakBuilder.</p>
+     */
+    protected BreakBuilder() {
+        super(new DRBreak());
+    }
+
+    /**
+     * <p>setType.</p>
+     *
+     * @param breakType a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     */
+    public BreakBuilder setType(BreakType breakType) {
+        getObject().setType(breakType);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilder.java
new file mode 100644
index 0000000..64b2268
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilder.java
@@ -0,0 +1,162 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRComponent;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract ComponentBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("unchecked")
+public abstract class ComponentBuilder<T extends ComponentBuilder<T, U>, U extends DRComponent> extends AbstractBuilder<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for ComponentBuilder.</p>
+     *
+     * @param object a U object.
+     */
+    protected ComponentBuilder(U object) {
+        super(object);
+    }
+
+    /**
+     * <p>setStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setStyle(ReportStyleBuilder style) {
+        if (style != null) {
+            getObject().setStyle(style.getStyle());
+        } else {
+            getObject().setStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setPrintWhenExpression.</p>
+     *
+     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
+        getObject().setPrintWhenExpression(printWhenExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>removeLineWhenBlank.</p>
+     *
+     * @return a T object.
+     */
+    public T removeLineWhenBlank() {
+        return setRemoveLineWhenBlank(true);
+    }
+
+    /**
+     * <p>setRemoveLineWhenBlank.</p>
+     *
+     * @param removeLineWhenBlank a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setRemoveLineWhenBlank(Boolean removeLineWhenBlank) {
+        getObject().setRemoveLineWhenBlank(removeLineWhenBlank);
+        return (T) this;
+    }
+
+    /**
+     * <p>addProperty.</p>
+     *
+     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @return a T object.
+     */
+    public T addProperty(DRIPropertyExpression propertyExpression) {
+        getComponent().addPropertyExpression(propertyExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>addProperty.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T addProperty(String name, DRIExpression<String> valueExpression) {
+        getComponent().addPropertyExpression(Expressions.property(name, valueExpression));
+        return (T) this;
+    }
+
+    /**
+     * <p>addProperty.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T addProperty(String name, String value) {
+        getComponent().addPropertyExpression(Expressions.property(name, value));
+        return (T) this;
+    }
+
+    /**
+     * <p>setTableOfContentsHeading.</p>
+     *
+     * @param label a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setTableOfContentsHeading(String label) {
+        TableOfContentsHeadingBuilder tocHeading = DynamicReports.tableOfContentsHeading(label);
+        return setTableOfContentsHeading(tocHeading);
+    }
+
+    /**
+     * <p>setTableOfContentsHeading.</p>
+     *
+     * @param tocHeading a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @return a T object.
+     */
+    public T setTableOfContentsHeading(TableOfContentsHeadingBuilder tocHeading) {
+        Validate.notNull(tocHeading, "tocHeading must not be null");
+        getComponent().setTableOfContentsHeading(tocHeading.build());
+        return (T) this;
+    }
+
+    /**
+     * <p>getComponent.</p>
+     *
+     * @return a U object.
+     */
+    public U getComponent() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilders.java
new file mode 100644
index 0000000..d09bc16
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilders.java
@@ -0,0 +1,641 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.VariableBuilder;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.renderers.Renderable;
+
+import java.awt.Image;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * A set of methods of creating components
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ComponentBuilders {
+
+    // horizontal list
+
+    /**
+     * <p>horizontalList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder horizontalList() {
+        return Components.horizontalList();
+    }
+
+    /**
+     * <p>horizontalList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder horizontalList(ComponentBuilder<?, ?>... components) {
+        return Components.horizontalList(components);
+    }
+
+    /**
+     * <p>horizontalList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder horizontalList(HorizontalListCellBuilder... cells) {
+        return Components.horizontalList(cells);
+    }
+
+    /**
+     * <p>hListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public HorizontalListCellBuilder hListCell(ComponentBuilder<?, ?> component) {
+        return Components.hListCell(component);
+    }
+
+    // horizontal flow list
+
+    /**
+     * <p>horizontalFlowList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder horizontalFlowList() {
+        return Components.horizontalFlowList();
+    }
+
+    /**
+     * <p>horizontalFlowList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder horizontalFlowList(ComponentBuilder<?, ?>... components) {
+        return Components.horizontalFlowList(components);
+    }
+
+    /**
+     * <p>horizontalFlowList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder horizontalFlowList(HorizontalListCellBuilder... cells) {
+        return Components.horizontalFlowList(cells);
+    }
+
+    // vertical list
+
+    /**
+     * <p>verticalList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder verticalList() {
+        return Components.verticalList();
+    }
+
+    /**
+     * <p>verticalList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder verticalList(ComponentBuilder<?, ?>... components) {
+        return Components.verticalList(components);
+    }
+
+    /**
+     * <p>verticalList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder verticalList(VerticalListCellBuilder... cells) {
+        return Components.verticalList(cells);
+    }
+
+    /**
+     * <p>vListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public VerticalListCellBuilder vListCell(ComponentBuilder<?, ?> component) {
+        return Components.vListCell(component);
+    }
+
+    // xy list
+
+    /**
+     * <p>xyList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     */
+    public XyListBuilder xyList() {
+        return Components.xyList();
+    }
+
+    /**
+     * <p>xyList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     */
+    public XyListBuilder xyList(XyListCellBuilder... cells) {
+        return Components.xyList(cells);
+    }
+
+    /**
+     * <p>xyListCell.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     */
+    public XyListCellBuilder xyListCell(Integer x, Integer y, ComponentBuilder<?, ?> component) {
+        return Components.xyListCell(x, y, component);
+    }
+
+    /**
+     * <p>xyListCell.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param width     a {@link java.lang.Integer} object.
+     * @param height    a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     */
+    public XyListCellBuilder xyListCell(Integer x, Integer y, Integer width, Integer height, ComponentBuilder<?, ?> component) {
+        return Components.xyListCell(x, y, width, height, component);
+    }
+
+    // multi page list
+
+    /**
+     * <p>multiPageList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     */
+    public MultiPageListBuilder multiPageList() {
+        return Components.multiPageList();
+    }
+
+    /**
+     * <p>multiPageList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     */
+    public MultiPageListBuilder multiPageList(ComponentBuilder<?, ?>... components) {
+        return Components.multiPageList(components);
+    }
+
+    /**
+     * <p>currentDate.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.CurrentDateBuilder} object.
+     */
+    public CurrentDateBuilder currentDate() {
+        return Components.currentDate();
+    }
+
+    /**
+     * <p>pageNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageNumberBuilder} object.
+     */
+    public PageNumberBuilder pageNumber() {
+        return Components.pageNumber();
+    }
+
+    /**
+     * <p>pageXofY.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     */
+    public PageXofYBuilder pageXofY() {
+        return Components.pageXofY();
+    }
+
+    /**
+     * <p>pageXslashY.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     */
+    public PageXslashYBuilder pageXslashY() {
+        return Components.pageXslashY();
+    }
+
+    /**
+     * <p>totalPages.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TotalPagesBuilder} object.
+     */
+    public TotalPagesBuilder totalPages() {
+        return Components.totalPages();
+    }
+
+    // text
+
+    /**
+     * <p>text.</p>
+     *
+     * @param text a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<String> text(String text) {
+        return Components.text(text);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param date a {@link java.util.Date} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<Date> text(Date date) {
+        return Components.text(date);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param number a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public <T extends Number> TextFieldBuilder<T> text(T number) {
+        return Components.text(number);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public <T> TextFieldBuilder<T> text(FieldBuilder<T> field) {
+        return Components.text(field);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param <T>      a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public <T> TextFieldBuilder<T> text(VariableBuilder<T> variable) {
+        return Components.text(variable);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param textExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>            a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public <T> TextFieldBuilder<T> text(DRIExpression<T> textExpression) {
+        return Components.text(textExpression);
+    }
+
+    // filler
+
+    /**
+     * <p>filler.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     */
+    public FillerBuilder filler() {
+        return Components.filler();
+    }
+
+    /**
+     * <p>horizontalGap.</p>
+     *
+     * @param width a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     */
+    public FillerBuilder horizontalGap(int width) {
+        return Components.horizontalGap(width);
+    }
+
+    /**
+     * <p>verticalGap.</p>
+     *
+     * @param height a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     */
+    public FillerBuilder verticalGap(int height) {
+        return Components.verticalGap(height);
+    }
+
+    /**
+     * <p>gap.</p>
+     *
+     * @param width  a int.
+     * @param height a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     */
+    public FillerBuilder gap(int width, int height) {
+        return Components.gap(width, height);
+    }
+
+    // image
+
+    /**
+     * <p>image.</p>
+     *
+     * @param imageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder image(DRIExpression<?> imageExpression) {
+        return Components.image(imageExpression);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param imagePath a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder image(String imagePath) {
+        return Components.image(imagePath);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param image a {@link java.awt.Image} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder image(Image image) {
+        return Components.image(image);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param imageInputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder image(InputStream imageInputStream) {
+        return Components.image(imageInputStream);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param imageUrl a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder image(URL imageUrl) {
+        return Components.image(imageUrl);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param image a {@link net.sf.jasperreports.renderers.Renderable} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder image(Renderable image) {
+        return Components.image(image);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param image a {@link net.sf.jasperreports.engine.Renderable} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @deprecated use image(net.sf.jasperreports.renderers.Renderable image) instead
+     */
+    @Deprecated
+    public ImageBuilder image(net.sf.jasperreports.engine.Renderable image) {
+        return Components.image(image);
+    }
+
+    // subreport
+
+    /**
+     * <p>subreport.</p>
+     *
+     * @param reportBuilder a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder subreport(JasperReportBuilder reportBuilder) {
+        return Components.subreport(reportBuilder);
+    }
+
+    /**
+     * <p>subreport.</p>
+     *
+     * @param jasperReport a {@link net.sf.jasperreports.engine.JasperReport} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder subreport(JasperReport jasperReport) {
+        return Components.subreport(jasperReport);
+    }
+
+    /**
+     * <p>subreport.</p>
+     *
+     * @param reportExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder subreport(DRIExpression<?> reportExpression) {
+        return Components.subreport(reportExpression);
+    }
+
+    // line
+
+    /**
+     * <p>line.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.LineBuilder} object.
+     */
+    public LineBuilder line() {
+        return Components.line();
+    }
+
+    // break
+
+    /**
+     * <p>pageBreak.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     */
+    public BreakBuilder pageBreak() {
+        return Components.pageBreak();
+    }
+
+    /**
+     * <p>columnBreak.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     */
+    public BreakBuilder columnBreak() {
+        return Components.columnBreak();
+    }
+
+    // generic element
+
+    /**
+     * <p>genericElement.</p>
+     *
+     * @param namespace a {@link java.lang.String} object.
+     * @param namespace a {@link java.lang.String} object.
+     * @param name      a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     */
+    public GenericElementBuilder genericElement(String namespace, String name) {
+        return Components.genericElement(namespace, name);
+    }
+
+    // boolean
+
+    /**
+     * <p>booleanField.</p>
+     *
+     * @param value a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder booleanField(Boolean value) {
+        return Components.booleanField(value);
+    }
+
+    /**
+     * <p>booleanField.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder booleanField(FieldBuilder<Boolean> field) {
+        return Components.booleanField(field);
+    }
+
+    /**
+     * <p>booleanField.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public BooleanFieldBuilder booleanField(DRIExpression<Boolean> valueExpression) {
+        return Components.booleanField(valueExpression);
+    }
+
+    // ellipse
+
+    /**
+     * <p>ellipse.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.EllipseBuilder} object.
+     */
+    public EllipseBuilder ellipse() {
+        return Components.ellipse();
+    }
+
+    // rectangle
+
+    /**
+     * <p>rectangle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     */
+    public RectangleBuilder rectangle() {
+        return Components.rectangle();
+    }
+
+    /**
+     * <p>roundRectangle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     */
+    public RectangleBuilder roundRectangle() {
+        return Components.roundRectangle();
+    }
+
+    /**
+     * <p>roundRectangle.</p>
+     *
+     * @param radius a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     */
+    public RectangleBuilder roundRectangle(int radius) {
+        return Components.roundRectangle(radius);
+    }
+
+    // map
+
+    /**
+     * <p>map.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public MapBuilder map() {
+        return Components.map();
+    }
+
+    /**
+     * <p>map.</p>
+     *
+     * @param latitude  a {@link java.lang.Float} object.
+     * @param longitude a {@link java.lang.Float} object.
+     * @param zoom      a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public MapBuilder map(Float latitude, Float longitude, Integer zoom) {
+        return Components.map(latitude, longitude, zoom);
+    }
+
+    // alignment
+
+    /**
+     * <p>centerHorizontal.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder centerHorizontal(ComponentBuilder<?, ?> component) {
+        return Components.centerHorizontal(component);
+    }
+
+    /**
+     * <p>centerVertical.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder centerVertical(ComponentBuilder<?, ?> component) {
+        return Components.centerVertical(component);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/Components.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/Components.java
new file mode 100644
index 0000000..e68b358
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/Components.java
@@ -0,0 +1,668 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.VariableBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.BreakType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.renderers.Renderable;
+import org.apache.commons.lang3.Validate;
+
+import java.awt.Image;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * A set of methods of creating components
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Components {
+
+    // horizontal list
+
+    /**
+     * <p>horizontalList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public static HorizontalListBuilder horizontalList() {
+        return new HorizontalListBuilder();
+    }
+
+    /**
+     * <p>horizontalList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public static HorizontalListBuilder horizontalList(ComponentBuilder<?, ?>... components) {
+        return new HorizontalListBuilder().add(components);
+    }
+
+    /**
+     * <p>horizontalList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public static HorizontalListBuilder horizontalList(HorizontalListCellBuilder... cells) {
+        return new HorizontalListBuilder().add(cells);
+    }
+
+    /**
+     * <p>hListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public static HorizontalListCellBuilder hListCell(ComponentBuilder<?, ?> component) {
+        Validate.notNull(component, "component must not be null");
+        return new HorizontalListCellBuilder(component);
+    }
+
+    // horizontal flow list
+
+    /**
+     * <p>horizontalFlowList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public static HorizontalListBuilder horizontalFlowList() {
+        return new HorizontalFlowListBuilder();
+    }
+
+    /**
+     * <p>horizontalFlowList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public static HorizontalListBuilder horizontalFlowList(ComponentBuilder<?, ?>... components) {
+        return new HorizontalFlowListBuilder().add(components);
+    }
+
+    /**
+     * <p>horizontalFlowList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public static HorizontalListBuilder horizontalFlowList(HorizontalListCellBuilder... cells) {
+        return new HorizontalFlowListBuilder().add(cells);
+    }
+
+    // vertical list
+
+    /**
+     * <p>verticalList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public static VerticalListBuilder verticalList() {
+        return new VerticalListBuilder();
+    }
+
+    /**
+     * <p>verticalList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public static VerticalListBuilder verticalList(ComponentBuilder<?, ?>... components) {
+        return new VerticalListBuilder().add(components);
+    }
+
+    /**
+     * <p>verticalList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public static VerticalListBuilder verticalList(VerticalListCellBuilder... cells) {
+        return new VerticalListBuilder().add(cells);
+    }
+
+    /**
+     * <p>vListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public static VerticalListCellBuilder vListCell(ComponentBuilder<?, ?> component) {
+        Validate.notNull(component, "component must not be null");
+        return new VerticalListCellBuilder(component);
+    }
+
+    // xy list
+
+    /**
+     * <p>xyList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     */
+    public static XyListBuilder xyList() {
+        return new XyListBuilder();
+    }
+
+    /**
+     * <p>xyList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     */
+    public static XyListBuilder xyList(XyListCellBuilder... cells) {
+        return new XyListBuilder().add(cells);
+    }
+
+    /**
+     * <p>xyListCell.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     */
+    public static XyListCellBuilder xyListCell(Integer x, Integer y, ComponentBuilder<?, ?> component) {
+        Validate.notNull(component, "component must not be null");
+        return new XyListCellBuilder(x, y, component);
+    }
+
+    /**
+     * <p>xyListCell.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param width     a {@link java.lang.Integer} object.
+     * @param height    a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     */
+    public static XyListCellBuilder xyListCell(Integer x, Integer y, Integer width, Integer height, ComponentBuilder<?, ?> component) {
+        Validate.notNull(component, "component must not be null");
+        return new XyListCellBuilder(x, y, width, height, component);
+    }
+
+    // multi page list
+
+    /**
+     * <p>multiPageList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     */
+    public static MultiPageListBuilder multiPageList() {
+        return new MultiPageListBuilder();
+    }
+
+    /**
+     * <p>multiPageList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     */
+    public static MultiPageListBuilder multiPageList(ComponentBuilder<?, ?>... components) {
+        return new MultiPageListBuilder().add(components);
+    }
+
+    /**
+     * <p>currentDate.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.CurrentDateBuilder} object.
+     */
+    public static CurrentDateBuilder currentDate() {
+        return new CurrentDateBuilder();
+    }
+
+    /**
+     * <p>pageNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageNumberBuilder} object.
+     */
+    public static PageNumberBuilder pageNumber() {
+        return new PageNumberBuilder();
+    }
+
+    /**
+     * <p>pageXofY.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     */
+    public static PageXofYBuilder pageXofY() {
+        return new PageXofYBuilder();
+    }
+
+    /**
+     * <p>pageXslashY.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     */
+    public static PageXslashYBuilder pageXslashY() {
+        return new PageXslashYBuilder();
+    }
+
+    /**
+     * <p>totalPages.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TotalPagesBuilder} object.
+     */
+    public static TotalPagesBuilder totalPages() {
+        return new TotalPagesBuilder();
+    }
+
+    // text
+
+    /**
+     * <p>text.</p>
+     *
+     * @param text a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public static TextFieldBuilder<String> text(String text) {
+        return new TextFieldBuilder<String>().setText(text);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param date a {@link java.util.Date} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public static TextFieldBuilder<Date> text(Date date) {
+        return new TextFieldBuilder<Date>().setText(date);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param number a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public static <T extends Number> TextFieldBuilder<T> text(T number) {
+        return new TextFieldBuilder<T>().setText(number);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public static <T> TextFieldBuilder<T> text(FieldBuilder<T> field) {
+        return new TextFieldBuilder<T>().setText(field);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param <T>      a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public static <T> TextFieldBuilder<T> text(VariableBuilder<T> variable) {
+        return new TextFieldBuilder<T>().setText(variable);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param textExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>            a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public static <T> TextFieldBuilder<T> text(DRIExpression<T> textExpression) {
+        return new TextFieldBuilder<T>().setText(textExpression);
+    }
+
+    // filler
+
+    /**
+     * <p>filler.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     */
+    public static FillerBuilder filler() {
+        return new FillerBuilder();
+    }
+
+    /**
+     * <p>horizontalGap.</p>
+     *
+     * @param width a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     */
+    public static FillerBuilder horizontalGap(int width) {
+        return new FillerBuilder().setFixedWidth(width);
+    }
+
+    /**
+     * <p>verticalGap.</p>
+     *
+     * @param height a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     */
+    public static FillerBuilder verticalGap(int height) {
+        return new FillerBuilder().setFixedHeight(height);
+    }
+
+    /**
+     * <p>gap.</p>
+     *
+     * @param width  a int.
+     * @param height a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     */
+    public static FillerBuilder gap(int width, int height) {
+        return new FillerBuilder().setFixedDimension(width, height);
+    }
+
+    // image
+
+    /**
+     * <p>image.</p>
+     *
+     * @param imageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public static ImageBuilder image(DRIExpression<?> imageExpression) {
+        return new ImageBuilder().setImage(imageExpression);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param imagePath a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public static ImageBuilder image(String imagePath) {
+        return new ImageBuilder().setImage(imagePath);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param image a {@link java.awt.Image} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public static ImageBuilder image(Image image) {
+        return new ImageBuilder().setImage(image);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param imageInputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public static ImageBuilder image(InputStream imageInputStream) {
+        return new ImageBuilder().setImage(imageInputStream);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param imageUrl a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public static ImageBuilder image(URL imageUrl) {
+        return new ImageBuilder().setImage(imageUrl);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param image a {@link net.sf.jasperreports.renderers.Renderable} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public static ImageBuilder image(Renderable image) {
+        return new ImageBuilder().setImage(Expressions.value(image, Renderable.class));
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param image a {@link net.sf.jasperreports.engine.Renderable} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @deprecated use image(net.sf.jasperreports.renderers.Renderable image) instead
+     */
+    @Deprecated
+    public static ImageBuilder image(net.sf.jasperreports.engine.Renderable image) {
+        return new ImageBuilder().setImage(Expressions.value(image, net.sf.jasperreports.engine.Renderable.class));
+    }
+
+    // subreport
+
+    /**
+     * <p>subreport.</p>
+     *
+     * @param reportBuilder a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public static SubreportBuilder subreport(JasperReportBuilder reportBuilder) {
+        SubreportBuilder subreport = new SubreportBuilder();
+        subreport.setReport(reportBuilder);
+        if (reportBuilder.getConnection() != null) {
+            subreport.setConnection(reportBuilder.getConnection());
+        }
+        if (reportBuilder.getDataSource() != null) {
+            subreport.setDataSource(reportBuilder.getDataSource());
+        }
+        return subreport;
+    }
+
+    /**
+     * <p>subreport.</p>
+     *
+     * @param jasperReport a {@link net.sf.jasperreports.engine.JasperReport} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public static SubreportBuilder subreport(JasperReport jasperReport) {
+        return new SubreportBuilder().setReport(jasperReport);
+    }
+
+    /**
+     * <p>subreport.</p>
+     *
+     * @param reportExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public static SubreportBuilder subreport(DRIExpression<?> reportExpression) {
+        return new SubreportBuilder().setReport(reportExpression);
+    }
+
+    // line
+
+    /**
+     * <p>line.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.LineBuilder} object.
+     */
+    public static LineBuilder line() {
+        return new LineBuilder();
+    }
+
+    // break
+
+    /**
+     * <p>pageBreak.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     */
+    public static BreakBuilder pageBreak() {
+        return new BreakBuilder().setType(BreakType.PAGE);
+    }
+
+    /**
+     * <p>columnBreak.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     */
+    public static BreakBuilder columnBreak() {
+        return new BreakBuilder().setType(BreakType.COLUMN);
+    }
+
+    // generic element
+
+    /**
+     * <p>genericElement.</p>
+     *
+     * @param namespace a {@link java.lang.String} object.
+     * @param namespace a {@link java.lang.String} object.
+     * @param name      a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     */
+    public static GenericElementBuilder genericElement(String namespace, String name) {
+        return new GenericElementBuilder(namespace, name);
+    }
+
+    // boolean
+
+    /**
+     * <p>booleanField.</p>
+     *
+     * @param value a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public static BooleanFieldBuilder booleanField(Boolean value) {
+        return new BooleanFieldBuilder().setValue(value);
+    }
+
+    /**
+     * <p>booleanField.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public static BooleanFieldBuilder booleanField(FieldBuilder<Boolean> field) {
+        return new BooleanFieldBuilder().setValue(field);
+    }
+
+    /**
+     * <p>booleanField.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     */
+    public static BooleanFieldBuilder booleanField(DRIExpression<Boolean> valueExpression) {
+        return new BooleanFieldBuilder().setValue(valueExpression);
+    }
+
+    // ellipse
+
+    /**
+     * <p>ellipse.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.EllipseBuilder} object.
+     */
+    public static EllipseBuilder ellipse() {
+        return new EllipseBuilder();
+    }
+
+    // rectangle
+
+    /**
+     * <p>rectangle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     */
+    public static RectangleBuilder rectangle() {
+        return new RectangleBuilder();
+    }
+
+    /**
+     * <p>roundRectangle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     */
+    public static RectangleBuilder roundRectangle() {
+        return new RectangleBuilder().setRadius(10);
+    }
+
+    /**
+     * <p>roundRectangle.</p>
+     *
+     * @param radius a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     */
+    public static RectangleBuilder roundRectangle(int radius) {
+        return new RectangleBuilder().setRadius(radius);
+    }
+
+    // map
+
+    /**
+     * <p>map.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public static MapBuilder map() {
+        return new MapBuilder();
+    }
+
+    /**
+     * <p>map.</p>
+     *
+     * @param latitude  a {@link java.lang.Float} object.
+     * @param longitude a {@link java.lang.Float} object.
+     * @param zoom      a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public static MapBuilder map(Float latitude, Float longitude, Integer zoom) {
+        MapBuilder mapBuilder = new MapBuilder();
+        mapBuilder.setLatitude(latitude);
+        mapBuilder.setLongitude(longitude);
+        mapBuilder.setZoom(zoom);
+        return mapBuilder;
+    }
+
+    // alignment
+
+    /**
+     * <p>centerHorizontal.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public static HorizontalListBuilder centerHorizontal(ComponentBuilder<?, ?> component) {
+        HorizontalListBuilder list = horizontalList();
+        list.add(filler().setWidth(1));
+        list.add(component);
+        list.add(filler().setWidth(1));
+        return list;
+    }
+
+    /**
+     * <p>centerVertical.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public static VerticalListBuilder centerVertical(ComponentBuilder<?, ?> component) {
+        VerticalListBuilder list = verticalList();
+        list.add(filler().setHeight(1));
+        list.add(component);
+        list.add(filler().setHeight(1));
+        return list;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/CurrentDateBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/CurrentDateBuilder.java
new file mode 100644
index 0000000..00012ca
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/CurrentDateBuilder.java
@@ -0,0 +1,59 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRCurrentDate;
+import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>CurrentDateBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CurrentDateBuilder extends AbstractFormatFieldBuilder<CurrentDateBuilder, DRCurrentDate> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CurrentDateBuilder.</p>
+     */
+    protected CurrentDateBuilder() {
+        super(new DRCurrentDate());
+    }
+
+    /**
+     * <p>setPattern.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.CurrentDateBuilder} object.
+     */
+    public CurrentDateBuilder setPattern(String pattern) {
+        getObject().setPattern(pattern);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        if (getObject().getFormatExpression() == null) {
+            setFormatExpression(new SystemMessageExpression("current_date"));
+        }
+        super.configure();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/DimensionComponentBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/DimensionComponentBuilder.java
new file mode 100644
index 0000000..ed61f77
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/DimensionComponentBuilder.java
@@ -0,0 +1,278 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRDimensionComponent;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.StretchType;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract DimensionComponentBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("unchecked")
+public abstract class DimensionComponentBuilder<T extends DimensionComponentBuilder<T, U>, U extends DRDimensionComponent> extends ComponentBuilder<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for DimensionComponentBuilder.</p>
+     *
+     * @param component a U object.
+     */
+    public DimensionComponentBuilder(U component) {
+        super(component);
+    }
+
+    /**
+     * Sets the component preferred dimension.
+     *
+     * @param width  the component preferred width >= 0
+     * @param height the component preferred height >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setDimension(Integer width, Integer height) {
+        getObject().setWidth(width);
+        getObject().setHeight(height);
+        return (T) this;
+    }
+
+    /**
+     * Sets the component fixed dimension.
+     *
+     * @param width  the component fixed width >= 0
+     * @param height the component fixed height >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setFixedDimension(Integer width, Integer height) {
+        getObject().setWidth(width);
+        getObject().setHeight(height);
+        getObject().setWidthType(ComponentDimensionType.FIXED);
+        getObject().setHeightType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * Sets the component minimum dimension.
+     *
+     * @param width  the component minimum width >= 0
+     * @param height the component minimum height >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setMinDimension(Integer width, Integer height) {
+        getObject().setWidth(width);
+        getObject().setHeight(height);
+        getObject().setWidthType(ComponentDimensionType.EXPAND);
+        getObject().setHeightType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * Sets the component preferred width.
+     *
+     * @param width the component preferred width >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setWidth(Integer width) {
+        getObject().setWidth(width);
+        return (T) this;
+    }
+
+    /**
+     * Sets the component fixed width.
+     *
+     * @param width the component fixed width >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setFixedWidth(Integer width) {
+        getObject().setWidth(width);
+        getObject().setWidthType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * Sets the component minimum width.
+     *
+     * @param width the component minimum width >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setMinWidth(Integer width) {
+        getObject().setWidth(width);
+        getObject().setWidthType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * Sets the component preferred height.
+     *
+     * @param height the component preferred height >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setHeight(Integer height) {
+        getObject().setHeight(height);
+        return (T) this;
+    }
+
+    /**
+     * Sets the component fixed height.
+     *
+     * @param height the component fixed height >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setFixedHeight(Integer height) {
+        getObject().setHeight(height);
+        getObject().setHeightType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * Sets the component minimum height.
+     *
+     * @param height the component minimum height >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setMinHeight(Integer height) {
+        getObject().setHeight(height);
+        getObject().setHeightType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPositionType.</p>
+     *
+     * @param positionType a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     * @return a T object.
+     */
+    public T setPositionType(ComponentPositionType positionType) {
+        getObject().setPositionType(positionType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setStretchType.</p>
+     *
+     * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     * @return a T object.
+     */
+    public T setStretchType(StretchType stretchType) {
+        getObject().setStretchType(stretchType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPrintInFirstWholeBand.</p>
+     *
+     * @param printInFirstWholeBand a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setPrintInFirstWholeBand(Boolean printInFirstWholeBand) {
+        getObject().setPrintInFirstWholeBand(printInFirstWholeBand);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPrintWhenDetailOverflows.</p>
+     *
+     * @param printWhenDetailOverflows a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setPrintWhenDetailOverflows(Boolean printWhenDetailOverflows) {
+        getObject().setPrintWhenDetailOverflows(printWhenDetailOverflows);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPrintWhenGroupChanges.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a T object.
+     */
+    public T setPrintWhenGroupChanges(GroupBuilder<?> group) {
+        Validate.notNull(group, "group must not be null");
+        getObject().setPrintWhenGroupChanges(group.getGroup());
+        return (T) this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/EllipseBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/EllipseBuilder.java
new file mode 100644
index 0000000..220de0c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/EllipseBuilder.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DREllipse;
+import net.sf.dynamicreports.report.builder.style.PenBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>EllipseBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class EllipseBuilder extends DimensionComponentBuilder<EllipseBuilder, DREllipse> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for EllipseBuilder.</p>
+     */
+    protected EllipseBuilder() {
+        super(new DREllipse());
+    }
+
+    /**
+     * <p>setPen.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.EllipseBuilder} object.
+     */
+    public EllipseBuilder setPen(PenBuilder pen) {
+        if (pen != null) {
+            getObject().setPen(pen.build());
+        } else {
+            getObject().setPen(null);
+        }
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/FillerBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/FillerBuilder.java
new file mode 100644
index 0000000..8d3c983
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/FillerBuilder.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRFiller;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>FillerBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class FillerBuilder extends DimensionComponentBuilder<FillerBuilder, DRFiller> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for FillerBuilder.</p>
+     */
+    protected FillerBuilder() {
+        super(new DRFiller());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/GenericElementBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/GenericElementBuilder.java
new file mode 100644
index 0000000..c70244b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/GenericElementBuilder.java
@@ -0,0 +1,80 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRGenericElement;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+
+/**
+ * <p>GenericElementBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GenericElementBuilder extends DimensionComponentBuilder<GenericElementBuilder, DRGenericElement> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for GenericElementBuilder.</p>
+     *
+     * @param namespace a {@link java.lang.String} object.
+     * @param namespace a {@link java.lang.String} object.
+     * @param name      a {@link java.lang.String} object.
+     */
+    protected GenericElementBuilder(String namespace, String name) {
+        super(new DRGenericElement(namespace, name));
+    }
+
+    /**
+     * <p>addParameter.</p>
+     *
+     * @param parameterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIParameterExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     */
+    public GenericElementBuilder addParameter(DRIParameterExpression parameterExpression) {
+        getComponent().addParameterExpression(parameterExpression);
+        return this;
+    }
+
+    /**
+     * <p>addParameter.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     */
+    public GenericElementBuilder addParameter(String name, DRIExpression<?> valueExpression) {
+        getComponent().addParameterExpression(Expressions.parameter(name, valueExpression));
+        return this;
+    }
+
+    /**
+     * <p>addParameter.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a {@link java.lang.Object} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     */
+    public GenericElementBuilder addParameter(String name, Object value) {
+        getComponent().addParameterExpression(Expressions.parameter(name, value));
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java
new file mode 100644
index 0000000..e5187c2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java
@@ -0,0 +1,42 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>HorizontalFlowListBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class HorizontalFlowListBuilder extends HorizontalListBuilder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for HorizontalFlowListBuilder.</p>
+     */
+    protected HorizontalFlowListBuilder() {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        newFlowRow();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListBuilder.java
new file mode 100644
index 0000000..62205b9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListBuilder.java
@@ -0,0 +1,257 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRList;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>HorizontalListBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class HorizontalListBuilder extends DimensionComponentBuilder<HorizontalListBuilder, DRList> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRList row;
+
+    /**
+     * <p>Constructor for HorizontalListBuilder.</p>
+     */
+    protected HorizontalListBuilder() {
+        super(new DRList(ListType.VERTICAL));
+        init();
+    }
+
+    /**
+     * <p>init.</p>
+     */
+    protected void init() {
+        newRow();
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder add(ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ComponentBuilder<?, ?> component : components) {
+            row.addComponent(component.getComponent());
+        }
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param gap        a int.
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder add(int gap, ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        for (ComponentBuilder<?, ?> component : components) {
+            add(Components.hListCell(Components.filler().setWidth(gap)).widthFixed());
+            add(component);
+        }
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder add(HorizontalListCellBuilder... cells) {
+        Validate.notNull(cells, "cells must not be null");
+        Validate.noNullElements(cells, "cells must not contains null cell");
+        for (HorizontalListCellBuilder cell : cells) {
+            row.addCell(cell.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param gap   a int.
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder add(int gap, HorizontalListCellBuilder... cells) {
+        Validate.notNull(cells, "cells must not be null");
+        for (HorizontalListCellBuilder cell : cells) {
+            add(Components.hListCell(Components.filler().setWidth(gap)).widthFixed(), cell);
+        }
+        return this;
+    }
+
+    /**
+     * <p>newRow.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder newRow() {
+        return newRow(0);
+    }
+
+    /**
+     * <p>newRow.</p>
+     *
+     * @param verticalGap a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder newRow(Integer verticalGap) {
+        return newRow(verticalGap, ListType.HORIZONTAL);
+    }
+
+    /**
+     * <p>newFlowRow.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder newFlowRow() {
+        return newFlowRow(0);
+    }
+
+    /**
+     * <p>newFlowRow.</p>
+     *
+     * @param verticalGap a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder newFlowRow(Integer verticalGap) {
+        return newRow(verticalGap, ListType.HORIZONTAL_FLOW);
+    }
+
+    private HorizontalListBuilder newRow(Integer verticalGap, ListType listType) {
+        if (verticalGap != null) {
+            Validate.isTrue(verticalGap >= 0, "verticalGap must be >= 0");
+        }
+        if (verticalGap != null && verticalGap > 0) {
+            getObject().addComponent(HorizontalCellComponentAlignment.CENTER, VerticalCellComponentAlignment.TOP, Components.filler().setHeight(verticalGap).build());
+        }
+        row = new DRList(listType);
+        getObject().addComponent(row);
+        return this;
+    }
+
+    /**
+     * <p>setGap.</p>
+     *
+     * @param gap a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder setGap(Integer gap) {
+        row.setGap(gap);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalListBuilder setStyle(ReportStyleBuilder style) {
+        if (style != null) {
+            row.setStyle(style.build());
+        } else {
+            row.setStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setBaseStretchType.</p>
+     *
+     * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder setBaseStretchType(StretchType stretchType) {
+        row.setStretchType(stretchType);
+        return this;
+    }
+
+    /**
+     * <p>setBaseGap.</p>
+     *
+     * @param gap a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder setBaseGap(Integer gap) {
+        getObject().setGap(gap);
+        return this;
+    }
+
+    /**
+     * <p>setBaseStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder setBaseStyle(ReportStyleBuilder style) {
+        if (style != null) {
+            getObject().setStyle(style.build());
+        } else {
+            getObject().setStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setBaseBackgroundComponent.</p>
+     *
+     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder setBaseBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
+        Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+        getObject().setBackgroundComponent(backgroundComponent.build());
+        return this;
+    }
+
+    /**
+     * <p>setBackgroundComponent.</p>
+     *
+     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     */
+    public HorizontalListBuilder setBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
+        Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+        row.setBackgroundComponent(backgroundComponent.build());
+        return this;
+    }
+
+    /**
+     * <p>getList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.component.DRList} object.
+     */
+    public DRList getList() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListCellBuilder.java
new file mode 100644
index 0000000..573234b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListCellBuilder.java
@@ -0,0 +1,126 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRListCell;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+
+/**
+ * <p>HorizontalListCellBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class HorizontalListCellBuilder extends AbstractBuilder<HorizontalListCellBuilder, DRListCell> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for HorizontalListCellBuilder.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     */
+    protected HorizontalListCellBuilder(ComponentBuilder<?, ?> component) {
+        super(new DRListCell(component.build()));
+    }
+
+    // width
+
+    /**
+     * <p>widthFixed.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public HorizontalListCellBuilder widthFixed() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.LEFT);
+        return this;
+    }
+
+    /**
+     * <p>widthFloat.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public HorizontalListCellBuilder widthFloat() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.FLOAT);
+        return this;
+    }
+
+    /**
+     * <p>widthExpand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public HorizontalListCellBuilder widthExpand() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.EXPAND);
+        return this;
+    }
+
+    // height
+
+    /**
+     * <p>heightFixedOnTop.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public HorizontalListCellBuilder heightFixedOnTop() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.TOP);
+        return this;
+    }
+
+    /**
+     * <p>heightFixedOnMiddle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public HorizontalListCellBuilder heightFixedOnMiddle() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.MIDDLE);
+        return this;
+    }
+
+    /**
+     * <p>heightFixedOnBottom.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public HorizontalListCellBuilder heightFixedOnBottom() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.BOTTOM);
+        return this;
+    }
+
+    /**
+     * <p>heightExpand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     */
+    public HorizontalListCellBuilder heightExpand() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.EXPAND);
+        return this;
+    }
+
+    /**
+     * <p>getListCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.component.DRListCell} object.
+     */
+    public DRListCell getListCell() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java
new file mode 100644
index 0000000..cac8092
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java
@@ -0,0 +1,92 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRHyperLinkComponent;
+import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>Abstract HyperLinkComponentBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("unchecked")
+public abstract class HyperLinkComponentBuilder<T extends HyperLinkComponentBuilder<T, U>, U extends DRHyperLinkComponent> extends DimensionComponentBuilder<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for HyperLinkComponentBuilder.</p>
+     *
+     * @param component a U object.
+     */
+    public HyperLinkComponentBuilder(U component) {
+        super(component);
+    }
+
+    /**
+     * <p>setAnchorName.</p>
+     *
+     * @param anchorName a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setAnchorName(String anchorName) {
+        getObject().setAnchorNameExpression(Expressions.text(anchorName));
+        return (T) this;
+    }
+
+    /**
+     * <p>setAnchorName.</p>
+     *
+     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setAnchorName(DRIExpression<String> anchorNameExpression) {
+        getObject().setAnchorNameExpression(anchorNameExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setBookmarkLevel.</p>
+     *
+     * @param bookmarkLevel a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setBookmarkLevel(Integer bookmarkLevel) {
+        getObject().setBookmarkLevel(bookmarkLevel);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHyperLink.</p>
+     *
+     * @param hyperLink a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a T object.
+     */
+    public T setHyperLink(HyperLinkBuilder hyperLink) {
+        if (hyperLink != null) {
+            getObject().setHyperLink(hyperLink.getHyperLink());
+        } else {
+            getObject().setHyperLink(null);
+        }
+        return (T) this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ImageBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ImageBuilder.java
new file mode 100644
index 0000000..8695ac2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ImageBuilder.java
@@ -0,0 +1,168 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRImage;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.awt.Image;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * <p>ImageBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("deprecation")
+public class ImageBuilder extends HyperLinkComponentBuilder<ImageBuilder, DRImage> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for ImageBuilder.</p>
+     */
+    protected ImageBuilder() {
+        super(new DRImage());
+    }
+
+    /**
+     * <p>setImage.</p>
+     *
+     * @param imageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setImage(DRIExpression<?> imageExpression) {
+        getObject().setImageExpression(imageExpression);
+        return this;
+    }
+
+    /**
+     * <p>setImage.</p>
+     *
+     * @param imagePath a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setImage(String imagePath) {
+        getObject().setImageExpression(Expressions.text(imagePath));
+        getObject().setUsingCache(true);
+        return this;
+    }
+
+    /**
+     * <p>setImage.</p>
+     *
+     * @param image a {@link java.awt.Image} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setImage(Image image) {
+        getObject().setImageExpression(Expressions.image(image));
+        getObject().setUsingCache(true);
+        return this;
+    }
+
+    /**
+     * <p>setImage.</p>
+     *
+     * @param imageInputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setImage(InputStream imageInputStream) {
+        getObject().setImageExpression(Expressions.inputStream(imageInputStream));
+        getObject().setUsingCache(true);
+        return this;
+    }
+
+    /**
+     * <p>setImage.</p>
+     *
+     * @param imageUrl a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setImage(URL imageUrl) {
+        getObject().setImageExpression(Expressions.url(imageUrl));
+        getObject().setUsingCache(true);
+        return this;
+    }
+
+    /**
+     * <p>setImageScale.</p>
+     *
+     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setImageScale(ImageScale imageScale) {
+        getObject().setImageScale(imageScale);
+        return this;
+    }
+
+    /**
+     * <p>setUsingCache.</p>
+     *
+     * @param usingCache a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setUsingCache(Boolean usingCache) {
+        getObject().setUsingCache(usingCache);
+        return this;
+    }
+
+    /**
+     * <p>setLazy.</p>
+     *
+     * @param lazy a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setLazy(Boolean lazy) {
+        getObject().setLazy(lazy);
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @deprecated use setHorizontalImageAlignment instead
+     */
+    @Deprecated
+    public ImageBuilder setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().setHorizontalImageAlignment(HorizontalImageAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().setHorizontalImageAlignment(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalImageAlignment.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     */
+    public ImageBuilder setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        getObject().setHorizontalImageAlignment(horizontalImageAlignment);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/LineBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/LineBuilder.java
new file mode 100644
index 0000000..3595580
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/LineBuilder.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRLine;
+import net.sf.dynamicreports.report.builder.style.PenBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.LineDirection;
+
+/**
+ * <p>LineBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class LineBuilder extends DimensionComponentBuilder<LineBuilder, DRLine> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for LineBuilder.</p>
+     */
+    protected LineBuilder() {
+        super(new DRLine());
+    }
+
+    /**
+     * <p>setDirection.</p>
+     *
+     * @param lineDirection a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.LineBuilder} object.
+     */
+    public LineBuilder setDirection(LineDirection lineDirection) {
+        getObject().setDirection(lineDirection);
+        return this;
+    }
+
+    /**
+     * <p>setPen.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.LineBuilder} object.
+     */
+    public LineBuilder setPen(PenBuilder pen) {
+        if (pen != null) {
+            getObject().setPen(pen.build());
+        } else {
+            getObject().setPen(null);
+        }
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MapBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MapBuilder.java
new file mode 100644
index 0000000..1995214
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MapBuilder.java
@@ -0,0 +1,106 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRMap;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>MapBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MapBuilder extends DimensionComponentBuilder<MapBuilder, DRMap> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for MapBuilder.</p>
+     */
+    protected MapBuilder() {
+        super(new DRMap());
+    }
+
+    /**
+     * <p>setLatitude.</p>
+     *
+     * @param latitude a {@link java.lang.Float} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public MapBuilder setLatitude(Float latitude) {
+        getObject().setLatitudeExpression(Expressions.value(latitude));
+        return this;
+    }
+
+    /**
+     * <p>setLatitude.</p>
+     *
+     * @param latitudeExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public MapBuilder setLatitude(DRIExpression<Float> latitudeExpression) {
+        getObject().setLatitudeExpression(latitudeExpression);
+        return this;
+    }
+
+    /**
+     * <p>setLongitude.</p>
+     *
+     * @param longitude a {@link java.lang.Float} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public MapBuilder setLongitude(Float longitude) {
+        getObject().setLongitudeExpression(Expressions.value(longitude));
+        return this;
+    }
+
+    /**
+     * <p>setLongitude.</p>
+     *
+     * @param longitudeExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public MapBuilder setLongitude(DRIExpression<Float> longitudeExpression) {
+        getObject().setLongitudeExpression(longitudeExpression);
+        return this;
+    }
+
+    /**
+     * <p>setZoom.</p>
+     *
+     * @param zoom a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public MapBuilder setZoom(Integer zoom) {
+        getObject().setZoomExpression(Expressions.value(zoom));
+        return this;
+    }
+
+    /**
+     * <p>setZoom.</p>
+     *
+     * @param zoomExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     */
+    public MapBuilder setZoom(DRIExpression<Integer> zoomExpression) {
+        getObject().setZoomExpression(zoomExpression);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MultiPageListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MultiPageListBuilder.java
new file mode 100644
index 0000000..7d008d3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MultiPageListBuilder.java
@@ -0,0 +1,90 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRMultiPageList;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>MultiPageListBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MultiPageListBuilder extends DimensionComponentBuilder<MultiPageListBuilder, DRMultiPageList> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for MultiPageListBuilder.</p>
+     */
+    protected MultiPageListBuilder() {
+        super(new DRMultiPageList());
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     */
+    public MultiPageListBuilder add(ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ComponentBuilder<?, ?> component : components) {
+            getObject().addComponent(component.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>newPage.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     */
+    public MultiPageListBuilder newPage() {
+        BreakBuilder pageBreak = Components.pageBreak();
+        pageBreak.setPrintWhenExpression(new PageBreakExpression());
+        getObject().addComponent(pageBreak.build());
+        return this;
+    }
+
+    /**
+     * <p>setSplitType.</p>
+     *
+     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     */
+    public MultiPageListBuilder setSplitType(SplitType splitType) {
+        getObject().setSplitType(splitType);
+        return this;
+    }
+
+    private class PageBreakExpression extends AbstractSimpleExpression<Boolean> {
+        private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+        @Override
+        public Boolean evaluate(ReportParameters reportParameters) {
+            return reportParameters.getMasterParameters().getPageRowNumber() > 0;
+        }
+
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageNumberBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageNumberBuilder.java
new file mode 100644
index 0000000..d207730
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageNumberBuilder.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRPageNumber;
+import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>PageNumberBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PageNumberBuilder extends AbstractFormatFieldBuilder<PageNumberBuilder, DRPageNumber> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for PageNumberBuilder.</p>
+     */
+    protected PageNumberBuilder() {
+        super(new DRPageNumber());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        if (getObject().getFormatExpression() == null) {
+            setFormatExpression(new SystemMessageExpression("page_number"));
+        }
+        super.configure();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXofYBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXofYBuilder.java
new file mode 100644
index 0000000..b8443e3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXofYBuilder.java
@@ -0,0 +1,131 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRPageXofY;
+import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>PageXofYBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PageXofYBuilder extends AbstractFormatFieldBuilder<PageXofYBuilder, DRPageXofY> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for PageXofYBuilder.</p>
+     */
+    protected PageXofYBuilder() {
+        super(new DRPageXofY());
+    }
+
+    /**
+     * Sets the pageX component preferred width.
+     *
+     * @param width the pageX component preferred width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXofYBuilder setPageXWidth(Integer width) {
+        getObject().setPageXWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the pageX component fixed width.
+     *
+     * @param width the pageX component fixed width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXofYBuilder setPageXFixedWidth(Integer width) {
+        getObject().setPageXWidth(width);
+        getObject().setPageXWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the pageX component minimum width.
+     *
+     * @param width the pageX component minimum width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXofYBuilder setPageXMinWidth(Integer width) {
+        getObject().setPageXWidth(width);
+        getObject().setPageXWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * Sets the pageY component preferred width.
+     *
+     * @param width the pageY component preferred width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXofYBuilder setPageYWidth(Integer width) {
+        getObject().setPageYWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the pageY component fixed width.
+     *
+     * @param width the pageY component fixed width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXofYBuilder setPageYFixedWidth(Integer width) {
+        getObject().setPageYWidth(width);
+        getObject().setPageYWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the pageY component minimum width.
+     *
+     * @param width the pageY component minimum width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXofYBuilder setPageYMinWidth(Integer width) {
+        getObject().setPageYWidth(width);
+        getObject().setPageYWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        if (getObject().getFormatExpression() == null) {
+            setFormatExpression(new SystemMessageExpression("page_x_of_y"));
+        }
+        super.configure();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXslashYBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXslashYBuilder.java
new file mode 100644
index 0000000..febbcbd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXslashYBuilder.java
@@ -0,0 +1,131 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRPageXofY;
+import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>PageXslashYBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PageXslashYBuilder extends AbstractFormatFieldBuilder<PageXslashYBuilder, DRPageXofY> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for PageXslashYBuilder.</p>
+     */
+    protected PageXslashYBuilder() {
+        super(new DRPageXofY());
+    }
+
+    /**
+     * Sets the pageX component preferred width.
+     *
+     * @param width the pageX component preferred width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXslashYBuilder setPageXWidth(Integer width) {
+        getObject().setPageXWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the pageX component fixed width.
+     *
+     * @param width the pageX component fixed width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXslashYBuilder setPageXFixedWidth(Integer width) {
+        getObject().setPageXWidth(width);
+        getObject().setPageXWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the pageX component minimum width.
+     *
+     * @param width the pageX component minimum width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXslashYBuilder setPageXMinWidth(Integer width) {
+        getObject().setPageXWidth(width);
+        getObject().setPageXWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * Sets the pageY component preferred width.
+     *
+     * @param width the pageY component preferred width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXslashYBuilder setPageYWidth(Integer width) {
+        getObject().setPageYWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the pageY component fixed width.
+     *
+     * @param width the pageY component fixed width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXslashYBuilder setPageYFixedWidth(Integer width) {
+        getObject().setPageYWidth(width);
+        getObject().setPageYWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the pageY component minimum width.
+     *
+     * @param width the pageY component minimum width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public PageXslashYBuilder setPageYMinWidth(Integer width) {
+        getObject().setPageYWidth(width);
+        getObject().setPageYWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        if (getObject().getFormatExpression() == null) {
+            setFormatExpression(new SystemMessageExpression("page_x_slash_y"));
+        }
+        super.configure();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/RectangleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/RectangleBuilder.java
new file mode 100644
index 0000000..19ea9e4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/RectangleBuilder.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRRectangle;
+import net.sf.dynamicreports.report.builder.style.PenBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>RectangleBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class RectangleBuilder extends DimensionComponentBuilder<RectangleBuilder, DRRectangle> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for RectangleBuilder.</p>
+     */
+    protected RectangleBuilder() {
+        super(new DRRectangle());
+    }
+
+    /**
+     * <p>setRadius.</p>
+     *
+     * @param radius a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     */
+    public RectangleBuilder setRadius(Integer radius) {
+        getObject().setRadius(radius);
+        return this;
+    }
+
+    /**
+     * <p>setPen.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     */
+    public RectangleBuilder setPen(PenBuilder pen) {
+        if (pen != null) {
+            getObject().setPen(pen.build());
+        } else {
+            getObject().setPen(null);
+        }
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/SubreportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/SubreportBuilder.java
new file mode 100644
index 0000000..faf3858
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/SubreportBuilder.java
@@ -0,0 +1,164 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRSubreport;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JasperReport;
+
+import java.sql.Connection;
+import java.util.Map;
+
+/**
+ * <p>SubreportBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SubreportBuilder extends DimensionComponentBuilder<SubreportBuilder, DRSubreport> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for SubreportBuilder.</p>
+     */
+    protected SubreportBuilder() {
+        super(new DRSubreport());
+    }
+
+    // report
+
+    /**
+     * <p>setReport.</p>
+     *
+     * @param reportBuilder a {@link net.sf.dynamicreports.report.builder.ReportBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setReport(ReportBuilder<?> reportBuilder) {
+        getObject().setReportExpression(Expressions.value(reportBuilder));
+        return this;
+    }
+
+    /**
+     * <p>setReport.</p>
+     *
+     * @param jasperReport a {@link net.sf.jasperreports.engine.JasperReport} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setReport(JasperReport jasperReport) {
+        getObject().setReportExpression(Expressions.value(jasperReport));
+        return this;
+    }
+
+    /**
+     * <p>setReport.</p>
+     *
+     * @param reportExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setReport(DRIExpression<?> reportExpression) {
+        getObject().setReportExpression(reportExpression);
+        return this;
+    }
+
+    // parameters
+
+    /**
+     * <p>setParameters.</p>
+     *
+     * @param parameters a {@link java.util.Map} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setParameters(Map<String, Object> parameters) {
+        getObject().setParametersExpression(Expressions.value(parameters));
+        return this;
+    }
+
+    /**
+     * <p>setParameters.</p>
+     *
+     * @param parametersExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setParameters(DRIExpression<Map<String, Object>> parametersExpression) {
+        getObject().setParametersExpression(parametersExpression);
+        return this;
+    }
+
+    // connection
+
+    /**
+     * <p>setConnection.</p>
+     *
+     * @param connection a {@link java.sql.Connection} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setConnection(Connection connection) {
+        getObject().setConnectionExpression(Expressions.value(connection));
+        return this;
+    }
+
+    /**
+     * <p>setConnection.</p>
+     *
+     * @param connectionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setConnection(DRIExpression<Connection> connectionExpression) {
+        getObject().setConnectionExpression(connectionExpression);
+        return this;
+    }
+
+    // datasource
+
+    /**
+     * <p>setDataSource.</p>
+     *
+     * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setDataSource(JRDataSource dataSource) {
+        getObject().setDataSourceExpression(Expressions.dataSource(dataSource));
+        return this;
+    }
+
+    /**
+     * <p>setDataSource.</p>
+     *
+     * @param dataSourceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setDataSource(DRIExpression<JRDataSource> dataSourceExpression) {
+        getObject().setDataSourceExpression(dataSourceExpression);
+        return this;
+    }
+
+    /**
+     * <p>setRunToBottom.</p>
+     *
+     * @param runToBottom a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     */
+    public SubreportBuilder setRunToBottom(Boolean runToBottom) {
+        getObject().setRunToBottom(runToBottom);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TextFieldBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TextFieldBuilder.java
new file mode 100644
index 0000000..888bd6a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TextFieldBuilder.java
@@ -0,0 +1,352 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.VariableBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+
+/**
+ * <p>TextFieldBuilder class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+@SuppressWarnings("deprecation")
+public class TextFieldBuilder<T> extends HyperLinkComponentBuilder<TextFieldBuilder<T>, DRTextField<T>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for TextFieldBuilder.</p>
+     */
+    protected TextFieldBuilder() {
+        super(new DRTextField<T>());
+    }
+
+    /**
+     * <p>setText.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setText(final VariableBuilder<T> variable) {
+        Validate.notNull(variable, "variable must not be null");
+        getObject().setValueExpression(variable.getVariable());
+        return this;
+    }
+
+    /**
+     * <p>setText.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setText(final FieldBuilder<T> field) {
+        Validate.notNull(field, "field must not be null");
+        getObject().setValueExpression(field.getField());
+        if (getObject().getDataType() == null) {
+            getObject().setDataType(field.getField().getDataType());
+        }
+        return this;
+    }
+
+    /**
+     * <p>setText.</p>
+     *
+     * @param textExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setText(final DRIExpression<T> textExpression) {
+        getObject().setValueExpression(textExpression);
+        if (textExpression instanceof DRIField && getObject().getDataType() == null) {
+            getObject().setDataType(((DRIField<T>) textExpression).getDataType());
+        }
+        return this;
+    }
+
+    /**
+     * <p>setText.</p>
+     *
+     * @param text a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    @SuppressWarnings("unchecked")
+    public TextFieldBuilder<T> setText(final String text) {
+        getObject().setValueExpression((DRIExpression<T>) Expressions.text(text));
+        return this;
+    }
+
+    /**
+     * <p>setText.</p>
+     *
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    @SuppressWarnings("unchecked")
+    public TextFieldBuilder<T> setText(final Number number) {
+        getObject().setValueExpression((DRIExpression<T>) Expressions.number(number));
+        return this;
+    }
+
+    /**
+     * <p>setText.</p>
+     *
+     * @param date a {@link java.util.Date} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    @SuppressWarnings("unchecked")
+    public TextFieldBuilder<T> setText(final Date date) {
+        getObject().setValueExpression((DRIExpression<T>) Expressions.date(date));
+        return this;
+    }
+
+    /**
+     * <p>setPattern.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setPattern(final String pattern) {
+        getObject().setPattern(pattern);
+        return this;
+    }
+
+    /**
+     * <p>setPattern.</p>
+     *
+     * @param patternExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setPattern(final DRIExpression<String> patternExpression) {
+        getObject().setPatternExpression(patternExpression);
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @deprecated use setHorizontalTextAlignment instead
+     */
+    @Deprecated
+    public TextFieldBuilder<T> setHorizontalAlignment(final HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().setHorizontalTextAlignment(HorizontalTextAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().setHorizontalTextAlignment(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalTextAlignment.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
+        getObject().setHorizontalTextAlignment(horizontalTextAlignment);
+        return this;
+    }
+
+    /**
+     * <p>setValueFormatter.</p>
+     *
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setValueFormatter(final DRIValueFormatter<?, ? super T> valueFormatter) {
+        getObject().setValueFormatter(valueFormatter);
+        return this;
+    }
+
+    /**
+     * <p>setDataType.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setDataType(final DRIDataType<? super T, T> dataType) {
+        getObject().setDataType(dataType);
+        return this;
+    }
+
+    /**
+     * This method is used to define the preferred width of a textField. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
+     *
+     * @param columns the number of preferred columns >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public TextFieldBuilder<T> setColumns(final Integer columns) {
+        getObject().setColumns(columns);
+        return this;
+    }
+
+    /**
+     * This method is used to define the fixed width of a textField. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
+     *
+     * @param columns the number of fixed columns >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public TextFieldBuilder<T> setFixedColumns(final Integer columns) {
+        getObject().setColumns(columns);
+        getObject().setWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * This method is used to define the minimum width of a textField. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
+     *
+     * @param columns the number of minimum columns >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public TextFieldBuilder<T> setMinColumns(final Integer columns) {
+        getObject().setColumns(columns);
+        getObject().setWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * This method is used to define the preferred height of a textField. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of preferred rows >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public TextFieldBuilder<T> setRows(final Integer rows) {
+        getObject().setRows(rows);
+        return this;
+    }
+
+    /**
+     * This method is used to define the fixed height of a textField. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of fixed rows >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public TextFieldBuilder<T> setFixedRows(final Integer rows) {
+        getObject().setRows(rows);
+        getObject().setHeightType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * This method is used to define the minimum height of a textField. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of minimum rows >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public TextFieldBuilder<T> setMinRows(final Integer rows) {
+        getObject().setRows(rows);
+        getObject().setHeightType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * <p>setEvaluationTime.</p>
+     *
+     * @param evaluationTime a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setEvaluationTime(final Evaluation evaluationTime) {
+        getObject().setEvaluationTime(evaluationTime);
+        return this;
+    }
+
+    /**
+     * <p>setEvaluationGroup.</p>
+     *
+     * @param evaluationGroup a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setEvaluationGroup(final GroupBuilder<?> evaluationGroup) {
+        Validate.notNull(evaluationGroup, "evaluationGroup must not be null");
+        getObject().setEvaluationGroup(evaluationGroup.build());
+        getObject().setEvaluationTime(Evaluation.GROUP);
+        return this;
+    }
+
+    /**
+     * <p>setMarkup.</p>
+     *
+     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setMarkup(final Markup markup) {
+        getObject().setMarkup(markup);
+        return this;
+    }
+
+    /**
+     * <p>setStretchWithOverflow.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @deprecated replaced by {@link #setTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public TextFieldBuilder<T> setStretchWithOverflow(final Boolean stretchWithOverflow) {
+        getObject().setStretchWithOverflow(stretchWithOverflow);
+        return this;
+    }
+
+    /**
+     * <p>setTextAdjust.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a T object.
+     */
+    public TextFieldBuilder<T> setTextAdjust(final TextAdjust textAdjust) {
+        getObject().setTextAdjust(textAdjust);
+        return this;
+    }
+
+    /**
+     * <p>setPrintRepeatedValues.</p>
+     *
+     * @param printRepeatedValues a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     */
+    public TextFieldBuilder<T> setPrintRepeatedValues(final Boolean printRepeatedValues) {
+        getObject().setPrintRepeatedValues(printRepeatedValues);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TotalPagesBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TotalPagesBuilder.java
new file mode 100644
index 0000000..264a56d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TotalPagesBuilder.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRTotalPages;
+import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>TotalPagesBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TotalPagesBuilder extends AbstractFormatFieldBuilder<TotalPagesBuilder, DRTotalPages> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for TotalPagesBuilder.</p>
+     */
+    protected TotalPagesBuilder() {
+        super(new DRTotalPages());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        if (getObject().getFormatExpression() == null) {
+            setFormatExpression(new SystemMessageExpression("total_pages"));
+        }
+        super.configure();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListBuilder.java
new file mode 100644
index 0000000..2d33cd0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListBuilder.java
@@ -0,0 +1,133 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRList;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ListType;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>VerticalListBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class VerticalListBuilder extends DimensionComponentBuilder<VerticalListBuilder, DRList> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for VerticalListBuilder.</p>
+     */
+    protected VerticalListBuilder() {
+        super(new DRList(ListType.VERTICAL));
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder add(ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ComponentBuilder<?, ?> component : components) {
+            getObject().addComponent(component.getComponent());
+        }
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param gap        a {@link java.lang.Integer} object.
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder add(Integer gap, ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        for (ComponentBuilder<?, ?> component : components) {
+            add(Components.vListCell(Components.filler().setHeight(gap)).heightFixed());
+            add(component);
+        }
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder add(VerticalListCellBuilder... cells) {
+        Validate.notNull(cells, "cells must not be null");
+        Validate.noNullElements(cells, "cells must not contains null cell");
+        for (VerticalListCellBuilder cell : cells) {
+            getObject().addCell(cell.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param gap   a {@link java.lang.Integer} object.
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder add(Integer gap, VerticalListCellBuilder... cells) {
+        Validate.notNull(cells, "cells must not be null");
+        for (VerticalListCellBuilder cell : cells) {
+            add(Components.vListCell(Components.filler().setHeight(gap)).heightFixed(), cell);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setGap.</p>
+     *
+     * @param gap a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder setGap(Integer gap) {
+        getObject().setGap(gap);
+        return this;
+    }
+
+    /**
+     * <p>setBackgroundComponent.</p>
+     *
+     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     */
+    public VerticalListBuilder setBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
+        Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+        getObject().setBackgroundComponent(backgroundComponent.build());
+        return this;
+    }
+
+    /**
+     * <p>getList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.component.DRList} object.
+     */
+    public DRList getList() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListCellBuilder.java
new file mode 100644
index 0000000..2785cfc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListCellBuilder.java
@@ -0,0 +1,126 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRListCell;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+
+/**
+ * <p>VerticalListCellBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class VerticalListCellBuilder extends AbstractBuilder<VerticalListCellBuilder, DRListCell> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for VerticalListCellBuilder.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     */
+    protected VerticalListCellBuilder(ComponentBuilder<?, ?> component) {
+        super(new DRListCell(component.build()));
+    }
+
+    // width
+
+    /**
+     * <p>widthFixedOnLeft.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public VerticalListCellBuilder widthFixedOnLeft() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.LEFT);
+        return this;
+    }
+
+    /**
+     * <p>widthFixedOnCenter.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public VerticalListCellBuilder widthFixedOnCenter() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.CENTER);
+        return this;
+    }
+
+    /**
+     * <p>widthFixedOnRight.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public VerticalListCellBuilder widthFixedOnRight() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.RIGHT);
+        return this;
+    }
+
+    /**
+     * <p>widthFloat.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public VerticalListCellBuilder widthFloat() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.FLOAT);
+        return this;
+    }
+
+    /**
+     * <p>widthExpand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public VerticalListCellBuilder widthExpand() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.EXPAND);
+        return this;
+    }
+
+    // height
+
+    /**
+     * <p>heightFixed.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public VerticalListCellBuilder heightFixed() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.TOP);
+        return this;
+    }
+
+    /**
+     * <p>heightExpand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     */
+    public VerticalListCellBuilder heightExpand() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.EXPAND);
+        return this;
+    }
+
+    /**
+     * <p>getListCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.component.DRListCell} object.
+     */
+    public DRListCell getListCell() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListBuilder.java
new file mode 100644
index 0000000..e7044ec
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListBuilder.java
@@ -0,0 +1,101 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRXyList;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>XyListBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class XyListBuilder extends DimensionComponentBuilder<XyListBuilder, DRXyList> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for XyListBuilder.</p>
+     */
+    protected XyListBuilder() {
+        super(new DRXyList());
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     */
+    public XyListBuilder add(Integer x, Integer y, ComponentBuilder<?, ?> component) {
+        Validate.notNull(x, "x must not be null");
+        Validate.notNull(y, "y must not be null");
+        Validate.notNull(component, "component must not be null");
+        getObject().addComponent(x, y, component.getComponent());
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param width     a {@link java.lang.Integer} object.
+     * @param height    a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     */
+    public XyListBuilder add(Integer x, Integer y, Integer width, Integer height, ComponentBuilder<?, ?> component) {
+        Validate.notNull(x, "x must not be null");
+        Validate.notNull(y, "y must not be null");
+        Validate.notNull(component, "component must not be null");
+        if (component instanceof DimensionComponentBuilder) {
+            ((DimensionComponentBuilder<?, ?>) component).setWidth(width);
+            ((DimensionComponentBuilder<?, ?>) component).setHeight(height);
+        }
+        getObject().addComponent(x, y, component.getComponent());
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     */
+    public XyListBuilder add(XyListCellBuilder... cells) {
+        Validate.notNull(cells, "cells must not be null");
+        Validate.noNullElements(cells, "cells must not contains null cell");
+        for (XyListCellBuilder cell : cells) {
+            getObject().addCell(cell.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>getXyList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.component.DRXyList} object.
+     */
+    public DRXyList getXyList() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListCellBuilder.java
new file mode 100644
index 0000000..6fb9df7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListCellBuilder.java
@@ -0,0 +1,69 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.component;
+
+import net.sf.dynamicreports.report.base.component.DRXyListCell;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>XyListCellBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class XyListCellBuilder extends AbstractBuilder<XyListCellBuilder, DRXyListCell> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for XyListCellBuilder.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     */
+    protected XyListCellBuilder(Integer x, Integer y, ComponentBuilder<?, ?> component) {
+        super(new DRXyListCell(x, y, component.build()));
+    }
+
+    /**
+     * <p>Constructor for XyListCellBuilder.</p>
+     *
+     * @param x         a {@link java.lang.Integer} object.
+     * @param y         a {@link java.lang.Integer} object.
+     * @param width     a {@link java.lang.Integer} object.
+     * @param height    a {@link java.lang.Integer} object.
+     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     */
+    protected XyListCellBuilder(Integer x, Integer y, Integer width, Integer height, ComponentBuilder<?, ?> component) {
+        super(new DRXyListCell(x, y, component.build()));
+        if (component instanceof DimensionComponentBuilder) {
+            ((DimensionComponentBuilder<?, ?>) component).setWidth(width);
+            ((DimensionComponentBuilder<?, ?>) component).setHeight(height);
+        }
+    }
+
+    /**
+     * <p>getXyListCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.component.DRXyListCell} object.
+     */
+    public DRXyListCell getXyListCell() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java
new file mode 100644
index 0000000..831bec4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java
@@ -0,0 +1,81 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract AbstractBetweenValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractBetweenValueExpression<T extends Number> extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIValue<T> value;
+    private Number min;
+    private Number max;
+
+    /**
+     * <p>Constructor for AbstractBetweenValueExpression.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param min   a {@link java.lang.Number} object.
+     * @param max   a {@link java.lang.Number} object.
+     */
+    public AbstractBetweenValueExpression(DRIValue<T> value, Number min, Number max) {
+        Validate.notNull(value, "value must not be null");
+        Validate.notNull(min, "min must not be null");
+        Validate.notNull(max, "min must not be null");
+        Validate.isTrue(min.doubleValue() < max.doubleValue(), "min < max");
+        this.value = value;
+        this.min = min;
+        this.max = max;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        Number actualValue = reportParameters.getValue(value);
+        if (actualValue != null) {
+            return compare(actualValue, min, max);
+        }
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<Boolean> getValueClass() {
+        return Boolean.class;
+    }
+
+    /**
+     * <p>compare.</p>
+     *
+     * @param actualValue a {@link java.lang.Number} object.
+     * @param min         a {@link java.lang.Number} object.
+     * @param max         a {@link java.lang.Number} object.
+     * @return a {@link java.lang.Boolean} object.
+     */
+    protected abstract Boolean compare(Number actualValue, Number min, Number max);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValueExpression.java
new file mode 100644
index 0000000..55d3c77
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValueExpression.java
@@ -0,0 +1,75 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract AbstractValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractValueExpression<T extends Number> extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIValue<T> value;
+    private Number number;
+
+    /**
+     * <p>Constructor for AbstractValueExpression.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     */
+    public AbstractValueExpression(DRIValue<T> value, Number number) {
+        Validate.notNull(value, "value must not be null");
+        Validate.notNull(number, "number must not be null");
+        this.value = value;
+        this.number = number;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        Number actualValue = reportParameters.getValue(value);
+        if (actualValue != null) {
+            return compare(actualValue, number);
+        }
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<Boolean> getValueClass() {
+        return Boolean.class;
+    }
+
+    /**
+     * <p>compare.</p>
+     *
+     * @param actualValue a {@link java.lang.Number} object.
+     * @param number      a {@link java.lang.Number} object.
+     * @return a {@link java.lang.Boolean} object.
+     */
+    protected abstract Boolean compare(Number actualValue, Number number);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValuesExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValuesExpression.java
new file mode 100644
index 0000000..ad1ee5a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValuesExpression.java
@@ -0,0 +1,75 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract AbstractValuesExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractValuesExpression<T extends Number> extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIValue<T> value;
+    private Number[] numbers;
+
+    /**
+     * <p>Constructor for AbstractValuesExpression.</p>
+     *
+     * @param value   a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param numbers a {@link java.lang.Number} object.
+     */
+    public AbstractValuesExpression(DRIValue<T> value, Number... numbers) {
+        Validate.notNull(value, "value must not be null");
+        Validate.noNullElements(numbers, "numbers must not contains null number");
+        this.value = value;
+        this.numbers = numbers;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        Number actualValue = reportParameters.getValue(value);
+        if (actualValue != null) {
+            return compare(actualValue, numbers);
+        }
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<Boolean> getValueClass() {
+        return Boolean.class;
+    }
+
+    /**
+     * <p>compare.</p>
+     *
+     * @param actualValue a {@link java.lang.Number} object.
+     * @param numbers     an array of {@link java.lang.Number} objects.
+     * @return a {@link java.lang.Boolean} object.
+     */
+    protected abstract Boolean compare(Number actualValue, Number[] numbers);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/BetweenValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/BetweenValueExpression.java
new file mode 100644
index 0000000..18c59e8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/BetweenValueExpression.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * <p>BetweenValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BetweenValueExpression<T extends Number> extends AbstractBetweenValueExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for BetweenValueExpression.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param min   a {@link java.lang.Number} object.
+     * @param max   a {@link java.lang.Number} object.
+     */
+    public BetweenValueExpression(DRIValue<T> value, Number min, Number max) {
+        super(value, min, max);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Boolean compare(Number actualValue, Number min, Number max) {
+        return actualValue.doubleValue() >= min.doubleValue() && actualValue.doubleValue() <= max.doubleValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/ConditionBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/ConditionBuilders.java
new file mode 100644
index 0000000..2be3b7b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/ConditionBuilders.java
@@ -0,0 +1,147 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * A set of build in condition expressions
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ConditionBuilders {
+
+    /**
+     * <p>equal.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param values a T object.
+     * @param values a T object.
+     * @param <T>    a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.EqualExpression} object.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> EqualExpression equal(DRIValue<T> value, T... values) {
+        return Conditions.equal(value, values);
+    }
+
+    /**
+     * <p>equal.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.EqualValueExpression} object.
+     */
+    public <T extends Number> EqualValueExpression<T> equal(DRIValue<T> value, Number... number) {
+        return Conditions.equal(value, number);
+    }
+
+    /**
+     * <p>unEqual.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param values a T object.
+     * @param values a T object.
+     * @param <T>    a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.UnEqualExpression} object.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> UnEqualExpression unEqual(DRIValue<T> value, T... values) {
+        return Conditions.unEqual(value, values);
+    }
+
+    /**
+     * <p>unEqual.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.UnEqualValueExpression} object.
+     */
+    public <T extends Number> UnEqualValueExpression<T> unEqual(DRIValue<T> value, Number... number) {
+        return Conditions.unEqual(value, number);
+    }
+
+    /**
+     * <p>smaller.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.SmallerValueExpression} object.
+     */
+    public <T extends Number> SmallerValueExpression<T> smaller(DRIValue<T> value, Number number) {
+        return Conditions.smaller(value, number);
+    }
+
+    /**
+     * <p>smallerOrEquals.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.SmallerOrEqualsValueExpression} object.
+     */
+    public <T extends Number> SmallerOrEqualsValueExpression<T> smallerOrEquals(DRIValue<T> value, Number number) {
+        return Conditions.smallerOrEquals(value, number);
+    }
+
+    /**
+     * <p>greater.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.GreaterValueExpression} object.
+     */
+    public <T extends Number> GreaterValueExpression<T> greater(DRIValue<T> value, Number number) {
+        return Conditions.greater(value, number);
+    }
+
+    /**
+     * <p>greaterOrEquals.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.GreaterOrEqualsValueExpression} object.
+     */
+    public <T extends Number> GreaterOrEqualsValueExpression<T> greaterOrEquals(DRIValue<T> value, Number number) {
+        return Conditions.greaterOrEquals(value, number);
+    }
+
+    /**
+     * <p>between.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param min   a {@link java.lang.Number} object.
+     * @param max   a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.BetweenValueExpression} object.
+     */
+    public <T extends Number> BetweenValueExpression<T> between(DRIValue<T> value, Number min, Number max) {
+        return Conditions.between(value, min, max);
+    }
+
+    /**
+     * <p>notBetween.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param min   a {@link java.lang.Number} object.
+     * @param max   a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.NotBetweenValueExpression} object.
+     */
+    public <T extends Number> NotBetweenValueExpression<T> notBetween(DRIValue<T> value, Number min, Number max) {
+        return Conditions.notBetween(value, min, max);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/Conditions.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/Conditions.java
new file mode 100644
index 0000000..46f6a02
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/Conditions.java
@@ -0,0 +1,147 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * A set of build in condition expressions
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Conditions {
+
+    /**
+     * <p>equal.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param values a T object.
+     * @param values a T object.
+     * @param <T>    a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.EqualExpression} object.
+     */
+    @SafeVarargs
+    public static <T> EqualExpression equal(DRIValue<T> value, T... values) {
+        return new EqualExpression(value, values);
+    }
+
+    /**
+     * <p>equal.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.EqualValueExpression} object.
+     */
+    public static <T extends Number> EqualValueExpression<T> equal(DRIValue<T> value, Number... number) {
+        return new EqualValueExpression<T>(value, number);
+    }
+
+    /**
+     * <p>unEqual.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param values a T object.
+     * @param values a T object.
+     * @param <T>    a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.UnEqualExpression} object.
+     */
+    @SafeVarargs
+    public static <T> UnEqualExpression unEqual(DRIValue<T> value, T... values) {
+        return new UnEqualExpression(value, values);
+    }
+
+    /**
+     * <p>unEqual.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.UnEqualValueExpression} object.
+     */
+    public static <T extends Number> UnEqualValueExpression<T> unEqual(DRIValue<T> value, Number... number) {
+        return new UnEqualValueExpression<T>(value, number);
+    }
+
+    /**
+     * <p>smaller.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.SmallerValueExpression} object.
+     */
+    public static <T extends Number> SmallerValueExpression<T> smaller(DRIValue<T> value, Number number) {
+        return new SmallerValueExpression<T>(value, number);
+    }
+
+    /**
+     * <p>smallerOrEquals.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.SmallerOrEqualsValueExpression} object.
+     */
+    public static <T extends Number> SmallerOrEqualsValueExpression<T> smallerOrEquals(DRIValue<T> value, Number number) {
+        return new SmallerOrEqualsValueExpression<T>(value, number);
+    }
+
+    /**
+     * <p>greater.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.GreaterValueExpression} object.
+     */
+    public static <T extends Number> GreaterValueExpression<T> greater(DRIValue<T> value, Number number) {
+        return new GreaterValueExpression<T>(value, number);
+    }
+
+    /**
+     * <p>greaterOrEquals.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.GreaterOrEqualsValueExpression} object.
+     */
+    public static <T extends Number> GreaterOrEqualsValueExpression<T> greaterOrEquals(DRIValue<T> value, Number number) {
+        return new GreaterOrEqualsValueExpression<T>(value, number);
+    }
+
+    /**
+     * <p>between.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param min   a {@link java.lang.Number} object.
+     * @param max   a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.BetweenValueExpression} object.
+     */
+    public static <T extends Number> BetweenValueExpression<T> between(DRIValue<T> value, Number min, Number max) {
+        return new BetweenValueExpression<T>(value, min, max);
+    }
+
+    /**
+     * <p>notBetween.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param min   a {@link java.lang.Number} object.
+     * @param max   a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.condition.NotBetweenValueExpression} object.
+     */
+    public static <T extends Number> NotBetweenValueExpression<T> notBetween(DRIValue<T> value, Number min, Number max) {
+        return new NotBetweenValueExpression<T>(value, min, max);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualExpression.java
new file mode 100644
index 0000000..d590c26
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualExpression.java
@@ -0,0 +1,70 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>EqualExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class EqualExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIValue<?> value;
+    private Object[] values;
+
+    @SafeVarargs
+    /**
+     * Constructor for EqualExpression.
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param values a T object.
+     * @param <T> a T object.
+     */
+    public <T> EqualExpression(DRIValue<T> value, T... values) {
+        Validate.notNull(value, "value must not be null");
+        Validate.noNullElements(values, "values must not contains null value");
+        this.value = value;
+        this.values = values;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        Object actualValue = reportParameters.getValue(value);
+        for (Object value : values) {
+            if (value.equals(actualValue)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<Boolean> getValueClass() {
+        return Boolean.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualValueExpression.java
new file mode 100644
index 0000000..dea221f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualValueExpression.java
@@ -0,0 +1,52 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * <p>EqualValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class EqualValueExpression<T extends Number> extends AbstractValuesExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for EqualValueExpression.</p>
+     *
+     * @param value   a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param numbers a {@link java.lang.Number} object.
+     */
+    public EqualValueExpression(DRIValue<T> value, Number... numbers) {
+        super(value, numbers);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Boolean compare(Number actualValue, Number[] numbers) {
+        for (Number number : numbers) {
+            if (actualValue.doubleValue() == number.doubleValue()) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java
new file mode 100644
index 0000000..c4ffc4d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java
@@ -0,0 +1,47 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * <p>GreaterOrEqualsValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GreaterOrEqualsValueExpression<T extends Number> extends AbstractValueExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for GreaterOrEqualsValueExpression.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     */
+    public GreaterOrEqualsValueExpression(DRIValue<T> value, Number number) {
+        super(value, number);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Boolean compare(Number actualValue, Number number) {
+        return actualValue.doubleValue() >= number.doubleValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterValueExpression.java
new file mode 100644
index 0000000..f41f785
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterValueExpression.java
@@ -0,0 +1,47 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * <p>GreaterValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GreaterValueExpression<T extends Number> extends AbstractValueExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for GreaterValueExpression.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     */
+    public GreaterValueExpression(DRIValue<T> value, Number number) {
+        super(value, number);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Boolean compare(Number actualValue, Number number) {
+        return actualValue.doubleValue() > number.doubleValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/NotBetweenValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/NotBetweenValueExpression.java
new file mode 100644
index 0000000..569f881
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/NotBetweenValueExpression.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * <p>NotBetweenValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class NotBetweenValueExpression<T extends Number> extends AbstractBetweenValueExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for NotBetweenValueExpression.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param min   a {@link java.lang.Number} object.
+     * @param max   a {@link java.lang.Number} object.
+     */
+    public NotBetweenValueExpression(DRIValue<T> value, Number min, Number max) {
+        super(value, min, max);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Boolean compare(Number actualValue, Number min, Number max) {
+        return actualValue.doubleValue() < min.doubleValue() || actualValue.doubleValue() > max.doubleValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java
new file mode 100644
index 0000000..643f9f7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java
@@ -0,0 +1,47 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * <p>SmallerOrEqualsValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SmallerOrEqualsValueExpression<T extends Number> extends AbstractValueExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for SmallerOrEqualsValueExpression.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     */
+    public SmallerOrEqualsValueExpression(DRIValue<T> value, Number number) {
+        super(value, number);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Boolean compare(Number actualValue, Number number) {
+        return actualValue.doubleValue() <= number.doubleValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerValueExpression.java
new file mode 100644
index 0000000..cf2f575
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerValueExpression.java
@@ -0,0 +1,47 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * <p>SmallerValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SmallerValueExpression<T extends Number> extends AbstractValueExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for SmallerValueExpression.</p>
+     *
+     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param number a {@link java.lang.Number} object.
+     */
+    public SmallerValueExpression(DRIValue<T> value, Number number) {
+        super(value, number);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Boolean compare(Number actualValue, Number number) {
+        return actualValue.doubleValue() < number.doubleValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualExpression.java
new file mode 100644
index 0000000..31963b4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualExpression.java
@@ -0,0 +1,70 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>UnEqualExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class UnEqualExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIValue<?> value;
+    private Object[] values;
+
+    @SafeVarargs
+    /**
+     * <p>Constructor for UnEqualExpression.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param values a T object.
+     * @param <T> a T object.
+     */
+    public <T> UnEqualExpression(DRIValue<T> value, T... values) {
+        Validate.notNull(value, "value must not be null");
+        Validate.noNullElements(values, "values must not contains null value");
+        this.value = value;
+        this.values = values;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        Object actualValue = reportParameters.getValue(value);
+        for (Object value : values) {
+            if (value.equals(actualValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<Boolean> getValueClass() {
+        return Boolean.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualValueExpression.java
new file mode 100644
index 0000000..0a1a112
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualValueExpression.java
@@ -0,0 +1,52 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.condition;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+
+/**
+ * <p>UnEqualValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class UnEqualValueExpression<T extends Number> extends AbstractValuesExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for UnEqualValueExpression.</p>
+     *
+     * @param value   a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param numbers a {@link java.lang.Number} object.
+     */
+    public UnEqualValueExpression(DRIValue<T> value, Number... numbers) {
+        super(value, numbers);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Boolean compare(Number actualValue, Number[] numbers) {
+        for (Number number : numbers) {
+            if (actualValue.doubleValue() == number.doubleValue()) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java
new file mode 100644
index 0000000..fee7da1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java
@@ -0,0 +1,423 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.crosstab;
+
+import java.util.Comparator;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.column.DRValueColumn;
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabGroup;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+
+/**
+ * <p>Abstract AbstractCrosstabGroupBuilder class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+@SuppressWarnings( {"unchecked", "deprecation"})
+public abstract class AbstractCrosstabGroupBuilder<T extends AbstractCrosstabGroupBuilder<T, U, V>, U extends DRCrosstabGroup<V>, V> extends AbstractBuilder<T, U> implements DRIValue<V> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for AbstractCrosstabGroupBuilder.</p>
+     *
+     * @param column        a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param crosstabGroup a U object.
+     */
+    protected AbstractCrosstabGroupBuilder(final ValueColumnBuilder<?, V> column, final U crosstabGroup) {
+        super(crosstabGroup);
+        Validate.notNull(column, "column must not be null");
+        final DRValueColumn<V> col = column.getColumn();
+        getObject().setExpression(col);
+        getObject().setDataType(col.getComponent().getDataType());
+        getObject().setHeaderPattern(col.getComponent().getPattern());
+    }
+
+    /**
+     * <p>Constructor for AbstractCrosstabGroupBuilder.</p>
+     *
+     * @param field         a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param crosstabGroup a U object.
+     */
+    protected AbstractCrosstabGroupBuilder(final FieldBuilder<V> field, final U crosstabGroup) {
+        super(crosstabGroup);
+        Validate.notNull(field, "field must not be null");
+        getObject().setExpression(field.getField());
+        getObject().setDataType(field.getField().getDataType());
+    }
+
+    /**
+     * <p>Constructor for AbstractCrosstabGroupBuilder.</p>
+     *
+     * @param expression    a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param crosstabGroup a U object.
+     */
+    protected AbstractCrosstabGroupBuilder(final DRIExpression<V> expression, final U crosstabGroup) {
+        super(crosstabGroup);
+        getObject().setExpression(expression);
+        if (expression instanceof DRIField) {
+            getObject().setDataType(((DRIField<V>) expression).getDataType());
+        }
+    }
+
+    /**
+     * <p>setHeaderPattern.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setHeaderPattern(final String pattern) {
+        getObject().setHeaderPattern(pattern);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderHorizontalAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a T object.
+     * @deprecated use setHeaderHorizontalTextAlignment instead
+     */
+    @Deprecated
+    public T setHeaderHorizontalAlignment(final HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().setHeaderHorizontalTextAlignment(HorizontalTextAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().setHeaderHorizontalTextAlignment(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderHorizontalTextAlignment.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a T object.
+     */
+    public T setHeaderHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
+        getObject().setHeaderHorizontalTextAlignment(horizontalTextAlignment);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderValueFormatter.</p>
+     *
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a T object.
+     */
+    public T setHeaderValueFormatter(final DRIValueFormatter<?, ? super V> valueFormatter) {
+        getObject().setHeaderValueFormatter(valueFormatter);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderStretchWithOverflow.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @return a T object.
+     * @deprecated replaced by {@link #setHeaderTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public T setHeaderStretchWithOverflow(final Boolean stretchWithOverflow) {
+        getObject().setHeaderStretchWithOverflow(stretchWithOverflow);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderTextAdjust.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a T object.
+     */
+    public T setHeaderTextAdjust(final TextAdjust textAdjust) {
+        getObject().setHeaderTextAdjust(textAdjust);
+        return (T )this;
+    }
+
+    /**
+     * Sets the crosstab group header hyperlink.
+     *
+     * @param hyperLink the group header hyperlink
+     * @return a crosstab group builder
+     */
+    public T setHeaderHyperLink(final HyperLinkBuilder hyperLink) {
+        if (hyperLink != null) {
+            getObject().setHeaderHyperLink(hyperLink.getHyperLink());
+        } else {
+            getObject().setHeaderHyperLink(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setHeaderStyle(final ReportStyleBuilder style) {
+        if (style != null) {
+            getObject().setHeaderStyle(style.getStyle());
+        } else {
+            getObject().setHeaderStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the header group.
+     *
+     * @param propertyExpression the property expression
+     * @return a crosstab group builder
+     */
+    public T addHeaderProperty(final DRIPropertyExpression propertyExpression) {
+        getObject().addHeaderPropertyExpression(propertyExpression);
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the header group.
+     *
+     * @param name            the property name
+     * @param valueExpression the property value expression
+     * @return a crosstab group builder
+     */
+    public T addHeaderProperty(final String name, final DRIExpression<String> valueExpression) {
+        getObject().addHeaderPropertyExpression(Expressions.property(name, valueExpression));
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the header group.
+     *
+     * @param name  the property name
+     * @param value the property value
+     * @return a crosstab group builder
+     */
+    public T addHeaderProperty(final String name, final String value) {
+        getObject().addHeaderPropertyExpression(Expressions.property(name, value));
+        return (T) this;
+    }
+
+    /**
+     * <p>setShowTotal.</p>
+     *
+     * @param showTotal a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setShowTotal(final Boolean showTotal) {
+        getObject().setShowTotal(showTotal);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTotalPosition.</p>
+     *
+     * @param totalPosition a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     * @return a T object.
+     */
+    public T setTotalPosition(final CrosstabTotalPosition totalPosition) {
+        getObject().setTotalPosition(totalPosition);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTotalHeader.</p>
+     *
+     * @param totalHeaderExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setTotalHeader(final DRIExpression<?> totalHeaderExpression) {
+        getObject().setTotalHeaderExpression(totalHeaderExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTotalHeader.</p>
+     *
+     * @param totalHeader a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setTotalHeader(final String totalHeader) {
+        getObject().setTotalHeaderExpression(Expressions.text(totalHeader));
+        return (T) this;
+    }
+
+    /**
+     * <p>setTotalHeaderStretchWithOverflow.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @return a T object.
+     * @deprecated replaced by {@link #setTotalHeaderTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public T setTotalHeaderStretchWithOverflow(final Boolean stretchWithOverflow) {
+        getObject().setTotalHeaderStretchWithOverflow(stretchWithOverflow);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTotalHeaderTextAdjust.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a T object.
+     */
+    public T setTotalHeaderTextAdjust(final TextAdjust textAdjust) {
+        getObject().setTotalHeaderTextAdjust(textAdjust);
+        return (T )this;
+    }
+
+    /**
+     * <p>setTotalHeaderStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setTotalHeaderStyle(final ReportStyleBuilder style) {
+        if (style != null) {
+            getObject().setTotalHeaderStyle(style.getStyle());
+        } else {
+            getObject().setTotalHeaderStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the total header group.
+     *
+     * @param propertyExpression the property expression
+     * @return a crosstab group builder
+     */
+    public T addTotalHeaderProperty(final DRIPropertyExpression propertyExpression) {
+        getObject().addTotalHeaderPropertyExpression(propertyExpression);
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the total header group.
+     *
+     * @param name            the property name
+     * @param valueExpression the property value expression
+     * @return a crosstab group builder
+     */
+    public T addTotalHeaderProperty(final String name, final DRIExpression<String> valueExpression) {
+        getObject().addTotalHeaderPropertyExpression(Expressions.property(name, valueExpression));
+        return (T) this;
+    }
+
+    /**
+     * Adds a jasper property to the total header group.
+     *
+     * @param name  the property name
+     * @param value the property value
+     * @return a crosstab group builder
+     */
+    public T addTotalHeaderProperty(final String name, final String value) {
+        getObject().addTotalHeaderPropertyExpression(Expressions.property(name, value));
+        return (T) this;
+    }
+
+    /**
+     * <p>setDataType.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a T object.
+     */
+    public T setDataType(final DRIDataType<? super V, V> dataType) {
+        getObject().setDataType(dataType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setOrderType.</p>
+     *
+     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @return a T object.
+     */
+    public T setOrderType(final OrderType orderType) {
+        getObject().setOrderType(orderType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setOrderByExpression.</p>
+     *
+     * @param orderByExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setOrderByExpression(final DRIExpression<? extends Comparable<?>> orderByExpression) {
+        return orderBy(orderByExpression);
+    }
+
+    /**
+     * <p>orderBy.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a T object.
+     */
+    public T orderBy(final CrosstabMeasureBuilder<? extends Comparable<?>> measure) {
+        return orderBy(Expressions.orderBy(measure));
+    }
+
+    /**
+     * <p>orderBy.</p>
+     *
+     * @param orderByExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T orderBy(final DRIExpression<? extends Comparable<?>> orderByExpression) {
+        getObject().setOrderByExpression(orderByExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setComparatorExpression.</p>
+     *
+     * @param comparatorExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setComparatorExpression(final DRIExpression<? extends Comparator<?>> comparatorExpression) {
+        getObject().setComparatorExpression(comparatorExpression);
+        return (T) this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getObject().getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilder.java
new file mode 100644
index 0000000..6cc6efd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilder.java
@@ -0,0 +1,471 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.crosstab;
+
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstab;
+import net.sf.dynamicreports.report.builder.DatasetBuilder;
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
+import net.sf.dynamicreports.report.builder.component.DimensionComponentBuilder;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.jasperreports.engine.JRDataSource;
+import org.apache.commons.lang3.Validate;
+
+import java.sql.Connection;
+
+/**
+ * <p>CrosstabBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabBuilder extends DimensionComponentBuilder<CrosstabBuilder, DRCrosstab> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CrosstabBuilder.</p>
+     */
+    protected CrosstabBuilder() {
+        super(new DRCrosstab());
+    }
+
+    /**
+     * <p>setRepeatColumnHeaders.</p>
+     *
+     * @param repeatColumnHeaders a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setRepeatColumnHeaders(Boolean repeatColumnHeaders) {
+        getObject().setRepeatColumnHeaders(repeatColumnHeaders);
+        return this;
+    }
+
+    /**
+     * <p>setRepeatRowHeaders.</p>
+     *
+     * @param repeatRowHeaders a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setRepeatRowHeaders(Boolean repeatRowHeaders) {
+        getObject().setRepeatRowHeaders(repeatRowHeaders);
+        return this;
+    }
+
+    /**
+     * <p>setColumnBreakOffset.</p>
+     *
+     * @param columnBreakOffset a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setColumnBreakOffset(Integer columnBreakOffset) {
+        getObject().setColumnBreakOffset(columnBreakOffset);
+        return this;
+    }
+
+    /**
+     * <p>setIgnoreWidth.</p>
+     *
+     * @param ignoreWidth a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setIgnoreWidth(Boolean ignoreWidth) {
+        getObject().setIgnoreWidth(ignoreWidth);
+        return this;
+    }
+
+    /**
+     * <p>setRunDirection.</p>
+     *
+     * @param runDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setRunDirection(RunDirection runDirection) {
+        getObject().setRunDirection(runDirection);
+        return this;
+    }
+
+    /**
+     * <p>setCellWidth.</p>
+     *
+     * @param cellWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setCellWidth(Integer cellWidth) {
+        getObject().setCellWidth(cellWidth);
+        return this;
+    }
+
+    /**
+     * <p>setCellHeight.</p>
+     *
+     * @param cellHeight a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setCellHeight(Integer cellHeight) {
+        getObject().setCellHeight(cellHeight);
+        return this;
+    }
+
+    /**
+     * <p>highlightOddRows.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder highlightOddRows() {
+        return setHighlightOddRows(true);
+    }
+
+    /**
+     * <p>setHighlightOddRows.</p>
+     *
+     * @param highlightOddRows a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setHighlightOddRows(Boolean highlightOddRows) {
+        getObject().setHighlightOddRows(highlightOddRows);
+        return this;
+    }
+
+    /**
+     * <p>setOddRowStyle.</p>
+     *
+     * @param oddRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setOddRowStyle(SimpleStyleBuilder oddRowStyle) {
+        if (oddRowStyle != null) {
+            getObject().setOddRowStyle(oddRowStyle.build());
+        } else {
+            getObject().setOddRowStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setGroupStyle.</p>
+     *
+     * @param groupStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setGroupStyle(ReportStyleBuilder groupStyle) {
+        if (groupStyle != null) {
+            getObject().setGroupStyle(groupStyle.build());
+        } else {
+            getObject().setGroupStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setGroupTotalStyle.</p>
+     *
+     * @param groupTotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setGroupTotalStyle(ReportStyleBuilder groupTotalStyle) {
+        if (groupTotalStyle != null) {
+            getObject().setGroupTotalStyle(groupTotalStyle.build());
+        } else {
+            getObject().setGroupTotalStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setGrandTotalStyle.</p>
+     *
+     * @param grandTotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setGrandTotalStyle(ReportStyleBuilder grandTotalStyle) {
+        if (grandTotalStyle != null) {
+            getObject().setGrandTotalStyle(grandTotalStyle.build());
+        } else {
+            getObject().setGrandTotalStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setCellStyle.</p>
+     *
+     * @param cellStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setCellStyle(ReportStyleBuilder cellStyle) {
+        if (cellStyle != null) {
+            getObject().setCellStyle(cellStyle.build());
+        } else {
+            getObject().setCellStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setMeasureTitleStyle.</p>
+     *
+     * @param measureTitleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setMeasureTitleStyle(ReportStyleBuilder measureTitleStyle) {
+        if (measureTitleStyle != null) {
+            getObject().setMeasureTitleStyle(measureTitleStyle.build());
+        } else {
+            getObject().setMeasureTitleStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>highlightEvenRows.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder highlightEvenRows() {
+        return setHighlightEvenRows(true);
+    }
+
+    /**
+     * <p>setHighlightEvenRows.</p>
+     *
+     * @param highlightEvenRows a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setHighlightEvenRows(Boolean highlightEvenRows) {
+        getObject().setHighlightEvenRows(highlightEvenRows);
+        return this;
+    }
+
+    /**
+     * <p>setEvenRowStyle.</p>
+     *
+     * @param evenRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setEvenRowStyle(SimpleStyleBuilder evenRowStyle) {
+        if (evenRowStyle != null) {
+            getObject().setEvenRowStyle(evenRowStyle.build());
+        } else {
+            getObject().setEvenRowStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>whenNoDataCell.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder whenNoDataCell(ComponentBuilder<?, ?>... components) {
+        return addWhenNoDataCell(components);
+    }
+
+    /**
+     * <p>addWhenNoDataCell.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder addWhenNoDataCell(ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ComponentBuilder<?, ?> component : components) {
+            getObject().getWhenNoDataCell().addComponent(component.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>headerCell.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder headerCell(ComponentBuilder<?, ?>... components) {
+        return addHeaderCell(components);
+    }
+
+    /**
+     * <p>addHeaderCell.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder addHeaderCell(ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ComponentBuilder<?, ?> component : components) {
+            getObject().getHeaderCell().addComponent(component.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>columnGroups.</p>
+     *
+     * @param columnGroups a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder columnGroups(CrosstabColumnGroupBuilder<?>... columnGroups) {
+        return addColumnGroup(columnGroups);
+    }
+
+    /**
+     * <p>addColumnGroup.</p>
+     *
+     * @param columnGroups a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder addColumnGroup(CrosstabColumnGroupBuilder<?>... columnGroups) {
+        Validate.notNull(columnGroups, "columnGroups must not be null");
+        Validate.noNullElements(columnGroups, "columnGroups must not contains null columnGroup");
+        for (CrosstabColumnGroupBuilder<?> columnGroup : columnGroups) {
+            getObject().addColumnGroup(columnGroup.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>rowGroups.</p>
+     *
+     * @param rowGroups a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder rowGroups(CrosstabRowGroupBuilder<?>... rowGroups) {
+        return addRowGroup(rowGroups);
+    }
+
+    /**
+     * <p>addRowGroup.</p>
+     *
+     * @param rowGroups a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder addRowGroup(CrosstabRowGroupBuilder<?>... rowGroups) {
+        Validate.notNull(rowGroups, "rowGroups must not be null");
+        Validate.noNullElements(rowGroups, "rowGroups must not contains null rowGroup");
+        for (CrosstabRowGroupBuilder<?> rowGroup : rowGroups) {
+            getObject().addRowGroup(rowGroup.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>variables.</p>
+     *
+     * @param variables a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder variables(CrosstabVariableBuilder<?>... variables) {
+        return addVariable(variables);
+    }
+
+    /**
+     * <p>addVariable.</p>
+     *
+     * @param variables a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder addVariable(CrosstabVariableBuilder<?>... variables) {
+        Validate.notNull(variables, "variables must not be null");
+        Validate.noNullElements(variables, "variables must not contains null measure");
+        for (CrosstabVariableBuilder<?> variable : variables) {
+            getObject().addVariable(variable.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>measures.</p>
+     *
+     * @param measures a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder measures(CrosstabMeasureBuilder<?>... measures) {
+        return addMeasure(measures);
+    }
+
+    /**
+     * <p>addMeasure.</p>
+     *
+     * @param measures a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder addMeasure(CrosstabMeasureBuilder<?>... measures) {
+        Validate.notNull(measures, "measures must not be null");
+        Validate.noNullElements(measures, "measures must not contains null measure");
+        for (CrosstabMeasureBuilder<?> measure : measures) {
+            getObject().addMeasure(measure.build());
+        }
+        return this;
+    }
+
+    // subdataset
+
+    /**
+     * <p>setSubDataset.</p>
+     *
+     * @param subDataset a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setSubDataset(DatasetBuilder subDataset) {
+        Validate.notNull(subDataset, "subDataset must not be null");
+        getObject().getDataset().setSubDataset(subDataset.build());
+        return this;
+    }
+
+    /**
+     * <p>setDataSource.</p>
+     *
+     * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setDataSource(JRDataSource dataSource) {
+        DatasetBuilder dataset = DynamicReports.dataset();
+        dataset.setDataSource(dataSource);
+        return setSubDataset(dataset);
+    }
+
+    /**
+     * <p>setDataSource.</p>
+     *
+     * @param sql        a {@link java.lang.String} object.
+     * @param connection a {@link java.sql.Connection} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setDataSource(String sql, Connection connection) {
+        DatasetBuilder dataset = DynamicReports.dataset();
+        dataset.setDataSource(sql, connection);
+        return setSubDataset(dataset);
+    }
+
+    /**
+     * <p>setDataPreSorted.</p>
+     *
+     * @param dataPreSorted a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder setDataPreSorted(Boolean dataPreSorted) {
+        getObject().getDataset().setDataPreSorted(dataPreSorted);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilders.java
new file mode 100644
index 0000000..987c5b2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilders.java
@@ -0,0 +1,313 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.crosstab;
+
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * A set of methods of creating and customizing crosstabs
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabBuilders {
+
+    /**
+     * <p>crosstab.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public CrosstabBuilder crosstab() {
+        return Crosstabs.crosstab();
+    }
+
+    // column group
+
+    /**
+     * <p>columnGroup.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param <T>    a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public <T> CrosstabColumnGroupBuilder<T> columnGroup(ValueColumnBuilder<?, T> column) {
+        return Crosstabs.columnGroup(column);
+    }
+
+    /**
+     * <p>columnGroup.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public <T> CrosstabColumnGroupBuilder<T> columnGroup(FieldBuilder<T> field) {
+        return Crosstabs.columnGroup(field);
+    }
+
+    /**
+     * <p>columnGroup.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public <T> CrosstabColumnGroupBuilder<T> columnGroup(String fieldName, Class<T> valueClass) {
+        return Crosstabs.columnGroup(fieldName, valueClass);
+    }
+
+    /**
+     * <p>columnGroup.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public <T> CrosstabColumnGroupBuilder<T> columnGroup(DRIExpression<T> expression) {
+        return Crosstabs.columnGroup(expression);
+    }
+
+    // row group
+
+    /**
+     * <p>rowGroup.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param <T>    a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public <T> CrosstabRowGroupBuilder<T> rowGroup(ValueColumnBuilder<?, T> column) {
+        return Crosstabs.rowGroup(column);
+    }
+
+    /**
+     * <p>rowGroup.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public <T> CrosstabRowGroupBuilder<T> rowGroup(FieldBuilder<T> field) {
+        return Crosstabs.rowGroup(field);
+    }
+
+    /**
+     * <p>rowGroup.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public <T> CrosstabRowGroupBuilder<T> rowGroup(String fieldName, Class<T> valueClass) {
+        return Crosstabs.rowGroup(fieldName, valueClass);
+    }
+
+    /**
+     * <p>rowGroup.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public <T> CrosstabRowGroupBuilder<T> rowGroup(DRIExpression<T> expression) {
+        return Crosstabs.rowGroup(expression);
+    }
+
+    // variable
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public <T> CrosstabVariableBuilder<T> variable(ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        return Crosstabs.variable(column, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public <T> CrosstabVariableBuilder<T> variable(FieldBuilder<T> field, Calculation calculation) {
+        return Crosstabs.variable(field, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param fieldName   a {@link java.lang.String} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public <T> CrosstabVariableBuilder<T> variable(String fieldName, Class<?> valueClass, Calculation calculation) {
+        return Crosstabs.variable(fieldName, valueClass, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public <T> CrosstabVariableBuilder<T> variable(DRIExpression<?> expression, Calculation calculation) {
+        return Crosstabs.variable(expression, calculation);
+    }
+
+    // measure
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        return Crosstabs.measure(column, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title       a {@link java.lang.String} object.
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(String title, ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        return Crosstabs.measure(title, column, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(FieldBuilder<T> field, Calculation calculation) {
+        return Crosstabs.measure(field, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title       a {@link java.lang.String} object.
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(String title, FieldBuilder<T> field, Calculation calculation) {
+        return Crosstabs.measure(title, field, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param fieldName   a {@link java.lang.String} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(String fieldName, Class<?> valueClass, Calculation calculation) {
+        return Crosstabs.measure(fieldName, valueClass, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title       a {@link java.lang.String} object.
+     * @param fieldName   a {@link java.lang.String} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(String title, String fieldName, Class<?> valueClass, Calculation calculation) {
+        return Crosstabs.measure(title, fieldName, valueClass, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression, Calculation calculation) {
+        return Crosstabs.measure(expression, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title       a {@link java.lang.String} object.
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expression, Calculation calculation) {
+        return Crosstabs.measure(title, expression, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression) {
+        return Crosstabs.measure(expression);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title      a {@link java.lang.String} object.
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expression) {
+        return Crosstabs.measure(title, expression);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java
new file mode 100644
index 0000000..72677d4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java
@@ -0,0 +1,83 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.crosstab;
+
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabColumnGroup;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>CrosstabColumnGroupBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabColumnGroupBuilder<T> extends AbstractCrosstabGroupBuilder<CrosstabColumnGroupBuilder<T>, DRCrosstabColumnGroup<T>, T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CrosstabColumnGroupBuilder.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     */
+    protected CrosstabColumnGroupBuilder(ValueColumnBuilder<?, T> column) {
+        super(column, new DRCrosstabColumnGroup<T>());
+    }
+
+    /**
+     * <p>Constructor for CrosstabColumnGroupBuilder.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected CrosstabColumnGroupBuilder(FieldBuilder<T> field) {
+        super(field, new DRCrosstabColumnGroup<T>());
+    }
+
+    /**
+     * <p>Constructor for CrosstabColumnGroupBuilder.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected CrosstabColumnGroupBuilder(DRIExpression<T> expression) {
+        super(expression, new DRCrosstabColumnGroup<T>());
+    }
+
+    /**
+     * <p>setHeaderHeight.</p>
+     *
+     * @param headerHeight a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public CrosstabColumnGroupBuilder<T> setHeaderHeight(Integer headerHeight) {
+        getObject().setHeaderHeight(headerHeight);
+        return this;
+    }
+
+    /**
+     * <p>setTotalHeaderWidth.</p>
+     *
+     * @param totalHeaderWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public CrosstabColumnGroupBuilder<T> setTotalHeaderWidth(Integer totalHeaderWidth) {
+        getObject().setTotalHeaderWidth(totalHeaderWidth);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java
new file mode 100644
index 0000000..b6ddf09
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java
@@ -0,0 +1,373 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.crosstab;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabCellStyle;
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabMeasure;
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabVariable;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.builder.datatype.DataTypes;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.DRICrosstabValue;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.exception.DRReportException;
+
+/**
+ * <p>CrosstabMeasureBuilder class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+@SuppressWarnings("deprecation")
+public class CrosstabMeasureBuilder<T> extends AbstractBuilder<CrosstabMeasureBuilder<T>, DRCrosstabMeasure<T>> implements DRICrosstabValue<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CrosstabMeasureBuilder.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected CrosstabMeasureBuilder(final ValueColumnBuilder<?, ?> column, final Calculation calculation) {
+        super(new DRCrosstabMeasure<T>(Crosstabs.variable(column, calculation).build()));
+        if (calculation.equals(Calculation.COUNT) || calculation.equals(Calculation.DISTINCT_COUNT)) {
+            setDataType(DataTypes.longType());
+        } else if (calculation.equals(Calculation.AVERAGE) || calculation.equals(Calculation.STANDARD_DEVIATION) || calculation.equals(Calculation.VARIANCE)) {
+            setDataType(DataTypes.doubleType());
+        } else {
+            final DRITextField<?> columnComponent = column.getColumn().getComponent();
+            setDataType(columnComponent.getDataType());
+            setPattern(columnComponent.getPattern());
+        }
+    }
+
+    /**
+     * <p>Constructor for CrosstabMeasureBuilder.</p>
+     *
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected CrosstabMeasureBuilder(final FieldBuilder<?> field, final Calculation calculation) {
+        super(new DRCrosstabMeasure<T>(Crosstabs.variable(field, calculation).build()));
+        if (calculation.equals(Calculation.COUNT) || calculation.equals(Calculation.DISTINCT_COUNT)) {
+            setDataType(DataTypes.longType());
+        } else if (calculation.equals(Calculation.AVERAGE) || calculation.equals(Calculation.STANDARD_DEVIATION) || calculation.equals(Calculation.VARIANCE)) {
+            setDataType(DataTypes.doubleType());
+        } else {
+            setDataType(field.getField().getDataType());
+        }
+    }
+
+    /**
+     * <p>Constructor for CrosstabMeasureBuilder.</p>
+     *
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected CrosstabMeasureBuilder(final DRIExpression<?> expression, final Calculation calculation) {
+        super(new DRCrosstabMeasure<T>(Crosstabs.variable(expression, calculation).build()));
+        if (calculation.equals(Calculation.COUNT) || calculation.equals(Calculation.DISTINCT_COUNT)) {
+            setDataType(DataTypes.longType());
+        } else if (calculation.equals(Calculation.AVERAGE) || calculation.equals(Calculation.STANDARD_DEVIATION) || calculation.equals(Calculation.VARIANCE)) {
+            setDataType(DataTypes.doubleType());
+        } else if (expression instanceof DRIField) {
+            setDataType(((DRIField<?>) expression).getDataType());
+        }
+    }
+
+    /**
+     * <p>Constructor for CrosstabMeasureBuilder.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected CrosstabMeasureBuilder(final DRIExpression<?> expression) {
+        super(new DRCrosstabMeasure<T>(expression));
+    }
+
+    /**
+     * <p>setDataType.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    @SuppressWarnings( {"unchecked", "rawtypes"})
+    public CrosstabMeasureBuilder<T> setDataType(final DRIDataType dataType) {
+        getObject().setDataType(dataType);
+        return this;
+    }
+
+    /**
+     * <p>setPercentageType.</p>
+     *
+     * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setPercentageType(final CrosstabPercentageType percentageType) {
+        if (getObject().getExpression() instanceof DRCrosstabVariable<?>) {
+            final DRCrosstabVariable<?> variable = (DRCrosstabVariable<?>) getObject().getExpression();
+            if (percentageType != null && percentageType.equals(CrosstabPercentageType.GRAND_TOTAL) && !variable.getCalculation().equals(Calculation.COUNT) &&
+                !variable.getCalculation().equals(Calculation.DISTINCT_COUNT)) {
+                setDataType(DataTypes.doubleType());
+            }
+            variable.setPercentageType(percentageType);
+        } else {
+            throw new DRReportException("Percentage is not supported in this type of measure");
+        }
+        return this;
+    }
+
+    /**
+     * <p>setPattern.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setPattern(final String pattern) {
+        getObject().setPattern(pattern);
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @deprecated use setHorizontalTextAlignment instead
+     */
+    @Deprecated
+    public CrosstabMeasureBuilder<T> setHorizontalAlignment(final HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().setHorizontalTextAlignment(HorizontalTextAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().setHorizontalTextAlignment(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setHorizontalTextAlignment.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
+        getObject().setHorizontalTextAlignment(horizontalTextAlignment);
+        return this;
+    }
+
+    /**
+     * <p>setValueFormatter.</p>
+     *
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setValueFormatter(final DRIValueFormatter<?, ? super T> valueFormatter) {
+        getObject().setValueFormatter(valueFormatter);
+        return this;
+    }
+
+    /**
+     * <p>setStretchWithOverflow.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @deprecated replaced by {@link #setTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public CrosstabMeasureBuilder<T> setStretchWithOverflow(final Boolean stretchWithOverflow) {
+        getObject().setStretchWithOverflow(stretchWithOverflow);
+        return this;
+    }
+
+    /**
+     * <p>setTotalHeaderTextAdjust.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a T object.
+     */
+    public CrosstabMeasureBuilder<T> setTextAdjust(final TextAdjust textAdjust) {
+        getObject().setTextAdjust(textAdjust);
+        return  this;
+    }
+
+    /**
+     * Sets the crosstab measure hyperlink.
+     *
+     * @param hyperLink the measure hyperlink
+     * @return a crosstab measure builder
+     */
+    public CrosstabMeasureBuilder<T> setHyperLink(final HyperLinkBuilder hyperLink) {
+        if (hyperLink != null) {
+            getObject().setHyperLink(hyperLink.getHyperLink());
+        } else {
+            getObject().setHyperLink(null);
+        }
+        return this;
+    }
+
+    /**
+     * Adds a jasper property to the measure.
+     *
+     * @param propertyExpression the property expression
+     * @return a crosstab measure builder
+     */
+    public CrosstabMeasureBuilder<T> addProperty(final DRIPropertyExpression propertyExpression) {
+        getObject().addPropertyExpression(propertyExpression);
+        return this;
+    }
+
+    /**
+     * Adds a jasper property to the measure.
+     *
+     * @param name            the property name
+     * @param valueExpression the property value expression
+     * @return a crosstab measure builder
+     */
+    public CrosstabMeasureBuilder<T> addProperty(final String name, final DRIExpression<String> valueExpression) {
+        getObject().addPropertyExpression(Expressions.property(name, valueExpression));
+        return this;
+    }
+
+    /**
+     * Adds a jasper property to the measure.
+     *
+     * @param name  the property name
+     * @param value the property value
+     * @return a crosstab measure builder
+     */
+    public CrosstabMeasureBuilder<T> addProperty(final String name, final String value) {
+        getObject().addPropertyExpression(Expressions.property(name, value));
+        return this;
+    }
+
+    /**
+     * <p>setStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style) {
+        Validate.notNull(style, "style must not be null");
+        getObject().getStyles().add(new DRCrosstabCellStyle(style.getStyle()));
+        return this;
+    }
+
+    /**
+     * <p>setStyle.</p>
+     *
+     * @param style    a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param rowGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final CrosstabRowGroupBuilder<?> rowGroup) {
+        Validate.notNull(style, "style must not be null");
+        Validate.notNull(rowGroup, "rowGroup must not be null");
+        getObject().getStyles().add(new DRCrosstabCellStyle(style.getStyle(), rowGroup.build(), null));
+        return this;
+    }
+
+    /**
+     * <p>setStyle.</p>
+     *
+     * @param style       a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final CrosstabColumnGroupBuilder<?> columnGroup) {
+        Validate.notNull(style, "style must not be null");
+        Validate.notNull(columnGroup, "columnGroup must not be null");
+        getObject().getStyles().add(new DRCrosstabCellStyle(style.getStyle(), null, columnGroup.build()));
+        return this;
+    }
+
+    /**
+     * <p>setStyle.</p>
+     *
+     * @param style       a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param rowGroup    a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final CrosstabRowGroupBuilder<?> rowGroup, final CrosstabColumnGroupBuilder<?> columnGroup) {
+        Validate.notNull(style, "style must not be null");
+        Validate.notNull(rowGroup, "rowGroup must not be null");
+        Validate.notNull(columnGroup, "columnGroup must not be null");
+        getObject().getStyles().add(new DRCrosstabCellStyle(style.getStyle(), rowGroup.build(), columnGroup.build()));
+        return this;
+    }
+
+    /**
+     * <p>setTitle.</p>
+     *
+     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setTitle(final DRIExpression<?> titleExpression) {
+        getObject().setTitleExpression(titleExpression);
+        return this;
+    }
+
+    /**
+     * <p>setTitle.</p>
+     *
+     * @param title a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setTitle(final String title) {
+        getObject().setTitleExpression(Expressions.text(title));
+        return this;
+    }
+
+    /**
+     * <p>setTitleStyle.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public CrosstabMeasureBuilder<T> setTitleStyle(final ReportStyleBuilder titleStyle) {
+        if (titleStyle != null) {
+            getObject().setTitleStyle(titleStyle.getStyle());
+        } else {
+            getObject().setTitleStyle(null);
+        }
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return build().getExpression().getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java
new file mode 100644
index 0000000..4cf9a2a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java
@@ -0,0 +1,83 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.crosstab;
+
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabRowGroup;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>CrosstabRowGroupBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabRowGroupBuilder<T> extends AbstractCrosstabGroupBuilder<CrosstabRowGroupBuilder<T>, DRCrosstabRowGroup<T>, T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CrosstabRowGroupBuilder.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     */
+    protected CrosstabRowGroupBuilder(ValueColumnBuilder<?, T> column) {
+        super(column, new DRCrosstabRowGroup<T>());
+    }
+
+    /**
+     * <p>Constructor for CrosstabRowGroupBuilder.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected CrosstabRowGroupBuilder(FieldBuilder<T> field) {
+        super(field, new DRCrosstabRowGroup<T>());
+    }
+
+    /**
+     * <p>Constructor for CrosstabRowGroupBuilder.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected CrosstabRowGroupBuilder(DRIExpression<T> expression) {
+        super(expression, new DRCrosstabRowGroup<T>());
+    }
+
+    /**
+     * <p>setHeaderWidth.</p>
+     *
+     * @param headerWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public CrosstabRowGroupBuilder<T> setHeaderWidth(Integer headerWidth) {
+        getObject().setHeaderWidth(headerWidth);
+        return this;
+    }
+
+    /**
+     * <p>setTotalHeaderHeight.</p>
+     *
+     * @param totalHeaderHeight a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public CrosstabRowGroupBuilder<T> setTotalHeaderHeight(Integer totalHeaderHeight) {
+        getObject().setTotalHeaderHeight(totalHeaderHeight);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java
new file mode 100644
index 0000000..eae5f04
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java
@@ -0,0 +1,85 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.crosstab;
+
+import net.sf.dynamicreports.report.base.crosstab.DRCrosstabVariable;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.definition.DRICrosstabValue;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>CrosstabVariableBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CrosstabVariableBuilder<T> extends AbstractBuilder<CrosstabVariableBuilder<T>, DRCrosstabVariable<T>> implements DRICrosstabValue<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CrosstabVariableBuilder.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected CrosstabVariableBuilder(ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        super(new DRCrosstabVariable<T>(column.build(), calculation));
+    }
+
+    /**
+     * <p>Constructor for CrosstabVariableBuilder.</p>
+     *
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected CrosstabVariableBuilder(FieldBuilder<?> field, Calculation calculation) {
+        super(new DRCrosstabVariable<T>(field.getField(), calculation));
+    }
+
+    /**
+     * <p>Constructor for CrosstabVariableBuilder.</p>
+     *
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected CrosstabVariableBuilder(DRIExpression<?> expression, Calculation calculation) {
+        super(new DRCrosstabVariable<T>(expression, calculation));
+    }
+
+    /**
+     * <p>setPercentageType.</p>
+     *
+     * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public CrosstabVariableBuilder<T> setPercentageType(CrosstabPercentageType percentageType) {
+        getObject().setPercentageType(percentageType);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getObject().getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/Crosstabs.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/Crosstabs.java
new file mode 100644
index 0000000..a90d462
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/Crosstabs.java
@@ -0,0 +1,323 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.crosstab;
+
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * A set of methods of creating and customizing crosstabs
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Crosstabs {
+
+    /**
+     * <p>crosstab.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     */
+    public static CrosstabBuilder crosstab() {
+        return new CrosstabBuilder();
+    }
+
+    // column group
+
+    /**
+     * <p>columnGroup.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param <T>    a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public static <T> CrosstabColumnGroupBuilder<T> columnGroup(ValueColumnBuilder<?, T> column) {
+        return new CrosstabColumnGroupBuilder<T>(column);
+    }
+
+    /**
+     * <p>columnGroup.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public static <T> CrosstabColumnGroupBuilder<T> columnGroup(FieldBuilder<T> field) {
+        return new CrosstabColumnGroupBuilder<T>(field);
+    }
+
+    /**
+     * <p>columnGroup.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public static <T> CrosstabColumnGroupBuilder<T> columnGroup(String fieldName, Class<T> valueClass) {
+        return new CrosstabColumnGroupBuilder<T>(DynamicReports.<T>field(fieldName, valueClass));
+    }
+
+    /**
+     * <p>columnGroup.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    public static <T> CrosstabColumnGroupBuilder<T> columnGroup(DRIExpression<T> expression) {
+        return new CrosstabColumnGroupBuilder<T>(expression);
+    }
+
+    // row group
+
+    /**
+     * <p>rowGroup.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param <T>    a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public static <T> CrosstabRowGroupBuilder<T> rowGroup(ValueColumnBuilder<?, T> column) {
+        return new CrosstabRowGroupBuilder<T>(column);
+    }
+
+    /**
+     * <p>rowGroup.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public static <T> CrosstabRowGroupBuilder<T> rowGroup(FieldBuilder<T> field) {
+        return new CrosstabRowGroupBuilder<T>(field);
+    }
+
+    /**
+     * <p>rowGroup.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public static <T> CrosstabRowGroupBuilder<T> rowGroup(String fieldName, Class<T> valueClass) {
+        return new CrosstabRowGroupBuilder<T>(DynamicReports.<T>field(fieldName, valueClass));
+    }
+
+    /**
+     * <p>rowGroup.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     */
+    public static <T> CrosstabRowGroupBuilder<T> rowGroup(DRIExpression<T> expression) {
+        return new CrosstabRowGroupBuilder<T>(expression);
+    }
+
+    // variable
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public static <T> CrosstabVariableBuilder<T> variable(ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        Validate.notNull(column, "column must not be null");
+        return new CrosstabVariableBuilder<T>(column, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public static <T> CrosstabVariableBuilder<T> variable(FieldBuilder<T> field, Calculation calculation) {
+        Validate.notNull(field, "field must not be null");
+        return new CrosstabVariableBuilder<T>(field, calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param fieldName   a {@link java.lang.String} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public static <T> CrosstabVariableBuilder<T> variable(String fieldName, Class<?> valueClass, Calculation calculation) {
+        return new CrosstabVariableBuilder<T>(DynamicReports.field(fieldName, valueClass), calculation);
+    }
+
+    /**
+     * <p>variable.</p>
+     *
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     */
+    public static <T> CrosstabVariableBuilder<T> variable(DRIExpression<?> expression, Calculation calculation) {
+        return new CrosstabVariableBuilder<T>(expression, calculation);
+    }
+
+    // measure
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        Validate.notNull(column, "column must not be null");
+        return new CrosstabMeasureBuilder<T>(column, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title       a {@link java.lang.String} object.
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(String title, ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        CrosstabMeasureBuilder<T> measure = measure(column, calculation);
+        return measure.setTitle(title);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(FieldBuilder<T> field, Calculation calculation) {
+        Validate.notNull(field, "field must not be null");
+        return new CrosstabMeasureBuilder<T>(field, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title       a {@link java.lang.String} object.
+     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(String title, FieldBuilder<T> field, Calculation calculation) {
+        return measure(field, calculation).setTitle(title);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param fieldName   a {@link java.lang.String} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(String fieldName, Class<?> valueClass, Calculation calculation) {
+        return new CrosstabMeasureBuilder<T>(DynamicReports.field(fieldName, valueClass), calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title       a {@link java.lang.String} object.
+     * @param fieldName   a {@link java.lang.String} object.
+     * @param valueClass  a {@link java.lang.Class} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(String title, String fieldName, Class<?> valueClass, Calculation calculation) {
+        CrosstabMeasureBuilder<T> measure = measure(fieldName, valueClass, calculation);
+        return measure.setTitle(title);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression, Calculation calculation) {
+        return new CrosstabMeasureBuilder<T>(expression, calculation);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title       a {@link java.lang.String} object.
+     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expression, Calculation calculation) {
+        CrosstabMeasureBuilder<T> measure = measure(expression, calculation);
+        return measure.setTitle(title);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression) {
+        return new CrosstabMeasureBuilder<T>(expression);
+    }
+
+    /**
+     * <p>measure.</p>
+     *
+     * @param title      a {@link java.lang.String} object.
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public static <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expression) {
+        CrosstabMeasureBuilder<T> measure = measure(expression);
+        return measure.setTitle(title);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigDecimalType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigDecimalType.java
new file mode 100644
index 0000000..2da68e2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigDecimalType.java
@@ -0,0 +1,52 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>BigDecimalType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BigDecimalType extends NumberType<BigDecimal> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getBigDecimalType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getBigDecimalType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected BigDecimal numberToValue(Number number) {
+        return new BigDecimal(number.doubleValue());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigIntegerType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigIntegerType.java
new file mode 100644
index 0000000..6e646f1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigIntegerType.java
@@ -0,0 +1,52 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+import java.math.BigInteger;
+
+/**
+ * <p>BigIntegerType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BigIntegerType extends NumberType<BigInteger> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getBigIntegerType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getBigIntegerType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected BigInteger numberToValue(Number number) {
+        return BigInteger.valueOf(number.longValue());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BooleanType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BooleanType.java
new file mode 100644
index 0000000..9599c84
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BooleanType.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.Locale;
+
+/**
+ * <p>BooleanType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BooleanType extends AbstractDataType<Boolean, Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getBooleanType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getBooleanType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean stringToValue(String value, Locale locale) throws DRException {
+        return new Boolean(value);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ByteType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ByteType.java
new file mode 100644
index 0000000..f0dcf24
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ByteType.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>ByteType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ByteType extends NumberType<Byte> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getByteType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getByteType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Byte numberToValue(Number number) {
+        return number.byteValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/CharacterType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/CharacterType.java
new file mode 100644
index 0000000..5861e25
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/CharacterType.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.exception.DRException;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Locale;
+
+/**
+ * <p>CharacterType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CharacterType extends AbstractDataType<Character, Character> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getCharacterType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getCharacterType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Character stringToValue(String value, Locale locale) throws DRException {
+        if (StringUtils.isNotEmpty(value)) {
+            return value.charAt(0);
+        }
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypeBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypeBuilders.java
new file mode 100644
index 0000000..33bd899
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypeBuilders.java
@@ -0,0 +1,278 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.exception.DRException;
+
+/**
+ * A set of build in data types
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DataTypeBuilders {
+
+    /**
+     * <p>detectType.</p>
+     *
+     * @param dataType a {@link java.lang.Class} object.
+     * @param <U>      a U object.
+     * @return a T object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public <U, T extends DRIDataType<? super U, U>> T detectType(Class<U> dataType) throws DRException {
+        return DataTypes.detectType(dataType);
+    }
+
+    /**
+     * <p>detectType.</p>
+     *
+     * @param dataType a {@link java.lang.String} object.
+     * @return a T object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public <T extends DRIDataType<?, ?>> T detectType(String dataType) throws DRException {
+        return DataTypes.detectType(dataType);
+    }
+
+    /**
+     * <p>bigDecimalType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BigDecimalType} object.
+     */
+    public BigDecimalType bigDecimalType() {
+        return DataTypes.bigDecimalType();
+    }
+
+    /**
+     * <p>bigIntegerType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BigIntegerType} object.
+     */
+    public BigIntegerType bigIntegerType() {
+        return DataTypes.bigIntegerType();
+    }
+
+    /**
+     * <p>booleanType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BooleanType} object.
+     */
+    public BooleanType booleanType() {
+        return DataTypes.booleanType();
+    }
+
+    /**
+     * <p>byteType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ByteType} object.
+     */
+    public ByteType byteType() {
+        return DataTypes.byteType();
+    }
+
+    /**
+     * <p>dateType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateType} object.
+     */
+    public DateType dateType() {
+        return DataTypes.dateType();
+    }
+
+    /**
+     * <p>dateYearToFractionType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToFractionType} object.
+     */
+    public DateYearToFractionType dateYearToFractionType() {
+        return DataTypes.dateYearToFractionType();
+    }
+
+    /**
+     * <p>dateYearToHourType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToHourType} object.
+     */
+    public DateYearToHourType dateYearToHourType() {
+        return DataTypes.dateYearToHourType();
+    }
+
+    /**
+     * <p>dateYearToMinuteType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToMinuteType} object.
+     */
+    public DateYearToMinuteType dateYearToMinuteType() {
+        return DataTypes.dateYearToMinuteType();
+    }
+
+    /**
+     * <p>dateYearToMonthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToMonthType} object.
+     */
+    public DateYearToMonthType dateYearToMonthType() {
+        return DataTypes.dateYearToMonthType();
+    }
+
+    /**
+     * <p>dateYearToSecondType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToSecondType} object.
+     */
+    public DateYearToSecondType dateYearToSecondType() {
+        return DataTypes.dateYearToSecondType();
+    }
+
+    /**
+     * <p>dateYearType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearType} object.
+     */
+    public DateYearType dateYearType() {
+        return DataTypes.dateYearType();
+    }
+
+    /**
+     * <p>dateMonthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateMonthType} object.
+     */
+    public DateMonthType dateMonthType() {
+        return DataTypes.dateMonthType();
+    }
+
+    /**
+     * <p>dateDayType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateDayType} object.
+     */
+    public DateDayType dateDayType() {
+        return DataTypes.dateDayType();
+    }
+
+    /**
+     * <p>doubleType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DoubleType} object.
+     */
+    public DoubleType doubleType() {
+        return DataTypes.doubleType();
+    }
+
+    /**
+     * <p>floatType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.FloatType} object.
+     */
+    public FloatType floatType() {
+        return DataTypes.floatType();
+    }
+
+    /**
+     * <p>characterType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.CharacterType} object.
+     */
+    public CharacterType characterType() {
+        return DataTypes.characterType();
+    }
+
+    /**
+     * <p>integerType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.IntegerType} object.
+     */
+    public IntegerType integerType() {
+        return DataTypes.integerType();
+    }
+
+    /**
+     * <p>longType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.LongType} object.
+     */
+    public LongType longType() {
+        return DataTypes.longType();
+    }
+
+    /**
+     * <p>shortType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ShortType} object.
+     */
+    public ShortType shortType() {
+        return DataTypes.shortType();
+    }
+
+    /**
+     * <p>stringType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.StringType} object.
+     */
+    public StringType stringType() {
+        return DataTypes.stringType();
+    }
+
+    /**
+     * <p>listType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ListType} object.
+     */
+    public ListType listType() {
+        return DataTypes.listType();
+    }
+
+    /**
+     * <p>timeHourToFractionType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToFractionType} object.
+     */
+    public TimeHourToFractionType timeHourToFractionType() {
+        return DataTypes.timeHourToFractionType();
+    }
+
+    /**
+     * <p>timeHourToMinuteType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToMinuteType} object.
+     */
+    public TimeHourToMinuteType timeHourToMinuteType() {
+        return DataTypes.timeHourToMinuteType();
+    }
+
+    /**
+     * <p>timeHourToSecondType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToSecondType} object.
+     */
+    public TimeHourToSecondType timeHourToSecondType() {
+        return DataTypes.timeHourToSecondType();
+    }
+
+    /**
+     * <p>percentageType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.PercentageType} object.
+     */
+    public PercentageType percentageType() {
+        return DataTypes.percentageType();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypes.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypes.java
new file mode 100644
index 0000000..f37ed7a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypes.java
@@ -0,0 +1,389 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.exception.DRException;
+import org.apache.commons.lang3.Validate;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * A set of build in data types
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DataTypes {
+    private static final BigDecimalType bigDecimalType = new BigDecimalType();
+    private static final BigIntegerType bigIntegerType = new BigIntegerType();
+    private static final ByteType byteType = new ByteType();
+    private static final DoubleType doubleType = new DoubleType();
+    private static final FloatType floatType = new FloatType();
+    private static final IntegerType integerType = new IntegerType();
+    private static final LongType longType = new LongType();
+    private static final ShortType shortType = new ShortType();
+    private static final DateType dateType = new DateType();
+    private static final DateYearToMonthType dateYearToMonthType = new DateYearToMonthType();
+    private static final DateYearToHourType dateYearToHourType = new DateYearToHourType();
+    private static final DateYearToMinuteType dateYearToMinuteType = new DateYearToMinuteType();
+    private static final DateYearToSecondType dateYearToSecondType = new DateYearToSecondType();
+    private static final DateYearToFractionType dateYearToFractionType = new DateYearToFractionType();
+    private static final DateYearType dateYearType = new DateYearType();
+    private static final DateMonthType dateMonthType = new DateMonthType();
+    private static final DateDayType dateDayType = new DateDayType();
+    private static final TimeHourToMinuteType timeHourToMinuteType = new TimeHourToMinuteType();
+    private static final TimeHourToSecondType timeHourToSecondType = new TimeHourToSecondType();
+    private static final TimeHourToFractionType timeHourToFractionType = new TimeHourToFractionType();
+    private static final PercentageType percentageType = new PercentageType();
+    private static final BooleanType booleanType = new BooleanType();
+    private static final CharacterType characterType = new CharacterType();
+    private static final StringType stringType = new StringType();
+    private static final ListType listType = new ListType();
+
+    /**
+     * <p>detectType.</p>
+     *
+     * @param dataType a {@link java.lang.Class} object.
+     * @param <U>      a U object.
+     * @return a T object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public static <U, T extends DRIDataType<? super U, U>> T detectType(Class<U> dataType) throws DRException {
+        return detectType(dataType.getName());
+    }
+
+    /**
+     * <p>detectType.</p>
+     *
+     * @param dataType a {@link java.lang.String} object.
+     * @return a T object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T extends DRIDataType<?, ?>> T detectType(String dataType) throws DRException {
+        Validate.notNull(dataType, "dataType must not be null");
+
+        String dataTypeLC = dataType.toLowerCase().trim();
+        if (dataTypeLC.equals("bigdecimal") || dataType.equals(BigDecimal.class.getName())) {
+            return (T) bigDecimalType;
+        }
+        if (dataTypeLC.equals("biginteger") || dataType.equals(BigInteger.class.getName())) {
+            return (T) bigIntegerType;
+        }
+        if (dataTypeLC.equals("byte") || dataType.equals(Byte.class.getName())) {
+            return (T) byteType;
+        }
+        if (dataTypeLC.equals("double") || dataType.equals(Double.class.getName())) {
+            return (T) doubleType;
+        }
+        if (dataTypeLC.equals("float") || dataType.equals(Float.class.getName())) {
+            return (T) floatType;
+        }
+        if (dataTypeLC.equals("integer") || dataType.equals(Integer.class.getName())) {
+            return (T) integerType;
+        }
+        if (dataTypeLC.equals("long") || dataType.equals(Long.class.getName())) {
+            return (T) longType;
+        }
+        if (dataTypeLC.equals("short") || dataType.equals(Short.class.getName())) {
+            return (T) shortType;
+        }
+        if (dataTypeLC.equals("date") || dataType.equals(Date.class.getName())) {
+            return (T) dateType;
+        }
+        if (dataTypeLC.equals("dateyeartomonth")) {
+            return (T) dateYearToMonthType;
+        }
+        if (dataTypeLC.equals("dateyeartohour")) {
+            return (T) dateYearToHourType;
+        }
+        if (dataTypeLC.equals("dateyeartominute")) {
+            return (T) dateYearToMinuteType;
+        }
+        if (dataTypeLC.equals("dateyeartosecond")) {
+            return (T) dateYearToSecondType;
+        }
+        if (dataTypeLC.equals("dateyeartofraction")) {
+            return (T) dateYearToFractionType;
+        }
+        if (dataTypeLC.equals("dateyear")) {
+            return (T) dateYearType;
+        }
+        if (dataTypeLC.equals("datemonth")) {
+            return (T) dateMonthType;
+        }
+        if (dataTypeLC.equals("dateday")) {
+            return (T) dateDayType;
+        }
+        if (dataTypeLC.equals("timehourtominute")) {
+            return (T) timeHourToMinuteType;
+        }
+        if (dataTypeLC.equals("timehourtosecond")) {
+            return (T) timeHourToSecondType;
+        }
+        if (dataTypeLC.equals("timehourtofraction")) {
+            return (T) timeHourToFractionType;
+        }
+        if (dataTypeLC.equals("percentage")) {
+            return (T) percentageType;
+        }
+        if (dataTypeLC.equals("boolean") || dataType.equals(Boolean.class.getName())) {
+            return (T) booleanType;
+        }
+        if (dataTypeLC.equals("character") || dataType.equals(Character.class.getName())) {
+            return (T) characterType;
+        }
+        if (dataTypeLC.equals("string") || dataTypeLC.equals("text") || dataType.equals(String.class.getName())) {
+            return (T) stringType;
+        }
+        if (dataTypeLC.equals("list") || dataType.equals(List.class.getName())) {
+            return (T) listType;
+        }
+
+        throw new DRException("Data type \"" + dataType + "\" is not supported");
+    }
+
+    /**
+     * <p>bigDecimalType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BigDecimalType} object.
+     */
+    public static BigDecimalType bigDecimalType() {
+        return bigDecimalType;
+    }
+
+    /**
+     * <p>bigIntegerType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BigIntegerType} object.
+     */
+    public static BigIntegerType bigIntegerType() {
+        return bigIntegerType;
+    }
+
+    /**
+     * <p>booleanType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BooleanType} object.
+     */
+    public static BooleanType booleanType() {
+        return booleanType;
+    }
+
+    /**
+     * <p>byteType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ByteType} object.
+     */
+    public static ByteType byteType() {
+        return byteType;
+    }
+
+    /**
+     * <p>dateType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateType} object.
+     */
+    public static DateType dateType() {
+        return dateType;
+    }
+
+    /**
+     * <p>dateYearToFractionType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToFractionType} object.
+     */
+    public static DateYearToFractionType dateYearToFractionType() {
+        return dateYearToFractionType;
+    }
+
+    /**
+     * <p>dateYearType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearType} object.
+     */
+    public static DateYearType dateYearType() {
+        return dateYearType;
+    }
+
+    /**
+     * <p>dateMonthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateMonthType} object.
+     */
+    public static DateMonthType dateMonthType() {
+        return dateMonthType;
+    }
+
+    /**
+     * <p>dateDayType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateDayType} object.
+     */
+    public static DateDayType dateDayType() {
+        return dateDayType;
+    }
+
+    /**
+     * <p>dateYearToHourType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToHourType} object.
+     */
+    public static DateYearToHourType dateYearToHourType() {
+        return dateYearToHourType;
+    }
+
+    /**
+     * <p>dateYearToMinuteType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToMinuteType} object.
+     */
+    public static DateYearToMinuteType dateYearToMinuteType() {
+        return dateYearToMinuteType;
+    }
+
+    /**
+     * <p>dateYearToMonthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToMonthType} object.
+     */
+    public static DateYearToMonthType dateYearToMonthType() {
+        return dateYearToMonthType;
+    }
+
+    /**
+     * <p>dateYearToSecondType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToSecondType} object.
+     */
+    public static DateYearToSecondType dateYearToSecondType() {
+        return dateYearToSecondType;
+    }
+
+    /**
+     * <p>doubleType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DoubleType} object.
+     */
+    public static DoubleType doubleType() {
+        return doubleType;
+    }
+
+    /**
+     * <p>floatType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.FloatType} object.
+     */
+    public static FloatType floatType() {
+        return floatType;
+    }
+
+    /**
+     * <p>characterType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.CharacterType} object.
+     */
+    public static CharacterType characterType() {
+        return characterType;
+    }
+
+    /**
+     * <p>integerType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.IntegerType} object.
+     */
+    public static IntegerType integerType() {
+        return integerType;
+    }
+
+    /**
+     * <p>longType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.LongType} object.
+     */
+    public static LongType longType() {
+        return longType;
+    }
+
+    /**
+     * <p>shortType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ShortType} object.
+     */
+    public static ShortType shortType() {
+        return shortType;
+    }
+
+    /**
+     * <p>stringType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.StringType} object.
+     */
+    public static StringType stringType() {
+        return stringType;
+    }
+
+    /**
+     * <p>listType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ListType} object.
+     */
+    public static ListType listType() {
+        return listType;
+    }
+
+    /**
+     * <p>timeHourToFractionType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToFractionType} object.
+     */
+    public static TimeHourToFractionType timeHourToFractionType() {
+        return timeHourToFractionType;
+    }
+
+    /**
+     * <p>timeHourToMinuteType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToMinuteType} object.
+     */
+    public static TimeHourToMinuteType timeHourToMinuteType() {
+        return timeHourToMinuteType;
+    }
+
+    /**
+     * <p>timeHourToSecondType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToSecondType} object.
+     */
+    public static TimeHourToSecondType timeHourToSecondType() {
+        return timeHourToSecondType;
+    }
+
+    /**
+     * <p>percentageType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.datatype.PercentageType} object.
+     */
+    public static PercentageType percentageType() {
+        return percentageType;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateDayType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateDayType.java
new file mode 100644
index 0000000..4d8cf08
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateDayType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DateDayType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateDayType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateDayType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateDayType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateMonthType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateMonthType.java
new file mode 100644
index 0000000..fc6f187
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateMonthType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DateMonthType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateMonthType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateMonthType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateMonthType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateType.java
new file mode 100644
index 0000000..a63f14c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateType.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * <p>DateType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateType extends AbstractDataType<Date, Date> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String valueToString(Date value, Locale locale) {
+        if (value != null) {
+            return new SimpleDateFormat(getPattern(), locale).format(value);
+        }
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Date stringToValue(String value, Locale locale) throws DRException {
+        if (value != null) {
+            try {
+                return new SimpleDateFormat(getPattern(), locale).parse(value);
+            } catch (ParseException e) {
+                throw new DRException("Unable to convert string value to date", e);
+            }
+        }
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToFractionType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToFractionType.java
new file mode 100644
index 0000000..55f2954
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToFractionType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DateYearToFractionType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateYearToFractionType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateYearToFractionType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateYearToFractionType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToHourType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToHourType.java
new file mode 100644
index 0000000..c20599f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToHourType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DateYearToHourType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateYearToHourType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateYearToHourType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateYearToHourType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMinuteType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMinuteType.java
new file mode 100644
index 0000000..a921633
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMinuteType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DateYearToMinuteType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateYearToMinuteType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateYearToMinuteType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateYearToMinuteType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMonthType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMonthType.java
new file mode 100644
index 0000000..5cd3588
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMonthType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DateYearToMonthType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateYearToMonthType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateYearToMonthType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateYearToMonthType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToSecondType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToSecondType.java
new file mode 100644
index 0000000..81361e3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToSecondType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DateYearToSecondType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateYearToSecondType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateYearToSecondType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateYearToSecondType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearType.java
new file mode 100644
index 0000000..9229459
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DateYearType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DateYearType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDateYearType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDateYearType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DoubleType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DoubleType.java
new file mode 100644
index 0000000..d2289b5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DoubleType.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>DoubleType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DoubleType extends NumberType<Double> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getDoubleType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getDoubleType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Double numberToValue(Number number) {
+        return number.doubleValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/FloatType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/FloatType.java
new file mode 100644
index 0000000..a8d0c76
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/FloatType.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>FloatType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class FloatType extends NumberType<Float> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getFloatType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getFloatType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Float numberToValue(Number number) {
+        return number.floatValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/IntegerType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/IntegerType.java
new file mode 100644
index 0000000..b70242e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/IntegerType.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>IntegerType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class IntegerType extends NumberType<Integer> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getIntegerType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getIntegerType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Integer numberToValue(Number number) {
+        return number.intValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ListType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ListType.java
new file mode 100644
index 0000000..13480e0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ListType.java
@@ -0,0 +1,77 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+
+import java.util.List;
+
+/**
+ * <p>ListType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("rawtypes")
+public class ListType extends AbstractDataType<List, List> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private static ListFormatter listFormatter = new ListFormatter();
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIValueFormatter<?, ? extends List> getValueFormatter() {
+        return listFormatter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getStringType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getStringType().getHorizontalTextAlignment();
+    }
+
+    private static class ListFormatter extends AbstractValueFormatter<String, List> {
+        private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+        @Override
+        public String format(List values, ReportParameters reportParameters) {
+            StringBuilder result = new StringBuilder();
+            for (Object value : values) {
+                if (result.length() > 0) {
+                    result.append("\n");
+                }
+                if (value != null) {
+                    result.append(value.toString());
+                }
+            }
+            return result.toString();
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/LongType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/LongType.java
new file mode 100644
index 0000000..4aabb5a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/LongType.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>LongType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class LongType extends NumberType<Long> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getLongType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getLongType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Long numberToValue(Number number) {
+        return number.longValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/NumberType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/NumberType.java
new file mode 100644
index 0000000..7249197
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/NumberType.java
@@ -0,0 +1,75 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.ParseException;
+import java.util.Locale;
+
+/**
+ * <p>Abstract NumberType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class NumberType<T extends Number> extends AbstractDataType<Number, T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String valueToString(Number value, Locale locale) {
+        if (value != null) {
+            return new DecimalFormat(getPattern(), new DecimalFormatSymbols(locale)).format(value);
+        }
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public T stringToValue(String value, Locale locale) throws DRException {
+        if (value != null) {
+            try {
+                return numberToValue(new DecimalFormat(getPattern(), new DecimalFormatSymbols(locale)).parse(value));
+            } catch (ParseException e) {
+                throw new DRException("Unable to convert string value to date", e);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * <p>numberToValue.</p>
+     *
+     * @param number a {@link java.lang.Number} object.
+     * @return a T object.
+     */
+    protected abstract T numberToValue(Number number);
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override
+    public Class<T> getValueClass() {
+        return (Class<T>) ReportUtils.getGenericClass(this, 0);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/PercentageType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/PercentageType.java
new file mode 100644
index 0000000..1ef1142
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/PercentageType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>PercentageType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PercentageType extends DoubleType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getPercentageType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getPercentageType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ShortType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ShortType.java
new file mode 100644
index 0000000..0d9f430
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ShortType.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>ShortType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ShortType extends NumberType<Short> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getShortType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getShortType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Short numberToValue(Number number) {
+        return number.shortValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/StringType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/StringType.java
new file mode 100644
index 0000000..10dee93
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/StringType.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.util.Locale;
+
+/**
+ * <p>StringType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class StringType extends AbstractDataType<String, String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getStringType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getStringType().getHorizontalTextAlignment();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String stringToValue(String value, Locale locale) throws DRException {
+        return value;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToFractionType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToFractionType.java
new file mode 100644
index 0000000..ab7d4c3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToFractionType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>TimeHourToFractionType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TimeHourToFractionType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getTimeHourToFractionType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getTimeHourToFractionType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java
new file mode 100644
index 0000000..e383513
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>TimeHourToMinuteType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TimeHourToMinuteType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getTimeHourToMinuteType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getTimeHourToMinuteType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToSecondType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToSecondType.java
new file mode 100644
index 0000000..b4f4779
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToSecondType.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.datatype;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Defaults;
+
+/**
+ * <p>TimeHourToSecondType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TimeHourToSecondType extends DateType {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPattern() {
+        return Defaults.getDefaults().getTimeHourToSecondType().getPattern();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public HorizontalTextAlignment getHorizontalTextAlignment() {
+        return Defaults.getDefaults().getTimeHourToSecondType().getHorizontalTextAlignment();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractComplexExpression.java
new file mode 100644
index 0000000..df9053b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractComplexExpression.java
@@ -0,0 +1,149 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.base.DRField;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.VariableBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIComplexExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>Abstract AbstractComplexExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractComplexExpression<T> implements DRIComplexExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private List<DRIExpression<?>> expressions;
+
+    /**
+     * <p>Constructor for AbstractComplexExpression.</p>
+     */
+    protected AbstractComplexExpression() {
+        this.name = ReportUtils.generateUniqueName("complexExpression");
+        this.expressions = new ArrayList<DRIExpression<?>>();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>addExpression.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected void addExpression(FieldBuilder<?> field) {
+        Validate.notNull(field, "field must not be null");
+        this.expressions.add(field.getField());
+    }
+
+    /**
+     * <p>addExpression.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    protected void addExpression(String fieldName, Class<?> valueClass) {
+        @SuppressWarnings( {"unchecked", "rawtypes"}) DRField<?> field = new DRField(fieldName, valueClass);
+        this.expressions.add(field);
+    }
+
+    /**
+     * <p>addExpression.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     */
+    protected void addExpression(TextColumnBuilder<?> column) {
+        Validate.notNull(column, "column must not be null");
+        this.expressions.add(column.build());
+    }
+
+    /**
+     * <p>addExpression.</p>
+     *
+     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     */
+    protected void addExpression(VariableBuilder<?> variable) {
+        Validate.notNull(variable, "variable must not be null");
+        this.expressions.add(variable.getVariable());
+    }
+
+    /**
+     * <p>addExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected void addExpression(DRIExpression<?> expression) {
+        Validate.notNull(expression, "expression must not be null");
+        this.expressions.add(expression);
+    }
+
+    /**
+     * <p>addExpression.</p>
+     *
+     * @param crosstabGroup a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     */
+    protected void addExpression(AbstractCrosstabGroupBuilder<?, ?, ?> crosstabGroup) {
+        Validate.notNull(crosstabGroup, "crosstabGroup must not be null");
+        this.expressions.add(Expressions.crosstabValue(crosstabGroup));
+    }
+
+    /**
+     * <p>addExpression.</p>
+     *
+     * @param crosstabMeasure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    protected void addExpression(CrosstabMeasureBuilder<?> crosstabMeasure) {
+        Validate.notNull(crosstabMeasure, "crosstabMeasure must not be null");
+        this.expressions.add(Expressions.crosstabValue(crosstabMeasure));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<DRIExpression<?>> getExpressions() {
+        return expressions;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Class<? super T> getValueClass() {
+        return (Class<? super T>) ReportUtils.getGenericClass(this, 0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public abstract T evaluate(List<?> values, ReportParameters reportParameters);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java
new file mode 100644
index 0000000..cf4a045
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java
@@ -0,0 +1,87 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+import org.apache.commons.lang3.Validate;
+
+import java.util.List;
+
+/**
+ * <p>Abstract AbstractSubDatasourceExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class AbstractSubDatasourceExpression<T> extends AbstractComplexExpression<JRDataSource> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for AbstractSubDatasourceExpression.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     */
+    protected AbstractSubDatasourceExpression(String fieldName) {
+        Validate.notNull(fieldName, "fieldName must not be null");
+        addExpression(fieldName, getSubDatasourceDataClass());
+    }
+
+    /**
+     * <p>Constructor for AbstractSubDatasourceExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected AbstractSubDatasourceExpression(DRIExpression<? extends T> expression) {
+        addExpression(expression);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("unchecked")
+    @Override
+    public JRDataSource evaluate(List<?> values, ReportParameters reportParameters) {
+        return createSubDatasource((T) values.get(0));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<? super JRDataSource> getValueClass() {
+        return JRDataSource.class;
+    }
+
+    /**
+     * <p>getSubDatasourceDataClass.</p>
+     *
+     * @return a {@link java.lang.Class} object.
+     */
+    @SuppressWarnings("unchecked")
+    protected Class<T> getSubDatasourceDataClass() {
+        return (Class<T>) ReportUtils.getGenericClass(this, 0);
+    }
+
+    /**
+     * <p>createSubDatasource.</p>
+     *
+     * @param data a T object.
+     * @return a {@link net.sf.jasperreports.engine.JRDataSource} object.
+     */
+    protected abstract JRDataSource createSubDatasource(T data);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AddExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AddExpression.java
new file mode 100644
index 0000000..efcd154
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AddExpression.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>AddExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class AddExpression extends CalculationExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    @SafeVarargs
+    /**
+     * <p>Constructor for AddExpression.</p>
+     *
+     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public AddExpression(DRIExpression<? extends Number>... expressions) {
+        super(expressions);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected BigDecimal calculate(BigDecimal value1, BigDecimal value2) {
+        return value1.add(value2);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java
new file mode 100644
index 0000000..f34f30f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.data.JRBeanArrayDataSource;
+
+/**
+ * <p>BeanArraySubDatasourceExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BeanArraySubDatasourceExpression extends AbstractSubDatasourceExpression<Object[]> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for BeanArraySubDatasourceExpression.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     */
+    public BeanArraySubDatasourceExpression(String fieldName) {
+        super(fieldName);
+    }
+
+    /**
+     * <p>Constructor for BeanArraySubDatasourceExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public BeanArraySubDatasourceExpression(DRIExpression<? extends Object[]> expression) {
+        super(expression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JRDataSource createSubDatasource(Object[] data) {
+        return new JRBeanArrayDataSource(data);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java
new file mode 100644
index 0000000..f21090d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java
@@ -0,0 +1,59 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+import java.util.Collection;
+
+/**
+ * <p>BeanCollectionSubDatasourceExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BeanCollectionSubDatasourceExpression extends AbstractSubDatasourceExpression<Collection<?>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for BeanCollectionSubDatasourceExpression.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     */
+    public BeanCollectionSubDatasourceExpression(String fieldName) {
+        super(fieldName);
+    }
+
+    /**
+     * <p>Constructor for BeanCollectionSubDatasourceExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public BeanCollectionSubDatasourceExpression(DRIExpression<? extends Collection<?>> expression) {
+        super(expression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JRDataSource createSubDatasource(Collection<?> data) {
+        return new JRBeanCollectionDataSource(data);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CalculationExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CalculationExpression.java
new file mode 100644
index 0000000..32f55a0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CalculationExpression.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author Ricardo Mariaca
+ */
+abstract class CalculationExpression extends AbstractComplexExpression<BigDecimal> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    @SafeVarargs
+    /**
+     * <p>Constructor for CalculationExpression.</p>
+     *
+     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected CalculationExpression(DRIExpression<? extends Number>... expressions) {
+        Validate.notNull(expressions, "expressions must not be null");
+        Validate.noNullElements(expressions, "expressions must not contains null expression");
+        for (DRIExpression<? extends Number> expression : expressions) {
+            addExpression(expression);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public BigDecimal evaluate(List<?> values, ReportParameters reportParameters) {
+        BigDecimal result = null;
+        for (Object value : values) {
+            BigDecimal bigDecimalValue;
+            if (value instanceof BigDecimal) {
+                bigDecimalValue = (BigDecimal) value;
+            } else {
+                bigDecimalValue = new BigDecimal(((Number) value).doubleValue());
+            }
+            if (result == null) {
+                result = bigDecimalValue;
+            } else {
+                result = calculate(result, bigDecimalValue);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * <p>calculate.</p>
+     *
+     * @param value1 a {@link java.math.BigDecimal} object.
+     * @param value2 a {@link java.math.BigDecimal} object.
+     * @return a {@link java.math.BigDecimal} object.
+     */
+    protected abstract BigDecimal calculate(BigDecimal value1, BigDecimal value2);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnNumberExpression.java
new file mode 100644
index 0000000..6c9084b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnNumberExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>ColumnNumberExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ColumnNumberExpression extends AbstractSimpleExpression<Integer> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer evaluate(ReportParameters reportParameters) {
+        return reportParameters.getColumnNumber();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java
new file mode 100644
index 0000000..52c8639
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>ColumnRowNumberExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ColumnRowNumberExpression extends AbstractSimpleExpression<Integer> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer evaluate(ReportParameters reportParameters) {
+        return reportParameters.getColumnRowNumber();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CrosstabValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CrosstabValueExpression.java
new file mode 100644
index 0000000..355f246
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CrosstabValueExpression.java
@@ -0,0 +1,74 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSystemExpression;
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRICrosstabValue;
+
+/**
+ * <p>CrosstabValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public final class CrosstabValueExpression<T> extends AbstractSystemExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CrosstabValueExpression.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     */
+    protected CrosstabValueExpression(AbstractCrosstabGroupBuilder<?, ?, ?> group) {
+        super(group.getName());
+    }
+
+    /**
+     * <p>Constructor for CrosstabValueExpression.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     */
+    protected CrosstabValueExpression(DRICrosstabValue<T> measure) {
+        super(measure.getName());
+    }
+
+    /**
+     * <p>Constructor for CrosstabValueExpression.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param group   a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     */
+    protected CrosstabValueExpression(DRICrosstabValue<T> measure, AbstractCrosstabGroupBuilder<?, ?, ?> group) {
+        super(measure.getName() + "_" + group.getName() + "_ALL");
+    }
+
+    /**
+     * <p>Constructor for CrosstabValueExpression.</p>
+     *
+     * @param measure     a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param rowGroup    a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     */
+    protected CrosstabValueExpression(DRICrosstabValue<T> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup) {
+        super(measure.getName() + "_" + rowGroup.getName() + "_" + columnGroup.getName() + "_ALL");
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DataSourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DataSourceExpression.java
new file mode 100644
index 0000000..4ec9f7b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DataSourceExpression.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRRewindableDataSource;
+
+/**
+ * <p>DataSourceExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DataSourceExpression extends AbstractSimpleExpression<JRDataSource> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private JRDataSource dataSource;
+    private boolean moveFirst = false;
+
+    /**
+     * <p>Constructor for DataSourceExpression.</p>
+     *
+     * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
+     */
+    public DataSourceExpression(JRDataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public JRDataSource evaluate(ReportParameters reportParameters) {
+        if (moveFirst && dataSource != null && dataSource instanceof JRRewindableDataSource) {
+            try {
+                ((JRRewindableDataSource) dataSource).moveFirst();
+            } catch (JRException e) {
+            }
+        }
+        moveFirst = true;
+        return dataSource;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<JRDataSource> getValueClass() {
+        return JRDataSource.class;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DivideExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DivideExpression.java
new file mode 100644
index 0000000..1376ee4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DivideExpression.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>DivideExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DivideExpression extends CalculationExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private int scale;
+
+    @SafeVarargs
+    /**
+     * <p>Constructor for DivideExpression.</p>
+     *
+     * @param scale a int.
+     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DivideExpression(int scale, DRIExpression<? extends Number>... expressions) {
+        super(expressions);
+        this.scale = scale;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected BigDecimal calculate(BigDecimal value1, BigDecimal value2) {
+        return value1.divide(value2, scale, BigDecimal.ROUND_HALF_UP);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ExpressionBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ExpressionBuilders.java
new file mode 100644
index 0000000..0415d57
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ExpressionBuilders.java
@@ -0,0 +1,494 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import java.awt.Image;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Map;
+
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.definition.DRICrosstabValue;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * A set of build in expressions.<br/> Expressions are used to define various calculations, conditions, text field content, specific report groups, etc.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ExpressionBuilders {
+
+    /**
+     * <p>printInFirstPage.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInFirstPageExpression} object.
+     */
+    public PrintInFirstPageExpression printInFirstPage() {
+        return Expressions.printInFirstPage();
+    }
+
+    /**
+     * <p>printNotInFirstPage.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintNotInFirstPageExpression} object.
+     */
+    public PrintNotInFirstPageExpression printNotInFirstPage() {
+        return Expressions.printNotInFirstPage();
+    }
+
+    /**
+     * <p>printWhenGroupHasMoreThanOneRow.</p>
+     *
+     * @param groupName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
+     */
+    public PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow(final String groupName) {
+        return Expressions.printWhenGroupHasMoreThanOneRow(groupName);
+    }
+
+    /**
+     * <p>printWhenGroupHasMoreThanOneRow.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
+     */
+    public PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow(final GroupBuilder<?> group) {
+        return Expressions.printWhenGroupHasMoreThanOneRow(group);
+    }
+
+    /**
+     * <p>reportRowNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ReportRowNumberExpression} object.
+     */
+    public ReportRowNumberExpression reportRowNumber() {
+        return Expressions.reportRowNumber();
+    }
+
+    /**
+     * <p>pageRowNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PageRowNumberExpression} object.
+     */
+    public PageRowNumberExpression pageRowNumber() {
+        return Expressions.pageRowNumber();
+    }
+
+    /**
+     * <p>columnRowNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ColumnRowNumberExpression} object.
+     */
+    public ColumnRowNumberExpression columnRowNumber() {
+        return Expressions.columnRowNumber();
+    }
+
+    /**
+     * <p>pageNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PageNumberExpression} object.
+     */
+    public PageNumberExpression pageNumber() {
+        return Expressions.pageNumber();
+    }
+
+    /**
+     * <p>columnNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ColumnNumberExpression} object.
+     */
+    public ColumnNumberExpression columnNumber() {
+        return Expressions.columnNumber();
+    }
+
+    /**
+     * <p>groupRowNumber.</p>
+     *
+     * @param groupName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
+     */
+    public GroupRowNumberExpression groupRowNumber(final String groupName) {
+        return Expressions.groupRowNumber(groupName);
+    }
+
+    /**
+     * <p>groupRowNumber.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
+     */
+    public GroupRowNumberExpression groupRowNumber(final GroupBuilder<?> group) {
+        return Expressions.groupRowNumber(group);
+    }
+
+    /**
+     * <p>date.</p>
+     *
+     * @param date a {@link java.util.Date} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public ValueExpression<Date> date(final Date date) {
+        return Expressions.date(date);
+    }
+
+    /**
+     * <p>number.</p>
+     *
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public ValueExpression<Number> number(final Number number) {
+        return Expressions.number(number);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param image a {@link java.awt.Image} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public ValueExpression<Image> image(final Image image) {
+        return Expressions.image(image);
+    }
+
+    /**
+     * <p>inputStream.</p>
+     *
+     * @param inputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public ValueExpression<InputStream> inputStream(final InputStream inputStream) {
+        return Expressions.inputStream(inputStream);
+    }
+
+    /**
+     * <p>url.</p>
+     *
+     * @param url a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public ValueExpression<URL> url(final URL url) {
+        return Expressions.url(url);
+    }
+
+    /**
+     * <p>value.</p>
+     *
+     * @param value a T object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public <T> ValueExpression<T> value(final T value) {
+        return Expressions.value(value);
+    }
+
+    /**
+     * <p>value.</p>
+     *
+     * @param value      a T object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public <T> ValueExpression<T> value(final T value, final Class<? super T> valueClass) {
+        return Expressions.value(value, valueClass);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param text a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public ValueExpression<String> text(final String text) {
+        return Expressions.text(text);
+    }
+
+    /**
+     * <p>dataSource.</p>
+     *
+     * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.DataSourceExpression} object.
+     */
+    public DataSourceExpression dataSource(final JRDataSource dataSource) {
+        return Expressions.dataSource(dataSource);
+    }
+
+    /**
+     * <p>message.</p>
+     *
+     * @param key a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MessageExpression} object.
+     */
+    public MessageExpression message(final String key) {
+        return Expressions.message(key);
+    }
+
+    /**
+     * <p>message.</p>
+     *
+     * @param key       a {@link java.lang.String} object.
+     * @param arguments an array of {@link java.lang.Object} objects.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MessageExpression} object.
+     */
+    public MessageExpression message(final String key, final Object[] arguments) {
+        return Expressions.message(key, arguments);
+    }
+
+    // jasper
+
+    /**
+     * Creates a new jasper expression.<br/> This expression allows declaring an expression in a Jasper native syntax. Knowledge of the jasper syntax is also required for proper use.
+     *
+     * @param expression the jasper expression
+     * @param valueClass the expression class
+     * @param <T>        a T object.
+     * @return the expression
+     */
+    public <T> JasperExpression<T> jasperSyntax(final String expression, final Class<? super T> valueClass) {
+        return Expressions.jasperSyntax(expression, valueClass);
+    }
+
+    /**
+     * Creates a new jasper expression.<br/> This expression allows declaring an expression in a Jasper native syntax. Knowledge of the jasper syntax is also required for proper use.
+     *
+     * @param expression the jasper expression
+     * @return the expression
+     */
+    @SuppressWarnings("rawtypes")
+    public JasperExpression jasperSyntax(final String expression) {
+        return Expressions.jasperSyntax(expression);
+    }
+
+    // property
+
+    /**
+     * <p>property.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRISimpleExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PropertyExpression} object.
+     */
+    public PropertyExpression property(final String name, final DRISimpleExpression<String> valueExpression) {
+        return Expressions.property(name, valueExpression);
+    }
+
+    /**
+     * <p>property.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PropertyExpression} object.
+     */
+    public PropertyExpression property(final String name, final String value) {
+        return Expressions.property(name, value);
+    }
+
+    // parameter
+
+    /**
+     * <p>parameter.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRISimpleExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ParameterExpression} object.
+     */
+    public ParameterExpression parameter(final String name, final DRISimpleExpression<?> valueExpression) {
+        return Expressions.parameter(name, valueExpression);
+    }
+
+    /**
+     * <p>parameter.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a {@link java.lang.Object} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ParameterExpression} object.
+     */
+    public ParameterExpression parameter(final String name, final Object value) {
+        return Expressions.parameter(name, value);
+    }
+
+    /**
+     * <p>printInOddRow.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInOddRowExpression} object.
+     */
+    public PrintInOddRowExpression printInOddRow() {
+        return Expressions.printInOddRow();
+    }
+
+    /**
+     * <p>printInEvenRow.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInEvenRowExpression} object.
+     */
+    public PrintInEvenRowExpression printInEvenRow() {
+        return Expressions.printInEvenRow();
+    }
+
+    // subdatasource
+
+    /**
+     * <p>subDatasourceBeanCollection.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
+     */
+    public BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final String fieldName) {
+        return Expressions.subDatasourceBeanCollection(fieldName);
+    }
+
+    /**
+     * <p>subDatasourceBeanCollection.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
+     */
+    public BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final DRIExpression<? extends Collection<?>> expression) {
+        return Expressions.subDatasourceBeanCollection(expression);
+    }
+
+    /**
+     * <p>subDatasourceBeanArray.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
+     */
+    public BeanArraySubDatasourceExpression subDatasourceBeanArray(final String fieldName) {
+        return Expressions.subDatasourceBeanArray(fieldName);
+    }
+
+    /**
+     * <p>subDatasourceBeanArray.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
+     */
+    public BeanArraySubDatasourceExpression subDatasourceBeanArray(final DRIExpression<? extends Object[]> expression) {
+        return Expressions.subDatasourceBeanArray(expression);
+    }
+
+    /**
+     * <p>subDatasourceMapCollection.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
+     */
+    public MapCollectionSubDatasourceExpression subDatasourceMapCollection(final String fieldName) {
+        return Expressions.subDatasourceMapCollection(fieldName);
+    }
+
+    /**
+     * <p>subDatasourceMapCollection.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
+     */
+    public MapCollectionSubDatasourceExpression subDatasourceMapCollection(final DRIExpression<? extends Collection<Map<String, ?>>> expression) {
+        return Expressions.subDatasourceMapCollection(expression);
+    }
+
+    /**
+     * <p>subDatasourceMapArray.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
+     */
+    public MapArraySubDatasourceExpression subDatasourceMapArray(final String fieldName) {
+        return Expressions.subDatasourceMapArray(fieldName);
+    }
+
+    /**
+     * <p>subDatasourceMapArray.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
+     */
+    public MapArraySubDatasourceExpression subDatasourceMapArray(final DRIExpression<? extends Object[]> expression) {
+        return Expressions.subDatasourceMapArray(expression);
+    }
+
+    // crosstab
+
+    /**
+     * <p>orderBy.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.OrderByExpression} object.
+     */
+    public OrderByExpression orderBy(final CrosstabMeasureBuilder<? extends Comparable<?>> measure) {
+        return Expressions.orderBy(measure);
+    }
+
+    /**
+     * <p>crosstabValue.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     */
+    public <T> CrosstabValueExpression<T> crosstabValue(final AbstractCrosstabGroupBuilder<?, ?, ?> group) {
+        return Expressions.crosstabValue(group);
+    }
+
+    /**
+     * <p>crosstabValue.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param <T>     a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     */
+    public <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure) {
+        return Expressions.crosstabValue(measure);
+    }
+
+    /**
+     * <p>crosstabValue.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param group   a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param <T>     a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     */
+    public <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure, final AbstractCrosstabGroupBuilder<?, ?, ?> group) {
+        return Expressions.crosstabValue(measure, group);
+    }
+
+    /**
+     * <p>crosstabValue.</p>
+     *
+     * @param measure     a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param rowGroup    a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     */
+    public <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure, final CrosstabRowGroupBuilder<?> rowGroup, final CrosstabColumnGroupBuilder<?> columnGroup) {
+        return Expressions.crosstabValue(measure, rowGroup, columnGroup);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/Expressions.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/Expressions.java
new file mode 100644
index 0000000..c5f034f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/Expressions.java
@@ -0,0 +1,512 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import java.awt.Image;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Map;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.definition.DRICrosstabValue;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * A set of build in expressions.<br/> Expressions are used to define various calculations, conditions, text field content, specific report groups, etc.
+ *
+ * @author Ricardo Mariaca
+ *
+ */
+public class Expressions {
+    private static final PrintInFirstPageExpression printInFirstPage = new PrintInFirstPageExpression();
+    private static final PrintNotInFirstPageExpression printNotInFirstPage = new PrintNotInFirstPageExpression();
+    private static final ReportRowNumberExpression reportRowNumber = new ReportRowNumberExpression();
+    private static final PageRowNumberExpression pageRowNumber = new PageRowNumberExpression();
+    private static final ColumnRowNumberExpression columnRowNumber = new ColumnRowNumberExpression();
+    private static final PageNumberExpression pageNumber = new PageNumberExpression();
+    private static final ColumnNumberExpression columnNumber = new ColumnNumberExpression();
+    private static final PrintInOddRowExpression printInOddRow = new PrintInOddRowExpression();
+    private static final PrintInEvenRowExpression printInEvenRow = new PrintInEvenRowExpression();
+
+    /**
+     * <p>printInFirstPage.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInFirstPageExpression} object.
+     */
+    public static PrintInFirstPageExpression printInFirstPage() {
+        return printInFirstPage;
+    }
+
+    /**
+     * <p>printNotInFirstPage.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintNotInFirstPageExpression} object.
+     */
+    public static PrintNotInFirstPageExpression printNotInFirstPage() {
+        return printNotInFirstPage;
+    }
+
+    /**
+     * <p>printWhenGroupHasMoreThanOneRow.</p>
+     *
+     * @param groupName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
+     */
+    public static PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow(final String groupName) {
+        return new PrintWhenGroupHasMoreThanOneRowExpression(groupName);
+    }
+
+    /**
+     * <p>printWhenGroupHasMoreThanOneRow.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
+     */
+    public static PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow(final GroupBuilder<?> group) {
+        Validate.notNull(group, "group must not be null");
+        return printWhenGroupHasMoreThanOneRow(group.getGroup().getName());
+    }
+
+    /**
+     * <p>reportRowNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ReportRowNumberExpression} object.
+     */
+    public static ReportRowNumberExpression reportRowNumber() {
+        return reportRowNumber;
+    }
+
+    /**
+     * <p>pageRowNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PageRowNumberExpression} object.
+     */
+    public static PageRowNumberExpression pageRowNumber() {
+        return pageRowNumber;
+    }
+
+    /**
+     * <p>columnRowNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ColumnRowNumberExpression} object.
+     */
+    public static ColumnRowNumberExpression columnRowNumber() {
+        return columnRowNumber;
+    }
+
+    /**
+     * <p>pageNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PageNumberExpression} object.
+     */
+    public static PageNumberExpression pageNumber() {
+        return pageNumber;
+    }
+
+    /**
+     * <p>columnNumber.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ColumnNumberExpression} object.
+     */
+    public static ColumnNumberExpression columnNumber() {
+        return columnNumber;
+    }
+
+    /**
+     * <p>groupRowNumber.</p>
+     *
+     * @param groupName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
+     */
+    public static GroupRowNumberExpression groupRowNumber(final String groupName) {
+        return new GroupRowNumberExpression(groupName);
+    }
+
+    /**
+     * <p>groupRowNumber.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
+     */
+    public static GroupRowNumberExpression groupRowNumber(final GroupBuilder<?> group) {
+        Validate.notNull(group, "group must not be null");
+        return groupRowNumber(group.getGroup().getName());
+    }
+
+    /**
+     * <p>date.</p>
+     *
+     * @param date a {@link java.util.Date} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public static ValueExpression<Date> date(final Date date) {
+        return value(date, Date.class);
+    }
+
+    /**
+     * <p>number.</p>
+     *
+     * @param number a {@link java.lang.Number} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public static ValueExpression<Number> number(final Number number) {
+        return value(number, Number.class);
+    }
+
+    /**
+     * <p>image.</p>
+     *
+     * @param image a {@link java.awt.Image} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public static ValueExpression<Image> image(final Image image) {
+        return value(image, Image.class);
+    }
+
+    /**
+     * <p>inputStream.</p>
+     *
+     * @param inputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public static ValueExpression<InputStream> inputStream(final InputStream inputStream) {
+        return value(inputStream, InputStream.class);
+    }
+
+    /**
+     * <p>url.</p>
+     *
+     * @param url a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public static ValueExpression<URL> url(final URL url) {
+        return value(url, URL.class);
+    }
+
+    /**
+     * <p>value.</p>
+     *
+     * @param value a T object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public static <T> ValueExpression<T> value(final T value) {
+        return new ValueExpression<>(value);
+    }
+
+    /**
+     * <p>value.</p>
+     *
+     * @param value      a T object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param <T>        a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public static <T> ValueExpression<T> value(final T value, final Class<? super T> valueClass) {
+        return new ValueExpression<>(value, valueClass);
+    }
+
+    /**
+     * <p>text.</p>
+     *
+     * @param text a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     */
+    public static ValueExpression<String> text(final String text) {
+        return value(text, String.class);
+    }
+
+    /**
+     * <p>dataSource.</p>
+     *
+     * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.DataSourceExpression} object.
+     */
+    public static DataSourceExpression dataSource(final JRDataSource dataSource) {
+        return new DataSourceExpression(dataSource);
+    }
+
+    /**
+     * <p>message.</p>
+     *
+     * @param key a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MessageExpression} object.
+     */
+    public static MessageExpression message(final String key) {
+        if (key != null) {
+            return new MessageExpression(key);
+        }
+        return null;
+    }
+
+    /**
+     * <p>message.</p>
+     *
+     * @param key       a {@link java.lang.String} object.
+     * @param arguments an array of {@link java.lang.Object} objects.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MessageExpression} object.
+     */
+    public static MessageExpression message(final String key, final Object[] arguments) {
+        if (key != null) {
+            return new MessageExpression(key, arguments);
+        }
+        return null;
+    }
+
+    // jasper
+
+    /**
+     * Creates a new jasper expression.<br/> This expression allows declaring an expression in a Jasper native syntax. Knowledge of the jasper syntax is also required for proper use.
+     *
+     * @param expression the jasper expression
+     * @param valueClass the expression class
+     * @param <T>        a T object.
+     * @return the expression
+     */
+    public static <T> JasperExpression<T> jasperSyntax(final String expression, final Class<? super T> valueClass) {
+        return new JasperExpression<>(expression, valueClass);
+    }
+
+    /**
+     * Creates a new jasper expression.<br/> This expression allows declaring an expression in a Jasper native syntax. Knowledge of the jasper syntax is also required for proper use.
+     *
+     * @param expression the jasper expression
+     * @return the expression
+     */
+    @SuppressWarnings("rawtypes")
+    public static JasperExpression jasperSyntax(final String expression) {
+        return jasperSyntax(expression, Object.class);
+    }
+
+    // property
+
+    /**
+     * <p>property.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PropertyExpression} object.
+     */
+    public static PropertyExpression property(final String name, final DRIExpression<String> valueExpression) {
+        return new PropertyExpression(name, valueExpression);
+    }
+
+    /**
+     * <p>property.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PropertyExpression} object.
+     */
+    public static PropertyExpression property(final String name, final String value) {
+        return new PropertyExpression(name, text(value));
+    }
+
+    // parameter
+
+    /**
+     * <p>parameter.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ParameterExpression} object.
+     */
+    public static ParameterExpression parameter(final String name, final DRIExpression<?> valueExpression) {
+        return new ParameterExpression(name, valueExpression);
+    }
+
+    /**
+     * <p>parameter.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a {@link java.lang.Object} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.ParameterExpression} object.
+     */
+    public static ParameterExpression parameter(final String name, final Object value) {
+        return new ParameterExpression(name, value(value));
+    }
+
+    /**
+     * <p>printInOddRow.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInOddRowExpression} object.
+     */
+    public static PrintInOddRowExpression printInOddRow() {
+        return printInOddRow;
+    }
+
+    /**
+     * <p>printInEvenRow.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInEvenRowExpression} object.
+     */
+    public static PrintInEvenRowExpression printInEvenRow() {
+        return printInEvenRow;
+    }
+
+    // subdatasource
+
+    /**
+     * <p>subDatasourceBeanCollection.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
+     */
+    public static BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final String fieldName) {
+        return new BeanCollectionSubDatasourceExpression(fieldName);
+    }
+
+    /**
+     * <p>subDatasourceBeanCollection.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
+     */
+    public static BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final DRIExpression<? extends Collection<?>> expression) {
+        return new BeanCollectionSubDatasourceExpression(expression);
+    }
+
+    /**
+     * <p>subDatasourceBeanArray.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
+     */
+    public static BeanArraySubDatasourceExpression subDatasourceBeanArray(final String fieldName) {
+        return new BeanArraySubDatasourceExpression(fieldName);
+    }
+
+    /**
+     * <p>subDatasourceBeanArray.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
+     */
+    public static BeanArraySubDatasourceExpression subDatasourceBeanArray(final DRIExpression<? extends Object[]> expression) {
+        return new BeanArraySubDatasourceExpression(expression);
+    }
+
+    /**
+     * <p>subDatasourceMapCollection.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
+     */
+    public static MapCollectionSubDatasourceExpression subDatasourceMapCollection(final String fieldName) {
+        return new MapCollectionSubDatasourceExpression(fieldName);
+    }
+
+    /**
+     * <p>subDatasourceMapCollection.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
+     */
+    public static MapCollectionSubDatasourceExpression subDatasourceMapCollection(final DRIExpression<? extends Collection<Map<String, ?>>> expression) {
+        return new MapCollectionSubDatasourceExpression(expression);
+    }
+
+    /**
+     * <p>subDatasourceMapArray.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
+     */
+    public static MapArraySubDatasourceExpression subDatasourceMapArray(final String fieldName) {
+        return new MapArraySubDatasourceExpression(fieldName);
+    }
+
+    /**
+     * <p>subDatasourceMapArray.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
+     */
+    public static MapArraySubDatasourceExpression subDatasourceMapArray(final DRIExpression<? extends Object[]> expression) {
+        return new MapArraySubDatasourceExpression(expression);
+    }
+
+    // crosstab
+
+    /**
+     * <p>orderBy.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.OrderByExpression} object.
+     */
+    public static OrderByExpression orderBy(final CrosstabMeasureBuilder<? extends Comparable<?>> measure) {
+        return new OrderByExpression(measure);
+    }
+
+    /**
+     * <p>crosstabValue.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param <T>   a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     */
+    public static <T> CrosstabValueExpression<T> crosstabValue(final AbstractCrosstabGroupBuilder<?, ?, ?> group) {
+        return new CrosstabValueExpression<>(group);
+    }
+
+    /**
+     * <p>crosstabValue.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param <T>     a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     */
+    public static <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure) {
+        return new CrosstabValueExpression<>(measure);
+    }
+
+    /**
+     * <p>crosstabValue.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param group   a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param <T>     a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     */
+    public static <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure, final AbstractCrosstabGroupBuilder<?, ?, ?> group) {
+        return new CrosstabValueExpression<>(measure, group);
+    }
+
+    /**
+     * <p>crosstabValue.</p>
+     *
+     * @param measure     a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param rowGroup    a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @param <T>         a T object.
+     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     */
+    public static <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure, final CrosstabRowGroupBuilder<?> rowGroup, final CrosstabColumnGroupBuilder<?> columnGroup) {
+        return new CrosstabValueExpression<>(measure, rowGroup, columnGroup);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/GroupRowNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/GroupRowNumberExpression.java
new file mode 100644
index 0000000..c8fb972
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/GroupRowNumberExpression.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>GroupRowNumberExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GroupRowNumberExpression extends AbstractSimpleExpression<Integer> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String groupName;
+
+    /**
+     * <p>Constructor for GroupRowNumberExpression.</p>
+     *
+     * @param groupName a {@link java.lang.String} object.
+     */
+    public GroupRowNumberExpression(String groupName) {
+        this.groupName = groupName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer evaluate(ReportParameters reportParameters) {
+        return reportParameters.getGroupCount(groupName);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/JasperExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/JasperExpression.java
new file mode 100644
index 0000000..ad9aeda
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/JasperExpression.java
@@ -0,0 +1,69 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.ReportUtils;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>JasperExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class JasperExpression<T> implements DRIJasperExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private String expression;
+    private Class<? super T> valueClass;
+
+    /**
+     * <p>Constructor for JasperExpression.</p>
+     *
+     * @param expression a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    protected JasperExpression(String expression, Class<? super T> valueClass) {
+        Validate.notNull(expression, "expression must not be null");
+        Validate.notNull(valueClass, "valueClass must not be null");
+        this.expression = expression;
+        this.valueClass = valueClass;
+        this.name = ReportUtils.generateUniqueName("jasperExpression");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getExpression() {
+        return expression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<? super T> getValueClass() {
+        return valueClass;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java
new file mode 100644
index 0000000..1b97a80
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.data.JRMapArrayDataSource;
+
+/**
+ * <p>MapArraySubDatasourceExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MapArraySubDatasourceExpression extends AbstractSubDatasourceExpression<Object[]> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for MapArraySubDatasourceExpression.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     */
+    public MapArraySubDatasourceExpression(String fieldName) {
+        super(fieldName);
+    }
+
+    /**
+     * <p>Constructor for MapArraySubDatasourceExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public MapArraySubDatasourceExpression(DRIExpression<? extends Object[]> expression) {
+        super(expression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JRDataSource createSubDatasource(Object[] data) {
+        return new JRMapArrayDataSource(data);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java
new file mode 100644
index 0000000..da88353
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * <p>MapCollectionSubDatasourceExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MapCollectionSubDatasourceExpression extends AbstractSubDatasourceExpression<Collection<Map<String, ?>>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for MapCollectionSubDatasourceExpression.</p>
+     *
+     * @param fieldName a {@link java.lang.String} object.
+     */
+    public MapCollectionSubDatasourceExpression(String fieldName) {
+        super(fieldName);
+    }
+
+    /**
+     * <p>Constructor for MapCollectionSubDatasourceExpression.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public MapCollectionSubDatasourceExpression(DRIExpression<? extends Collection<Map<String, ?>>> expression) {
+        super(expression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JRDataSource createSubDatasource(Collection<Map<String, ?>> data) {
+        return new JRMapCollectionDataSource(data);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MessageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MessageExpression.java
new file mode 100644
index 0000000..25b86d7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MessageExpression.java
@@ -0,0 +1,61 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>MessageExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MessageExpression extends AbstractSimpleExpression<String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String key;
+    private Object[] arguments;
+
+    /**
+     * <p>Constructor for MessageExpression.</p>
+     *
+     * @param key a {@link java.lang.String} object.
+     */
+    public MessageExpression(String key) {
+        this(key, null);
+    }
+
+    /**
+     * <p>Constructor for MessageExpression.</p>
+     *
+     * @param key       a {@link java.lang.String} object.
+     * @param arguments an array of {@link java.lang.Object} objects.
+     */
+    public MessageExpression(String key, Object[] arguments) {
+        this.key = key;
+        this.arguments = arguments;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String evaluate(ReportParameters reportParameters) {
+        return reportParameters.getMessage(key, arguments);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MultiplyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MultiplyExpression.java
new file mode 100644
index 0000000..93d1592
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MultiplyExpression.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>MultiplyExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class MultiplyExpression extends CalculationExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    @SafeVarargs
+    /**
+     * <p>Constructor for MultiplyExpression.</p>
+     *
+     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public MultiplyExpression(DRIExpression<? extends Number>... expressions) {
+        super(expressions);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected BigDecimal calculate(BigDecimal value1, BigDecimal value2) {
+        return value1.multiply(value2);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/OrderByExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/OrderByExpression.java
new file mode 100644
index 0000000..674a328
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/OrderByExpression.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>OrderByExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class OrderByExpression extends AbstractSimpleExpression<Comparable<?>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private CrosstabMeasureBuilder<? extends Comparable<?>> measure;
+
+    /**
+     * <p>Constructor for OrderByExpression.</p>
+     *
+     * @param measure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     */
+    public OrderByExpression(CrosstabMeasureBuilder<? extends Comparable<?>> measure) {
+        this.measure = measure;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Comparable<?> evaluate(ReportParameters reportParameters) {
+        return reportParameters.getValue(measure);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageNumberExpression.java
new file mode 100644
index 0000000..eca44eb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageNumberExpression.java
@@ -0,0 +1,39 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSystemExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.SystemExpression;
+
+/**
+ * <p>PageNumberExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public final class PageNumberExpression extends AbstractSystemExpression<Integer> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for PageNumberExpression.</p>
+     */
+    protected PageNumberExpression() {
+        super(SystemExpression.PAGE_NUMBER.name());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageRowNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageRowNumberExpression.java
new file mode 100644
index 0000000..f74658f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageRowNumberExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>PageRowNumberExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PageRowNumberExpression extends AbstractSimpleExpression<Integer> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer evaluate(ReportParameters reportParameters) {
+        return reportParameters.getPageRowNumber();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ParameterExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ParameterExpression.java
new file mode 100644
index 0000000..3946e60
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ParameterExpression.java
@@ -0,0 +1,79 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>ParameterExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ParameterExpression implements DRIParameterExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIExpression<?> valueExpression;
+
+    /**
+     * <p>Constructor for ParameterExpression.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public ParameterExpression(String name, DRIExpression<?> valueExpression) {
+        Validate.notNull(name, "name must not be null");
+        Validate.notNull(valueExpression, "valueExpression must not be null");
+        this.name = name;
+        this.valueExpression = valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<?> getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setValueExpression(DRIExpression<?> valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PercentageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PercentageExpression.java
new file mode 100644
index 0000000..294cd3b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PercentageExpression.java
@@ -0,0 +1,51 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.util.List;
+
+/**
+ * <p>PercentageExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PercentageExpression extends AbstractComplexExpression<Double> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for PercentageExpression.</p>
+     *
+     * @param actualExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param totalExpression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public PercentageExpression(DRIExpression<? extends Number> actualExpression, DRIExpression<? extends Number> totalExpression) {
+        addExpression(actualExpression);
+        addExpression(totalExpression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Double evaluate(List<?> values, ReportParameters reportParameters) {
+        return ((Number) values.get(0)).doubleValue() / ((Number) values.get(1)).doubleValue();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java
new file mode 100644
index 0000000..8fc2814
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>PrintInEvenRowExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PrintInEvenRowExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        return reportParameters.getReportRowNumber().doubleValue() % 2 != 0;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java
new file mode 100644
index 0000000..29fbdfc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>PrintInFirstPageExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PrintInFirstPageExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        return reportParameters.getPageNumber() == 1;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInOddRowExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInOddRowExpression.java
new file mode 100644
index 0000000..9d99aca
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInOddRowExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>PrintInOddRowExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PrintInOddRowExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        return reportParameters.getReportRowNumber().doubleValue() % 2 == 0;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java
new file mode 100644
index 0000000..1f81cac
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>PrintNotInFirstPageExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PrintNotInFirstPageExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        return reportParameters.getPageNumber() > 1;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java
new file mode 100644
index 0000000..737e317
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>PrintWhenGroupHasMoreThanOneRowExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PrintWhenGroupHasMoreThanOneRowExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String groupName;
+
+    /**
+     * <p>Constructor for PrintWhenGroupHasMoreThanOneRowExpression.</p>
+     *
+     * @param groupName a {@link java.lang.String} object.
+     */
+    public PrintWhenGroupHasMoreThanOneRowExpression(String groupName) {
+        this.groupName = groupName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+        return reportParameters.getGroupCount(groupName) > 1;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PropertyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PropertyExpression.java
new file mode 100644
index 0000000..a2a6cb1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PropertyExpression.java
@@ -0,0 +1,79 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>PropertyExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PropertyExpression implements DRIPropertyExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String name;
+    private DRIExpression<String> valueExpression;
+
+    /**
+     * <p>Constructor for PropertyExpression.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public PropertyExpression(String name, DRIExpression<String> valueExpression) {
+        Validate.notNull(name, "name must not be null");
+        Validate.notNull(valueExpression, "valueExpression must not be null");
+        this.name = name;
+        this.valueExpression = valueExpression;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRIExpression<String> getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public void setValueExpression(DRIExpression<String> valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ReportRowNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ReportRowNumberExpression.java
new file mode 100644
index 0000000..e582be4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ReportRowNumberExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>ReportRowNumberExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ReportRowNumberExpression extends AbstractSimpleExpression<Integer> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /** {@inheritDoc} */
+    @Override
+    public Integer evaluate(ReportParameters reportParameters) {
+        return reportParameters.getReportRowNumber();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SubtractExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SubtractExpression.java
new file mode 100644
index 0000000..5dbe097
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SubtractExpression.java
@@ -0,0 +1,49 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>SubtractExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SubtractExpression extends CalculationExpression {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    @SafeVarargs
+    /**
+     * <p>Constructor for SubtractExpression.</p>
+     *
+     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public SubtractExpression(DRIExpression<? extends Number>... expressions) {
+        super(expressions);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected BigDecimal calculate(BigDecimal value1, BigDecimal value2) {
+        return value1.subtract(value2);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SystemMessageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SystemMessageExpression.java
new file mode 100644
index 0000000..580e66e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SystemMessageExpression.java
@@ -0,0 +1,51 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.ResourceBundle;
+
+/**
+ * <p>SystemMessageExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SystemMessageExpression extends AbstractSimpleExpression<String> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String key;
+
+    /**
+     * <p>Constructor for SystemMessageExpression.</p>
+     *
+     * @param key a {@link java.lang.String} object.
+     */
+    public SystemMessageExpression(String key) {
+        this.key = key;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String evaluate(ReportParameters reportParameters) {
+        return ResourceBundle.getBundle(Constants.RESOURCE_BUNDLE_NAME, reportParameters.getLocale()).getString(key);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ValueExpression.java
new file mode 100644
index 0000000..4ab992f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ValueExpression.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.expression;
+
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>ValueExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ValueExpression<T> extends AbstractSimpleExpression<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private T value;
+    private Class<? super T> valueClass;
+
+    @SuppressWarnings("unchecked")
+    /**
+     * <p>Constructor for ValueExpression.</p>
+     *
+     * @param value a T object.
+     */
+    public ValueExpression(T value) {
+        Validate.notNull(value, "value must not be null");
+        this.value = value;
+        this.valueClass = (Class<? super T>) value.getClass();
+    }
+
+    /**
+     * <p>Constructor for ValueExpression.</p>
+     *
+     * @param value      a T object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     */
+    public ValueExpression(T value, Class<? super T> valueClass) {
+        Validate.notNull(valueClass, "valueClass must not be null");
+        this.value = value;
+        this.valueClass = valueClass;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public T evaluate(ReportParameters reportParameters) {
+        return value;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<? super T> getValueClass() {
+        return valueClass;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java
new file mode 100644
index 0000000..5cdda26
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java
@@ -0,0 +1,36 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+
+/**
+ * <p>ColumnGridComponentBuilder interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface ColumnGridComponentBuilder {
+
+    /**
+     * <p>build.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     */
+    public DRIColumnGridComponent build();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java
new file mode 100644
index 0000000..097c1ae
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java
@@ -0,0 +1,325 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+import org.apache.commons.lang3.Validate;
+
+import net.sf.dynamicreports.report.base.grid.DRColumnTitleGroup;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+
+/**
+ * <p>ColumnTitleGroupBuilder class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class ColumnTitleGroupBuilder extends AbstractBuilder<ColumnTitleGroupBuilder, DRColumnTitleGroup> implements ColumnGridComponentBuilder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for ColumnTitleGroupBuilder.</p>
+     */
+    protected ColumnTitleGroupBuilder() {
+        super(new DRColumnTitleGroup());
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public ColumnTitleGroupBuilder add(final ColumnGridComponentBuilder... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (final ColumnGridComponentBuilder component : components) {
+            getObject().addComponent(component.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>setTitle.</p>
+     *
+     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public ColumnTitleGroupBuilder setTitle(final DRIExpression<?> titleExpression) {
+        getObject().setTitleExpression(titleExpression);
+        return this;
+    }
+
+    /**
+     * <p>setTitle.</p>
+     *
+     * @param title a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public ColumnTitleGroupBuilder setTitle(final String title) {
+        getObject().setTitleExpression(Expressions.text(title));
+        return this;
+    }
+
+    /**
+     * <p>setTitleStyle.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public ColumnTitleGroupBuilder setTitleStyle(final ReportStyleBuilder titleStyle) {
+        if (titleStyle != null) {
+            getObject().setTitleStyle(titleStyle.getStyle());
+        } else {
+            getObject().setTitleStyle(null);
+        }
+        return this;
+    }
+
+    /**
+     * This method is used to define the preferred width of a column title. The width is set to the <code>columns</code> multiplied by width of the font
+     *
+     * @param columns the number of preferred columns >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public ColumnTitleGroupBuilder setTitleColumns(final Integer columns) {
+        getObject().setTitleColumns(columns);
+        return this;
+    }
+
+    /**
+     * This method is used to define the fixed width of a column title. The width is set to the <code>columns</code> multiplied by width of the font
+     *
+     * @param columns the number of fixed columns >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public ColumnTitleGroupBuilder setTitleFixedColumns(final Integer columns) {
+        getObject().setTitleColumns(columns);
+        getObject().setTitleWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * This method is used to define the minimum width of a column title. The width is set to the <code>columns</code> multiplied by width of the font
+     *
+     * @param columns the number of minimum columns >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
+     */
+    public ColumnTitleGroupBuilder setTitleMinColumns(final Integer columns) {
+        getObject().setTitleColumns(columns);
+        getObject().setTitleWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * Sets the preferred width of a column title.
+     *
+     * @param width the column title preferred width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ColumnTitleGroupBuilder setTitleWidth(final Integer width) {
+        getObject().setTitleWidth(width);
+        return this;
+    }
+
+    /**
+     * Sets the fixed width of a column title.
+     *
+     * @param width the column title fixed width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ColumnTitleGroupBuilder setTitleFixedWidth(final Integer width) {
+        getObject().setTitleWidth(width);
+        getObject().setTitleWidthType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the minimum width of a column title.
+     *
+     * @param width the column title minimum width >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ColumnTitleGroupBuilder setTitleMinWidth(final Integer width) {
+        getObject().setTitleWidth(width);
+        getObject().setTitleWidthType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * This method is used to define the preferred height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of preferred rows >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public ColumnTitleGroupBuilder setTitleRows(final Integer rows) {
+        getObject().setTitleRows(rows);
+        return this;
+    }
+
+    /**
+     * This method is used to define the fixed height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of fixed rows >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public ColumnTitleGroupBuilder setTitleFixedRows(final Integer rows) {
+        getObject().setTitleRows(rows);
+        getObject().setTitleHeightType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * This method is used to define the minimum height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
+     *
+     * @param rows the number of minimum rows >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
+     */
+    public ColumnTitleGroupBuilder setTitleMinRows(final Integer rows) {
+        getObject().setTitleRows(rows);
+        getObject().setTitleHeightType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * Sets the preferred height of a column title.
+     *
+     * @param height the column title preferred height >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ColumnTitleGroupBuilder setTitleHeight(final Integer height) {
+        getObject().setTitleHeight(height);
+        return this;
+    }
+
+    /**
+     * Sets the fixed height of a column title.
+     *
+     * @param height the column title fixed height >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ColumnTitleGroupBuilder setTitleFixedHeight(final Integer height) {
+        getObject().setTitleHeight(height);
+        getObject().setTitleHeightType(ComponentDimensionType.FIXED);
+        return this;
+    }
+
+    /**
+     * Sets the minimum height of a column title.
+     *
+     * @param height the column title minimum height >= 0
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public ColumnTitleGroupBuilder setTitleMinHeight(final Integer height) {
+        getObject().setTitleHeight(height);
+        getObject().setTitleHeightType(ComponentDimensionType.EXPAND);
+        return this;
+    }
+
+    /**
+     * <p>setTitleStretchWithOverflow.</p>
+     *
+     * @param stretchWithOverflow a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @deprecated replaced by {@link #setTitleTextAdjust(TextAdjust)}
+     */
+    @Deprecated
+    public ColumnTitleGroupBuilder setTitleStretchWithOverflow(final Boolean stretchWithOverflow) {
+        getObject().setTitleStretchWithOverflow(stretchWithOverflow);
+        return this;
+    }
+
+    /**
+     * <p>setTitleTextAdjust.</p>
+     *
+     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a T object.
+     */
+    public ColumnTitleGroupBuilder setTitleTextAdjust(final TextAdjust textAdjust) {
+        getObject().setTitleTextAdjust(textAdjust);
+        return this;
+    }
+
+    /**
+     * Adds a jasper property to the column title group.
+     *
+     * @param propertyExpression the property expression
+     * @return a column title group builder
+     */
+    public ColumnTitleGroupBuilder addTitleProperty(final DRIPropertyExpression propertyExpression) {
+        getObject().addTitlePropertyExpression(propertyExpression);
+        return this;
+    }
+
+    /**
+     * Adds a jasper property to the column title group.
+     *
+     * @param name            the property name
+     * @param valueExpression the property value expression
+     * @return a column title group builder
+     */
+    public ColumnTitleGroupBuilder addTitleProperty(final String name, final DRIExpression<String> valueExpression) {
+        getObject().addTitlePropertyExpression(Expressions.property(name, valueExpression));
+        return this;
+    }
+
+    /**
+     * Adds a jasper property to the column title group.
+     *
+     * @param name  the property name
+     * @param value the property value
+     * @return a column title group builder
+     */
+    public ColumnTitleGroupBuilder addTitleProperty(final String name, final String value) {
+        getObject().addTitlePropertyExpression(Expressions.property(name, value));
+        return this;
+    }
+
+    /**
+     * <p>getColumnGridTitleGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnTitleGroup} object.
+     */
+    public DRColumnTitleGroup getColumnGridTitleGroup() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/GridBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/GridBuilders.java
new file mode 100644
index 0000000..7defc87
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/GridBuilders.java
@@ -0,0 +1,172 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+/**
+ * A set of methods of customizing columns layout
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GridBuilders {
+
+    // horizontal
+
+    /**
+     * <p>horizontalColumnGridList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder horizontalColumnGridList() {
+        return Grids.horizontalColumnGridList();
+    }
+
+    /**
+     * <p>horizontalColumnGridList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder horizontalColumnGridList(ColumnGridComponentBuilder... components) {
+        return Grids.horizontalColumnGridList(components);
+    }
+
+    /**
+     * <p>horizontalColumnGridList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder horizontalColumnGridList(HorizontalColumnGridListCellBuilder... cells) {
+        return Grids.horizontalColumnGridList(cells);
+    }
+
+    /**
+     * <p>hColumnGridListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public HorizontalColumnGridListCellBuilder hColumnGridListCell(ColumnGridComponentBuilder component) {
+        return Grids.hColumnGridListCell(component);
+    }
+
+    // horizontal flow
+
+    /**
+     * <p>horizontalFlowColumnGridList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder horizontalFlowColumnGridList() {
+        return Grids.horizontalFlowColumnGridList();
+    }
+
+    /**
+     * <p>horizontalFlowColumnGridList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder horizontalFlowColumnGridList(ColumnGridComponentBuilder... components) {
+        return Grids.horizontalFlowColumnGridList(components);
+    }
+
+    /**
+     * <p>horizontalFlowColumnGridList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder horizontalFlowColumnGridList(HorizontalColumnGridListCellBuilder... cells) {
+        return Grids.horizontalFlowColumnGridList(cells);
+    }
+
+    // vertical
+
+    /**
+     * <p>verticalColumnGridList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public VerticalColumnGridListBuilder verticalColumnGridList() {
+        return Grids.verticalColumnGridList();
+    }
+
+    /**
+     * <p>verticalColumnGridList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public VerticalColumnGridListBuilder verticalColumnGridList(ColumnGridComponentBuilder... components) {
+        return Grids.verticalColumnGridList(components);
+    }
+
+    /**
+     * <p>verticalColumnGridList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public VerticalColumnGridListBuilder verticalColumnGridList(VerticalColumnGridListCellBuilder... cells) {
+        return Grids.verticalColumnGridList(cells);
+    }
+
+    /**
+     * <p>vColumnGridListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public VerticalColumnGridListCellBuilder vColumnGridListCell(ColumnGridComponentBuilder component) {
+        return Grids.vColumnGridListCell(component);
+    }
+
+    // title group
+
+    /**
+     * <p>titleGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public ColumnTitleGroupBuilder titleGroup() {
+        return Grids.titleGroup();
+    }
+
+    /**
+     * <p>titleGroup.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public ColumnTitleGroupBuilder titleGroup(ColumnGridComponentBuilder... components) {
+        return Grids.titleGroup(components);
+    }
+
+    /**
+     * <p>titleGroup.</p>
+     *
+     * @param title      a {@link java.lang.String} object.
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public ColumnTitleGroupBuilder titleGroup(String title, ColumnGridComponentBuilder... components) {
+        return Grids.titleGroup(title, components);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/Grids.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/Grids.java
new file mode 100644
index 0000000..bb96aee
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/Grids.java
@@ -0,0 +1,176 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+import org.apache.commons.lang3.Validate;
+
+/**
+ * A set of methods of customizing columns layout
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Grids {
+
+    // horizontal
+
+    /**
+     * <p>horizontalColumnGridList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public static HorizontalColumnGridListBuilder horizontalColumnGridList() {
+        return new HorizontalColumnGridListBuilder();
+    }
+
+    /**
+     * <p>horizontalColumnGridList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public static HorizontalColumnGridListBuilder horizontalColumnGridList(ColumnGridComponentBuilder... components) {
+        return new HorizontalColumnGridListBuilder().add(components);
+    }
+
+    /**
+     * <p>horizontalColumnGridList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public static HorizontalColumnGridListBuilder horizontalColumnGridList(HorizontalColumnGridListCellBuilder... cells) {
+        return new HorizontalColumnGridListBuilder().add(cells);
+    }
+
+    /**
+     * <p>hColumnGridListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public static HorizontalColumnGridListCellBuilder hColumnGridListCell(ColumnGridComponentBuilder component) {
+        Validate.notNull(component, "component must not be null");
+        return new HorizontalColumnGridListCellBuilder(component);
+    }
+
+    // horizontal flow
+
+    /**
+     * <p>horizontalFlowColumnGridList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList() {
+        return new HorizontalFlowColumnGridListBuilder();
+    }
+
+    /**
+     * <p>horizontalFlowColumnGridList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList(ColumnGridComponentBuilder... components) {
+        return new HorizontalFlowColumnGridListBuilder().add(components);
+    }
+
+    /**
+     * <p>horizontalFlowColumnGridList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList(HorizontalColumnGridListCellBuilder... cells) {
+        return new HorizontalFlowColumnGridListBuilder().add(cells);
+    }
+
+    // vertical
+
+    /**
+     * <p>verticalColumnGridList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public static VerticalColumnGridListBuilder verticalColumnGridList() {
+        return new VerticalColumnGridListBuilder();
+    }
+
+    /**
+     * <p>verticalColumnGridList.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public static VerticalColumnGridListBuilder verticalColumnGridList(ColumnGridComponentBuilder... components) {
+        return new VerticalColumnGridListBuilder().add(components);
+    }
+
+    /**
+     * <p>verticalColumnGridList.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public static VerticalColumnGridListBuilder verticalColumnGridList(VerticalColumnGridListCellBuilder... cells) {
+        return new VerticalColumnGridListBuilder().add(cells);
+    }
+
+    /**
+     * <p>vColumnGridListCell.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public static VerticalColumnGridListCellBuilder vColumnGridListCell(ColumnGridComponentBuilder component) {
+        Validate.notNull(component, "component must not be null");
+        return new VerticalColumnGridListCellBuilder(component);
+    }
+
+    // title group
+
+    /**
+     * <p>titleGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public static ColumnTitleGroupBuilder titleGroup() {
+        return new ColumnTitleGroupBuilder();
+    }
+
+    /**
+     * <p>titleGroup.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public static ColumnTitleGroupBuilder titleGroup(ColumnGridComponentBuilder... components) {
+        return new ColumnTitleGroupBuilder().add(components);
+    }
+
+    /**
+     * <p>titleGroup.</p>
+     *
+     * @param title      a {@link java.lang.String} object.
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     */
+    public static ColumnTitleGroupBuilder titleGroup(String title, ColumnGridComponentBuilder... components) {
+        return titleGroup(components).setTitle(title);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java
new file mode 100644
index 0000000..3a1385a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java
@@ -0,0 +1,136 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+import net.sf.dynamicreports.report.base.grid.DRColumnGridList;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ListType;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>HorizontalColumnGridListBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class HorizontalColumnGridListBuilder extends AbstractBuilder<HorizontalColumnGridListBuilder, DRColumnGridList> implements ColumnGridComponentBuilder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRColumnGridList row;
+
+    /**
+     * <p>Constructor for HorizontalColumnGridListBuilder.</p>
+     */
+    protected HorizontalColumnGridListBuilder() {
+        super(new DRColumnGridList(ListType.VERTICAL));
+        init();
+    }
+
+    /**
+     * <p>init.</p>
+     */
+    protected void init() {
+        newRow();
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder add(ColumnGridComponentBuilder... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ColumnGridComponentBuilder component : components) {
+            row.addComponent(component.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder add(HorizontalColumnGridListCellBuilder... cells) {
+        Validate.notNull(cells, "cells must not be null");
+        Validate.noNullElements(cells, "cells must not contains null cell");
+        for (HorizontalColumnGridListCellBuilder cell : cells) {
+            row.addCell(cell.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>newRow.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder newRow() {
+        return newRow(ListType.HORIZONTAL);
+    }
+
+    /**
+     * <p>newFlowRow.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder newFlowRow() {
+        return newRow(ListType.HORIZONTAL_FLOW);
+    }
+
+    private HorizontalColumnGridListBuilder newRow(ListType listType) {
+        row = new DRColumnGridList(listType);
+        getObject().addComponent(row);
+        return this;
+    }
+
+    /**
+     * <p>setGap.</p>
+     *
+     * @param gap a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder setGap(int gap) {
+        row.setGap(gap);
+        return this;
+    }
+
+    /**
+     * <p>setVerticalGap.</p>
+     *
+     * @param gap a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     */
+    public HorizontalColumnGridListBuilder setVerticalGap(int gap) {
+        getObject().setGap(gap);
+        return this;
+    }
+
+    /**
+     * <p>getColumnGridList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridList} object.
+     */
+    public DRColumnGridList getColumnGridList() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java
new file mode 100644
index 0000000..72e68da
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java
@@ -0,0 +1,126 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+import net.sf.dynamicreports.report.base.grid.DRColumnGridListCell;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+
+/**
+ * <p>HorizontalColumnGridListCellBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class HorizontalColumnGridListCellBuilder extends AbstractBuilder<HorizontalColumnGridListCellBuilder, DRColumnGridListCell> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for HorizontalColumnGridListCellBuilder.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     */
+    protected HorizontalColumnGridListCellBuilder(ColumnGridComponentBuilder component) {
+        super(new DRColumnGridListCell(component.build()));
+    }
+
+    // width
+
+    /**
+     * <p>widthFixed.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public HorizontalColumnGridListCellBuilder widthFixed() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.LEFT);
+        return this;
+    }
+
+    /**
+     * <p>widthFloat.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public HorizontalColumnGridListCellBuilder widthFloat() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.FLOAT);
+        return this;
+    }
+
+    /**
+     * <p>widthExpand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public HorizontalColumnGridListCellBuilder widthExpand() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.EXPAND);
+        return this;
+    }
+
+    // height
+
+    /**
+     * <p>heightFixedOnTop.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public HorizontalColumnGridListCellBuilder heightFixedOnTop() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.TOP);
+        return this;
+    }
+
+    /**
+     * <p>heightFixedOnMiddle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public HorizontalColumnGridListCellBuilder heightFixedOnMiddle() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.MIDDLE);
+        return this;
+    }
+
+    /**
+     * <p>heightFixedOnBottom.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public HorizontalColumnGridListCellBuilder heightFixedOnBottom() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.BOTTOM);
+        return this;
+    }
+
+    /**
+     * <p>heightExpand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     */
+    public HorizontalColumnGridListCellBuilder heightExpand() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.EXPAND);
+        return this;
+    }
+
+    /**
+     * <p>getColumnGridListCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridListCell} object.
+     */
+    public DRColumnGridListCell getColumnGridListCell() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java
new file mode 100644
index 0000000..33a9ae7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java
@@ -0,0 +1,42 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>HorizontalFlowColumnGridListBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class HorizontalFlowColumnGridListBuilder extends HorizontalColumnGridListBuilder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for HorizontalFlowColumnGridListBuilder.</p>
+     */
+    protected HorizontalFlowColumnGridListBuilder() {
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void init() {
+        newFlowRow();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java
new file mode 100644
index 0000000..3e179e6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java
@@ -0,0 +1,91 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+import net.sf.dynamicreports.report.base.grid.DRColumnGridList;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.ListType;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>VerticalColumnGridListBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class VerticalColumnGridListBuilder extends AbstractBuilder<VerticalColumnGridListBuilder, DRColumnGridList> implements ColumnGridComponentBuilder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for VerticalColumnGridListBuilder.</p>
+     */
+    protected VerticalColumnGridListBuilder() {
+        super(new DRColumnGridList(ListType.VERTICAL));
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public VerticalColumnGridListBuilder add(ColumnGridComponentBuilder... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ColumnGridComponentBuilder component : components) {
+            getObject().addComponent(component.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public VerticalColumnGridListBuilder add(VerticalColumnGridListCellBuilder... cells) {
+        Validate.notNull(cells, "cells must not be null");
+        Validate.noNullElements(cells, "cells must not contains null cell");
+        for (VerticalColumnGridListCellBuilder cell : cells) {
+            getObject().addCell(cell.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>setGap.</p>
+     *
+     * @param gap a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     */
+    public VerticalColumnGridListBuilder setGap(int gap) {
+        getObject().setGap(gap);
+        return this;
+    }
+
+    /**
+     * <p>getColumnGridList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridList} object.
+     */
+    public DRColumnGridList getColumnGridList() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java
new file mode 100644
index 0000000..f0b5c82
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java
@@ -0,0 +1,126 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.grid;
+
+import net.sf.dynamicreports.report.base.grid.DRColumnGridListCell;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+
+/**
+ * <p>VerticalColumnGridListCellBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class VerticalColumnGridListCellBuilder extends AbstractBuilder<VerticalColumnGridListCellBuilder, DRColumnGridListCell> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for VerticalColumnGridListCellBuilder.</p>
+     *
+     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     */
+    protected VerticalColumnGridListCellBuilder(ColumnGridComponentBuilder component) {
+        super(new DRColumnGridListCell(component.build()));
+    }
+
+    // width
+
+    /**
+     * <p>widthFixedOnLeft.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public VerticalColumnGridListCellBuilder widthFixedOnLeft() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.LEFT);
+        return this;
+    }
+
+    /**
+     * <p>widthFixedOnCenter.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public VerticalColumnGridListCellBuilder widthFixedOnCenter() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.CENTER);
+        return this;
+    }
+
+    /**
+     * <p>widthFixedOnRight.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public VerticalColumnGridListCellBuilder widthFixedOnRight() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.RIGHT);
+        return this;
+    }
+
+    /**
+     * <p>widthFloat.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public VerticalColumnGridListCellBuilder widthFloat() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.FLOAT);
+        return this;
+    }
+
+    /**
+     * <p>widthExpand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public VerticalColumnGridListCellBuilder widthExpand() {
+        getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.EXPAND);
+        return this;
+    }
+
+    // height
+
+    /**
+     * <p>heightFixed.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public VerticalColumnGridListCellBuilder heightFixed() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.TOP);
+        return this;
+    }
+
+    /**
+     * <p>heightExpand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     */
+    public VerticalColumnGridListCellBuilder heightExpand() {
+        getObject().setVerticalAlignment(VerticalCellComponentAlignment.EXPAND);
+        return this;
+    }
+
+    /**
+     * <p>getColumnGridListCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridListCell} object.
+     */
+    public DRColumnGridListCell getColumnGridListCell() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/ColumnGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/ColumnGroupBuilder.java
new file mode 100644
index 0000000..bf0ef8d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/ColumnGroupBuilder.java
@@ -0,0 +1,91 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.group;
+
+import net.sf.dynamicreports.report.base.column.DRValueColumn;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>ColumnGroupBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ColumnGroupBuilder extends GroupBuilder<ColumnGroupBuilder> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRValueColumn<?> column;
+
+    /**
+     * <p>Constructor for ColumnGroupBuilder.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     */
+    protected ColumnGroupBuilder(ValueColumnBuilder<?, ?> column) {
+        Validate.notNull(column, "column must not be null");
+        this.column = column.build();
+        init();
+    }
+
+    /**
+     * <p>Constructor for ColumnGroupBuilder.</p>
+     *
+     * @param name   a {@link java.lang.String} object.
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     */
+    protected ColumnGroupBuilder(String name, ValueColumnBuilder<?, ?> column) {
+        super(name);
+        Validate.notNull(column, "column must not be null");
+        this.column = column.build();
+        init();
+    }
+
+    @SuppressWarnings("unchecked")
+    private void init() {
+        @SuppressWarnings("rawtypes") DRIDataType dataType = column.getComponent().getDataType();
+        getObject().getValueField().setDataType(dataType);
+        getObject().getValueField().setStyle(column.getComponent().getStyle());
+        getObject().getValueField().setPattern(column.getComponent().getPattern());
+        getObject().getValueField().setPatternExpression(column.getComponent().getPatternExpression());
+        getObject().getValueField().setHorizontalTextAlignment(column.getComponent().getHorizontalTextAlignment());
+        getObject().setTitleExpression(column.getTitleExpression());
+        getObject().setTitleStyle(column.getTitleStyle());
+        getObject().setTitleWidth(column.getComponent().getWidth());
+    }
+
+    /**
+     * <p>setHideColumn.</p>
+     *
+     * @param hideColumn a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     */
+    public ColumnGroupBuilder setHideColumn(Boolean hideColumn) {
+        getObject().setHideColumn(hideColumn);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        setValueExpression(column);
+        super.configure();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/CustomGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/CustomGroupBuilder.java
new file mode 100644
index 0000000..4aae74c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/CustomGroupBuilder.java
@@ -0,0 +1,101 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.group;
+
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>CustomGroupBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CustomGroupBuilder extends GroupBuilder<CustomGroupBuilder> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CustomGroupBuilder.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected CustomGroupBuilder(FieldBuilder<?> field) {
+        Validate.notNull(field, "field must not be null");
+        setValueExpression(field.build());
+    }
+
+    /**
+     * <p>Constructor for CustomGroupBuilder.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     */
+    protected CustomGroupBuilder(String name, FieldBuilder<?> field) {
+        super(name);
+        Validate.notNull(field, "field must not be null");
+        setValueExpression(field.build());
+    }
+
+    /**
+     * <p>Constructor for CustomGroupBuilder.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected CustomGroupBuilder(DRIExpression<?> valueExpression) {
+        setValueExpression(valueExpression);
+    }
+
+    /**
+     * <p>Constructor for CustomGroupBuilder.</p>
+     *
+     * @param name            a {@link java.lang.String} object.
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected CustomGroupBuilder(String name, DRIExpression<?> valueExpression) {
+        super(name);
+        setValueExpression(valueExpression);
+    }
+
+    /**
+     * <p>setTitle.</p>
+     *
+     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public CustomGroupBuilder setTitle(DRIExpression<?> titleExpression) {
+        getObject().setTitleExpression(titleExpression);
+        getObject().setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE);
+        return this;
+    }
+
+    /**
+     * <p>setTitle.</p>
+     *
+     * @param title a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public CustomGroupBuilder setTitle(String title) {
+        getObject().setTitleExpression(Expressions.text(title));
+        getObject().setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilder.java
new file mode 100644
index 0000000..39f1fe4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilder.java
@@ -0,0 +1,533 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.group;
+
+import net.sf.dynamicreports.report.base.DRGroup;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract GroupBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings( {"unchecked", "rawtypes", "deprecation"})
+public abstract class GroupBuilder<T extends GroupBuilder<T>> extends AbstractBuilder<T, DRGroup> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression valueExpression;
+
+    /**
+     * <p>Constructor for GroupBuilder.</p>
+     */
+    protected GroupBuilder() {
+        super(new DRGroup(new DRTextField()));
+    }
+
+    /**
+     * <p>Constructor for GroupBuilder.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    protected GroupBuilder(String name) {
+        super(new DRGroup(name, new DRTextField()));
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected void setValueExpression(DRIExpression<?> valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+
+    /**
+     * <p>setHeaderLayout.</p>
+     *
+     * @param headerLayout a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+     * @return a T object.
+     */
+    public T setHeaderLayout(GroupHeaderLayout headerLayout) {
+        getObject().setHeaderLayout(headerLayout);
+        return (T) this;
+    }
+
+    /**
+     * <p>showColumnHeaderAndFooter.</p>
+     *
+     * @return a T object.
+     */
+    public T showColumnHeaderAndFooter() {
+        return setShowColumnHeaderAndFooter(true);
+    }
+
+    /**
+     * <p>setShowColumnHeaderAndFooter.</p>
+     *
+     * @param showColumnHeaderAndFooter a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setShowColumnHeaderAndFooter(Boolean showColumnHeaderAndFooter) {
+        getObject().setShowColumnHeaderAndFooter(showColumnHeaderAndFooter);
+        return (T) this;
+    }
+
+    /**
+     * <p>setAddToTableOfContents.</p>
+     *
+     * @param addToTableOfContents a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setAddToTableOfContents(Boolean addToTableOfContents) {
+        getObject().setAddToTableOfContents(addToTableOfContents);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPrintSubtotalsWhenExpression.</p>
+     *
+     * @param printSubtotalsWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setPrintSubtotalsWhenExpression(DRIExpression<Boolean> printSubtotalsWhenExpression) {
+        getObject().setPrintSubtotalsWhenExpression(printSubtotalsWhenExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPadding.</p>
+     *
+     * @param padding a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setPadding(Integer padding) {
+        getObject().setPadding(padding);
+        return (T) this;
+    }
+
+    /**
+     * <p>startInNewPage.</p>
+     *
+     * @return a T object.
+     */
+    public T startInNewPage() {
+        return setStartInNewPage(true);
+    }
+
+    /**
+     * <p>setStartInNewPage.</p>
+     *
+     * @param startInNewPage a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setStartInNewPage(Boolean startInNewPage) {
+        getObject().setStartInNewPage(startInNewPage);
+        return (T) this;
+    }
+
+    /**
+     * <p>startInNewColumn.</p>
+     *
+     * @return a T object.
+     */
+    public T startInNewColumn() {
+        return setStartInNewColumn(true);
+    }
+
+    /**
+     * <p>setStartInNewColumn.</p>
+     *
+     * @param startInNewColumn a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setStartInNewColumn(Boolean startInNewColumn) {
+        getObject().setStartInNewColumn(startInNewColumn);
+        return (T) this;
+    }
+
+    /**
+     * <p>reprintHeaderOnEachPage.</p>
+     *
+     * @return a T object.
+     */
+    public T reprintHeaderOnEachPage() {
+        return setReprintHeaderOnEachPage(true);
+    }
+
+    /**
+     * <p>setReprintHeaderOnEachPage.</p>
+     *
+     * @param reprintHeaderOnEachPage a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setReprintHeaderOnEachPage(Boolean reprintHeaderOnEachPage) {
+        getObject().setReprintHeaderOnEachPage(reprintHeaderOnEachPage);
+        return (T) this;
+    }
+
+    /**
+     * <p>resetPageNumber.</p>
+     *
+     * @return a T object.
+     */
+    public T resetPageNumber() {
+        return setResetPageNumber(true);
+    }
+
+    /**
+     * <p>setResetPageNumber.</p>
+     *
+     * @param resetPageNumber a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setResetPageNumber(Boolean resetPageNumber) {
+        getObject().setResetPageNumber(resetPageNumber);
+        return (T) this;
+    }
+
+    /**
+     * <p>setMinHeightToStartNewPage.</p>
+     *
+     * @param minHeightToStartNewPage a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setMinHeightToStartNewPage(Integer minHeightToStartNewPage) {
+        getObject().setMinHeightToStartNewPage(minHeightToStartNewPage);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFooterPosition.</p>
+     *
+     * @param footerPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     * @return a T object.
+     */
+    public T setFooterPosition(GroupFooterPosition footerPosition) {
+        getObject().setFooterPosition(footerPosition);
+        return (T) this;
+    }
+
+    /**
+     * <p>keepTogether.</p>
+     *
+     * @return a T object.
+     */
+    public T keepTogether() {
+        return setKeepTogether(true);
+    }
+
+    /**
+     * <p>setKeepTogether.</p>
+     *
+     * @param keepTogether a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setKeepTogether(Boolean keepTogether) {
+        getObject().setKeepTogether(keepTogether);
+        return (T) this;
+    }
+
+    /**
+     * <p>headerWithSubtotal.</p>
+     *
+     * @return a T object.
+     */
+    public T headerWithSubtotal() {
+        return setHeaderWithSubtotal(true);
+    }
+
+    /**
+     * <p>setHeaderWithSubtotal.</p>
+     *
+     * @param headerWithSubtotal a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setHeaderWithSubtotal(Boolean headerWithSubtotal) {
+        getObject().setHeaderWithSubtotal(headerWithSubtotal);
+        return (T) this;
+    }
+
+    /**
+     * <p>groupByDataType.</p>
+     *
+     * @return a T object.
+     */
+    public T groupByDataType() {
+        return setGroupByDataType(true);
+    }
+
+    /**
+     * <p>setGroupByDataType.</p>
+     *
+     * @param groupByDataType a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setGroupByDataType(Boolean groupByDataType) {
+        getObject().setGroupByDataType(groupByDataType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setStyle(ReportStyleBuilder style) {
+        if (style != null) {
+            getObject().getValueField().setStyle(style.getStyle());
+        } else {
+            getObject().getValueField().setStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setHorizontalAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a T object.
+     * @deprecated use setHorizontalTextAlignment instead
+     */
+    @Deprecated
+    public T setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().getValueField().setHorizontalTextAlignment(HorizontalTextAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().getValueField().setHorizontalTextAlignment(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setHorizontalTextAlignment.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a T object.
+     */
+    public T setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        getObject().getValueField().setHorizontalTextAlignment(horizontalTextAlignment);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTitleStyle.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setTitleStyle(ReportStyleBuilder titleStyle) {
+        if (titleStyle != null) {
+            getObject().setTitleStyle(titleStyle.getStyle());
+        } else {
+            getObject().setTitleStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setTitleWidth.</p>
+     *
+     * @param titleWidth a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setTitleWidth(Integer titleWidth) {
+        getObject().setTitleWidth(titleWidth);
+        return (T) this;
+    }
+
+    // header
+
+    /**
+     * <p>setHeaderSplitType.</p>
+     *
+     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a T object.
+     */
+    public T setHeaderSplitType(SplitType splitType) {
+        getObject().getHeaderBand().setSplitType(splitType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderPrintWhenExpression.</p>
+     *
+     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setHeaderPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
+        getObject().getHeaderBand().setPrintWhenExpression(printWhenExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setHeaderStyle(ReportStyleBuilder style) {
+        if (style != null) {
+            getObject().getHeaderBand().getList().setStyle(style.build());
+        } else {
+            getObject().getHeaderBand().getList().setStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeaderBackgroundComponent.</p>
+     *
+     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a T object.
+     */
+    public T setHeaderBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
+        Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+        getObject().getHeaderBand().getList().setBackgroundComponent(backgroundComponent.build());
+        return (T) this;
+    }
+
+    /**
+     * <p>addHeaderComponent.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a T object.
+     */
+    public T addHeaderComponent(ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ComponentBuilder<?, ?> component : components) {
+            getObject().getHeaderBand().addComponent(component.build());
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>header.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a T object.
+     */
+    public T header(ComponentBuilder<?, ?>... components) {
+        return addHeaderComponent(components);
+    }
+
+    // footer
+
+    /**
+     * <p>setFooterSplitType.</p>
+     *
+     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a T object.
+     */
+    public T setFooterSplitType(SplitType splitType) {
+        getObject().getFooterBand().setSplitType(splitType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFooterPrintWhenExpression.</p>
+     *
+     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setFooterPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
+        getObject().getFooterBand().setPrintWhenExpression(printWhenExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFooterStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setFooterStyle(ReportStyleBuilder style) {
+        if (style != null) {
+            getObject().getFooterBand().getList().setStyle(style.build());
+        } else {
+            getObject().getFooterBand().getList().setStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setFooterBackgroundComponent.</p>
+     *
+     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a T object.
+     */
+    public T setFooterBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
+        Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
+        getObject().getFooterBand().getList().setBackgroundComponent(backgroundComponent.build());
+        return (T) this;
+    }
+
+    /**
+     * <p>addFooterComponent.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a T object.
+     */
+    public T addFooterComponent(ComponentBuilder<?, ?>... components) {
+        Validate.notNull(components, "components must not be null");
+        Validate.noNullElements(components, "components must not contains null component");
+        for (ComponentBuilder<?, ?> component : components) {
+            getObject().getFooterBand().addComponent(component.build());
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>footer.</p>
+     *
+     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a T object.
+     */
+    public T footer(ComponentBuilder<?, ?>... components) {
+        return addFooterComponent(components);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        super.configure();
+        getObject().getValueField().setValueExpression(valueExpression);
+    }
+
+    /**
+     * <p>getGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+     */
+    public DRGroup getGroup() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilders.java
new file mode 100644
index 0000000..a26694a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilders.java
@@ -0,0 +1,121 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.group;
+
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * A set of methods of creating report groups
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class GroupBuilders {
+
+    // column
+
+    /**
+     * <p>group.</p>
+     *
+     * @param groupColumn a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     */
+    public ColumnGroupBuilder group(ValueColumnBuilder<?, ?> groupColumn) {
+        return Groups.group(groupColumn);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param groupColumn a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     */
+    public ColumnGroupBuilder group(String name, ValueColumnBuilder<?, ?> groupColumn) {
+        return Groups.group(name, groupColumn);
+    }
+
+    // custom
+
+    /**
+     * <p>group.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public CustomGroupBuilder group(String fieldName, Class<?> valueClass) {
+        return Groups.group(fieldName, valueClass);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public CustomGroupBuilder group(String name, String fieldName, Class<?> valueClass) {
+        return Groups.group(name, fieldName, valueClass);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public CustomGroupBuilder group(FieldBuilder<?> field) {
+        return Groups.group(field);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public CustomGroupBuilder group(String name, FieldBuilder<?> field) {
+        return Groups.group(name, field);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public CustomGroupBuilder group(DRIExpression<?> expression) {
+        return Groups.group(expression);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public CustomGroupBuilder group(String name, DRIExpression<?> expression) {
+        return Groups.group(name, expression);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/Groups.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/Groups.java
new file mode 100644
index 0000000..3177790
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/Groups.java
@@ -0,0 +1,122 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.group;
+
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * A set of methods of creating report groups
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Groups {
+
+    // column
+
+    /**
+     * <p>group.</p>
+     *
+     * @param groupColumn a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     */
+    public static ColumnGroupBuilder group(ValueColumnBuilder<?, ?> groupColumn) {
+        return new ColumnGroupBuilder(groupColumn);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param name        a {@link java.lang.String} object.
+     * @param groupColumn a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     */
+    public static ColumnGroupBuilder group(String name, ValueColumnBuilder<?, ?> groupColumn) {
+        return new ColumnGroupBuilder(name, groupColumn);
+    }
+
+    // custom
+
+    /**
+     * <p>group.</p>
+     *
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public static CustomGroupBuilder group(String fieldName, Class<?> valueClass) {
+        return group(DynamicReports.field(fieldName, valueClass));
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param fieldName  a {@link java.lang.String} object.
+     * @param valueClass a {@link java.lang.Class} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public static CustomGroupBuilder group(String name, String fieldName, Class<?> valueClass) {
+        return group(name, DynamicReports.field(fieldName, valueClass));
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public static CustomGroupBuilder group(FieldBuilder<?> field) {
+        return new CustomGroupBuilder(field);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public static CustomGroupBuilder group(String name, FieldBuilder<?> field) {
+        return new CustomGroupBuilder(name, field);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public static CustomGroupBuilder group(DRIExpression<?> expression) {
+        return new CustomGroupBuilder(expression);
+    }
+
+    /**
+     * <p>group.</p>
+     *
+     * @param name       a {@link java.lang.String} object.
+     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     */
+    public static CustomGroupBuilder group(String name, DRIExpression<?> expression) {
+        return new CustomGroupBuilder(name, expression);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BaseStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BaseStyleBuilder.java
new file mode 100644
index 0000000..be39228
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BaseStyleBuilder.java
@@ -0,0 +1,706 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRBaseStyle;
+import net.sf.dynamicreports.report.base.style.DRTabStop;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.LineSpacing;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.Rotation;
+import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import net.sf.dynamicreports.report.constant.VerticalAlignment;
+import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
+import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+import org.apache.commons.lang3.Validate;
+
+import java.awt.Color;
+
+/**
+ * <p>Abstract BaseStyleBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings( {"unchecked", "deprecation"})
+public abstract class BaseStyleBuilder<T extends BaseStyleBuilder<T, U>, U extends DRBaseStyle> extends AbstractBuilder<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for BaseStyleBuilder.</p>
+     *
+     * @param baseStyle a U object.
+     */
+    protected BaseStyleBuilder(U baseStyle) {
+        super(baseStyle);
+    }
+
+    /**
+     * <p>setBackgroundColor.</p>
+     *
+     * @param backgroundColor a {@link java.awt.Color} object.
+     * @return a T object.
+     */
+    public T setBackgroundColor(Color backgroundColor) {
+        getObject().setBackgroundColor(backgroundColor);
+        return (T) this;
+    }
+
+    /**
+     * <p>setBorder.</p>
+     *
+     * @param border a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @return a T object.
+     */
+    public T setBorder(BorderBuilder border) {
+        if (border != null) {
+            getObject().setBorder(border.build());
+        } else {
+            getObject().setBorder(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setBorder.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a T object.
+     */
+    public T setBorder(PenBuilder pen) {
+        return setBorder(pen != null ? Styles.border(pen) : null);
+    }
+
+    /**
+     * <p>setTopBorder.</p>
+     *
+     * @param topPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a T object.
+     */
+    public T setTopBorder(PenBuilder topPen) {
+        if (topPen != null) {
+            getObject().getBorder().setTopPen(topPen.build());
+        } else {
+            getObject().getBorder().setTopPen(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setLeftBorder.</p>
+     *
+     * @param leftPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a T object.
+     */
+    public T setLeftBorder(PenBuilder leftPen) {
+        if (leftPen != null) {
+            getObject().getBorder().setLeftPen(leftPen.build());
+        } else {
+            getObject().getBorder().setLeftPen(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setBottomBorder.</p>
+     *
+     * @param bottomPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a T object.
+     */
+    public T setBottomBorder(PenBuilder bottomPen) {
+        if (bottomPen != null) {
+            getObject().getBorder().setBottomPen(bottomPen.build());
+        } else {
+            getObject().getBorder().setBottomPen(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setRightBorder.</p>
+     *
+     * @param rightPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a T object.
+     */
+    public T setRightBorder(PenBuilder rightPen) {
+        if (rightPen != null) {
+            getObject().getBorder().setRightPen(rightPen.build());
+        } else {
+            getObject().getBorder().setRightPen(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setFont.</p>
+     *
+     * @param font a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a T object.
+     */
+    public T setFont(FontBuilder font) {
+        if (font != null) {
+            getObject().setFont(font.build());
+        } else {
+            getObject().setFont(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>bold.</p>
+     *
+     * @return a T object.
+     */
+    public T bold() {
+        return setBold(true);
+    }
+
+    /**
+     * <p>setBold.</p>
+     *
+     * @param bold a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setBold(Boolean bold) {
+        getObject().getFont().setBold(bold);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFontName.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setFontName(String fontName) {
+        getObject().getFont().setFontName(fontName);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFontSize.</p>
+     *
+     * @param fontSize a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setFontSize(Integer fontSize) {
+        getObject().getFont().setFontSize(fontSize);
+        return (T) this;
+    }
+
+    /**
+     * <p>italic.</p>
+     *
+     * @return a T object.
+     */
+    public T italic() {
+        return setItalic(true);
+    }
+
+    /**
+     * <p>setItalic.</p>
+     *
+     * @param italic a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setItalic(Boolean italic) {
+        getObject().getFont().setItalic(italic);
+        return (T) this;
+    }
+
+    /**
+     * <p>boldItalic.</p>
+     *
+     * @return a T object.
+     */
+    public T boldItalic() {
+        setBold(true);
+        return setItalic(true);
+    }
+
+    @Deprecated
+    /**
+     * You should configure the fonts.xml file
+     *
+     * @param pdfEmbedded a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setPdfEmbedded(Boolean pdfEmbedded) {
+        getObject().getFont().setPdfEmbedded(pdfEmbedded);
+        return (T) this;
+    }
+
+    @Deprecated
+    /**
+     * You should configure the fonts.xml file
+     *
+     * @param pdfEncoding a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setPdfEncoding(String pdfEncoding) {
+        getObject().getFont().setPdfEncoding(pdfEncoding);
+        return (T) this;
+    }
+
+    @Deprecated
+    /**
+     * You should configure the fonts.xml file
+     *
+     * @param pdfFontName a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setPdfFontName(String pdfFontName) {
+        getObject().getFont().setPdfFontName(pdfFontName);
+        return (T) this;
+    }
+
+    /**
+     * <p>strikeThrough.</p>
+     *
+     * @return a T object.
+     */
+    public T strikeThrough() {
+        return setStrikeThrough(true);
+    }
+
+    /**
+     * <p>setStrikeThrough.</p>
+     *
+     * @param strikeThrough a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setStrikeThrough(Boolean strikeThrough) {
+        getObject().getFont().setStrikeThrough(strikeThrough);
+        return (T) this;
+    }
+
+    /**
+     * <p>underline.</p>
+     *
+     * @return a T object.
+     */
+    public T underline() {
+        return setUnderline(true);
+    }
+
+    /**
+     * <p>setUnderline.</p>
+     *
+     * @param underline a {@link java.lang.Boolean} object.
+     * @return a T object.
+     */
+    public T setUnderline(Boolean underline) {
+        getObject().getFont().setUnderline(underline);
+        return (T) this;
+    }
+
+    /**
+     * <p>setForegroundColor.</p>
+     *
+     * @param foregroudColor a {@link java.awt.Color} object.
+     * @return a T object.
+     */
+    public T setForegroundColor(Color foregroudColor) {
+        getObject().setForegroundColor(foregroudColor);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHorizontalAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a T object.
+     * @deprecated use setHorizontalTextAlignment instead
+     */
+    @Deprecated
+    public T setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().setHorizontalTextAlignment(HorizontalTextAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().setHorizontalTextAlignment(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setHorizontalTextAlignment.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a T object.
+     */
+    public T setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
+        getObject().setHorizontalTextAlignment(horizontalTextAlignment);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHorizontalImageAlignment.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a T object.
+     */
+    public T setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
+        getObject().setHorizontalImageAlignment(horizontalImageAlignment);
+        return (T) this;
+    }
+
+    /**
+     * <p>setImageScale.</p>
+     *
+     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @return a T object.
+     */
+    public T setImageScale(ImageScale imageScale) {
+        getObject().setImageScale(imageScale);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPadding.</p>
+     *
+     * @param padding a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a T object.
+     */
+    public T setPadding(PaddingBuilder padding) {
+        if (padding != null) {
+            getObject().setPadding(padding.build());
+        } else {
+            getObject().setPadding(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setPadding.</p>
+     *
+     * @param padding a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setPadding(Integer padding) {
+        return setPadding(Styles.padding(padding));
+    }
+
+    /**
+     * <p>setTopPadding.</p>
+     *
+     * @param top a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setTopPadding(Integer top) {
+        getObject().getPadding().setTop(top);
+        return (T) this;
+    }
+
+    /**
+     * <p>setLeftPadding.</p>
+     *
+     * @param left a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setLeftPadding(Integer left) {
+        getObject().getPadding().setLeft(left);
+        return (T) this;
+    }
+
+    /**
+     * <p>setBottomPadding.</p>
+     *
+     * @param bottom a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setBottomPadding(Integer bottom) {
+        getObject().getPadding().setBottom(bottom);
+        return (T) this;
+    }
+
+    /**
+     * <p>setRightPadding.</p>
+     *
+     * @param right a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setRightPadding(Integer right) {
+        getObject().getPadding().setRight(right);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPattern.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setPattern(String pattern) {
+        getObject().setPattern(pattern);
+        return (T) this;
+    }
+
+    /**
+     * <p>setRadius.</p>
+     *
+     * @param radius a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setRadius(Integer radius) {
+        getObject().setRadius(radius);
+        return (T) this;
+    }
+
+    /**
+     * <p>setRotation.</p>
+     *
+     * @param rotation a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     * @return a T object.
+     */
+    public T setRotation(Rotation rotation) {
+        getObject().setRotation(rotation);
+        return (T) this;
+    }
+
+    /**
+     * <p>setAlignment.</p>
+     *
+     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalAlignment} object.
+     * @return a T object.
+     * @deprecated use setTextAlignment instead
+     */
+    @Deprecated
+    public T setAlignment(HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment) {
+        if (horizontalAlignment != null) {
+            getObject().setHorizontalTextAlignment(HorizontalTextAlignment.valueOf(horizontalAlignment.name()));
+        } else {
+            getObject().setHorizontalTextAlignment(null);
+        }
+        if (verticalAlignment != null) {
+            getObject().setVerticalTextAlignment(VerticalTextAlignment.valueOf(verticalAlignment.name()));
+        } else {
+            getObject().setVerticalTextAlignment(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setTextAlignment.</p>
+     *
+     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param verticalTextAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     * @return a T object.
+     */
+    public T setTextAlignment(HorizontalTextAlignment horizontalTextAlignment, VerticalTextAlignment verticalTextAlignment) {
+        getObject().setHorizontalTextAlignment(horizontalTextAlignment);
+        getObject().setVerticalTextAlignment(verticalTextAlignment);
+        return (T) this;
+    }
+
+    /**
+     * <p>setImageAlignment.</p>
+     *
+     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param verticalImageAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     * @return a T object.
+     */
+    public T setImageAlignment(HorizontalImageAlignment horizontalImageAlignment, VerticalImageAlignment verticalImageAlignment) {
+        getObject().setHorizontalImageAlignment(horizontalImageAlignment);
+        getObject().setVerticalImageAlignment(verticalImageAlignment);
+        return (T) this;
+    }
+
+    /**
+     * <p>setVerticalAlignment.</p>
+     *
+     * @param verticalAlignment a {@link net.sf.dynamicreports.report.constant.VerticalAlignment} object.
+     * @return a T object.
+     * @deprecated use setVerticalTextAlignment instead
+     */
+    @Deprecated
+    public T setVerticalAlignment(VerticalAlignment verticalAlignment) {
+        if (verticalAlignment != null) {
+            getObject().setVerticalTextAlignment(VerticalTextAlignment.valueOf(verticalAlignment.name()));
+        } else {
+            getObject().setVerticalTextAlignment(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setVerticalTextAlignment.</p>
+     *
+     * @param verticalTextAlignment a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     * @return a T object.
+     */
+    public T setVerticalTextAlignment(VerticalTextAlignment verticalTextAlignment) {
+        getObject().setVerticalTextAlignment(verticalTextAlignment);
+        return (T) this;
+    }
+
+    /**
+     * <p>setVerticalImageAlignment.</p>
+     *
+     * @param verticalImageAlignment a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     * @return a T object.
+     */
+    public T setVerticalImageAlignment(VerticalImageAlignment verticalImageAlignment) {
+        getObject().setVerticalImageAlignment(verticalImageAlignment);
+        return (T) this;
+    }
+
+    /**
+     * <p>setMarkup.</p>
+     *
+     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @return a T object.
+     */
+    public T setMarkup(Markup markup) {
+        getObject().setMarkup(markup);
+        return (T) this;
+    }
+
+    /**
+     * <p>setLineSpacing.</p>
+     *
+     * @param lineSpacing a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     * @return a T object.
+     */
+    public T setLineSpacing(LineSpacing lineSpacing) {
+        getObject().getParagraph().setLineSpacing(lineSpacing);
+        return (T) this;
+    }
+
+    /**
+     * <p>setLineSpacingSize.</p>
+     *
+     * @param lineSpacingSize a {@link java.lang.Float} object.
+     * @return a T object.
+     */
+    public T setLineSpacingSize(Float lineSpacingSize) {
+        getObject().getParagraph().setLineSpacingSize(lineSpacingSize);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFirstLineIndent.</p>
+     *
+     * @param firstLineIndent a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setFirstLineIndent(Integer firstLineIndent) {
+        getObject().getParagraph().setFirstLineIndent(firstLineIndent);
+        return (T) this;
+    }
+
+    /**
+     * <p>setLeftIndent.</p>
+     *
+     * @param leftIndent a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setLeftIndent(Integer leftIndent) {
+        getObject().getParagraph().setLeftIndent(leftIndent);
+        return (T) this;
+    }
+
+    /**
+     * <p>setRightIndent.</p>
+     *
+     * @param rightIndent a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setRightIndent(Integer rightIndent) {
+        getObject().getParagraph().setRightIndent(rightIndent);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSpacingBefore.</p>
+     *
+     * @param spacingBefore a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setSpacingBefore(Integer spacingBefore) {
+        getObject().getParagraph().setSpacingBefore(spacingBefore);
+        return (T) this;
+    }
+
+    /**
+     * <p>setSpacingAfter.</p>
+     *
+     * @param spacingAfter a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setSpacingAfter(Integer spacingAfter) {
+        getObject().getParagraph().setSpacingAfter(spacingAfter);
+        return (T) this;
+    }
+
+    /**
+     * <p>setTabStopWidth.</p>
+     *
+     * @param tabStopWidth a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setTabStopWidth(Integer tabStopWidth) {
+        getObject().getParagraph().setTabStopWidth(tabStopWidth);
+        return (T) this;
+    }
+
+    /**
+     * <p>addTabStop.</p>
+     *
+     * @param position  a int.
+     * @param alignment a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     * @return a T object.
+     */
+    public T addTabStop(int position, TabStopAlignment alignment) {
+        Validate.notNull(alignment, "alignment must not be null");
+        DRTabStop tabStop = new DRTabStop();
+        tabStop.setPosition(position);
+        tabStop.setAlignment(alignment);
+        getObject().getParagraph().getTabStops().add(tabStop);
+        return (T) this;
+    }
+
+    /**
+     * <p>setLinePen.</p>
+     *
+     * @param linePen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a T object.
+     */
+    public T setLinePen(PenBuilder linePen) {
+        if (linePen != null) {
+            getObject().setLinePen(linePen.build());
+        } else {
+            getObject().setLinePen(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @return a U object.
+     */
+    public U getStyle() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BorderBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BorderBuilder.java
new file mode 100644
index 0000000..cbb97e2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BorderBuilder.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRBorder;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>BorderBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class BorderBuilder extends AbstractBuilder<BorderBuilder, DRBorder> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for BorderBuilder.</p>
+     */
+    protected BorderBuilder() {
+        super(new DRBorder());
+    }
+
+    /**
+     * <p>Constructor for BorderBuilder.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    protected BorderBuilder(PenBuilder pen) {
+        super(new DRBorder(pen.build()));
+    }
+
+    /**
+     * <p>setTopPen.</p>
+     *
+     * @param topPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     */
+    public BorderBuilder setTopPen(PenBuilder topPen) {
+        if (topPen != null) {
+            getObject().setTopPen(topPen.build());
+        } else {
+            getObject().setTopPen(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setLeftPen.</p>
+     *
+     * @param leftPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     */
+    public BorderBuilder setLeftPen(PenBuilder leftPen) {
+        if (leftPen != null) {
+            getObject().setLeftPen(leftPen.build());
+        } else {
+            getObject().setLeftPen(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setBottomPen.</p>
+     *
+     * @param bottomPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     */
+    public BorderBuilder setBottomPen(PenBuilder bottomPen) {
+        if (bottomPen != null) {
+            getObject().setBottomPen(bottomPen.build());
+        } else {
+            getObject().setBottomPen(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setRightPen.</p>
+     *
+     * @param rightPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     */
+    public BorderBuilder setRightPen(PenBuilder rightPen) {
+        if (rightPen != null) {
+            getObject().setRightPen(rightPen.build());
+        } else {
+            getObject().setRightPen(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>getBorder.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.style.DRBorder} object.
+     */
+    public DRBorder getBorder() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ConditionalStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ConditionalStyleBuilder.java
new file mode 100644
index 0000000..e0039ad
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ConditionalStyleBuilder.java
@@ -0,0 +1,41 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>ConditionalStyleBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class ConditionalStyleBuilder extends BaseStyleBuilder<ConditionalStyleBuilder, DRConditionalStyle> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for ConditionalStyleBuilder.</p>
+     *
+     * @param conditionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected ConditionalStyleBuilder(DRIExpression<Boolean> conditionExpression) {
+        super(new DRConditionalStyle(conditionExpression));
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/FontBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/FontBuilder.java
new file mode 100644
index 0000000..2a45b7f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/FontBuilder.java
@@ -0,0 +1,208 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRFont;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>FontBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class FontBuilder extends AbstractBuilder<FontBuilder, DRFont> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for FontBuilder.</p>
+     */
+    protected FontBuilder() {
+        super(new DRFont());
+    }
+
+    /**
+     * <p>Constructor for FontBuilder.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     * @param bold     a {@link java.lang.Boolean} object.
+     * @param italic   a {@link java.lang.Boolean} object.
+     * @param fontSize a {@link java.lang.Integer} object.
+     */
+    protected FontBuilder(String fontName, Boolean bold, Boolean italic, Integer fontSize) {
+        super(new DRFont(fontName, bold, italic, fontSize));
+    }
+
+    /**
+     * <p>setFontName.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setFontName(String fontName) {
+        getObject().setFontName(fontName);
+        return this;
+    }
+
+    /**
+     * <p>setFontSize.</p>
+     *
+     * @param fontSize a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setFontSize(Integer fontSize) {
+        getObject().setFontSize(fontSize);
+        return this;
+    }
+
+    /**
+     * <p>bold.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder bold() {
+        return setBold(true);
+    }
+
+    /**
+     * <p>setBold.</p>
+     *
+     * @param bold a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setBold(Boolean bold) {
+        getObject().setBold(bold);
+        return this;
+    }
+
+    /**
+     * <p>italic.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder italic() {
+        return setItalic(true);
+    }
+
+    /**
+     * <p>setItalic.</p>
+     *
+     * @param italic a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setItalic(Boolean italic) {
+        getObject().setItalic(italic);
+        return this;
+    }
+
+    /**
+     * <p>boldItalic.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder boldItalic() {
+        setBold(true);
+        return setItalic(true);
+    }
+
+    @Deprecated
+    /**
+     * You should configure the fonts.xml file
+     *
+     * @param pdfEmbedded a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setPdfEmbedded(Boolean pdfEmbedded) {
+        getObject().setPdfEmbedded(pdfEmbedded);
+        return this;
+    }
+
+    @Deprecated
+    /**
+     * You should configure the fonts.xml file
+     *
+     * @param pdfEncoding a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setPdfEncoding(String pdfEncoding) {
+        getObject().setPdfEncoding(pdfEncoding);
+        return this;
+    }
+
+    @Deprecated
+    /**
+     * You should configure the fonts.xml file
+     *
+     * @param pdfFontName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setPdfFontName(String pdfFontName) {
+        getObject().setPdfFontName(pdfFontName);
+        return this;
+    }
+
+    /**
+     * <p>strikeThrough.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder strikeThrough() {
+        return setStrikeThrough(true);
+    }
+
+    /**
+     * <p>setStrikeThrough.</p>
+     *
+     * @param strikeThrough a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setStrikeThrough(Boolean strikeThrough) {
+        getObject().setStrikeThrough(strikeThrough);
+        return this;
+    }
+
+    /**
+     * <p>underline.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder underline() {
+        return setUnderline(true);
+    }
+
+    /**
+     * <p>setUnderline.</p>
+     *
+     * @param underline a {@link java.lang.Boolean} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder setUnderline(Boolean underline) {
+        getObject().setUnderline(underline);
+        return this;
+    }
+
+    /**
+     * <p>getFont.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+     */
+    public DRFont getFont() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PaddingBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PaddingBuilder.java
new file mode 100644
index 0000000..b38ae82
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PaddingBuilder.java
@@ -0,0 +1,101 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRPadding;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>PaddingBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PaddingBuilder extends AbstractBuilder<PaddingBuilder, DRPadding> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for PaddingBuilder.</p>
+     */
+    protected PaddingBuilder() {
+        super(new DRPadding());
+    }
+
+    /**
+     * <p>Constructor for PaddingBuilder.</p>
+     *
+     * @param padding a int.
+     */
+    protected PaddingBuilder(int padding) {
+        super(new DRPadding(padding));
+    }
+
+    /**
+     * <p>setTop.</p>
+     *
+     * @param top a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     */
+    public PaddingBuilder setTop(Integer top) {
+        getObject().setTop(top);
+        return this;
+    }
+
+    /**
+     * <p>setLeft.</p>
+     *
+     * @param left a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     */
+    public PaddingBuilder setLeft(Integer left) {
+        getObject().setLeft(left);
+        return this;
+    }
+
+    /**
+     * <p>setBottom.</p>
+     *
+     * @param bottom a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     */
+    public PaddingBuilder setBottom(Integer bottom) {
+        getObject().setBottom(bottom);
+        return this;
+    }
+
+    /**
+     * <p>setRight.</p>
+     *
+     * @param right a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     */
+    public PaddingBuilder setRight(Integer right) {
+        getObject().setRight(right);
+        return this;
+    }
+
+    /**
+     * <p>getPadding.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.style.DRPadding} object.
+     */
+    public DRPadding getPadding() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PenBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PenBuilder.java
new file mode 100644
index 0000000..dc2d349
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PenBuilder.java
@@ -0,0 +1,94 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRPen;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.LineStyle;
+
+import java.awt.Color;
+
+/**
+ * <p>PenBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PenBuilder extends AbstractBuilder<PenBuilder, DRPen> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for PenBuilder.</p>
+     */
+    protected PenBuilder() {
+        super(new DRPen());
+    }
+
+    /**
+     * <p>Constructor for PenBuilder.</p>
+     *
+     * @param lineWidth a {@link java.lang.Float} object.
+     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     */
+    protected PenBuilder(Float lineWidth, LineStyle lineStyle) {
+        super(new DRPen(lineWidth, lineStyle));
+    }
+
+    /**
+     * <p>setLineWidth.</p>
+     *
+     * @param lineWidth a {@link java.lang.Float} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder setLineWidth(Float lineWidth) {
+        getObject().setLineWidth(lineWidth);
+        return this;
+    }
+
+    /**
+     * <p>setLineStyle.</p>
+     *
+     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder setLineStyle(LineStyle lineStyle) {
+        getObject().setLineStyle(lineStyle);
+        return this;
+    }
+
+    /**
+     * <p>setLineColor.</p>
+     *
+     * @param lineColor a {@link java.awt.Color} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder setLineColor(Color lineColor) {
+        getObject().setLineColor(lineColor);
+        return this;
+    }
+
+    /**
+     * <p>getPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     */
+    public DRPen getPen() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ReportStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ReportStyleBuilder.java
new file mode 100644
index 0000000..1a4068d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ReportStyleBuilder.java
@@ -0,0 +1,45 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+import java.io.Serializable;
+
+/**
+ * <p>ReportStyleBuilder interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface ReportStyleBuilder extends Serializable {
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getStyle();
+
+    /**
+     * <p>build.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle build();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/SimpleStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/SimpleStyleBuilder.java
new file mode 100644
index 0000000..fb267e2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/SimpleStyleBuilder.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>SimpleStyleBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SimpleStyleBuilder extends BaseStyleBuilder<SimpleStyleBuilder, DRSimpleStyle> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for SimpleStyleBuilder.</p>
+     */
+    protected SimpleStyleBuilder() {
+        super(new DRSimpleStyle());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilder.java
new file mode 100644
index 0000000..0e732df
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilder.java
@@ -0,0 +1,99 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRStyle;
+import net.sf.dynamicreports.report.constant.Constants;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>StyleBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class StyleBuilder extends BaseStyleBuilder<StyleBuilder, DRStyle> implements ReportStyleBuilder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for StyleBuilder.</p>
+     */
+    protected StyleBuilder() {
+        this(new DRStyle());
+    }
+
+    /**
+     * <p>Constructor for StyleBuilder.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+     */
+    protected StyleBuilder(DRStyle style) {
+        super(style);
+    }
+
+    /**
+     * <p>conditionalStyles.</p>
+     *
+     * @param conditionalStyles a {@link net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder conditionalStyles(ConditionalStyleBuilder... conditionalStyles) {
+        return addConditionalStyle(conditionalStyles);
+    }
+
+    /**
+     * <p>addConditionalStyle.</p>
+     *
+     * @param conditionalStyles a {@link net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder addConditionalStyle(ConditionalStyleBuilder... conditionalStyles) {
+        Validate.notNull(conditionalStyles, "conditionalStyles must not be null");
+        Validate.noNullElements(conditionalStyles, "conditionalStyles must not contains null conditionalStyle");
+        for (ConditionalStyleBuilder conditionalStyle : conditionalStyles) {
+            getObject().addConditionalStyle(conditionalStyle.build());
+        }
+        return this;
+    }
+
+    /**
+     * <p>setName.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder setName(String name) {
+        getObject().setName(name);
+        return this;
+    }
+
+    /**
+     * <p>setParentStyle.</p>
+     *
+     * @param parentStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder setParentStyle(ReportStyleBuilder parentStyle) {
+        if (parentStyle != null) {
+            getObject().setParentStyle(parentStyle.build());
+        } else {
+            getObject().setParentStyle(null);
+        }
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilders.java
new file mode 100644
index 0000000..5347c53
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilders.java
@@ -0,0 +1,361 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.constant.LineStyle;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * A set of methods of creating and customizing styles
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class StyleBuilders {
+
+    // font
+
+    /**
+     * <p>font.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder font() {
+        return Styles.font();
+    }
+
+    /**
+     * <p>font.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     * @param bold     a boolean.
+     * @param italic   a boolean.
+     * @param fontSize a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder font(String fontName, boolean bold, boolean italic, int fontSize) {
+        return Styles.font(fontName, bold, italic, fontSize);
+    }
+
+    /**
+     * <p>fontArial.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder fontArial() {
+        return Styles.fontArial();
+    }
+
+    /**
+     * <p>fontArialBold.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder fontArialBold() {
+        return Styles.fontArialBold();
+    }
+
+    /**
+     * <p>fontTimesNewRoman.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder fontTimesNewRoman() {
+        return Styles.fontTimesNewRoman();
+    }
+
+    /**
+     * <p>fontTimesNewRomanBold.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder fontTimesNewRomanBold() {
+        return Styles.fontTimesNewRomanBold();
+    }
+
+    /**
+     * <p>fontCourierNew.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder fontCourierNew() {
+        return Styles.fontCourierNew();
+    }
+
+    /**
+     * <p>fontCourierNewBold.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public FontBuilder fontCourierNewBold() {
+        return Styles.fontCourierNewBold();
+    }
+
+    // pen
+
+    /**
+     * <p>pen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder pen() {
+        return Styles.pen();
+    }
+
+    /**
+     * <p>pen.</p>
+     *
+     * @param lineWidth a {@link java.lang.Float} object.
+     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder pen(Float lineWidth, LineStyle lineStyle) {
+        return Styles.pen(lineWidth, lineStyle);
+    }
+
+    /**
+     * <p>penThin.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder penThin() {
+        return Styles.penThin();
+    }
+
+    /**
+     * <p>pen1Point.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder pen1Point() {
+        return Styles.pen1Point();
+    }
+
+    /**
+     * <p>pen2Point.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder pen2Point() {
+        return Styles.pen2Point();
+    }
+
+    /**
+     * <p>penDotted.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder penDotted() {
+        return Styles.penDotted();
+    }
+
+    /**
+     * <p>penDashed.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder penDashed() {
+        return Styles.penDashed();
+    }
+
+    /**
+     * <p>penDouble.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public PenBuilder penDouble() {
+        return Styles.penDouble();
+    }
+
+    // border
+
+    /**
+     * <p>border.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     */
+    public BorderBuilder border() {
+        return Styles.border();
+    }
+
+    /**
+     * <p>border.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     */
+    public BorderBuilder border(PenBuilder pen) {
+        return Styles.border(pen);
+    }
+
+    // padding
+
+    /**
+     * <p>padding.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     */
+    public PaddingBuilder padding() {
+        return Styles.padding();
+    }
+
+    /**
+     * <p>padding.</p>
+     *
+     * @param padding a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     */
+    public PaddingBuilder padding(int padding) {
+        return Styles.padding(padding);
+    }
+
+    // style
+
+    /**
+     * <p>style.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder style() {
+        return Styles.style();
+    }
+
+    /**
+     * <p>style.</p>
+     *
+     * @param parentStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder style(ReportStyleBuilder parentStyle) {
+        return Styles.style(parentStyle);
+    }
+
+    /**
+     * <p>style.</p>
+     *
+     * @param font a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder style(FontBuilder font) {
+        return Styles.style(font);
+    }
+
+    /**
+     * <p>style.</p>
+     *
+     * @param borderPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder style(PenBuilder borderPen) {
+        return Styles.style(borderPen);
+    }
+
+    /**
+     * <p>style.</p>
+     *
+     * @param padding a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder style(Integer padding) {
+        return Styles.style(padding);
+    }
+
+    /**
+     * <p>simpleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+     */
+    public SimpleStyleBuilder simpleStyle() {
+        return Styles.simpleStyle();
+    }
+
+    /**
+     * <p>templateStyle.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStyleBuilder} object.
+     */
+    public TemplateStyleBuilder templateStyle(String name) {
+        return Styles.templateStyle(name);
+    }
+
+    /**
+     * <p>conditionalStyle.</p>
+     *
+     * @param conditionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
+     */
+    public ConditionalStyleBuilder conditionalStyle(DRIExpression<Boolean> conditionExpression) {
+        return Styles.conditionalStyle(conditionExpression);
+    }
+
+    /**
+     * <p>templateStyles.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder templateStyles() {
+        return Styles.templateStyles();
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param inputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder loadStyles(InputStream inputStream) {
+        return Styles.loadStyles(inputStream);
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param file a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder loadStyles(File file) {
+        return Styles.loadStyles(file);
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param fileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public TemplateStylesBuilder loadStyles(String fileName) throws DRException {
+        return Styles.loadStyles(fileName);
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param url a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder loadStyles(URL url) {
+        return Styles.loadStyles(url);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/Styles.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/Styles.java
new file mode 100644
index 0000000..6524266
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/Styles.java
@@ -0,0 +1,364 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.constant.FontName;
+import net.sf.dynamicreports.report.constant.LineStyle;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRException;
+import org.apache.commons.lang3.Validate;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * A set of methods of creating and customizing styles
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Styles {
+
+    // font
+
+    /**
+     * <p>font.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public static FontBuilder font() {
+        return new FontBuilder();
+    }
+
+    /**
+     * <p>font.</p>
+     *
+     * @param fontName a {@link java.lang.String} object.
+     * @param bold     a boolean.
+     * @param italic   a boolean.
+     * @param fontSize a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public static FontBuilder font(String fontName, boolean bold, boolean italic, int fontSize) {
+        return new FontBuilder(fontName, bold, italic, fontSize);
+    }
+
+    /**
+     * <p>fontArial.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public static FontBuilder fontArial() {
+        return new FontBuilder(FontName.ARIAL, false, false, 10);
+    }
+
+    /**
+     * <p>fontArialBold.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public static FontBuilder fontArialBold() {
+        return new FontBuilder(FontName.ARIAL, true, false, 10);
+    }
+
+    /**
+     * <p>fontTimesNewRoman.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public static FontBuilder fontTimesNewRoman() {
+        return new FontBuilder(FontName.TIMES_NEW_ROMAN, false, false, 10);
+    }
+
+    /**
+     * <p>fontTimesNewRomanBold.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public static FontBuilder fontTimesNewRomanBold() {
+        return new FontBuilder(FontName.TIMES_NEW_ROMAN, true, false, 10);
+    }
+
+    /**
+     * <p>fontCourierNew.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public static FontBuilder fontCourierNew() {
+        return new FontBuilder(FontName.COURIER_NEW, false, false, 10);
+    }
+
+    /**
+     * <p>fontCourierNewBold.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     */
+    public static FontBuilder fontCourierNewBold() {
+        return new FontBuilder(FontName.COURIER_NEW, true, false, 10);
+    }
+
+    // pen
+
+    /**
+     * <p>pen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public static PenBuilder pen() {
+        return new PenBuilder();
+    }
+
+    /**
+     * <p>pen.</p>
+     *
+     * @param lineWidth a {@link java.lang.Float} object.
+     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public static PenBuilder pen(Float lineWidth, LineStyle lineStyle) {
+        return new PenBuilder(lineWidth, lineStyle);
+    }
+
+    /**
+     * <p>penThin.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public static PenBuilder penThin() {
+        return new PenBuilder(0.5f, LineStyle.SOLID);
+    }
+
+    /**
+     * <p>pen1Point.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public static PenBuilder pen1Point() {
+        return new PenBuilder(1f, LineStyle.SOLID);
+    }
+
+    /**
+     * <p>pen2Point.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public static PenBuilder pen2Point() {
+        return new PenBuilder(2f, LineStyle.SOLID);
+    }
+
+    /**
+     * <p>penDotted.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public static PenBuilder penDotted() {
+        return new PenBuilder(1f, LineStyle.DOTTED);
+    }
+
+    /**
+     * <p>penDashed.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public static PenBuilder penDashed() {
+        return new PenBuilder(1f, LineStyle.DASHED);
+    }
+
+    /**
+     * <p>penDouble.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     */
+    public static PenBuilder penDouble() {
+        return new PenBuilder(1f, LineStyle.DOUBLE);
+    }
+
+    // border
+
+    /**
+     * <p>border.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     */
+    public static BorderBuilder border() {
+        return new BorderBuilder();
+    }
+
+    /**
+     * <p>border.</p>
+     *
+     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     */
+    public static BorderBuilder border(PenBuilder pen) {
+        Validate.notNull(pen, "pen must not be null");
+        return new BorderBuilder(pen);
+    }
+
+    // padding
+
+    /**
+     * <p>padding.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     */
+    public static PaddingBuilder padding() {
+        return new PaddingBuilder();
+    }
+
+    /**
+     * <p>padding.</p>
+     *
+     * @param padding a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     */
+    public static PaddingBuilder padding(int padding) {
+        return new PaddingBuilder(padding);
+    }
+
+    // style
+
+    /**
+     * <p>style.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public static StyleBuilder style() {
+        return new StyleBuilder();
+    }
+
+    /**
+     * <p>style.</p>
+     *
+     * @param parentStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public static StyleBuilder style(ReportStyleBuilder parentStyle) {
+        return new StyleBuilder().setParentStyle(parentStyle);
+    }
+
+    /**
+     * <p>style.</p>
+     *
+     * @param font a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public static StyleBuilder style(FontBuilder font) {
+        return new StyleBuilder().setFont(font);
+    }
+
+    /**
+     * <p>style.</p>
+     *
+     * @param borderPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public static StyleBuilder style(PenBuilder borderPen) {
+        return new StyleBuilder().setBorder(borderPen);
+    }
+
+    /**
+     * <p>style.</p>
+     *
+     * @param padding a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public static StyleBuilder style(Integer padding) {
+        return new StyleBuilder().setPadding(padding);
+    }
+
+    /**
+     * <p>simpleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+     */
+    public static SimpleStyleBuilder simpleStyle() {
+        return new SimpleStyleBuilder();
+    }
+
+    /**
+     * <p>templateStyle.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStyleBuilder} object.
+     */
+    public static TemplateStyleBuilder templateStyle(String name) {
+        return new TemplateStyleBuilder(name);
+    }
+
+    /**
+     * <p>conditionalStyle.</p>
+     *
+     * @param conditionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
+     */
+    public static ConditionalStyleBuilder conditionalStyle(DRIExpression<Boolean> conditionExpression) {
+        return new ConditionalStyleBuilder(conditionExpression);
+    }
+
+    /**
+     * <p>templateStyles.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public static TemplateStylesBuilder templateStyles() {
+        return new TemplateStylesBuilder();
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param inputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public static TemplateStylesBuilder loadStyles(InputStream inputStream) {
+        return new TemplateStylesBuilder().loadStyles(inputStream);
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param file a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public static TemplateStylesBuilder loadStyles(File file) {
+        return new TemplateStylesBuilder().loadStyles(file);
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param fileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public static TemplateStylesBuilder loadStyles(String fileName) throws DRException {
+        return new TemplateStylesBuilder().loadStyles(fileName);
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param url a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public static TemplateStylesBuilder loadStyles(URL url) {
+        return new TemplateStylesBuilder().loadStyles(url);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStyleBuilder.java
new file mode 100644
index 0000000..4da57f9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStyleBuilder.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.report.base.style.DRTemplateStyle;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>TemplateStyleBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TemplateStyleBuilder extends AbstractBuilder<TemplateStyleBuilder, DRTemplateStyle> implements ReportStyleBuilder {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for TemplateStyleBuilder.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     */
+    protected TemplateStyleBuilder(String name) {
+        super(new DRTemplateStyle(name));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public DRTemplateStyle getStyle() {
+        return build();
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStylesBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStylesBuilder.java
new file mode 100644
index 0000000..89004ae
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStylesBuilder.java
@@ -0,0 +1,146 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.style;
+
+import net.sf.dynamicreports.jasper.base.JasperTemplateStyleLoader;
+import net.sf.dynamicreports.report.base.style.DRStyle;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.exception.DRException;
+import org.apache.commons.lang3.Validate;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>TemplateStylesBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TemplateStylesBuilder extends AbstractBuilder<TemplateStylesBuilder, List<StyleBuilder>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for TemplateStylesBuilder.</p>
+     */
+    protected TemplateStylesBuilder() {
+        super(new ArrayList<StyleBuilder>());
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param inputStream a {@link java.io.InputStream} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder loadStyles(InputStream inputStream) {
+        return addStyles(JasperTemplateStyleLoader.loadStyles(inputStream));
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param file a {@link java.io.File} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder loadStyles(File file) {
+        return addStyles(JasperTemplateStyleLoader.loadStyles(file));
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param fileName a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public TemplateStylesBuilder loadStyles(String fileName) throws DRException {
+        return addStyles(JasperTemplateStyleLoader.loadStyles(fileName));
+    }
+
+    /**
+     * <p>loadStyles.</p>
+     *
+     * @param url a {@link java.net.URL} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder loadStyles(URL url) {
+        return addStyles(JasperTemplateStyleLoader.loadStyles(url));
+    }
+
+    private TemplateStylesBuilder addStyles(DRStyle[] styles) {
+        for (DRStyle style : styles) {
+            this.getObject().add(new StyleBuilder(style));
+        }
+        return this;
+    }
+
+    /**
+     * <p>styles.</p>
+     *
+     * @param styles a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder styles(StyleBuilder... styles) {
+        return addStyle(styles);
+    }
+
+    /**
+     * <p>addStyle.</p>
+     *
+     * @param styles a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     */
+    public TemplateStylesBuilder addStyle(StyleBuilder... styles) {
+        Validate.notNull(styles, "styles must not be null");
+        Validate.noNullElements(styles, "styles must not contains null style");
+        for (StyleBuilder templateStyle : styles) {
+            getObject().add(templateStyle);
+        }
+        return this;
+    }
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     */
+    public StyleBuilder getStyle(String name) {
+        Validate.notNull(name, "name must not be null");
+        for (StyleBuilder style : getStyles()) {
+            if (name.equals(style.getStyle().getName())) {
+                return style;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * <p>getStyles.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<StyleBuilder> getStyles() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java
new file mode 100644
index 0000000..b53b828
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java
@@ -0,0 +1,140 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.subtotal;
+
+import net.sf.dynamicreports.report.base.DRVariable;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.builder.datatype.DataTypes;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.constant.SubtotalPosition;
+import net.sf.dynamicreports.report.definition.DRIField;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRReportException;
+
+/**
+ * <p>AggregationSubtotalBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class AggregationSubtotalBuilder<T> extends SubtotalBuilder<AggregationSubtotalBuilder<T>, T> implements DRIValue<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<?> expression;
+    private Calculation calculation;
+
+    // column
+
+    /**
+     * <p>Constructor for AggregationSubtotalBuilder.</p>
+     *
+     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected AggregationSubtotalBuilder(ValueColumnBuilder<?, ?> column, Calculation calculation) {
+        this(column.getColumn(), column, calculation);
+    }
+
+    // field
+
+    /**
+     * <p>Constructor for AggregationSubtotalBuilder.</p>
+     *
+     * @param field        a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param calculation  a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected AggregationSubtotalBuilder(FieldBuilder<?> field, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
+        this(field.build(), showInColumn, calculation);
+    }
+
+    // expression
+
+    /**
+     * <p>Constructor for AggregationSubtotalBuilder.</p>
+     *
+     * @param expression   a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param calculation  a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    protected AggregationSubtotalBuilder(DRIExpression<?> expression, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
+        super(showInColumn);
+        this.expression = expression;
+        this.calculation = calculation;
+        if (calculation.equals(Calculation.COUNT) || calculation.equals(Calculation.DISTINCT_COUNT)) {
+            setDataType(DataTypes.longType());
+        } else if (calculation.equals(Calculation.AVERAGE) || calculation.equals(Calculation.STANDARD_DEVIATION) || calculation.equals(Calculation.VARIANCE)) {
+            setDataType(DataTypes.doubleType());
+        } else if (expression instanceof DRIValueColumn) {
+            setDataType(((DRIValueColumn<?>) expression).getComponent().getDataType());
+            setPattern(((DRIValueColumn<?>) expression).getComponent().getPattern());
+        } else if (expression instanceof DRIField) {
+            setDataType(((DRIField<?>) expression).getDataType());
+        }
+    }
+
+    private static Evaluation subtotalPositionToEvaluation(SubtotalPosition position) {
+        switch (position) {
+            case PAGE_HEADER:
+            case PAGE_FOOTER:
+                return Evaluation.PAGE;
+            case COLUMN_HEADER:
+            case COLUMN_FOOTER:
+                return Evaluation.COLUMN;
+            case GROUP_HEADER:
+            case GROUP_FOOTER:
+                return Evaluation.GROUP;
+            case FIRST_GROUP_HEADER:
+            case FIRST_GROUP_FOOTER:
+                return Evaluation.FIRST_GROUP;
+            case LAST_GROUP_HEADER:
+            case LAST_GROUP_FOOTER:
+                return Evaluation.LAST_GROUP;
+            case TITLE:
+            case LAST_PAGE_FOOTER:
+            case SUMMARY:
+                return Evaluation.REPORT;
+            default:
+                throw new DRReportException("Subtotal position " + position.name() + " not supported");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        DRVariable<T> subtotalVariable = new DRVariable<T>(expression, calculation);
+        Evaluation resetType = subtotalPositionToEvaluation(getObject().getPosition());
+        subtotalVariable.setResetType(resetType);
+        subtotalVariable.setResetGroup(getObject().getGroup());
+        setValueExpression(subtotalVariable);
+
+        super.configure();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getSubtotal().getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java
new file mode 100644
index 0000000..80077a3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java
@@ -0,0 +1,397 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.subtotal;
+
+import net.sf.dynamicreports.report.base.DRSubtotal;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.SubtotalPosition;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * <p>Abstract BaseSubtotalBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+@SuppressWarnings("unchecked")
+public abstract class BaseSubtotalBuilder<T extends BaseSubtotalBuilder<T, U>, U> extends AbstractBuilder<T, DRSubtotal<U>> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<U> valueExpression;
+
+    /**
+     * <p>Constructor for BaseSubtotalBuilder.</p>
+     *
+     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     */
+    protected BaseSubtotalBuilder(ColumnBuilder<?, ?> showInColumn) {
+        super(new DRSubtotal<U>(showInColumn.build()));
+    }
+
+    /**
+     * <p>Setter for the field <code>valueExpression</code>.</p>
+     *
+     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    protected void setValueExpression(DRIExpression<U> valueExpression) {
+        this.valueExpression = valueExpression;
+    }
+
+    /**
+     * <p>setShowInColumn.</p>
+     *
+     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @return a T object.
+     */
+    public T setShowInColumn(ColumnBuilder<?, ?> showInColumn) {
+        Validate.notNull(showInColumn, "showInColumn must not be null");
+        getObject().setShowInColumn(showInColumn.build());
+        return (T) this;
+    }
+
+    /**
+     * <p>setLabel.</p>
+     *
+     * @param labelExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setLabel(DRIExpression<?> labelExpression) {
+        getObject().setLabelExpression(labelExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setLabel.</p>
+     *
+     * @param label a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setLabel(String label) {
+        getObject().setLabelExpression(Expressions.text(label));
+        return (T) this;
+    }
+
+    /**
+     * <p>setLabelStyle.</p>
+     *
+     * @param labelStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setLabelStyle(ReportStyleBuilder labelStyle) {
+        if (labelStyle != null) {
+            getObject().setLabelStyle(labelStyle.getStyle());
+        } else {
+            getObject().setLabelStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setLabelPosition.</p>
+     *
+     * @param labelPosition a {@link net.sf.dynamicreports.report.constant.Position} object.
+     * @return a T object.
+     */
+    public T setLabelPosition(Position labelPosition) {
+        getObject().setLabelPosition(labelPosition);
+        return (T) this;
+    }
+
+    /**
+     * Sets the label component preferred width.
+     *
+     * @param width the label component preferred width >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setLabelWidth(Integer width) {
+        getObject().setLabelWidth(width);
+        return (T) this;
+    }
+
+    /**
+     * Sets the label component fixed width.
+     *
+     * @param width the label component fixed width >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setLabelFixedWidth(Integer width) {
+        getObject().setLabelWidth(width);
+        getObject().setLabelWidthType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * Sets the label component minimum width.
+     *
+     * @param width the label component minimum width >= 0
+     * @return a T object.
+     * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
+     * @see net.sf.dynamicreports.report.builder.Units
+     */
+    public T setLabelMinWidth(Integer width) {
+        getObject().setLabelWidth(width);
+        getObject().setLabelWidthType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPattern.</p>
+     *
+     * @param pattern a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setPattern(String pattern) {
+        getObject().getValueField().setPattern(pattern);
+        return (T) this;
+    }
+
+    /**
+     * <p>setPattern.</p>
+     *
+     * @param patternExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setPattern(DRIExpression<String> patternExpression) {
+        getObject().getValueField().setPatternExpression(patternExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setValueFormatter.</p>
+     *
+     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a T object.
+     */
+    public T setValueFormatter(DRIValueFormatter<?, ? super U> valueFormatter) {
+        getObject().getValueField().setValueFormatter(valueFormatter);
+        return (T) this;
+    }
+
+    /**
+     * <p>setDataType.</p>
+     *
+     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a T object.
+     */
+    @SuppressWarnings("rawtypes")
+    public T setDataType(DRIDataType dataType) {
+        getObject().getValueField().setDataType(dataType);
+        return (T) this;
+    }
+
+    /**
+     * <p>setAnchorName.</p>
+     *
+     * @param anchorName a {@link java.lang.String} object.
+     * @return a T object.
+     */
+    public T setAnchorName(String anchorName) {
+        getObject().getValueField().setAnchorNameExpression(Expressions.text(anchorName));
+        return (T) this;
+    }
+
+    /**
+     * <p>setAnchorName.</p>
+     *
+     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setAnchorName(DRIExpression<String> anchorNameExpression) {
+        getObject().getValueField().setAnchorNameExpression(anchorNameExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setBookmarkLevel.</p>
+     *
+     * @param bookmarkLevel a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setBookmarkLevel(Integer bookmarkLevel) {
+        getObject().getValueField().setBookmarkLevel(bookmarkLevel);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHyperLink.</p>
+     *
+     * @param hyperLink a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a T object.
+     */
+    public T setHyperLink(HyperLinkBuilder hyperLink) {
+        if (hyperLink != null) {
+            getObject().getValueField().setHyperLink(hyperLink.getHyperLink());
+        } else {
+            getObject().getValueField().setHyperLink(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setRows.</p>
+     *
+     * @param rows a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setRows(Integer rows) {
+        getObject().getValueField().setRows(rows);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFixedRows.</p>
+     *
+     * @param rows a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setFixedRows(Integer rows) {
+        getObject().getValueField().setRows(rows);
+        getObject().getValueField().setHeightType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * <p>setMinRows.</p>
+     *
+     * @param rows a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setMinRows(Integer rows) {
+        getObject().getValueField().setRows(rows);
+        getObject().getValueField().setHeightType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * <p>setHeight.</p>
+     *
+     * @param height a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setHeight(Integer height) {
+        getObject().getValueField().setHeight(height);
+        return (T) this;
+    }
+
+    /**
+     * <p>setFixedHeight.</p>
+     *
+     * @param height a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setFixedHeight(Integer height) {
+        getObject().getValueField().setHeight(height);
+        getObject().getValueField().setHeightType(ComponentDimensionType.FIXED);
+        return (T) this;
+    }
+
+    /**
+     * <p>setMinHeight.</p>
+     *
+     * @param height a {@link java.lang.Integer} object.
+     * @return a T object.
+     */
+    public T setMinHeight(Integer height) {
+        getObject().getValueField().setHeight(height);
+        getObject().getValueField().setHeightType(ComponentDimensionType.EXPAND);
+        return (T) this;
+    }
+
+    /**
+     * <p>setStyle.</p>
+     *
+     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a T object.
+     */
+    public T setStyle(ReportStyleBuilder style) {
+        if (style != null) {
+            getObject().getValueField().setStyle(style.getStyle());
+        } else {
+            getObject().getValueField().setStyle(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setPrintWhenExpression.</p>
+     *
+     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a T object.
+     */
+    public T setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
+        getObject().getValueField().setPrintWhenExpression(printWhenExpression);
+        return (T) this;
+    }
+
+    /**
+     * <p>setGroup.</p>
+     *
+     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a T object.
+     */
+    public T setGroup(GroupBuilder<?> group) {
+        if (group != null) {
+            getObject().setGroup(group.getGroup());
+        } else {
+            getObject().setGroup(null);
+        }
+        return (T) this;
+    }
+
+    /**
+     * <p>setPosition.</p>
+     *
+     * @param position a {@link net.sf.dynamicreports.report.constant.SubtotalPosition} object.
+     * @return a T object.
+     */
+    public T setPosition(SubtotalPosition position) {
+        getObject().setPosition(position);
+        return (T) this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        super.configure();
+        getObject().getValueField().setValueExpression(valueExpression);
+    }
+
+    /**
+     * <p>getSubtotal.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRSubtotal} object.
+     */
+    public DRSubtotal<U> getSubtotal() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java
new file mode 100644
index 0000000..b12f543
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.subtotal;
+
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>CustomSubtotalBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CustomSubtotalBuilder<T> extends SubtotalBuilder<CustomSubtotalBuilder<T>, T> implements DRIValue<T> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for CustomSubtotalBuilder.</p>
+     *
+     * @param expression   a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     */
+    protected CustomSubtotalBuilder(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        super(showInColumn);
+        setValueExpression(expression);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return getSubtotal().getName();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java
new file mode 100644
index 0000000..5a25926
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java
@@ -0,0 +1,150 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.subtotal;
+
+import net.sf.dynamicreports.report.base.DRGroup;
+import net.sf.dynamicreports.report.base.DRVariable;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.builder.datatype.DataTypes;
+import net.sf.dynamicreports.report.builder.expression.PercentageExpression;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.constant.PercentageTotalType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.exception.DRReportException;
+
+/**
+ * <p>PercentageSubtotalBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PercentageSubtotalBuilder extends BaseSubtotalBuilder<PercentageSubtotalBuilder, Double> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private DRIExpression<? extends Number> expression;
+    private PercentageTotalType totalType;
+    private DRGroup totalGroup;
+
+    // column
+
+    /**
+     * <p>Constructor for PercentageSubtotalBuilder.</p>
+     *
+     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     */
+    protected PercentageSubtotalBuilder(ValueColumnBuilder<?, ? extends Number> column) {
+        this(column.build(), column);
+    }
+
+    // field
+
+    /**
+     * <p>Constructor for PercentageSubtotalBuilder.</p>
+     *
+     * @param field        a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     */
+    protected PercentageSubtotalBuilder(FieldBuilder<? extends Number> field, ColumnBuilder<?, ?> showInColumn) {
+        this(field.getField(), showInColumn);
+    }
+
+    // expression
+
+    /**
+     * <p>Constructor for PercentageSubtotalBuilder.</p>
+     *
+     * @param expression   a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     */
+    protected PercentageSubtotalBuilder(DRIExpression<? extends Number> expression, ColumnBuilder<?, ?> showInColumn) {
+        super(showInColumn);
+        this.expression = expression;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalType</code>.</p>
+     *
+     * @param totalType a {@link net.sf.dynamicreports.report.constant.PercentageTotalType} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder} object.
+     */
+    public PercentageSubtotalBuilder setTotalType(PercentageTotalType totalType) {
+        this.totalType = totalType;
+        return this;
+    }
+
+    /**
+     * <p>Setter for the field <code>totalGroup</code>.</p>
+     *
+     * @param totalGroup a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder} object.
+     */
+    public PercentageSubtotalBuilder setTotalGroup(GroupBuilder<?> totalGroup) {
+        if (totalGroup != null) {
+            this.totalGroup = totalGroup.getGroup();
+            setTotalType(PercentageTotalType.GROUP);
+        } else {
+            this.totalGroup = null;
+        }
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void configure() {
+        if (getObject().getValueField().getDataType() == null) {
+            getObject().getValueField().setDataType(DataTypes.percentageType());
+        }
+
+        DRVariable<Number> actualExpression = new DRVariable<Number>(expression, Calculation.SUM);
+        actualExpression.setResetType(Evaluation.GROUP);
+        actualExpression.setResetGroup(getObject().getGroup());
+
+        DRVariable<Number> totalExpression = new DRVariable<Number>(expression, Calculation.SUM);
+        if (totalType != null) {
+            switch (totalType) {
+                case REPORT:
+                    totalExpression.setResetType(Evaluation.REPORT);
+                    break;
+                case GROUP:
+                    totalExpression.setResetType(Evaluation.GROUP);
+                    break;
+                case FIRST_GROUP:
+                    totalExpression.setResetType(Evaluation.FIRST_GROUP);
+                    break;
+                case LAST_GROUP:
+                    totalExpression.setResetType(Evaluation.LAST_GROUP);
+                    break;
+                default:
+                    throw new DRReportException("Percentage total type " + totalType.name() + " not supported.");
+            }
+        } else {
+            totalExpression.setResetType(Evaluation.BEFORE_GROUP);
+            totalGroup = getObject().getGroup();
+        }
+        totalExpression.setResetGroup(totalGroup);
+
+        setValueExpression(new PercentageExpression(actualExpression, totalExpression));
+
+        super.configure();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilder.java
new file mode 100644
index 0000000..eccfc7b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilder.java
@@ -0,0 +1,40 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.subtotal;
+
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>Abstract SubtotalBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public abstract class SubtotalBuilder<T extends SubtotalBuilder<T, U>, U> extends BaseSubtotalBuilder<T, U> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for SubtotalBuilder.</p>
+     *
+     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     */
+    protected SubtotalBuilder(ColumnBuilder<?, ?> showInColumn) {
+        super(showInColumn);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilders.java
new file mode 100644
index 0000000..ae3edff
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilders.java
@@ -0,0 +1,230 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.subtotal;
+
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * A set of methods of creating column subtotals
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class SubtotalBuilders {
+
+    // calculation
+    public <T> AggregationSubtotalBuilder<T> aggregate(ValueColumnBuilder<?, ?> subtotalColumn, Calculation calculation) {
+        return Subtotals.aggregate(subtotalColumn, calculation);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> aggregate(String fieldName, Class<?> valueClass, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
+        return Subtotals.aggregate(fieldName, valueClass, showInColumn, calculation);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> aggregate(FieldBuilder<?> field, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
+        return Subtotals.aggregate(field, showInColumn, calculation);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> aggregate(DRIExpression<?> expression, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
+        return Subtotals.aggregate(expression, showInColumn, calculation);
+    }
+
+    // sum
+    public <T extends Number> AggregationSubtotalBuilder<T> sum(ValueColumnBuilder<?, T> subtotalColumn) {
+        return Subtotals.sum(subtotalColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<T> sum(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.sum(fieldName, valueClass, showInColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<T> sum(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.sum(field, showInColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<T> sum(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.sum(expression, showInColumn);
+    }
+
+    // average
+    public <T extends Number> AggregationSubtotalBuilder<Number> avg(ValueColumnBuilder<?, T> subtotalColumn) {
+        return Subtotals.avg(subtotalColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> avg(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.avg(fieldName, valueClass, showInColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> avg(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.avg(field, showInColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> avg(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.avg(expression, showInColumn);
+    }
+
+    // count
+    public AggregationSubtotalBuilder<Long> count(ValueColumnBuilder<?, ?> subtotalColumn) {
+        return Subtotals.count(subtotalColumn);
+    }
+
+    public AggregationSubtotalBuilder<Long> count(String fieldName, Class<?> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.count(fieldName, valueClass, showInColumn);
+    }
+
+    public AggregationSubtotalBuilder<Long> count(FieldBuilder<?> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.count(field, showInColumn);
+    }
+
+    public AggregationSubtotalBuilder<Long> count(DRIExpression<?> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.count(expression, showInColumn);
+    }
+
+    // distinct count
+    public AggregationSubtotalBuilder<Long> distinctCount(ValueColumnBuilder<?, ?> subtotalColumn) {
+        return Subtotals.distinctCount(subtotalColumn);
+    }
+
+    public AggregationSubtotalBuilder<Long> distinctCount(String fieldName, Class<?> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.distinctCount(fieldName, valueClass, showInColumn);
+    }
+
+    public AggregationSubtotalBuilder<Long> distinctCount(FieldBuilder<?> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.distinctCount(field, showInColumn);
+    }
+
+    public AggregationSubtotalBuilder<Long> distinctCount(DRIExpression<?> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.distinctCount(expression, showInColumn);
+    }
+
+    // first
+    public <T> AggregationSubtotalBuilder<T> first(ValueColumnBuilder<?, T> subtotalColumn) {
+        return Subtotals.first(subtotalColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> first(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.first(fieldName, valueClass, showInColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> first(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.first(field, showInColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> first(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.first(expression, showInColumn);
+    }
+
+    // highest
+    public <T> AggregationSubtotalBuilder<T> max(ValueColumnBuilder<?, T> subtotalColumn) {
+        return Subtotals.max(subtotalColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> max(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.max(fieldName, valueClass, showInColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> max(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.max(field, showInColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> max(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.max(expression, showInColumn);
+    }
+
+    // lowest
+    public <T> AggregationSubtotalBuilder<T> min(ValueColumnBuilder<?, T> subtotalColumn) {
+        return Subtotals.min(subtotalColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> min(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.min(fieldName, valueClass, showInColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> min(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.min(field, showInColumn);
+    }
+
+    public <T> AggregationSubtotalBuilder<T> min(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.min(expression, showInColumn);
+    }
+
+    // standard deviation
+    public <T extends Number> AggregationSubtotalBuilder<Number> stdDev(ValueColumnBuilder<?, T> subtotalColumn) {
+        return Subtotals.stdDev(subtotalColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> stdDev(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.stdDev(fieldName, valueClass, showInColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> stdDev(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.stdDev(field, showInColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> stdDev(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.stdDev(expression, showInColumn);
+    }
+
+    // variance
+    public <T extends Number> AggregationSubtotalBuilder<Number> var(ValueColumnBuilder<?, T> subtotalColumn) {
+        return Subtotals.var(subtotalColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> var(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.var(fieldName, valueClass, showInColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> var(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.var(field, showInColumn);
+    }
+
+    public <T extends Number> AggregationSubtotalBuilder<Number> var(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.var(expression, showInColumn);
+    }
+
+    // custom
+    public <T> CustomSubtotalBuilder<T> customValue(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.customValue(expression, showInColumn);
+    }
+
+    // percentage
+    public PercentageSubtotalBuilder percentage(ValueColumnBuilder<?, ? extends Number> subtotalColumn) {
+        return Subtotals.percentage(subtotalColumn);
+    }
+
+    public PercentageSubtotalBuilder percentage(String fieldName, Class<? extends Number> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.percentage(fieldName, valueClass, showInColumn);
+    }
+
+    public PercentageSubtotalBuilder percentage(FieldBuilder<? extends Number> field, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.percentage(field, showInColumn);
+    }
+
+    /*public PercentageSubtotalBuilder percentage(DRISimpleExpression<? extends Number> expression, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.percentage(expression, showInColumn);
+    }*/
+
+    // text
+    public AggregationSubtotalBuilder<String> text(String text, ColumnBuilder<?, ?> showInColumn) {
+        return Subtotals.text(text, showInColumn);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/Subtotals.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/Subtotals.java
new file mode 100644
index 0000000..d49e0d7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/Subtotals.java
@@ -0,0 +1,239 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.subtotal;
+
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import org.apache.commons.lang3.Validate;
+
+/**
+ * A set of methods of creating column subtotals
+ *
+ * @author Ricardo Mariaca
+ */
+public class Subtotals {
+
+    // calculation
+    public static <T> AggregationSubtotalBuilder<T> aggregate(ValueColumnBuilder<?, ?> subtotalColumn, Calculation calculation) {
+        Validate.notNull(subtotalColumn, "subtotalColumn must not be null");
+        return new AggregationSubtotalBuilder<T>(subtotalColumn, calculation);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> aggregate(String fieldName, Class<?> valueClass, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
+        return aggregate(DynamicReports.field(fieldName, valueClass), showInColumn, calculation);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> aggregate(FieldBuilder<?> field, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
+        Validate.notNull(showInColumn, "showInColumn must not be null");
+        return new AggregationSubtotalBuilder<T>(field, showInColumn, calculation);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> aggregate(DRIExpression<?> expression, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
+        Validate.notNull(showInColumn, "showInColumn must not be null");
+        return new AggregationSubtotalBuilder<T>(expression, showInColumn, calculation);
+    }
+
+    // sum
+    public static <T extends Number> AggregationSubtotalBuilder<T> sum(ValueColumnBuilder<?, T> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.SUM);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<T> sum(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.SUM);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<T> sum(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.SUM);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<T> sum(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.SUM);
+    }
+
+    // average
+    public static <T extends Number> AggregationSubtotalBuilder<Number> avg(ValueColumnBuilder<?, T> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.AVERAGE);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> avg(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.AVERAGE);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> avg(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.AVERAGE);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> avg(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.AVERAGE);
+    }
+
+    // count
+    public static AggregationSubtotalBuilder<Long> count(ValueColumnBuilder<?, ?> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.COUNT);
+    }
+
+    public static AggregationSubtotalBuilder<Long> count(String fieldName, Class<?> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.COUNT);
+    }
+
+    public static AggregationSubtotalBuilder<Long> count(FieldBuilder<?> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.COUNT);
+    }
+
+    public static AggregationSubtotalBuilder<Long> count(DRIExpression<?> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.COUNT);
+    }
+
+    // distinct count
+    public static AggregationSubtotalBuilder<Long> distinctCount(ValueColumnBuilder<?, ?> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.DISTINCT_COUNT);
+    }
+
+    public static AggregationSubtotalBuilder<Long> distinctCount(String fieldName, Class<?> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.DISTINCT_COUNT);
+    }
+
+    public static AggregationSubtotalBuilder<Long> distinctCount(FieldBuilder<?> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.DISTINCT_COUNT);
+    }
+
+    public static AggregationSubtotalBuilder<Long> distinctCount(DRIExpression<?> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.DISTINCT_COUNT);
+    }
+
+    // first
+    public static <T> AggregationSubtotalBuilder<T> first(ValueColumnBuilder<?, T> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.FIRST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> first(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.FIRST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> first(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.FIRST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> first(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.FIRST);
+    }
+
+    // highest
+    public static <T> AggregationSubtotalBuilder<T> max(ValueColumnBuilder<?, T> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.HIGHEST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> max(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.HIGHEST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> max(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.HIGHEST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> max(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.HIGHEST);
+    }
+
+    // lowest
+    public static <T> AggregationSubtotalBuilder<T> min(ValueColumnBuilder<?, T> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.LOWEST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> min(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.LOWEST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> min(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.LOWEST);
+    }
+
+    public static <T> AggregationSubtotalBuilder<T> min(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.LOWEST);
+    }
+
+    // standard deviation
+    public static <T extends Number> AggregationSubtotalBuilder<Number> stdDev(ValueColumnBuilder<?, T> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.STANDARD_DEVIATION);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> stdDev(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.STANDARD_DEVIATION);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> stdDev(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.STANDARD_DEVIATION);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> stdDev(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.STANDARD_DEVIATION);
+    }
+
+    // variance
+    public static <T extends Number> AggregationSubtotalBuilder<Number> var(ValueColumnBuilder<?, T> subtotalColumn) {
+        return aggregate(subtotalColumn, Calculation.VARIANCE);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> var(String fieldName, Class<T> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(fieldName, valueClass, showInColumn, Calculation.VARIANCE);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> var(FieldBuilder<T> field, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(field, showInColumn, Calculation.VARIANCE);
+    }
+
+    public static <T extends Number> AggregationSubtotalBuilder<Number> var(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(expression, showInColumn, Calculation.VARIANCE);
+    }
+
+    // custom
+    public static <T> CustomSubtotalBuilder<T> customValue(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
+        Validate.notNull(showInColumn, "showInColumn must not be null");
+        return new CustomSubtotalBuilder<T>(expression, showInColumn);
+    }
+
+    // percentage
+    public static PercentageSubtotalBuilder percentage(ValueColumnBuilder<?, ? extends Number> subtotalColumn) {
+        Validate.notNull(subtotalColumn, "subtotalColumn must not be null");
+        return new PercentageSubtotalBuilder(subtotalColumn);
+    }
+
+    public static PercentageSubtotalBuilder percentage(String fieldName, Class<? extends Number> valueClass, ColumnBuilder<?, ?> showInColumn) {
+        return percentage(DynamicReports.<Number>field(fieldName, valueClass), showInColumn);
+    }
+
+    public static PercentageSubtotalBuilder percentage(FieldBuilder<? extends Number> field, ColumnBuilder<?, ?> showInColumn) {
+        Validate.notNull(showInColumn, "showInColumn must not be null");
+        return new PercentageSubtotalBuilder(field, showInColumn);
+    }
+
+    /*public static PercentageSubtotalBuilder percentage(DRISimpleExpression<? extends Number> expression, ColumnBuilder<?, ?> showInColumn) {
+        Validate.notNull(showInColumn, "showInColumn must not be null");
+        return new PercentageSubtotalBuilder(expression, showInColumn);
+    }*/
+
+    // text
+    public static AggregationSubtotalBuilder<String> text(String text, ColumnBuilder<?, ?> showInColumn) {
+        return aggregate(Expressions.text(text), showInColumn, Calculation.NOTHING);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java
new file mode 100644
index 0000000..cb4f6fc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java
@@ -0,0 +1,316 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.tableofcontents;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.hyperLink;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
+import net.sf.dynamicreports.report.builder.component.HorizontalListBuilder;
+import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
+import net.sf.dynamicreports.report.builder.component.VerticalListBuilder;
+import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.HyperLinkType;
+import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * <p>TableOfContentsCustomizer class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public class TableOfContentsCustomizer implements DRITableOfContentsCustomizer {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * Constant <code>dots=""</code>
+     */
+    protected static String dots;
+
+    static {
+        final StringBuilder dots = new StringBuilder(200);
+        for (int i = 0; i < dots.capacity(); i++) {
+            dots.append(".");
+        }
+        TableOfContentsCustomizer.dots = dots.toString();
+    }
+
+    protected ReportBuilder<?> report;
+    protected List<JasperTocHeading> headingList;
+    protected int headings;
+    protected int levels;
+    protected FieldBuilder<Integer> levelField;
+    protected FieldBuilder<String> textField;
+    protected FieldBuilder<String> referenceField;
+    protected FieldBuilder<Integer> pageIndexField;
+    protected HyperLinkBuilder referenceHyperLink;
+    protected int pageIndexDigits;
+    protected ReportStyleBuilder titleStyle;
+    protected ReportStyleBuilder headingStyle;
+    protected Map<Integer, ReportStyleBuilder> headingStyles;
+    protected Integer textFixedWidth;
+    protected Integer dotsFixedWidth;
+    protected Integer pageIndexFixedWidth;
+    protected TableOfContentsPosition position;
+
+    /**
+     * <p>Constructor for TableOfContentsCustomizer.</p>
+     */
+    public TableOfContentsCustomizer() {
+        headingStyles = new HashMap<>();
+    }
+
+    /**
+     * <p>init.</p>
+     */
+    protected void init() {
+        levelField = field("level", type.integerType());
+        textField = field("text", type.stringType());
+        referenceField = field("reference", type.stringType());
+        pageIndexField = field("pageIndex", type.integerType());
+
+        referenceHyperLink = hyperLink();
+        referenceHyperLink.setAnchor(new ReferenceExpression());
+        referenceHyperLink.setType(HyperLinkType.LOCAL_ANCHOR);
+
+        pageIndexDigits = String.valueOf(headings).length();
+
+        if (titleStyle == null) {
+            titleStyle = stl.style().bold().setFontSize(16).setHorizontalTextAlignment(HorizontalTextAlignment.CENTER);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setReport(final ReportBuilder<?> report) {
+        this.report = report;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setHeadingList(final List<JasperTocHeading> headingList) {
+        this.headingList = headingList;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setHeadings(final int headings) {
+        this.headings = headings;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setLevels(final int levels) {
+        this.levels = levels;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void customize() {
+        init();
+
+        report.title(title(), cmp.filler().setFixedHeight(20)).fields(levelField, textField, referenceField, pageIndexField).detail(detailComponent());
+    }
+
+    /**
+     * <p>title.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     */
+    protected ComponentBuilder<?, ?> title() {
+        return cmp.text(new SystemMessageExpression("table_of_contents")).setStyle(titleStyle);
+    }
+
+    /**
+     * <p>detailComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     */
+    protected ComponentBuilder<?, ?> detailComponent() {
+        final VerticalListBuilder detailComponent = cmp.verticalList();
+        for (int i = 0; i < levels; i++) {
+            final ComponentBuilder<?, ?> headingComponent = headingComponent(i);
+            headingComponent.setPrintWhenExpression(new PrintHeadingExpression(i));
+            headingComponent.removeLineWhenBlank();
+            detailComponent.add(headingComponent);
+        }
+        return detailComponent;
+    }
+
+    /**
+     * <p>headingComponent.</p>
+     *
+     * @param level a int.
+     * @return a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     */
+    protected ComponentBuilder<?, ?> headingComponent(final int level) {
+        final HorizontalListBuilder headingComponent = cmp.horizontalList();
+
+        if (level > 0) {
+            headingComponent.add(cmp.filler().setFixedWidth(level * 10));
+        }
+
+        final TextFieldBuilder<String> textComponent = cmp.text(textField).setHyperLink(referenceHyperLink);
+        if (textFixedWidth != null) {
+            textComponent.setFixedWidth(textFixedWidth);
+        }
+        headingComponent.add(textComponent);
+
+        if (level > 0) {
+            headingComponent.add(cmp.filler().setFixedWidth(level * 10));
+        }
+
+        final TextFieldBuilder<String> dotsComponent = cmp.text(dots.toString()).setTextAdjust(TextAdjust.CUT_TEXT).setHyperLink(referenceHyperLink);
+        if (dotsFixedWidth != null) {
+            dotsComponent.setFixedWidth(dotsFixedWidth);
+        }
+        headingComponent.add(dotsComponent);
+
+        final TextFieldBuilder<Integer> pageIndexComponent = cmp.text(pageIndexField).setHyperLink(referenceHyperLink);
+        if (pageIndexFixedWidth != null) {
+            pageIndexComponent.setFixedWidth(pageIndexFixedWidth);
+        } else {
+            pageIndexComponent.setFixedColumns(pageIndexDigits);
+        }
+        headingComponent.add(pageIndexComponent);
+
+        ReportStyleBuilder headingStyle = headingStyles.get(level);
+        if (headingStyle == null) {
+            headingStyle = this.headingStyle;
+        }
+        if (headingStyle != null) {
+            textComponent.setStyle(headingStyle);
+            dotsComponent.setStyle(headingStyle);
+            pageIndexComponent.setStyle(headingStyle);
+        }
+
+        return headingComponent;
+    }
+
+    /**
+     * <p>Setter for the field <code>titleStyle</code>.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     */
+    public void setTitleStyle(final ReportStyleBuilder titleStyle) {
+        this.titleStyle = titleStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>headingStyle</code>.</p>
+     *
+     * @param headingStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     */
+    public void setHeadingStyle(final ReportStyleBuilder headingStyle) {
+        this.headingStyle = headingStyle;
+    }
+
+    /**
+     * <p>Setter for the field <code>headingStyle</code>.</p>
+     *
+     * @param level        a int.
+     * @param headingStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     */
+    public void setHeadingStyle(final int level, final ReportStyleBuilder headingStyle) {
+        this.headingStyles.put(level, headingStyle);
+    }
+
+    /**
+     * <p>Setter for the field <code>textFixedWidth</code>.</p>
+     *
+     * @param textFixedWidth a {@link java.lang.Integer} object.
+     */
+    public void setTextFixedWidth(final Integer textFixedWidth) {
+        this.textFixedWidth = textFixedWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>dotsFixedWidth</code>.</p>
+     *
+     * @param dotsFixedWidth a {@link java.lang.Integer} object.
+     */
+    public void setDotsFixedWidth(final Integer dotsFixedWidth) {
+        this.dotsFixedWidth = dotsFixedWidth;
+    }
+
+    /**
+     * <p>Setter for the field <code>pageIndexFixedWidth</code>.</p>
+     *
+     * @param pageIndexFixedWidth a {@link java.lang.Integer} object.
+     */
+    public void setPageIndexFixedWidth(final Integer pageIndexFixedWidth) {
+        this.pageIndexFixedWidth = pageIndexFixedWidth;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TableOfContentsPosition getPosition() {
+        return position;
+    }
+
+    /**
+     * <p>Setter for the field <code>position</code>.</p>
+     *
+     * @param position a {@link net.sf.dynamicreports.report.constant.TableOfContentsPosition} object.
+     */
+    public void setPosition(final TableOfContentsPosition position) {
+        this.position = position;
+    }
+
+    protected class ReferenceExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+        @Override
+        public String evaluate(final ReportParameters reportParameters) {
+            return reportParameters.getValue(referenceField);
+        }
+    }
+
+    protected class PrintHeadingExpression extends AbstractSimpleExpression<Boolean> {
+        private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+        private final int level;
+
+        public PrintHeadingExpression(final int level) {
+            this.level = level;
+        }
+
+        @Override
+        public Boolean evaluate(final ReportParameters reportParameters) {
+            return reportParameters.getValue(levelField) == level;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java
new file mode 100644
index 0000000..ae183ff
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java
@@ -0,0 +1,127 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.tableofcontents;
+
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
+
+/**
+ * <p>TableOfContentsCustomizerBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TableOfContentsCustomizerBuilder extends AbstractBuilder<TableOfContentsCustomizerBuilder, TableOfContentsCustomizer> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for TableOfContentsCustomizerBuilder.</p>
+     */
+    public TableOfContentsCustomizerBuilder() {
+        super(new TableOfContentsCustomizer());
+    }
+
+    /**
+     * <p>getTableOfContents.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer} object.
+     */
+    public TableOfContentsCustomizer getTableOfContents() {
+        return build();
+    }
+
+    /**
+     * <p>setTitleStyle.</p>
+     *
+     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     */
+    public TableOfContentsCustomizerBuilder setTitleStyle(ReportStyleBuilder titleStyle) {
+        this.getObject().setTitleStyle(titleStyle);
+        return this;
+    }
+
+    /**
+     * <p>setHeadingStyle.</p>
+     *
+     * @param headingStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     */
+    public TableOfContentsCustomizerBuilder setHeadingStyle(ReportStyleBuilder headingStyle) {
+        this.getObject().setHeadingStyle(headingStyle);
+        return this;
+    }
+
+    /**
+     * <p>setHeadingStyle.</p>
+     *
+     * @param level        a int.
+     * @param headingStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     */
+    public TableOfContentsCustomizerBuilder setHeadingStyle(int level, ReportStyleBuilder headingStyle) {
+        this.getObject().setHeadingStyle(level, headingStyle);
+        return this;
+    }
+
+    /**
+     * <p>setTextFixedWidth.</p>
+     *
+     * @param textFixedWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     */
+    public TableOfContentsCustomizerBuilder setTextFixedWidth(Integer textFixedWidth) {
+        this.getObject().setTextFixedWidth(textFixedWidth);
+        return this;
+    }
+
+    /**
+     * <p>setDotsFixedWidth.</p>
+     *
+     * @param dotsFixedWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     */
+    public TableOfContentsCustomizerBuilder setDotsFixedWidth(Integer dotsFixedWidth) {
+        this.getObject().setDotsFixedWidth(dotsFixedWidth);
+        return this;
+    }
+
+    /**
+     * <p>setPageIndexFixedWidth.</p>
+     *
+     * @param pageIndexFixedWidth a {@link java.lang.Integer} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     */
+    public TableOfContentsCustomizerBuilder setPageIndexFixedWidth(Integer pageIndexFixedWidth) {
+        this.getObject().setPageIndexFixedWidth(pageIndexFixedWidth);
+        return this;
+    }
+
+    /**
+     * <p>setPosition.</p>
+     *
+     * @param position a {@link net.sf.dynamicreports.report.constant.TableOfContentsPosition} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     */
+    public TableOfContentsCustomizerBuilder setPosition(TableOfContentsPosition position) {
+        this.getObject().setPosition(position);
+        return this;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java
new file mode 100644
index 0000000..c2480f5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java
@@ -0,0 +1,109 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.builder.tableofcontents;
+
+import net.sf.dynamicreports.report.base.DRTableOfContentsHeading;
+import net.sf.dynamicreports.report.builder.AbstractBuilder;
+import net.sf.dynamicreports.report.builder.expression.Expressions;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>TableOfContentsHeadingBuilder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class TableOfContentsHeadingBuilder extends AbstractBuilder<TableOfContentsHeadingBuilder, DRTableOfContentsHeading> {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for TableOfContentsHeadingBuilder.</p>
+     */
+    public TableOfContentsHeadingBuilder() {
+        super(new DRTableOfContentsHeading());
+    }
+
+    /**
+     * <p>setParentHeading.</p>
+     *
+     * @param parentHeading a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     */
+    public TableOfContentsHeadingBuilder setParentHeading(TableOfContentsHeadingBuilder parentHeading) {
+        if (parentHeading != null) {
+            getObject().setParentHeading(parentHeading.build());
+        } else {
+            getObject().setParentHeading(null);
+        }
+        return this;
+    }
+
+    /**
+     * <p>setLabel.</p>
+     *
+     * @param label a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     */
+    public TableOfContentsHeadingBuilder setLabel(String label) {
+        this.getObject().setLabelExpression(Expressions.text(label));
+        return this;
+    }
+
+    /**
+     * <p>setLabel.</p>
+     *
+     * @param labelExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     */
+    public TableOfContentsHeadingBuilder setLabel(DRIExpression<String> labelExpression) {
+        this.getObject().setLabelExpression(labelExpression);
+        return this;
+    }
+
+    /**
+     * <p>setCustomValue.</p>
+     *
+     * @param customValue a {@link java.lang.Object} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     */
+    public TableOfContentsHeadingBuilder setCustomValue(Object customValue) {
+        this.getObject().setCustomValueExpression(Expressions.value(customValue));
+        return this;
+    }
+
+    /**
+     * <p>setCustomValue.</p>
+     *
+     * @param customValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     */
+    public TableOfContentsHeadingBuilder setCustomValue(DRIExpression<?> customValueExpression) {
+        this.getObject().setCustomValueExpression(customValueExpression);
+        return this;
+    }
+
+    /**
+     * <p>getTableOfContentsHeading.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.base.DRTableOfContentsHeading} object.
+     */
+    public DRTableOfContentsHeading getTableOfContentsHeading() {
+        return build();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponentTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponentTransform.java
new file mode 100644
index 0000000..3d6db5c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponentTransform.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.component;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.constant.ResetType;
+import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
+import net.sf.dynamicreports.design.transformation.DesignTransformAccessor;
+import net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRComponentElement;
+
+/**
+ * <p>CustomComponentTransform interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface CustomComponentTransform<T extends DRIComponent, U extends DRIDesignComponent> {
+
+    /**
+     * <p>isTransform.</p>
+     *
+     * @param component a {@link java.lang.Object} object.
+     * @return a boolean.
+     */
+    public boolean isTransform(Object component);
+
+    /**
+     * <p>designComponent.</p>
+     *
+     * @param accessor   a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param component  a T object.
+     * @param resetType  a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a U object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public U designComponent(DesignTransformAccessor accessor, T component, ResetType resetType, DRDesignGroup resetGroup) throws DRException;
+
+    /**
+     * <p>jasperComponent.</p>
+     *
+     * @param accessor  a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param component a U object.
+     * @return a {@link net.sf.jasperreports.engine.JRComponentElement} object.
+     */
+    public JRComponentElement jasperComponent(JasperTransformAccessor accessor, U component);
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponents.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponents.java
new file mode 100644
index 0000000..19a7a83
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponents.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.component;
+
+import net.sf.jasperreports.extensions.ExtensionsEnvironment;
+
+import java.util.List;
+
+/**
+ * <p>CustomComponents class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class CustomComponents {
+
+    /**
+     * <p>getComponentTransform.</p>
+     *
+     * @param component a {@link java.lang.Object} object.
+     * @return a {@link net.sf.dynamicreports.report.component.CustomComponentTransform} object.
+     */
+    @SuppressWarnings("rawtypes")
+    public static CustomComponentTransform<?, ?> getComponentTransform(Object component) {
+        List<CustomComponentTransform> transforms = ExtensionsEnvironment.getExtensionsRegistry().getExtensions(CustomComponentTransform.class);
+        for (CustomComponentTransform transform : transforms) {
+            if (transform.isTransform(component)) {
+                return transform;
+            }
+        }
+        return null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRICustomComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRICustomComponent.java
new file mode 100644
index 0000000..22c5b04
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRICustomComponent.java
@@ -0,0 +1,30 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.component;
+
+import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+
+/**
+ * <p>DRICustomComponent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICustomComponent extends DRIDimensionComponent {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRIDesignCustomComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRIDesignCustomComponent.java
new file mode 100644
index 0000000..a2f2b75
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRIDesignCustomComponent.java
@@ -0,0 +1,30 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.component;
+
+import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
+
+/**
+ * <p>DRIDesignCustomComponent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDesignCustomComponent extends DRIDesignComponent {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/AxisPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/AxisPosition.java
new file mode 100644
index 0000000..7d05b66
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/AxisPosition.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>AxisPosition class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum AxisPosition {
+    LEFT_OR_TOP, RIGHT_OR_BOTTOM
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java
new file mode 100644
index 0000000..0ad8519
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java
@@ -0,0 +1,55 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>BooleanComponentType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum BooleanComponentType {
+    /**
+     * Shows a text value (true/false)
+     */
+    TEXT_TRUE_FALSE, /**
+     * Shows a text value (yes/no)
+     */
+    TEXT_YES_NO, /**
+     * Shows an image
+     */
+    IMAGE_STYLE_1, /**
+     * Shows an image
+     */
+    IMAGE_STYLE_2, /**
+     * Shows an image
+     */
+    IMAGE_STYLE_3, /**
+     * Shows an image
+     */
+    IMAGE_STYLE_4, /**
+     * Shows a ball image
+     */
+    IMAGE_BALL, /**
+     * Shows a check box image
+     */
+    IMAGE_CHECKBOX_1, /**
+     * Shows a check box image
+     */
+    IMAGE_CHECKBOX_2
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BreakType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BreakType.java
new file mode 100644
index 0000000..1a3fb45
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BreakType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>BreakType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum BreakType {
+    PAGE, COLUMN
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Calculation.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Calculation.java
new file mode 100644
index 0000000..d7b791f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Calculation.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>Calculation class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum Calculation {
+    NOTHING, COUNT, SUM, AVERAGE, LOWEST, HIGHEST, STANDARD_DEVIATION, VARIANCE, FIRST, DISTINCT_COUNT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentDimensionType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentDimensionType.java
new file mode 100644
index 0000000..93330ca
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentDimensionType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>ComponentDimensionType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ComponentDimensionType {
+    FIXED, FLOAT, EXPAND
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentPositionType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentPositionType.java
new file mode 100644
index 0000000..f247fd3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentPositionType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>ComponentPositionType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ComponentPositionType {
+    FLOAT, FIX_RELATIVE_TO_TOP, FIX_RELATIVE_TO_BOTTOM;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Constants.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Constants.java
new file mode 100644
index 0000000..bd5bd3f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Constants.java
@@ -0,0 +1,36 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>Constants interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface Constants {
+    /**
+     * Value used as <code>serialVersionUID</code> for the current version.
+     */
+    public static final long SERIAL_VERSION_UID = 10000;
+
+    /**
+     * Constant <code>RESOURCE_BUNDLE_NAME="dynamicreports-messages"</code>
+     */
+    public static final String RESOURCE_BUNDLE_NAME = "dynamicreports-messages";
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabPercentageType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabPercentageType.java
new file mode 100644
index 0000000..7a07ce5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabPercentageType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>CrosstabPercentageType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum CrosstabPercentageType {
+    NONE, GRAND_TOTAL
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabTotalPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabTotalPosition.java
new file mode 100644
index 0000000..97c20d0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabTotalPosition.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>CrosstabTotalPosition class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum CrosstabTotalPosition {
+    START, END
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Evaluation.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Evaluation.java
new file mode 100644
index 0000000..eac77f7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Evaluation.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>Evaluation class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum Evaluation {
+    NONE,
+
+    /**
+     * A constant specifying that an expression should be evaluated at the end of the filling process.
+     */
+    REPORT,
+
+    /**
+     * A constant specifying that an expression should be evaluated after each page is filled.
+     */
+    PAGE,
+
+    /**
+     * A constant specifying that an expression should be evaluated after each column is filled.
+     */
+    COLUMN,
+
+    /**
+     * A constant specifying that an expression should be evaluated after each group break.
+     */
+    GROUP,
+
+    FIRST_GROUP,
+
+    BEFORE_GROUP,
+
+    LAST_GROUP
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/FontName.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/FontName.java
new file mode 100644
index 0000000..feea330
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/FontName.java
@@ -0,0 +1,39 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>FontName class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class FontName {
+    /**
+     * Constant <code>ARIAL="Arial"</code>
+     */
+    public static final String ARIAL = "Arial";
+    /**
+     * Constant <code>TIMES_NEW_ROMAN="Times New Roman"</code>
+     */
+    public static final String TIMES_NEW_ROMAN = "Times New Roman";
+    /**
+     * Constant <code>COURIER_NEW="Courier New"</code>
+     */
+    public static final String COURIER_NEW = "Courier New";
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupFooterPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupFooterPosition.java
new file mode 100644
index 0000000..5972d0a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupFooterPosition.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>GroupFooterPosition class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum GroupFooterPosition {
+    NORMAL, STACK_AT_BOTTOM, FORCE_AT_BOTTOM, COLLATE_AT_BOTTOM
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupHeaderLayout.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupHeaderLayout.java
new file mode 100644
index 0000000..ea6b8cb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupHeaderLayout.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>GroupHeaderLayout class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum GroupHeaderLayout {
+    EMPTY, VALUE, TITLE_AND_VALUE
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalAlignment.java
new file mode 100644
index 0000000..caff7bb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalAlignment.java
@@ -0,0 +1,29 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>HorizontalAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ * @deprecated use HorizontalTextAligment for texts or HorizontalImageAligment for images instead
+ */
+public enum HorizontalAlignment {
+    LEFT, CENTER, RIGHT, JUSTIFIED
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalCellComponentAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalCellComponentAlignment.java
new file mode 100644
index 0000000..844fce6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalCellComponentAlignment.java
@@ -0,0 +1,86 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>HorizontalCellComponentAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum HorizontalCellComponentAlignment {
+    /**
+     * <pre>
+     *
+     *  -------------
+     * | -           |
+     * ||C|          |
+     * | -           |
+     *  -------------
+     * </pre>
+     */
+    LEFT,
+
+    /**
+     * <pre>
+     *
+     *  -------------
+     * |      -      |
+     * |     |C|     |
+     * |      -      |
+     *  -------------
+     * </pre>
+     */
+    CENTER,
+
+    /**
+     * <pre>
+     *
+     *  -------------
+     * |           - |
+     * |          |C||
+     * |           - |
+     *  -------------
+     * </pre>
+     */
+    RIGHT,
+
+    /**
+     * <pre>
+     *
+     *  -------------
+     * | ----------- |
+     * ||     C     ||
+     * | ----------- |
+     *  -------------
+     * </pre>
+     */
+    FLOAT,
+
+    /**
+     * <pre>
+     *
+     *  -------------
+     * | ----------- |
+     * ||     C     ||
+     * | ----------- |
+     *  -------------
+     * </pre>
+     */
+    EXPAND
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalImageAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalImageAlignment.java
new file mode 100644
index 0000000..63c908d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalImageAlignment.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>HorizontalImageAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum HorizontalImageAlignment {
+    LEFT, CENTER, RIGHT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalTextAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalTextAlignment.java
new file mode 100644
index 0000000..7329c2d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalTextAlignment.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>HorizontalTextAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum HorizontalTextAlignment {
+    LEFT, CENTER, RIGHT, JUSTIFIED
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkTarget.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkTarget.java
new file mode 100644
index 0000000..963e700
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkTarget.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>HyperLinkTarget class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum HyperLinkTarget {
+    NONE, SELF, BLANK, PARENT, TOP
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkType.java
new file mode 100644
index 0000000..76a120d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>HyperLinkType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum HyperLinkType {
+    NONE, REFERENCE, LOCAL_ANCHOR, LOCAL_PAGE, REMOTE_ANCHOR, REMOTE_PAGE
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageAnchorType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageAnchorType.java
new file mode 100644
index 0000000..8d80bca
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageAnchorType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>ImageAnchorType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ImageAnchorType {
+    MOVE_SIZE, MOVE_NO_SIZE, NO_MOVE_NO_SIZE
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageScale.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageScale.java
new file mode 100644
index 0000000..e488507
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageScale.java
@@ -0,0 +1,55 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>ImageScale class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ImageScale {
+
+    /**
+     * Use CLIP instead
+     */
+    @Deprecated NO_RESIZE, /**
+     * Use FILL_FRAME instead
+     */
+    @Deprecated FILL, /**
+     * Use RETAIN_SHAPE instead
+     */
+    @Deprecated FILL_PROPORTIONALLY, /**
+     * A constant value specifying that if the actual image is larger than the image element size, it will be cut off so that it keeps its original resolution, and only the region that fits the
+     * specified size will be displayed.
+     */
+    CLIP, /**
+     * A constant value specifying that if the dimensions of the actual image do not fit those specified for the image element that displays it, the image can be forced to obey them and stretch itself
+     * so that it fits in the designated output area.
+     */
+    FILL_FRAME, /**
+     * A constant value specifying that if the actual image does not fit into the image element, it can be adapted to those dimensions without needing to change its original proportions.
+     */
+    RETAIN_SHAPE, /**
+     * A scale image type that instructs the engine to stretch the image height to fit the actual height of the image.
+     */
+    REAL_HEIGHT, /**
+     * A scale image type that stretches the images height in the same way as {@link #REAL_HEIGHT}, and in addition it changes the image width to the actual with of the image.
+     */
+    REAL_SIZE
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Language.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Language.java
new file mode 100644
index 0000000..39a2813
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Language.java
@@ -0,0 +1,39 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>Language class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Language {
+    /**
+     * Constant <code>JAVA="java"</code>
+     */
+    public static final String JAVA = "java";
+    /**
+     * Constant <code>GROOVY="groovy"</code>
+     */
+    public static final String GROOVY = "groovy";
+    /**
+     * Constant <code>JAVA_SCRIPT="javascript"</code>
+     */
+    public static final String JAVA_SCRIPT = "javascript";
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineDirection.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineDirection.java
new file mode 100644
index 0000000..2efe0cf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineDirection.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>LineDirection class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum LineDirection {
+    TOP_DOWN, BOTTOM_UP
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineSpacing.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineSpacing.java
new file mode 100644
index 0000000..7298b23
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineSpacing.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>LineSpacing class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum LineSpacing {
+    SINGLE, ONE_AND_HALF, DOUBLE, AT_LEAST, FIXED, PROPORTIONAL
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineStyle.java
new file mode 100644
index 0000000..b50c41a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineStyle.java
@@ -0,0 +1,40 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>LineStyle class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum LineStyle {
+    /**
+     * Constant useful for specifying solid line style.
+     */
+    SOLID, /**
+     * Constant useful for specifying dashed line style.
+     */
+    DASHED, /**
+     * Constant useful for specifying dotted line style.
+     */
+    DOTTED, /**
+     * Constant useful for specifying double line style.
+     */
+    DOUBLE
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ListType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ListType.java
new file mode 100644
index 0000000..72b3766
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ListType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>ListType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ListType {
+    HORIZONTAL, HORIZONTAL_FLOW, VERTICAL
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Markup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Markup.java
new file mode 100644
index 0000000..2fbec46
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Markup.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>Markup class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum Markup {
+    NONE, STYLED, RTF, HTML
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/MeterShape.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/MeterShape.java
new file mode 100644
index 0000000..492c42c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/MeterShape.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>MeterShape class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum MeterShape {
+    CHORD, CIRCLE, PIE, DIAL
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/OrderType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/OrderType.java
new file mode 100644
index 0000000..d98f4c5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/OrderType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>OrderType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum OrderType {
+    ASCENDING, DESCENDING
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Orientation.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Orientation.java
new file mode 100644
index 0000000..fe39574
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Orientation.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>Orientation class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum Orientation {
+    HORIZONTAL, VERTICAL
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageOrientation.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageOrientation.java
new file mode 100644
index 0000000..a2e3764
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageOrientation.java
@@ -0,0 +1,36 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>PageOrientation class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum PageOrientation {
+    /**
+     * Portrait page orientation.
+     */
+    PORTRAIT,
+
+    /**
+     * Landscape page orientation.
+     */
+    LANDSCAPE
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageType.java
new file mode 100644
index 0000000..67f3603
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageType.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>PageType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum PageType {
+    LETTER(612, 792), NOTE(540, 720), LEGAL(612, 1008), A0(2380, 3368), A1(1684, 2380), A2(1190, 1684), A3(842, 1190), A4(595, 842), A5(421, 595), A6(297, 421), A7(210, 297), A8(148, 210),
+    A9(105, 148), A10(74, 105), B0(2836, 4008), B1(2004, 2836), B2(1418, 2004), B3(1002, 1418), B4(709, 1002), B5(501, 709), B6(353, 497), B7(252, 353), B8(173, 252), B9(122, 173), B10(86, 122),
+    C0(2599, 3679), C1(1836, 2599), C2(1296, 1836), C3(922, 1296), C4(648, 922), C5(461, 648), C6(324, 461), C7(230, 324), C8(158, 230), C9(115, 158), C10(79, 115), ARCH_E(2592, 3456),
+    ARCH_D(1728, 2592), ARCH_C(1296, 1728), ARCH_B(864, 1296), ARCH_A(648, 864), FLSA(612, 936), FLSE(612, 936), HALFLETTER(396, 612), _11X17(792, 1224), LEDGER(1224, 792);
+
+    private int width;
+    private int height;
+
+    private PageType(int width, int height) {
+        this.width = width;
+        this.height = height;
+    }
+
+    /**
+     * <p>Getter for the field <code>width</code>.</p>
+     *
+     * @return a int.
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * <p>Getter for the field <code>height</code>.</p>
+     *
+     * @return a int.
+     */
+    public int getHeight() {
+        return height;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfEncoding.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfEncoding.java
new file mode 100644
index 0000000..df8599c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfEncoding.java
@@ -0,0 +1,111 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>PdfEncoding class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class PdfEncoding {
+    /**
+     * Constant <code>CP1250_Central_European="CP1250"</code>
+     */
+    public static final String CP1250_Central_European = "CP1250";
+    /**
+     * Constant <code>CP1251_Cyrillic="CP1251"</code>
+     */
+    public static final String CP1251_Cyrillic = "CP1251";
+    /**
+     * Constant <code>CP1252_Western_European_ANSI="CP1252"</code>
+     */
+    public static final String CP1252_Western_European_ANSI = "CP1252";
+    /**
+     * Constant <code>CP1253_Greek="CP1253"</code>
+     */
+    public static final String CP1253_Greek = "CP1253";
+    /**
+     * Constant <code>CP1254_Turkish="CP1254"</code>
+     */
+    public static final String CP1254_Turkish = "CP1254";
+    /**
+     * Constant <code>CP1255_Hebrew="CP1255"</code>
+     */
+    public static final String CP1255_Hebrew = "CP1255";
+    /**
+     * Constant <code>CP1256_Arabic="CP1256"</code>
+     */
+    public static final String CP1256_Arabic = "CP1256";
+    /**
+     * Constant <code>CP1257_Baltic="CP1257"</code>
+     */
+    public static final String CP1257_Baltic = "CP1257";
+    /**
+     * Constant <code>CP1258_Vietnamese="CP1258"</code>
+     */
+    public static final String CP1258_Vietnamese = "CP1258";
+    /**
+     * Constant <code>UniGB_UCS2_H_Chinese_Simplified="UniGB-UCS2-H"</code>
+     */
+    public static final String UniGB_UCS2_H_Chinese_Simplified = "UniGB-UCS2-H";
+    /**
+     * Constant <code>UniGB_UCS2_V_Chinese_Simplified="UniGB-UCS2-V"</code>
+     */
+    public static final String UniGB_UCS2_V_Chinese_Simplified = "UniGB-UCS2-V";
+    /**
+     * Constant <code>UniCNS_UCS2_H_Chinese_traditional="UniCNS-UCS2-H"</code>
+     */
+    public static final String UniCNS_UCS2_H_Chinese_traditional = "UniCNS-UCS2-H";
+    /**
+     * Constant <code>UniCNS_UCS2_V_Chinese_traditional="UniCNS-UCS2-V"</code>
+     */
+    public static final String UniCNS_UCS2_V_Chinese_traditional = "UniCNS-UCS2-V";
+    /**
+     * Constant <code>UniJIS_UCS2_H_Japanese="UniJIS-UCS2-H"</code>
+     */
+    public static final String UniJIS_UCS2_H_Japanese = "UniJIS-UCS2-H";
+    /**
+     * Constant <code>UniJIS_UCS2_V_Japanese="UniJIS-UCS2-V"</code>
+     */
+    public static final String UniJIS_UCS2_V_Japanese = "UniJIS-UCS2-V";
+    /**
+     * Constant <code>UniJIS_UCS2_HW_H_Japanese="UniJIS-UCS2-HW-H"</code>
+     */
+    public static final String UniJIS_UCS2_HW_H_Japanese = "UniJIS-UCS2-HW-H";
+    /**
+     * Constant <code>UniJIS_UCS2_HW_V_Japanese="UniJIS-UCS2-HW-V"</code>
+     */
+    public static final String UniJIS_UCS2_HW_V_Japanese = "UniJIS-UCS2-HW-V";
+    /**
+     * Constant <code>UniKS_UCS2_H_Korean="UniKS-UCS2-H"</code>
+     */
+    public static final String UniKS_UCS2_H_Korean = "UniKS-UCS2-H";
+    /**
+     * Constant <code>UniKS_UCS2_V_Korean="UniKS-UCS2-V"</code>
+     */
+    public static final String UniKS_UCS2_V_Korean = "UniKS-UCS2-V";
+    /**
+     * Constant <code>Identity_H_Unicode_with_horizontal_writing="Identity-H"</code>
+     */
+    public static final String Identity_H_Unicode_with_horizontal_writing = "Identity-H";
+    /**
+     * Constant <code>Identity_V_Unicode_with_horizontal_writing="Identity-V"</code>
+     */
+    public static final String Identity_V_Unicode_with_horizontal_writing = "Identity-V";
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfPrintScaling.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfPrintScaling.java
new file mode 100644
index 0000000..ea69710
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfPrintScaling.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>PdfPrintScaling class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum PdfPrintScaling {
+    NONE, DEFAULT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfaConformance.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfaConformance.java
new file mode 100644
index 0000000..78bb81a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfaConformance.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>PdfaConformance class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum PdfaConformance {
+    NONE, PDFA_1A, PDFA_1B
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PercentageTotalType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PercentageTotalType.java
new file mode 100644
index 0000000..f7e1420
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PercentageTotalType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>PercentageTotalType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum PercentageTotalType {
+    REPORT, GROUP, FIRST_GROUP, LAST_GROUP
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Position.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Position.java
new file mode 100644
index 0000000..f8edac2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Position.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>Position class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum Position {
+    TOP, BOTTOM, LEFT, RIGHT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java
new file mode 100644
index 0000000..4c713de
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>QrCodeErrorCorrectionLevel class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum QrCodeErrorCorrectionLevel {
+    L, M, Q, H;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QueryLanguage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QueryLanguage.java
new file mode 100644
index 0000000..02e1e51
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QueryLanguage.java
@@ -0,0 +1,51 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>QueryLanguage class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class QueryLanguage {
+    /**
+     * Constant <code>SQL="sql"</code>
+     */
+    public static final String SQL = "sql";
+    /**
+     * Constant <code>HQL="hql"</code>
+     */
+    public static final String HQL = "hql";
+    /**
+     * Constant <code>XPATH="xPath"</code>
+     */
+    public static final String XPATH = "xPath";
+    /**
+     * Constant <code>MDX="mdx"</code>
+     */
+    public static final String MDX = "mdx";
+    /**
+     * Constant <code>EJBQL="ejbql"</code>
+     */
+    public static final String EJBQL = "ejbql";
+    /**
+     * Constant <code>CSV="csv"</code>
+     */
+    public static final String CSV = "csv";
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RectangleAnchor.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RectangleAnchor.java
new file mode 100644
index 0000000..dc31ec2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RectangleAnchor.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>RectangleAnchor class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum RectangleAnchor {
+    CENTER, TOP, TOP_LEFT, TOP_RIGHT, BOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT, LEFT, RIGHT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Rotation.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Rotation.java
new file mode 100644
index 0000000..56f65d7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Rotation.java
@@ -0,0 +1,40 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>Rotation class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum Rotation {
+    /**
+     * Constant useful for displaying the text without rotating it
+     */
+    NONE, /**
+     * Constant useful for rotating the text 90 degrees counter clockwise.
+     */
+    LEFT, /**
+     * Constant useful for rotating the text 90 degrees clockwise.
+     */
+    RIGHT, /**
+     * Constant useful for rotating the text 180 degrees.
+     */
+    UPSIDE_DOWN
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RunDirection.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RunDirection.java
new file mode 100644
index 0000000..0722a0c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RunDirection.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>RunDirection class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum RunDirection {
+    LEFT_TO_RIGHT, RIGHT_TO_LEFT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ScaleType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ScaleType.java
new file mode 100644
index 0000000..b2695b7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ScaleType.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>ScaleType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ScaleType {
+    ON_BOTH_AXES, ON_DOMAIN_AXIS, ON_RANGE_AXIS
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SpiderRotation.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SpiderRotation.java
new file mode 100644
index 0000000..d0e2eb7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SpiderRotation.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>SpiderRotation class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum SpiderRotation {
+    CLOCKWISE, ANTICLOCKWISE;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SplitType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SplitType.java
new file mode 100644
index 0000000..74e3188
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SplitType.java
@@ -0,0 +1,37 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>SplitType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum SplitType {
+    /**
+     * A band can be split
+     */
+    IMMEDIATE, /**
+     * Prevents a band from splitting.
+     */
+    PREVENT, /**
+     * A band can be split, but never within its declared height.
+     */
+    STRETCH
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/StretchType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/StretchType.java
new file mode 100644
index 0000000..10ff3bd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/StretchType.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>StretchType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum StretchType {
+    NO_STRETCH, /**
+     * @deprecated use ELEMENT_GROUP_HEIGHT instead
+     */
+    RELATIVE_TO_TALLEST_OBJECT, /**
+     * @deprecated use CONTAINER_HEIGHT instead
+     */
+    RELATIVE_TO_BAND_HEIGHT, ELEMENT_GROUP_HEIGHT, ELEMENT_GROUP_BOTTOM, CONTAINER_HEIGHT, CONTAINER_BOTTOM;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SubtotalPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SubtotalPosition.java
new file mode 100644
index 0000000..e054cd3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SubtotalPosition.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>SubtotalPosition class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum SubtotalPosition {
+    TITLE, PAGE_HEADER, PAGE_FOOTER, COLUMN_HEADER, COLUMN_FOOTER, GROUP_HEADER, GROUP_FOOTER, FIRST_GROUP_HEADER, FIRST_GROUP_FOOTER, LAST_GROUP_HEADER, LAST_GROUP_FOOTER, LAST_PAGE_FOOTER, SUMMARY
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SystemExpression.java
new file mode 100644
index 0000000..0d64ff2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SystemExpression.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>SystemExpression class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum SystemExpression {
+    PAGE_NUMBER
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TabStopAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TabStopAlignment.java
new file mode 100644
index 0000000..a6dc2d7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TabStopAlignment.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>TabStopAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum TabStopAlignment {
+    LEFT, CENTER, RIGHT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOfContentsPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOfContentsPosition.java
new file mode 100644
index 0000000..d070acf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOfContentsPosition.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>TableOfContentsPosition class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum TableOfContentsPosition {
+    TOP, BOTTOM
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOrder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOrder.java
new file mode 100644
index 0000000..6946c70
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOrder.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>TableOrder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum TableOrder {
+    BY_ROW, BY_COLUMN;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TextAdjust.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TextAdjust.java
new file mode 100644
index 0000000..fe308fd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TextAdjust.java
@@ -0,0 +1,27 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ *
+ * @author Jan Moxter
+ *
+ */
+public enum TextAdjust {
+    CUT_TEXT, STRETCH_HEIGHT, SCALE_FONT
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TimePeriod.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TimePeriod.java
new file mode 100644
index 0000000..c005d4f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TimePeriod.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>TimePeriod class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum TimePeriod {
+    YEAR, QUARTER, MONTH, WEEK, DAY, HOUR, MINUTE, SECOND, MILLISECOND
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ValueLocation.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ValueLocation.java
new file mode 100644
index 0000000..2e27d19
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ValueLocation.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>ValueLocation class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum ValueLocation {
+    NONE, LEFT, RIGHT, BULB
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalAlignment.java
new file mode 100644
index 0000000..8dad2d4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalAlignment.java
@@ -0,0 +1,29 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>VerticalAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ * @deprecated use VerticalTextAligment for texts or VerticalImageAligment for images instead
+ */
+public enum VerticalAlignment {
+    TOP, MIDDLE, BOTTOM, JUSTIFIED
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalCellComponentAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalCellComponentAlignment.java
new file mode 100644
index 0000000..c33e399
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalCellComponentAlignment.java
@@ -0,0 +1,82 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>VerticalCellComponentAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum VerticalCellComponentAlignment {
+    /**
+     * <pre>
+     *
+     *  ---
+     * | - |
+     * ||C||
+     * | - |
+     * |   |
+     * |   |
+     *  ---
+     * </pre>
+     */
+    TOP,
+
+    /**
+     * <pre>
+     *
+     *  ---
+     * |   |
+     * | - |
+     * ||C||
+     * | - |
+     * |   |
+     *  ---
+     * </pre>
+     */
+    MIDDLE,
+
+    /**
+     * <pre>
+     *
+     *  ---
+     * |   |
+     * |   |
+     * | - |
+     * ||C||
+     * | - |
+     *  ---
+     * </pre>
+     */
+    BOTTOM,
+
+    /**
+     * <pre>
+     *
+     *  ---
+     * | - |
+     * || ||
+     * ||C||
+     * || ||
+     * | - |
+     *  ---
+     * </pre>
+     */
+    EXPAND
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalImageAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalImageAlignment.java
new file mode 100644
index 0000000..541b603
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalImageAlignment.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>VerticalImageAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum VerticalImageAlignment {
+    TOP, MIDDLE, BOTTOM
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalTextAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalTextAlignment.java
new file mode 100644
index 0000000..1173139
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalTextAlignment.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>VerticalTextAlignment class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum VerticalTextAlignment {
+    TOP, MIDDLE, BOTTOM, JUSTIFIED
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenNoDataType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenNoDataType.java
new file mode 100644
index 0000000..9bd394e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenNoDataType.java
@@ -0,0 +1,40 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>WhenNoDataType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum WhenNoDataType {
+    /**
+     * Specifies that in case of empty datasources, there will be an empty report.
+     */
+    NO_PAGES, /**
+     * Specifies that in case of empty datasources, there will be a report with just one blank page.
+     */
+    BLANK_PAGE, /**
+     * Specifies that in case of empty datasources, all sections except detail will displayed.
+     */
+    ALL_SECTIONS_NO_DETAIL, /**
+     * Specifies that in case of empty datasources, the NoData section will be displayed.
+     */
+    NO_DATA_SECTION
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenResourceMissingType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenResourceMissingType.java
new file mode 100644
index 0000000..a17520e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenResourceMissingType.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.constant;
+
+/**
+ * <p>WhenResourceMissingType class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public enum WhenResourceMissingType {
+    /**
+     * Return NULL when a resource is missing.
+     */
+    NULL,
+
+    /**
+     * Return empty string when a resource is missing.
+     */
+    EMPTY,
+
+    /**
+     * Return the key when a resource is missing.
+     */
+    KEY,
+
+    /**
+     * Throw an exception when a resource is missing.
+     */
+    ERROR;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/datasource/DRDataSource.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/datasource/DRDataSource.java
new file mode 100644
index 0000000..96d7b79
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/datasource/DRDataSource.java
@@ -0,0 +1,93 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.datasource;
+
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRField;
+import net.sf.jasperreports.engine.JRRewindableDataSource;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>DRDataSource class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRDataSource implements JRRewindableDataSource, Serializable {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    private String[] columns;
+    private List<Map<String, Object>> values;
+    private Iterator<Map<String, Object>> iterator;
+    private Map<String, Object> currentRecord;
+
+    /**
+     * <p>Constructor for DRDataSource.</p>
+     *
+     * @param columns a {@link java.lang.String} object.
+     */
+    public DRDataSource(String... columns) {
+        this.columns = columns;
+        this.values = new ArrayList<Map<String, Object>>();
+    }
+
+    /**
+     * <p>add.</p>
+     *
+     * @param values a {@link java.lang.Object} object.
+     */
+    public void add(Object... values) {
+        Map<String, Object> row = new HashMap<String, Object>();
+        for (int i = 0; i < values.length; i++) {
+            row.put(columns[i], values[i]);
+        }
+        this.values.add(row);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Object getFieldValue(JRField field) throws JRException {
+        return currentRecord.get(field.getName());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean next() throws JRException {
+        if (iterator == null) {
+            this.iterator = values.iterator();
+        }
+        boolean hasNext = iterator.hasNext();
+        if (hasNext) {
+            currentRecord = iterator.next();
+        }
+        return hasNext;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void moveFirst() throws JRException {
+        iterator = null;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Default.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Default.java
new file mode 100644
index 0000000..dfbc4ae
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Default.java
@@ -0,0 +1,2056 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.defaults;
+
+import java.awt.Color;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+import java.util.Locale;
+
+import net.sf.dynamicreports.report.base.DRMargin;
+import net.sf.dynamicreports.report.base.datatype.DRDataType;
+import net.sf.dynamicreports.report.base.style.DRFont;
+import net.sf.dynamicreports.report.base.style.DRPadding;
+import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
+import net.sf.dynamicreports.report.base.style.DRStyle;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.Language;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+
+
+/**
+ * <p>Default class.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ */
+public class Default
+{
+	private String reportName;
+	private Locale locale;
+	private boolean showColumnTitle;
+	private boolean showColumnValues;
+	private boolean ignorePagination;
+	private WhenNoDataType whenNoDataType;
+	private WhenResourceMissingType whenResourceMissingType;
+	private boolean titleOnANewPage;
+	private boolean summaryOnANewPage;
+	private boolean summaryWithPageHeaderAndFooter;
+	private boolean floatColumnFooter;
+	private Orientation printOrder;
+	private RunDirection columnDirection;
+	private String language;
+	private boolean useFieldNameAsDescription;
+	// style
+	private boolean highlightDetailOddRows;
+	private DRSimpleStyle detailOddRowStyle;
+	private boolean highlightDetailEvenRows;
+	private DRSimpleStyle detailEvenRowStyle;
+	private DRStyle textStyle;
+	private DRStyle columnTitleStyle;
+	private DRStyle columnStyle;
+	private DRStyle groupTitleStyle;
+	private DRStyle groupStyle;
+	private DRStyle subtotalStyle;
+	private DRStyle imageStyle;
+	// page
+	private int pageWidth;
+	private int pageHeight;
+	private PageOrientation pageOrientation;
+	private DRMargin pageMargin;
+	private DRMargin subreportPageMargin;
+	private int pageColumnsPerPage;
+	private int pageColumnSpace;
+	private boolean ignorePageWidth;
+	// column
+	private boolean columnPrintRepeatedDetailValues;
+	private int columnWidth;
+	// component
+	private boolean removeLineWhenBlank;
+	private boolean printInFirstWholeBand;
+	private boolean printWhenDetailOverflows;
+	// group
+	private GroupHeaderLayout groupHeaderLayout;
+	private boolean groupHideColumn;
+	private boolean groupShowColumnHeaderAndFooter;
+	private int groupPadding;
+	private boolean groupStartInNewPage;
+	private boolean groupStartInNewColumn;
+	private boolean groupReprintHeaderOnEachPage;
+	private boolean groupResetPageNumber;
+	private Integer groupMinHeightToStartNewPage;
+	private GroupFooterPosition groupFooterPosition;
+	private boolean groupKeepTogether;
+	private boolean groupHeaderWithSubtotal;
+	private boolean groupByDataType;
+	// subtotal
+	private Position subtotalLabelPosition;
+	// table of contents
+	private boolean tableOfContents;
+	private DRITableOfContentsCustomizer tableOfContentsCustomizer;
+	private boolean addGroupToTableOfContents;
+	private TableOfContentsPosition tableOfContentsPosition;
+	// text field
+	private int textFieldWidth;
+	private boolean textFieldPrintRepeatedValues;
+	private boolean textFieldStretchWithOverflow;
+	private TextAdjust textFieldTextAdjust;
+	// image
+	private int imageWidth;
+	private int imageHeight;
+	// filler
+	private int fillerWidth;
+	private int fillerHeight;
+	// line
+	private int lineWidth;
+	private int lineHeight;
+	// ellipse
+	private int ellipseWidth;
+	private int ellipseHeight;
+	// rectangle
+	private Integer rectangleRadius;
+	private int rectangleWidth;
+	private int rectangleHeight;
+	// map
+	private int mapWidth;
+	private int mapHeight;
+	// custom component
+	private int customComponentWidth;
+	private int customComponentHeight;
+	// break
+	private int breakWidth;
+	private int breakHeight;
+	// generic element
+	private int genericElementWidth;
+	private int genericElementHeight;
+	// list
+	private Integer listWidth;
+	private Integer listHeight;
+	private int listgap;
+	private HorizontalCellComponentAlignment horizontalCellComponentAlignment;
+	private VerticalCellComponentAlignment verticalCellComponentAlignment;
+	// multi page list
+	private int multiPageListWidth;
+	private int multiPageListHeight;
+	// subreport
+	private int subreportWidth;
+	private int subreportHeight;
+	// crosstab
+	private int crosstabWidth;
+	private int crosstabHeight;
+	private CrosstabTotalPosition crosstabColumnGroupTotalPosition;
+	private CrosstabTotalPosition crosstabRowGroupTotalPosition;
+	private boolean crosstabColumnGroupShowTotal;
+	private boolean crosstabRowGroupShowTotal;
+	private int crosstabColumnGroupTotalHeaderMaxWidth;
+	private int crosstabRowGroupHeaderMaxWidth;
+	private int crosstabCellMaxWidth;
+	private boolean crosstabHighlightOddRows;
+	private DRSimpleStyle crosstabOddRowStyle;
+	private boolean crosstabHighlightEvenRows;
+	private DRSimpleStyle crosstabEvenRowStyle;
+	private DRStyle crosstabGroupStyle;
+	private DRStyle crosstabGroupTotalStyle;
+	private DRStyle crosstabGrandTotalStyle;
+	private DRStyle crosstabCellStyle;
+	private DRStyle crosstabMeasureTitleStyle;
+	private CrosstabPercentageType crosstabPercentageType;
+	// boolean
+	private BooleanComponentType booleanComponentType;
+	private boolean booleanEmptyWhenNullValue;
+	private int booleanImageWidth;
+	private int booleanImageHeight;
+	private DRStyle booleanColumnStyle;
+	private HorizontalImageAlignment booleanHorizontalImageAlignment;
+	// split
+	private SplitType defaultSplitType;
+	private SplitType titleSplitType;
+	private SplitType pageHeaderSplitType;
+	private SplitType pageFooterSplitType;
+	private SplitType columnHeaderSplitType;
+	private SplitType columnFooterSplitType;
+	private SplitType groupHeaderSplitType;
+	private SplitType groupFooterSplitType;
+	private SplitType detailHeaderSplitType;
+	private SplitType detailSplitType;
+	private SplitType detailFooterSplitType;
+	private SplitType lastPageFooterSplitType;
+	private SplitType summarySplitType;
+	private SplitType noDataSplitType;
+	private SplitType backgroundSplitType;
+	// band style
+	private DRIStyle bandStyle;
+	// band background component
+	private DRIComponent bandBackgroundComponent;
+	// font
+	private DRFont font;
+	// datatype
+	private DRDataType<Number, BigDecimal> bigDecimalType;
+	private DRDataType<Number, BigInteger> bigIntegerType;
+	private DRDataType<Number, Byte> byteType;
+	private DRDataType<Number, Double> doubleType;
+	private DRDataType<Number, Float> floatType;
+	private DRDataType<Number, Integer> integerType;
+	private DRDataType<Number, Long> longType;
+	private DRDataType<Number, Short> shortType;
+	private DRDataType<Date, Date> dateType;
+	private DRDataType<Date, Date> dateYearToMonthType;
+	private DRDataType<Date, Date> dateYearToHourType;
+	private DRDataType<Date, Date> dateYearToMinuteType;
+	private DRDataType<Date, Date> dateYearToSecondType;
+	private DRDataType<Date, Date> dateYearToFractionType;
+	private DRDataType<Date, Date> dateYearType;
+	private DRDataType<Date, Date> dateMonthType;
+	private DRDataType<Date, Date> dateDayType;
+	private DRDataType<Date, Date> timeHourToMinuteType;
+	private DRDataType<Date, Date> timeHourToSecondType;
+	private DRDataType<Date, Date> timeHourToFractionType;
+	private DRDataType<Number, Double> percentageType;
+	private DRDataType<Boolean, Boolean> booleanType;
+	private DRDataType<Character, Character> characterType;
+	private DRDataType<String, String> stringType;
+	private HorizontalTextAlignment pageXofYHorizontalTextAlignment;
+	// system fonts
+	private boolean loadSystemFonts;
+	
+	/**
+	 * <p>Constructor for Default.</p>
+	 */
+	public Default()
+	{
+        this.init();
+	}
+	
+	private void init()
+	{
+		this.reportName = "Report";
+		this.locale = Locale.getDefault();
+		this.showColumnTitle = true;
+		this.showColumnValues = true;
+		this.ignorePagination = false;
+		this.whenNoDataType = WhenNoDataType.NO_PAGES;
+		this.whenResourceMissingType = WhenResourceMissingType.NULL;
+		this.titleOnANewPage = false;
+		this.summaryOnANewPage = false;
+		this.summaryWithPageHeaderAndFooter = false;
+		this.floatColumnFooter = false;
+		this.printOrder = Orientation.VERTICAL;
+		this.columnDirection = RunDirection.LEFT_TO_RIGHT;
+		this.language = Language.JAVA;
+		this.useFieldNameAsDescription = true;
+		
+		this.highlightDetailOddRows = false;
+		this.detailOddRowStyle = new DRSimpleStyle();
+        this.detailOddRowStyle.setBackgroundColor(new Color(200, 200, 200));
+		this.highlightDetailEvenRows = false;
+		this.detailEvenRowStyle = new DRSimpleStyle();
+        this.detailEvenRowStyle.setBackgroundColor(new Color(240, 240, 240));
+		
+		this.textStyle = new DRStyle();
+        this.textStyle.setForegroundColor(Color.BLACK);
+        this.textStyle.setPadding(new DRPadding(2));
+		
+		this.columnTitleStyle = null;
+		this.columnStyle = null;
+		this.groupTitleStyle = null;
+		this.groupStyle = null;
+		this.subtotalStyle = null;
+		this.imageStyle = new DRStyle();
+        this.imageStyle.setImageScale(ImageScale.RETAIN_SHAPE);
+		
+		this.pageWidth = PageType.A4.getWidth();
+		this.pageHeight = PageType.A4.getHeight();
+		this.pageOrientation = PageOrientation.PORTRAIT;
+		this.pageMargin = new DRMargin(10);
+		this.subreportPageMargin = new DRMargin(0);
+		this.pageColumnsPerPage = 1;
+		this.pageColumnSpace = 0;
+		this.ignorePageWidth = false;
+		
+		this.columnPrintRepeatedDetailValues = true;
+		this.columnWidth = 100;
+		
+		this.removeLineWhenBlank = false;
+		this.printInFirstWholeBand = false;
+		this.printWhenDetailOverflows = false;
+		
+		this.groupHeaderLayout = GroupHeaderLayout.VALUE;
+		this.groupHideColumn = true;
+		this.groupShowColumnHeaderAndFooter = false;
+		this.groupPadding = 10;
+		this.groupStartInNewPage = false;
+		this.groupStartInNewColumn = false;
+		this.groupReprintHeaderOnEachPage = false;
+		this.groupResetPageNumber = false;
+		this.groupMinHeightToStartNewPage = null;
+		this.groupFooterPosition = GroupFooterPosition.NORMAL;
+		this.groupKeepTogether = false;
+		this.groupHeaderWithSubtotal = false;
+		this.groupByDataType = false;
+		
+		this.subtotalLabelPosition = Position.TOP;
+		
+		this.tableOfContents = false;
+		this.tableOfContentsCustomizer = new TableOfContentsCustomizer();
+		this.addGroupToTableOfContents = true;
+		this.tableOfContentsPosition = TableOfContentsPosition.TOP;
+		
+		this.textFieldWidth = 100;
+		this.textFieldPrintRepeatedValues = true;
+		this.textFieldStretchWithOverflow = true;
+		this.textFieldTextAdjust = TextAdjust.STRETCH_HEIGHT;
+		
+		this.imageWidth = 100;
+		this.imageHeight = 100;
+		
+		this.fillerWidth = 0;
+		this.fillerHeight = 0;
+		
+		this.lineWidth = 1;
+		this.lineHeight = 1;
+		
+		this.ellipseWidth = 100;
+		this.ellipseHeight = 100;
+		
+		this.rectangleRadius = null;
+		this.rectangleWidth = 100;
+		this.rectangleHeight = 100;
+		
+		this.mapWidth = 200;
+		this.mapHeight = 200;
+		
+		this.customComponentWidth = 200;
+		this.customComponentHeight = 200;
+		
+		this.breakWidth = 1;
+		this.breakHeight = 1;
+		
+		this.genericElementWidth = 100;
+		this.genericElementHeight = 100;
+		
+		this.genericElementWidth = 100;
+		this.genericElementHeight = 100;
+		
+		this.listWidth = null;
+		this.listHeight = null;
+		this.listgap = 0;
+		this.horizontalCellComponentAlignment = HorizontalCellComponentAlignment.FLOAT;
+		this.verticalCellComponentAlignment = VerticalCellComponentAlignment.EXPAND;
+		
+		this.multiPageListWidth = 200;
+		this.multiPageListHeight = 0;
+		
+		this.subreportWidth = 200;
+		this.subreportHeight = 0;
+		
+		this.crosstabWidth = 200;
+		this.crosstabHeight = 0;
+		this.crosstabColumnGroupTotalPosition = CrosstabTotalPosition.END;
+		this.crosstabRowGroupTotalPosition = CrosstabTotalPosition.END;
+		this.crosstabColumnGroupShowTotal = true;
+		this.crosstabRowGroupShowTotal = true;
+		this.crosstabColumnGroupTotalHeaderMaxWidth = 150;
+		this.crosstabRowGroupHeaderMaxWidth = 150;
+		this.crosstabCellMaxWidth = 150;
+		this.crosstabHighlightOddRows = false;
+		this.crosstabOddRowStyle = new DRSimpleStyle();
+        this.crosstabOddRowStyle.setBackgroundColor(new Color(200, 200, 200));
+		this.crosstabHighlightEvenRows = false;
+		this.crosstabEvenRowStyle = new DRSimpleStyle();
+        this.crosstabEvenRowStyle.setBackgroundColor(new Color(240, 240, 240));
+		this.crosstabGroupStyle = null;
+		this.crosstabGroupTotalStyle = null;
+		this.crosstabGrandTotalStyle = null;
+		this.crosstabCellStyle = null;
+		this.crosstabMeasureTitleStyle = null;
+		this.crosstabPercentageType = CrosstabPercentageType.NONE;
+		
+		this.booleanComponentType = BooleanComponentType.TEXT_TRUE_FALSE;
+		this.booleanEmptyWhenNullValue = false;
+		this.booleanImageWidth = 14;
+		this.booleanImageHeight = 14;
+		this.booleanColumnStyle = null;
+		this.booleanHorizontalImageAlignment = HorizontalImageAlignment.CENTER;
+		
+		this.pageXofYHorizontalTextAlignment = HorizontalTextAlignment.CENTER;
+		
+		this.defaultSplitType = null;
+		this.titleSplitType = null;
+		this.pageHeaderSplitType = null;
+		this.pageFooterSplitType = null;
+		this.columnHeaderSplitType = null;
+		this.columnFooterSplitType = null;
+		this.groupHeaderSplitType = null;
+		this.groupFooterSplitType = null;
+		this.detailHeaderSplitType = null;
+		this.detailSplitType = null;
+		this.detailFooterSplitType = null;
+		this.lastPageFooterSplitType = null;
+		this.summarySplitType = null;
+		this.noDataSplitType = null;
+		this.backgroundSplitType = null;
+		
+		this.bandStyle = null;
+		
+		this.bandBackgroundComponent = null;
+		
+		this.font = new DRFont("SansSerif", 10);
+		
+		this.bigDecimalType = new DRDataType<>("#,##0.00#", HorizontalTextAlignment.RIGHT);
+		this.bigIntegerType = new DRDataType<>("#,##0", HorizontalTextAlignment.RIGHT);
+		this.byteType = new DRDataType<>("#,##0", HorizontalTextAlignment.RIGHT);
+		this.doubleType = new DRDataType<>("#,##0.#", HorizontalTextAlignment.RIGHT);
+		this.floatType = new DRDataType<>("#,##0.#", HorizontalTextAlignment.RIGHT);
+		this.integerType = new DRDataType<>("#,##0", HorizontalTextAlignment.RIGHT);
+		this.longType = new DRDataType<>("#,##0", HorizontalTextAlignment.RIGHT);
+		this.shortType = new DRDataType<>("#,##0", HorizontalTextAlignment.RIGHT);
+		this.dateType = new DRDataType<>("MM/dd/yyyy", HorizontalTextAlignment.RIGHT);
+		this.dateYearToMonthType = new DRDataType<>("MM/yyyy", HorizontalTextAlignment.RIGHT);
+		this.dateYearToHourType = new DRDataType<>("MM/dd/yyyy h a", HorizontalTextAlignment.RIGHT);
+		this.dateYearToMinuteType = new DRDataType<>("MM/dd/yyyy h:mm a", HorizontalTextAlignment.RIGHT);
+		this.dateYearToSecondType = new DRDataType<>("MM/dd/yyyy h:mm:ss a", HorizontalTextAlignment.RIGHT);
+		this.dateYearToFractionType = new DRDataType<>("MM/dd/yyyy h:mm:ss,SSS a", HorizontalTextAlignment.RIGHT);
+		this.dateYearType = new DRDataType<>("yyyy", HorizontalTextAlignment.RIGHT);
+		this.dateMonthType = new DRDataType<>("MMMM", HorizontalTextAlignment.RIGHT);
+		this.dateDayType = new DRDataType<>("dd", HorizontalTextAlignment.RIGHT);
+		this.timeHourToMinuteType = new DRDataType<>("h:mm a", HorizontalTextAlignment.RIGHT);
+		this.timeHourToSecondType = new DRDataType<>("h:mm:ss a", HorizontalTextAlignment.RIGHT);
+		this.timeHourToFractionType = new DRDataType<>("h:mm:ss,SSS a", HorizontalTextAlignment.RIGHT);
+		this.percentageType = new DRDataType<>("#,##0.00%", HorizontalTextAlignment.RIGHT);
+		this.booleanType = new DRDataType<>(null, HorizontalTextAlignment.CENTER);
+		this.characterType = new DRDataType<>(null, HorizontalTextAlignment.LEFT);
+		this.stringType = new DRDataType<>(null, HorizontalTextAlignment.LEFT);
+		
+		this.loadSystemFonts = true;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>reportName</code>.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	public String getReportName()
+	{
+		return this.reportName;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>locale</code>.</p>
+	 *
+	 * @return a {@link java.util.Locale} object.
+	 */
+	public Locale getLocale()
+	{
+		return this.locale;
+	}
+	
+	/**
+	 * <p>isShowColumnTitle.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isShowColumnTitle()
+	{
+		return this.showColumnTitle;
+	}
+	
+	/**
+	 * <p>isShowColumnValues.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isShowColumnValues()
+	{
+		return this.showColumnValues;
+	}
+	
+	/**
+	 * <p>isIgnorePagination.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isIgnorePagination()
+	{
+		return this.ignorePagination;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>whenNoDataType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 */
+	public WhenNoDataType getWhenNoDataType()
+	{
+		return this.whenNoDataType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>whenResourceMissingType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 */
+	public WhenResourceMissingType getWhenResourceMissingType()
+	{
+		return this.whenResourceMissingType;
+	}
+	
+	/**
+	 * <p>isTitleOnANewPage.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isTitleOnANewPage()
+	{
+		return this.titleOnANewPage;
+	}
+	
+	/**
+	 * <p>isSummaryOnANewPage.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isSummaryOnANewPage()
+	{
+		return this.summaryOnANewPage;
+	}
+	
+	/**
+	 * <p>isSummaryWithPageHeaderAndFooter.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isSummaryWithPageHeaderAndFooter()
+	{
+		return this.summaryWithPageHeaderAndFooter;
+	}
+	
+	/**
+	 * <p>isFloatColumnFooter.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isFloatColumnFooter()
+	{
+		return this.floatColumnFooter;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>printOrder</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 */
+	public Orientation getPrintOrder()
+	{
+		return this.printOrder;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>columnDirection</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 */
+	public RunDirection getColumnDirection()
+	{
+		return this.columnDirection;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>language</code>.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	public String getLanguage()
+	{
+		return this.language;
+	}
+	
+	/**
+	 * <p>isUseFieldNameAsDescription.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isUseFieldNameAsDescription()
+	{
+		return this.useFieldNameAsDescription;
+	}
+	
+	/**
+	 * <p>isHighlightDetailOddRows.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isHighlightDetailOddRows()
+	{
+		return this.highlightDetailOddRows;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>detailOddRowStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public DRSimpleStyle getDetailOddRowStyle()
+	{
+		return this.detailOddRowStyle;
+	}
+	
+	/**
+	 * <p>isHighlightDetailEvenRows.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isHighlightDetailEvenRows()
+	{
+		return this.highlightDetailEvenRows;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>detailEvenRowStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public DRSimpleStyle getDetailEvenRowStyle()
+	{
+		return this.detailEvenRowStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>textStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getTextStyle()
+	{
+		return this.textStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>columnTitleStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getColumnTitleStyle()
+	{
+		return this.columnTitleStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>columnStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getColumnStyle()
+	{
+		return this.columnStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>groupTitleStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getGroupTitleStyle()
+	{
+		return this.groupTitleStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>groupStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getGroupStyle()
+	{
+		return this.groupStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>subtotalStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getSubtotalStyle()
+	{
+		return this.subtotalStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>imageStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getImageStyle()
+	{
+		return this.imageStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getPageWidth()
+	{
+		return this.pageWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getPageHeight()
+	{
+		return this.pageHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageOrientation</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 */
+	public PageOrientation getPageOrientation()
+	{
+		return this.pageOrientation;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageMargin</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+	 */
+	public DRMargin getPageMargin()
+	{
+		return this.pageMargin;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>subreportPageMargin</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+	 */
+	public DRMargin getSubreportPageMargin()
+	{
+		return this.subreportPageMargin;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageColumnsPerPage</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getPageColumnsPerPage()
+	{
+		return this.pageColumnsPerPage;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageColumnSpace</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getPageColumnSpace()
+	{
+		return this.pageColumnSpace;
+	}
+	
+	/**
+	 * <p>isIgnorePageWidth.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isIgnorePageWidth()
+	{
+		return this.ignorePageWidth;
+	}
+	
+	/**
+	 * <p>isColumnPrintRepeatedDetailValues.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isColumnPrintRepeatedDetailValues()
+	{
+		return this.columnPrintRepeatedDetailValues;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>columnWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getColumnWidth()
+	{
+		return this.columnWidth;
+	}
+	
+	/**
+	 * <p>isRemoveLineWhenBlank.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isRemoveLineWhenBlank()
+	{
+		return this.removeLineWhenBlank;
+	}
+	
+	/**
+	 * <p>isPrintInFirstWholeBand.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isPrintInFirstWholeBand()
+	{
+		return this.printInFirstWholeBand;
+	}
+	
+	/**
+	 * <p>isPrintWhenDetailOverflows.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isPrintWhenDetailOverflows()
+	{
+		return this.printWhenDetailOverflows;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>groupHeaderLayout</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+	 */
+	public GroupHeaderLayout getGroupHeaderLayout()
+	{
+		return this.groupHeaderLayout;
+	}
+	
+	/**
+	 * <p>isGroupHideColumn.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupHideColumn()
+	{
+		return this.groupHideColumn;
+	}
+	
+	/**
+	 * <p>isGroupShowColumnHeaderAndFooter.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupShowColumnHeaderAndFooter()
+	{
+		return this.groupShowColumnHeaderAndFooter;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>groupPadding</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getGroupPadding()
+	{
+		return this.groupPadding;
+	}
+	
+	/**
+	 * <p>isGroupStartInNewPage.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupStartInNewPage()
+	{
+		return this.groupStartInNewPage;
+	}
+	
+	/**
+	 * <p>isGroupStartInNewColumn.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupStartInNewColumn()
+	{
+		return this.groupStartInNewColumn;
+	}
+	
+	/**
+	 * <p>isGroupReprintHeaderOnEachPage.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupReprintHeaderOnEachPage()
+	{
+		return this.groupReprintHeaderOnEachPage;
+	}
+	
+	/**
+	 * <p>isGroupResetPageNumber.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupResetPageNumber()
+	{
+		return this.groupResetPageNumber;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>groupMinHeightToStartNewPage</code>.</p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	public Integer getGroupMinHeightToStartNewPage()
+	{
+		return this.groupMinHeightToStartNewPage;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>groupFooterPosition</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 */
+	public GroupFooterPosition getGroupFooterPosition()
+	{
+		return this.groupFooterPosition;
+	}
+	
+	/**
+	 * <p>isGroupKeepTogether.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupKeepTogether()
+	{
+		return this.groupKeepTogether;
+	}
+	
+	/**
+	 * <p>isGroupHeaderWithSubtotal.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupHeaderWithSubtotal()
+	{
+		return this.groupHeaderWithSubtotal;
+	}
+	
+	/**
+	 * <p>isGroupByDataType.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isGroupByDataType()
+	{
+		return this.groupByDataType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>subtotalLabelPosition</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.Position} object.
+	 */
+	public Position getSubtotalLabelPosition()
+	{
+		return this.subtotalLabelPosition;
+	}
+	
+	/**
+	 * <p>isTableOfContents.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isTableOfContents()
+	{
+		return this.tableOfContents;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>tableOfContentsCustomizer</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+	 */
+	public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
+	{
+		return this.tableOfContentsCustomizer;
+	}
+	
+	/**
+	 * <p>isAddGroupToTableOfContents.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isAddGroupToTableOfContents()
+	{
+		return this.addGroupToTableOfContents;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>tableOfContentsPosition</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.TableOfContentsPosition} object.
+	 */
+	public TableOfContentsPosition getTableOfContentsPosition()
+	{
+		return this.tableOfContentsPosition;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>textFieldWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getTextFieldWidth()
+	{
+		return this.textFieldWidth;
+	}
+	
+	/**
+	 * <p>isTextFieldPrintRepeatedValues.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isTextFieldPrintRepeatedValues()
+	{
+		return this.textFieldPrintRepeatedValues;
+	}
+	
+	/**
+	 * <p>isTextFieldStretchWithOverflow.</p>
+	 *
+	 * @return a boolean.
+	 * @deprecated replaced by {@link #getTextFieldTextAdjust(DRITextField)}
+	 */
+	@Deprecated
+	public boolean isTextFieldStretchWithOverflow()
+	{
+		return this.textFieldStretchWithOverflow;
+	}
+	
+	/**
+	 * <p>getTextFieldTextAdjust.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+	 */
+	public TextAdjust getTextFieldTextAdjust()
+	{
+		return null;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>imageWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getImageWidth()
+	{
+		return this.imageWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>imageHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getImageHeight()
+	{
+		return this.imageHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>fillerWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getFillerWidth()
+	{
+		return this.fillerWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>fillerHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getFillerHeight()
+	{
+		return this.fillerHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>lineWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getLineWidth()
+	{
+		return this.lineWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>lineHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getLineHeight()
+	{
+		return this.lineHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>ellipseWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getEllipseWidth()
+	{
+		return this.ellipseWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>ellipseHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getEllipseHeight()
+	{
+		return this.ellipseHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>rectangleRadius</code>.</p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	public Integer getRectangleRadius()
+	{
+		return this.rectangleRadius;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>rectangleWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getRectangleWidth()
+	{
+		return this.rectangleWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>rectangleHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getRectangleHeight()
+	{
+		return this.rectangleHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>mapWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getMapWidth()
+	{
+		return this.mapWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>mapHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getMapHeight()
+	{
+		return this.mapHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>customComponentWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getCustomComponentWidth()
+	{
+		return this.customComponentWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>customComponentHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getCustomComponentHeight()
+	{
+		return this.customComponentHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>breakWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getBreakWidth()
+	{
+		return this.breakWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>breakHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getBreakHeight()
+	{
+		return this.breakHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>genericElementWidth</code>.</p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	public Integer getGenericElementWidth()
+	{
+		return this.genericElementWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>genericElementHeight</code>.</p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	public Integer getGenericElementHeight()
+	{
+		return this.genericElementHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>listWidth</code>.</p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	public Integer getListWidth()
+	{
+		return this.listWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>listHeight</code>.</p>
+	 *
+	 * @return a {@link java.lang.Integer} object.
+	 */
+	public Integer getListHeight()
+	{
+		return this.listHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>listgap</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getListgap()
+	{
+		return this.listgap;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>horizontalCellComponentAlignment</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+	 */
+	public HorizontalCellComponentAlignment getHorizontalCellComponentAlignment()
+	{
+		return this.horizontalCellComponentAlignment;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>verticalCellComponentAlignment</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+	 */
+	public VerticalCellComponentAlignment getVerticalCellComponentAlignment()
+	{
+		return this.verticalCellComponentAlignment;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>multiPageListWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getMultiPageListWidth()
+	{
+		return this.multiPageListWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>multiPageListHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getMultiPageListHeight()
+	{
+		return this.multiPageListHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>subreportWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getSubreportWidth()
+	{
+		return this.subreportWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>subreportHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getSubreportHeight()
+	{
+		return this.subreportHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getCrosstabWidth()
+	{
+		return this.crosstabWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getCrosstabHeight()
+	{
+		return this.crosstabHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabColumnGroupTotalPosition</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 */
+	public CrosstabTotalPosition getCrosstabColumnGroupTotalPosition()
+	{
+		return this.crosstabColumnGroupTotalPosition;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabRowGroupTotalPosition</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 */
+	public CrosstabTotalPosition getCrosstabRowGroupTotalPosition()
+	{
+		return this.crosstabRowGroupTotalPosition;
+	}
+	
+	/**
+	 * <p>isCrosstabColumnGroupShowTotal.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isCrosstabColumnGroupShowTotal()
+	{
+		return this.crosstabColumnGroupShowTotal;
+	}
+	
+	/**
+	 * <p>isCrosstabRowGroupShowTotal.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isCrosstabRowGroupShowTotal()
+	{
+		return this.crosstabRowGroupShowTotal;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabColumnGroupTotalHeaderMaxWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getCrosstabColumnGroupTotalHeaderMaxWidth()
+	{
+		return this.crosstabColumnGroupTotalHeaderMaxWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabRowGroupHeaderMaxWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getCrosstabRowGroupHeaderMaxWidth()
+	{
+		return this.crosstabRowGroupHeaderMaxWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabCellMaxWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getCrosstabCellMaxWidth()
+	{
+		return this.crosstabCellMaxWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabOddRowStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public DRSimpleStyle getCrosstabOddRowStyle()
+	{
+		return this.crosstabOddRowStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabEvenRowStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 */
+	public DRSimpleStyle getCrosstabEvenRowStyle()
+	{
+		return this.crosstabEvenRowStyle;
+	}
+	
+	/**
+	 * <p>isCrosstabHighlightOddRows.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isCrosstabHighlightOddRows()
+	{
+		return this.crosstabHighlightOddRows;
+	}
+	
+	/**
+	 * <p>isCrosstabHighlightEvenRows.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isCrosstabHighlightEvenRows()
+	{
+		return this.crosstabHighlightEvenRows;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabGroupStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getCrosstabGroupStyle()
+	{
+		return this.crosstabGroupStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabGroupTotalStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getCrosstabGroupTotalStyle()
+	{
+		return this.crosstabGroupTotalStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabGrandTotalStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getCrosstabGrandTotalStyle()
+	{
+		return this.crosstabGrandTotalStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabCellStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getCrosstabCellStyle()
+	{
+		return this.crosstabCellStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabMeasureTitleStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 */
+	public DRStyle getCrosstabMeasureTitleStyle()
+	{
+		return this.crosstabMeasureTitleStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>crosstabPercentageType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+	 */
+	public CrosstabPercentageType getCrosstabPercentageType()
+	{
+		return this.crosstabPercentageType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>booleanComponentType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+	 */
+	public BooleanComponentType getBooleanComponentType()
+	{
+		return this.booleanComponentType;
+	}
+	
+	/**
+	 * <p>isBooleanEmptyWhenNullValue.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isBooleanEmptyWhenNullValue()
+	{
+		return this.booleanEmptyWhenNullValue;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>booleanImageWidth</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getBooleanImageWidth()
+	{
+		return this.booleanImageWidth;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>booleanImageHeight</code>.</p>
+	 *
+	 * @return a int.
+	 */
+	public int getBooleanImageHeight()
+	{
+		return this.booleanImageHeight;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>booleanColumnStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 */
+	public DRIStyle getBooleanColumnStyle()
+	{
+		return this.booleanColumnStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>booleanHorizontalImageAlignment</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+	 */
+	public HorizontalImageAlignment getBooleanHorizontalImageAlignment()
+	{
+		return this.booleanHorizontalImageAlignment;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>defaultSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getDefaultSplitType()
+	{
+		return this.defaultSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>titleSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getTitleSplitType()
+	{
+		return this.titleSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageHeaderSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getPageHeaderSplitType()
+	{
+		return this.pageHeaderSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageFooterSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getPageFooterSplitType()
+	{
+		return this.pageFooterSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>columnHeaderSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getColumnHeaderSplitType()
+	{
+		return this.columnHeaderSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>columnFooterSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getColumnFooterSplitType()
+	{
+		return this.columnFooterSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>groupHeaderSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getGroupHeaderSplitType()
+	{
+		return this.groupHeaderSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>groupFooterSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getGroupFooterSplitType()
+	{
+		return this.groupFooterSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>detailHeaderSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getDetailHeaderSplitType()
+	{
+		return this.detailHeaderSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>detailSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getDetailSplitType()
+	{
+		return this.detailSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>detailFooterSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getDetailFooterSplitType()
+	{
+		return this.detailFooterSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>lastPageFooterSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getLastPageFooterSplitType()
+	{
+		return this.lastPageFooterSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>summarySplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getSummarySplitType()
+	{
+		return this.summarySplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>noDataSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getNoDataSplitType()
+	{
+		return this.noDataSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>backgroundSplitType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 */
+	public SplitType getBackgroundSplitType()
+	{
+		return this.backgroundSplitType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>bandStyle</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 */
+	public DRIStyle getBandStyle()
+	{
+		return this.bandStyle;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>bandBackgroundComponent</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 */
+	public DRIComponent getBandBackgroundComponent()
+	{
+		return this.bandBackgroundComponent;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>font</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+	 */
+	public DRFont getFont()
+	{
+		return this.font;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>bigDecimalType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, BigDecimal> getBigDecimalType()
+	{
+		return this.bigDecimalType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>bigIntegerType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, BigInteger> getBigIntegerType()
+	{
+		return this.bigIntegerType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>byteType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, Byte> getByteType()
+	{
+		return this.byteType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>doubleType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, Double> getDoubleType()
+	{
+		return this.doubleType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>floatType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, Float> getFloatType()
+	{
+		return this.floatType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>integerType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, Integer> getIntegerType()
+	{
+		return this.integerType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>longType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, Long> getLongType()
+	{
+		return this.longType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>shortType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, Short> getShortType()
+	{
+		return this.shortType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateType()
+	{
+		return this.dateType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateYearToMonthType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateYearToMonthType()
+	{
+		return this.dateYearToMonthType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateYearToHourType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateYearToHourType()
+	{
+		return this.dateYearToHourType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateYearToMinuteType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateYearToMinuteType()
+	{
+		return this.dateYearToMinuteType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateYearToSecondType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateYearToSecondType()
+	{
+		return this.dateYearToSecondType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateYearToFractionType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateYearToFractionType()
+	{
+		return this.dateYearToFractionType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateYearType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateYearType()
+	{
+		return this.dateYearType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateMonthType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateMonthType()
+	{
+		return this.dateMonthType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>dateDayType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getDateDayType()
+	{
+		return this.dateDayType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>timeHourToMinuteType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getTimeHourToMinuteType()
+	{
+		return this.timeHourToMinuteType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>timeHourToSecondType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getTimeHourToSecondType()
+	{
+		return this.timeHourToSecondType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>timeHourToFractionType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Date, Date> getTimeHourToFractionType()
+	{
+		return this.timeHourToFractionType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>percentageType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Number, Double> getPercentageType()
+	{
+		return this.percentageType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>booleanType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Boolean, Boolean> getBooleanType()
+	{
+		return this.booleanType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>characterType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<Character, Character> getCharacterType()
+	{
+		return this.characterType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>stringType</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 */
+	public DRDataType<String, String> getStringType()
+	{
+		return this.stringType;
+	}
+	
+	/**
+	 * <p>Getter for the field <code>pageXofYHorizontalTextAlignment</code>.</p>
+	 *
+	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+	 */
+	public HorizontalTextAlignment getPageXofYHorizontalTextAlignment()
+	{
+		return this.pageXofYHorizontalTextAlignment;
+	}
+	
+	/**
+	 * <p>isLoadSystemFonts.</p>
+	 *
+	 * @return a boolean.
+	 */
+	public boolean isLoadSystemFonts()
+	{
+		return this.loadSystemFonts;
+	}
+	
+	/**
+	 * <p>Setter for the field <code>loadSystemFonts</code>.</p>
+	 *
+	 * @param loadSystemFonts a boolean.
+	 */
+	protected void setLoadSystemFonts(final boolean loadSystemFonts)
+	{
+		this.loadSystemFonts = loadSystemFonts;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/DefaultBinder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/DefaultBinder.java
new file mode 100644
index 0000000..ea9bd16
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/DefaultBinder.java
@@ -0,0 +1,119 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.defaults;
+
+import net.sf.dynamicreports.report.base.datatype.DRDataType;
+import net.sf.dynamicreports.report.base.style.DRFont;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.xml.XmlDataType;
+import net.sf.dynamicreports.report.defaults.xml.XmlDynamicReports;
+import net.sf.dynamicreports.report.defaults.xml.XmlFont;
+import net.sf.dynamicreports.report.exception.DRReportException;
+
+/**
+ * <p>DefaultBinder class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DefaultBinder {
+
+    /**
+     * <p>bind.</p>
+     *
+     * @param xmlDynamicReports a {@link net.sf.dynamicreports.report.defaults.xml.XmlDynamicReports} object.
+     * @return a {@link net.sf.dynamicreports.report.defaults.Default} object.
+     */
+    public static Default bind(XmlDynamicReports xmlDynamicReports) {
+        Default defaults = new Default();
+        if (xmlDynamicReports != null) {
+            // font
+            bind(defaults.getFont(), xmlDynamicReports.getFont());
+            // data type
+            bind(defaults.getBigDecimalType(), xmlDynamicReports.getBigDecimalType());
+            bind(defaults.getBigIntegerType(), xmlDynamicReports.getBigIntegerType());
+            bind(defaults.getByteType(), xmlDynamicReports.getByteType());
+            bind(defaults.getDoubleType(), xmlDynamicReports.getDoubleType());
+            bind(defaults.getFloatType(), xmlDynamicReports.getFloatType());
+            bind(defaults.getIntegerType(), xmlDynamicReports.getIntegerType());
+            bind(defaults.getLongType(), xmlDynamicReports.getLongType());
+            bind(defaults.getShortType(), xmlDynamicReports.getShortType());
+            bind(defaults.getDateType(), xmlDynamicReports.getDateType());
+            bind(defaults.getDateYearToMonthType(), xmlDynamicReports.getDateYearToMonthType());
+            bind(defaults.getDateYearToHourType(), xmlDynamicReports.getDateYearToHourType());
+            bind(defaults.getDateYearToMinuteType(), xmlDynamicReports.getDateYearToMinuteType());
+            bind(defaults.getDateYearToSecondType(), xmlDynamicReports.getDateYearToSecondType());
+            bind(defaults.getDateYearToFractionType(), xmlDynamicReports.getDateYearToFractionType());
+            bind(defaults.getDateYearType(), xmlDynamicReports.getDateYearType());
+            bind(defaults.getDateMonthType(), xmlDynamicReports.getDateMonthType());
+            bind(defaults.getDateDayType(), xmlDynamicReports.getDateDayType());
+            bind(defaults.getTimeHourToMinuteType(), xmlDynamicReports.getTimeHourToMinuteType());
+            bind(defaults.getTimeHourToSecondType(), xmlDynamicReports.getTimeHourToSecondType());
+            bind(defaults.getTimeHourToFractionType(), xmlDynamicReports.getTimeHourToFractionType());
+            bind(defaults.getPercentageType(), xmlDynamicReports.getPercentageType());
+            bind(defaults.getBooleanType(), xmlDynamicReports.getBooleanType());
+            bind(defaults.getCharacterType(), xmlDynamicReports.getCharacterType());
+            bind(defaults.getStringType(), xmlDynamicReports.getStringType());
+
+            if (xmlDynamicReports.isLoadSystemFonts() != null) {
+                defaults.setLoadSystemFonts(xmlDynamicReports.isLoadSystemFonts());
+            }
+        }
+        return defaults;
+    }
+
+    private static void bind(DRDataType<?, ?> dataType, XmlDataType xmlDataType) {
+        if (xmlDataType == null) {
+            return;
+        }
+
+        if (xmlDataType.getPattern() != null) {
+            dataType.setPattern(xmlDataType.getPattern());
+        }
+        if (xmlDataType.getHorizontalAlignment() != null) {
+            HorizontalTextAlignment alignment = HorizontalTextAlignment.valueOf(xmlDataType.getHorizontalAlignment().name());
+            if (alignment == null) {
+                throw new DRReportException("Horizontal text alignment " + xmlDataType.getHorizontalAlignment().name() + " not supported");
+            }
+            dataType.setHorizontalTextAlignment(alignment);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void bind(DRFont font, XmlFont xmlFont) {
+        if (xmlFont == null) {
+            return;
+        }
+
+        if (xmlFont.getFontName() != null) {
+            font.setFontName(xmlFont.getFontName());
+        }
+        if (xmlFont.getFontSize() != null) {
+            font.setFontSize(xmlFont.getFontSize());
+        }
+        if (xmlFont.getPdfFontName() != null) {
+            font.setPdfFontName(xmlFont.getPdfFontName());
+        }
+        if (xmlFont.getPdfEncoding() != null) {
+            font.setPdfEncoding(xmlFont.getPdfEncoding());
+        }
+        if (xmlFont.isPdfEmbedded() != null) {
+            font.setPdfEmbedded(xmlFont.isPdfEmbedded());
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Defaults.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Defaults.java
new file mode 100644
index 0000000..9cbcc72
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Defaults.java
@@ -0,0 +1,87 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.defaults;
+
+import java.io.InputStream;
+
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+import net.sf.dynamicreports.report.defaults.xml.XmlDynamicReports;
+
+/**
+ * <p>Defaults class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class Defaults {
+    private static final Log log = LogFactory.getLog(Defaults.class);
+
+    private static final Default defaults;
+
+    static {
+        defaults = DefaultBinder.bind(load());
+    }
+
+    private static XmlDynamicReports load() {
+        final String resource = "dynamicreports-defaults.xml";
+        InputStream is = null;
+
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        if (classLoader != null) {
+            is = classLoader.getResourceAsStream(resource);
+        }
+        if (is == null) {
+            classLoader = Defaults.class.getClassLoader();
+            if (classLoader != null) {
+                is = classLoader.getResourceAsStream(resource);
+            }
+            if (is == null) {
+                is = Defaults.class.getResourceAsStream("/" + resource);
+            }
+        }
+        if (is == null) {
+            return null;
+        }
+
+        try {
+            final Unmarshaller unmarshaller = JAXBContext.newInstance(XmlDynamicReports.class).createUnmarshaller();
+            final JAXBElement<XmlDynamicReports> root = unmarshaller.unmarshal(new StreamSource(is), XmlDynamicReports.class);
+            return root.getValue();
+        } catch (final JAXBException e) {
+            log.error("Could not load dynamic reports defaults", e);
+            return null;
+        }
+    }
+
+    /**
+     * <p>Getter for the field <code>defaults</code>.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.defaults.Default} object.
+     */
+    public static Default getDefaults() {
+        return defaults;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIBand.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIBand.java
new file mode 100644
index 0000000..499c4d2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIBand.java
@@ -0,0 +1,54 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.definition.component.DRIList;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIBand interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIBand extends Serializable {
+
+    /**
+     * <p>getSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getSplitType();
+
+    /**
+     * <p>getList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+     */
+    public DRIList getList();
+
+    /**
+     * <p>getPrintWhenExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Boolean> getPrintWhenExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICrosstabValue.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICrosstabValue.java
new file mode 100644
index 0000000..0aab90b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICrosstabValue.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+/**
+ * <p>DRICrosstabValue interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICrosstabValue<T> extends DRIValue<T> {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICustomValues.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICustomValues.java
new file mode 100644
index 0000000..db40c77
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICustomValues.java
@@ -0,0 +1,75 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * <p>DRICustomValues interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICustomValues extends Serializable {
+    /**
+     * Constant <code>NAME="CUSTOM_VALUES"</code>
+     */
+    public static final String NAME = "CUSTOM_VALUES";
+
+    /**
+     * <p>setSystemValue.</p>
+     *
+     * @param name  a {@link java.lang.String} object.
+     * @param value a {@link java.lang.Object} object.
+     */
+    public void setSystemValue(String name, Object value);
+
+    /**
+     * <p>addTocHeading.</p>
+     *
+     * @param level       a int.
+     * @param id          a {@link java.lang.String} object.
+     * @param text        a {@link java.lang.String} object.
+     * @param customValue a {@link java.lang.Object} object.
+     */
+    public void addTocHeading(int level, String id, String text, Object customValue);
+
+    /**
+     * <p>getTocHeadings.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     */
+    public Map<String, JasperTocHeading> getTocHeadings();
+
+    /**
+     * <p>setTocHeadings.</p>
+     *
+     * @param tocHeadings a {@link java.util.Map} object.
+     */
+    public void setTocHeadings(Map<String, JasperTocHeading> tocHeadings);
+
+    /**
+     * <p>setSubreportWidth.</p>
+     *
+     * @param subreportWidth a {@link java.lang.Integer} object.
+     */
+    public void setSubreportWidth(Integer subreportWidth);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIDataset.java
new file mode 100644
index 0000000..501999c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIDataset.java
@@ -0,0 +1,82 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import java.util.List;
+
+/**
+ * <p>DRIDataset interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDataset extends Serializable {
+
+    /**
+     * <p>getFields.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIField<?>> getFields();
+
+    /**
+     * <p>getVariables.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIVariable<?>> getVariables();
+
+    /**
+     * <p>getSorts.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRISort> getSorts();
+
+    /**
+     * <p>getQuery.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIQuery} object.
+     */
+    public DRIQuery getQuery();
+
+    /**
+     * <p>getConnectionExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Connection> getConnectionExpression();
+
+    /**
+     * <p>getDataSourceExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getDataSourceExpression();
+
+    /**
+     * <p>getFilterExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Boolean> getFilterExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIField.java
new file mode 100644
index 0000000..826057f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIField.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIField interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIField<T> extends DRIExpression<T>, DRIValue<T> {
+
+    /**
+     * <p>getDataType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    public DRIDataType<? super T, T> getDataType();
+
+    /**
+     * <p>getDescription.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getDescription();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIGroup.java
new file mode 100644
index 0000000..06c24e4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIGroup.java
@@ -0,0 +1,189 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIGroup interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIGroup extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueField.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+     */
+    public DRITextField<?> getValueField();
+
+    /**
+     * <p>getTitleExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getTitleExpression();
+
+    /**
+     * <p>getTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getTitleStyle();
+
+    /**
+     * <p>getTitleWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getTitleWidth();
+
+    /**
+     * <p>getHeaderLayout.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+     */
+    public GroupHeaderLayout getHeaderLayout();
+
+    /**
+     * <p>getHideColumn.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getHideColumn();
+
+    /**
+     * <p>getGroupByDataType.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupByDataType();
+
+    /**
+     * <p>getShowColumnHeaderAndFooter.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getShowColumnHeaderAndFooter();
+
+    /**
+     * <p>getAddToTableOfContents.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getAddToTableOfContents();
+
+    /**
+     * <p>getPrintSubtotalsWhenExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Boolean> getPrintSubtotalsWhenExpression();
+
+    /**
+     * <p>getPadding.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPadding();
+
+    /**
+     * <p>getStartInNewPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getStartInNewPage();
+
+    /**
+     * <p>getStartInNewColumn.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getStartInNewColumn();
+
+    /**
+     * <p>getReprintHeaderOnEachPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getReprintHeaderOnEachPage();
+
+    /**
+     * <p>getResetPageNumber.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getResetPageNumber();
+
+    /**
+     * <p>getMinHeightToStartNewPage.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getMinHeightToStartNewPage();
+
+    /**
+     * <p>getFooterPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     */
+    public GroupFooterPosition getFooterPosition();
+
+    /**
+     * <p>getKeepTogether.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getKeepTogether();
+
+    /**
+     * <p>getHeaderWithSubtotal.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getHeaderWithSubtotal();
+
+    /**
+     * <p>getHeaderBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getHeaderBand();
+
+    /**
+     * <p>getFooterBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getFooterBand();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIHyperLink.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIHyperLink.java
new file mode 100644
index 0000000..feafda3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIHyperLink.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIHyperLink interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIHyperLink extends Serializable {
+
+    /**
+     * <p>getAnchorExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<String> getAnchorExpression();
+
+    /**
+     * <p>getPageExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Integer> getPageExpression();
+
+    /**
+     * <p>getReferenceExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<String> getReferenceExpression();
+
+    /**
+     * <p>getTooltipExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<String> getTooltipExpression();
+
+    /**
+     * <p>getType.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getType();
+
+    /**
+     * <p>getTarget.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getTarget();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIMargin.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIMargin.java
new file mode 100644
index 0000000..903de30
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIMargin.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIMargin interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIMargin extends Serializable {
+
+    /**
+     * <p>getTop.</p>
+     *
+     * @return a int.
+     */
+    public int getTop();
+
+    /**
+     * <p>getLeft.</p>
+     *
+     * @return a int.
+     */
+    public int getLeft();
+
+    /**
+     * <p>getBottom.</p>
+     *
+     * @return a int.
+     */
+    public int getBottom();
+
+    /**
+     * <p>getRight.</p>
+     *
+     * @return a int.
+     */
+    public int getRight();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIPage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIPage.java
new file mode 100644
index 0000000..2945774
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIPage.java
@@ -0,0 +1,80 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.constant.PageOrientation;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIPage interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIPage extends Serializable {
+
+    /**
+     * <p>getWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getWidth();
+
+    /**
+     * <p>getHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getHeight();
+
+    /**
+     * <p>getOrientation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     */
+    public PageOrientation getOrientation();
+
+    /**
+     * <p>getMargin.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIMargin} object.
+     */
+    public DRIMargin getMargin();
+
+    /**
+     * <p>getColumnsPerPage.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getColumnsPerPage();
+
+    /**
+     * <p>getColumnSpace.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getColumnSpace();
+
+    /**
+     * <p>getIgnorePageWidth.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnorePageWidth();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIParameter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIParameter.java
new file mode 100644
index 0000000..0e5cf4b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIParameter.java
@@ -0,0 +1,47 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIParameter interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIParameter<T> extends DRIValue<T>, Serializable {
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName();
+
+    /**
+     * <p>getValueClass.</p>
+     *
+     * @return a {@link java.lang.Class} object.
+     */
+    public Class<T> getValueClass();
+
+    /**
+     * <p>getValue.</p>
+     *
+     * @return a T object.
+     */
+    public T getValue();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIQuery.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIQuery.java
new file mode 100644
index 0000000..115966b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIQuery.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIQuery interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIQuery extends Serializable {
+
+    /**
+     * <p>getText.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getText();
+
+    /**
+     * <p>getLanguage.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getLanguage();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReport.java
new file mode 100644
index 0000000..cbc70f6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReport.java
@@ -0,0 +1,474 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.column.DRIColumn;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGrid;
+import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
+import net.sf.dynamicreports.report.definition.style.DRIFont;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+
+/**
+ * <p>DRIReport interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIReport extends Serializable {
+
+    /**
+     * <p>getTemplate.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIReportTemplate} object.
+     */
+    public DRIReportTemplate getTemplate();
+
+    /**
+     * <p>getTemplateStyles.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIStyle> getTemplateStyles();
+
+    /**
+     * <p>getTemplateDesign.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRITemplateDesign} object.
+     */
+    public DRITemplateDesign<?> getTemplateDesign();
+
+    /**
+     * <p>getReportName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getReportName();
+
+    /**
+     * <p>getLocale.</p>
+     *
+     * @return a {@link java.util.Locale} object.
+     */
+    public Locale getLocale();
+
+    /**
+     * <p>getResourceBundle.</p>
+     *
+     * @return a {@link java.util.ResourceBundle} object.
+     */
+    public ResourceBundle getResourceBundle();
+
+    /**
+     * <p>getResourceBundleName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getResourceBundleName();
+
+    /**
+     * <p>getShowColumnTitle.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getShowColumnTitle();
+
+    /**
+     * <p>getShowColumnValues.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getShowColumnValues();
+
+    /**
+     * <p>getColumns.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIColumn<?>> getColumns();
+
+    /**
+     * <p>getGroups.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIGroup> getGroups();
+
+    /**
+     * <p>getFields.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIField<?>> getFields();
+
+    /**
+     * <p>getVariables.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIVariable<?>> getVariables();
+
+    /**
+     * <p>getSorts.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRISort> getSorts();
+
+    /**
+     * <p>getSubtotals.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRISubtotal<?>> getSubtotals();
+
+    /**
+     * <p>getParameters.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIParameter<?>> getParameters();
+
+    /**
+     * <p>getParameterValues.</p>
+     *
+     * @return a {@link java.util.Map} object.
+     */
+    public Map<String, Object> getParameterValues();
+
+    /**
+     * <p>getScriptlets.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIScriptlet> getScriptlets();
+
+    /**
+     * <p>getProperties.</p>
+     *
+     * @return a {@link java.util.Properties} object.
+     */
+    public Properties getProperties();
+
+    /**
+     * <p>getQuery.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIQuery} object.
+     */
+    public DRIQuery getQuery();
+
+    /**
+     * <p>getPage.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIPage} object.
+     */
+    public DRIPage getPage();
+
+    /**
+     * <p>getIgnorePagination.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnorePagination();
+
+    /**
+     * <p>getWhenNoDataType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+     */
+    public WhenNoDataType getWhenNoDataType();
+
+    /**
+     * <p>getWhenResourceMissingType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     */
+    public WhenResourceMissingType getWhenResourceMissingType();
+
+    /**
+     * <p>getTitleOnANewPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getTitleOnANewPage();
+
+    /**
+     * <p>getSummaryOnANewPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getSummaryOnANewPage();
+
+    /**
+     * <p>getSummaryWithPageHeaderAndFooter.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getSummaryWithPageHeaderAndFooter();
+
+    /**
+     * <p>getFloatColumnFooter.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFloatColumnFooter();
+
+    /**
+     * <p>getPrintOrder.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+     */
+    public Orientation getPrintOrder();
+
+    /**
+     * <p>getColumnDirection.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public RunDirection getColumnDirection();
+
+    /**
+     * <p>getLanguage.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getLanguage();
+
+    /**
+     * <p>getUseFieldNameAsDescription.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getUseFieldNameAsDescription();
+
+    /**
+     * <p>getDefaultFont.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+     */
+    public DRIFont getDefaultFont();
+
+    /**
+     * <p>getTextStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getTextStyle();
+
+    /**
+     * <p>getColumnTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getColumnTitleStyle();
+
+    /**
+     * <p>getColumnStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getColumnStyle();
+
+    /**
+     * <p>getGroupTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGroupTitleStyle();
+
+    /**
+     * <p>getGroupStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGroupStyle();
+
+    /**
+     * <p>getSubtotalStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getSubtotalStyle();
+
+    /**
+     * <p>getImageStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getImageStyle();
+
+    /**
+     * <p>getHighlightDetailOddRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getHighlightDetailOddRows();
+
+    /**
+     * <p>getDetailOddRowStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     */
+    public DRISimpleStyle getDetailOddRowStyle();
+
+    /**
+     * <p>getHighlightDetailEvenRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getHighlightDetailEvenRows();
+
+    /**
+     * <p>getDetailEvenRowStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     */
+    public DRISimpleStyle getDetailEvenRowStyle();
+
+    /**
+     * <p>getDetailRowHighlighters.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIConditionalStyle> getDetailRowHighlighters();
+
+    /**
+     * <p>getColumnGrid.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGrid} object.
+     */
+    public DRIColumnGrid getColumnGrid();
+
+    /**
+     * <p>getTableOfContents.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getTableOfContents();
+
+    /**
+     * <p>getTableOfContentsCustomizer.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+     */
+    public DRITableOfContentsCustomizer getTableOfContentsCustomizer();
+
+    /**
+     * <p>getFilterExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Boolean> getFilterExpression();
+
+    /**
+     * <p>getTitleBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getTitleBand();
+
+    /**
+     * <p>getPageHeaderBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getPageHeaderBand();
+
+    /**
+     * <p>getPageFooterBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getPageFooterBand();
+
+    /**
+     * <p>getColumnHeaderBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getColumnHeaderBand();
+
+    /**
+     * <p>getColumnFooterBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getColumnFooterBand();
+
+    /**
+     * <p>getDetailBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getDetailBand();
+
+    /**
+     * <p>getDetailHeaderBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getDetailHeaderBand();
+
+    /**
+     * <p>getDetailFooterBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getDetailFooterBand();
+
+    /**
+     * <p>getLastPageFooterBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getLastPageFooterBand();
+
+    /**
+     * <p>getSummaryBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getSummaryBand();
+
+    /**
+     * <p>getNoDataBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getNoDataBand();
+
+    /**
+     * <p>getBackgroundBand.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     */
+    public DRIBand getBackgroundBand();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReportTemplate.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReportTemplate.java
new file mode 100644
index 0000000..3bf77c3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReportTemplate.java
@@ -0,0 +1,867 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.style.DRIFont;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+import net.sf.dynamicreports.report.definition.style.DRIStyle;
+
+/**
+ * <p>DRIReportTemplate interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIReportTemplate extends Serializable {
+
+    /**
+     * <p>getTemplateStyles.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIStyle> getTemplateStyles();
+
+    /**
+     * <p>getLocale.</p>
+     *
+     * @return a {@link java.util.Locale} object.
+     */
+    public Locale getLocale();
+
+    /**
+     * <p>getShowColumnTitle.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getShowColumnTitle();
+
+    /**
+     * <p>getShowColumnValues.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getShowColumnValues();
+
+    /**
+     * <p>getIgnorePagination.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnorePagination();
+
+    /**
+     * <p>getWhenNoDataType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+     */
+    public WhenNoDataType getWhenNoDataType();
+
+    /**
+     * <p>getWhenResourceMissingType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     */
+    public WhenResourceMissingType getWhenResourceMissingType();
+
+    /**
+     * <p>getTitleOnANewPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getTitleOnANewPage();
+
+    /**
+     * <p>getSummaryOnANewPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getSummaryOnANewPage();
+
+    /**
+     * <p>getSummaryWithPageHeaderAndFooter.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getSummaryWithPageHeaderAndFooter();
+
+    /**
+     * <p>getFloatColumnFooter.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFloatColumnFooter();
+
+    /**
+     * <p>getPrintOrder.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+     */
+    public Orientation getPrintOrder();
+
+    /**
+     * <p>getColumnDirection.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public RunDirection getColumnDirection();
+
+    /**
+     * <p>getLanguage.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getLanguage();
+
+    /**
+     * <p>getUseFieldNameAsDescription.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getUseFieldNameAsDescription();
+
+    /**
+     * <p>getHighlightDetailOddRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getHighlightDetailOddRows();
+
+    /**
+     * <p>getDetailOddRowStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     */
+    public DRISimpleStyle getDetailOddRowStyle();
+
+    /**
+     * <p>getHighlightDetailEvenRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getHighlightDetailEvenRows();
+
+    /**
+     * <p>getDetailEvenRowStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     */
+    public DRISimpleStyle getDetailEvenRowStyle();
+
+    /**
+     * <p>getDefaultFont.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+     */
+    public DRIFont getDefaultFont();
+
+    /**
+     * <p>getTextStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getTextStyle();
+
+    /**
+     * <p>getColumnTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getColumnTitleStyle();
+
+    /**
+     * <p>getColumnStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getColumnStyle();
+
+    /**
+     * <p>getGroupTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGroupTitleStyle();
+
+    /**
+     * <p>getGroupStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGroupStyle();
+
+    /**
+     * <p>getSubtotalStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getSubtotalStyle();
+
+    /**
+     * <p>getImageStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getImageStyle();
+
+    /**
+     * <p>getPageWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageWidth();
+
+    /**
+     * <p>getPageHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageHeight();
+
+    /**
+     * <p>getPageOrientation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     */
+    public PageOrientation getPageOrientation();
+
+    /**
+     * <p>getPageMargin.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIMargin} object.
+     */
+    public DRIMargin getPageMargin();
+
+    /**
+     * <p>getPageColumnsPerPage.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageColumnsPerPage();
+
+    /**
+     * <p>getPageColumnSpace.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageColumnSpace();
+
+    /**
+     * <p>getIgnorePageWidth.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnorePageWidth();
+
+    /**
+     * <p>getColumnPrintRepeatedDetailValues.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getColumnPrintRepeatedDetailValues();
+
+    /**
+     * <p>getColumnWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getColumnWidth();
+
+    /**
+     * <p>getGroupHeaderLayout.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+     */
+    public GroupHeaderLayout getGroupHeaderLayout();
+
+    /**
+     * <p>getGroupHideColumn.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupHideColumn();
+
+    /**
+     * <p>getGroupShowColumnHeaderAndFooter.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupShowColumnHeaderAndFooter();
+
+    /**
+     * <p>getGroupPadding.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getGroupPadding();
+
+    /**
+     * <p>getGroupStartInNewPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupStartInNewPage();
+
+    /**
+     * <p>getGroupStartInNewColumn.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupStartInNewColumn();
+
+    /**
+     * <p>getGroupReprintHeaderOnEachPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupReprintHeaderOnEachPage();
+
+    /**
+     * <p>getGroupResetPageNumber.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupResetPageNumber();
+
+    /**
+     * <p>getGroupFooterPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     */
+    public GroupFooterPosition getGroupFooterPosition();
+
+    /**
+     * <p>getGroupKeepTogether.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupKeepTogether();
+
+    /**
+     * <p>getGroupHeaderWithSubtotal.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getGroupHeaderWithSubtotal();
+
+    /**
+     * <p>getSubtotalLabelPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Position} object.
+     */
+    public Position getSubtotalLabelPosition();
+
+    /**
+     * <p>getTableOfContents.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getTableOfContents();
+
+    /**
+     * <p>getTableOfContentsCustomizer.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+     */
+    public DRITableOfContentsCustomizer getTableOfContentsCustomizer();
+
+    /**
+     * <p>getTextFieldWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getTextFieldWidth();
+
+    /**
+     * <p>getImageHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getImageHeight();
+
+    /**
+     * <p>getImageWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getImageWidth();
+
+    /**
+     * <p>getListgap.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getListgap();
+
+    /**
+     * <p>getMultiPageListHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getMultiPageListHeight();
+
+    /**
+     * <p>getMultiPageListWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getMultiPageListWidth();
+
+    /**
+     * <p>getSubreportHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getSubreportHeight();
+
+    /**
+     * <p>getSubreportWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getSubreportWidth();
+
+    /**
+     * <p>getCrosstabHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getCrosstabHeight();
+
+    /**
+     * <p>getCrosstabWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getCrosstabWidth();
+
+    /**
+     * <p>getCrosstabHighlightOddRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCrosstabHighlightOddRows();
+
+    /**
+     * <p>getCrosstabOddRowStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     */
+    public DRISimpleStyle getCrosstabOddRowStyle();
+
+    /**
+     * <p>getCrosstabHighlightEvenRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getCrosstabHighlightEvenRows();
+
+    /**
+     * <p>getCrosstabEvenRowStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     */
+    public DRISimpleStyle getCrosstabEvenRowStyle();
+
+    /**
+     * <p>getCrosstabGroupStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getCrosstabGroupStyle();
+
+    /**
+     * <p>getCrosstabGroupTotalStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getCrosstabGroupTotalStyle();
+
+    /**
+     * <p>getCrosstabGrandTotalStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getCrosstabGrandTotalStyle();
+
+    /**
+     * <p>getCrosstabCellStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getCrosstabCellStyle();
+
+    /**
+     * <p>getCrosstabMeasureTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getCrosstabMeasureTitleStyle();
+
+    /**
+     * <p>getBooleanComponentType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+     */
+    public BooleanComponentType getBooleanComponentType();
+
+    /**
+     * <p>getBooleanEmptyWhenNullValue.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getBooleanEmptyWhenNullValue();
+
+    /**
+     * <p>getBooleanImageWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getBooleanImageWidth();
+
+    /**
+     * <p>getBooleanImageHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getBooleanImageHeight();
+
+    /**
+     * <p>getBooleanColumnStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getBooleanColumnStyle();
+
+    /**
+     * <p>getDefaultSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getDefaultSplitType();
+
+    /**
+     * <p>getTitleSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getTitleSplitType();
+
+    /**
+     * <p>getPageHeaderSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getPageHeaderSplitType();
+
+    /**
+     * <p>getPageFooterSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getPageFooterSplitType();
+
+    /**
+     * <p>getColumnHeaderSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getColumnHeaderSplitType();
+
+    /**
+     * <p>getColumnFooterSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getColumnFooterSplitType();
+
+    /**
+     * <p>getGroupHeaderSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getGroupHeaderSplitType();
+
+    /**
+     * <p>getGroupFooterSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getGroupFooterSplitType();
+
+    /**
+     * <p>getDetailHeaderSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getDetailHeaderSplitType();
+
+    /**
+     * <p>getDetailSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getDetailSplitType();
+
+    /**
+     * <p>getDetailFooterSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getDetailFooterSplitType();
+
+    /**
+     * <p>getLastPageFooterSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getLastPageFooterSplitType();
+
+    /**
+     * <p>getSummarySplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getSummarySplitType();
+
+    /**
+     * <p>getNoDataSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getNoDataSplitType();
+
+    /**
+     * <p>getBackgroundSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getBackgroundSplitType();
+
+    /**
+     * <p>getTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getTitleStyle();
+
+    /**
+     * <p>getPageHeaderStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getPageHeaderStyle();
+
+    /**
+     * <p>getPageFooterStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getPageFooterStyle();
+
+    /**
+     * <p>getColumnHeaderStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getColumnHeaderStyle();
+
+    /**
+     * <p>getColumnFooterStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getColumnFooterStyle();
+
+    /**
+     * <p>getGroupHeaderStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGroupHeaderStyle();
+
+    /**
+     * <p>getGroupFooterStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGroupFooterStyle();
+
+    /**
+     * <p>getDetailHeaderStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getDetailHeaderStyle();
+
+    /**
+     * <p>getDetailStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getDetailStyle();
+
+    /**
+     * <p>getDetailFooterStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getDetailFooterStyle();
+
+    /**
+     * <p>getLastPageFooterStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getLastPageFooterStyle();
+
+    /**
+     * <p>getSummaryStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getSummaryStyle();
+
+    /**
+     * <p>getNoDataStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getNoDataStyle();
+
+    /**
+     * <p>getBackgroundStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getBackgroundStyle();
+
+    /**
+     * <p>getTitleBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getTitleBackgroundComponent();
+
+    /**
+     * <p>getPageHeaderBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getPageHeaderBackgroundComponent();
+
+    /**
+     * <p>getPageFooterBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getPageFooterBackgroundComponent();
+
+    /**
+     * <p>getColumnHeaderBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getColumnHeaderBackgroundComponent();
+
+    /**
+     * <p>getColumnFooterBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getColumnFooterBackgroundComponent();
+
+    /**
+     * <p>getGroupHeaderBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getGroupHeaderBackgroundComponent();
+
+    /**
+     * <p>getGroupFooterBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getGroupFooterBackgroundComponent();
+
+    /**
+     * <p>getDetailHeaderBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getDetailHeaderBackgroundComponent();
+
+    /**
+     * <p>getDetailBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getDetailBackgroundComponent();
+
+    /**
+     * <p>getDetailFooterBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getDetailFooterBackgroundComponent();
+
+    /**
+     * <p>getLastPageFooterBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getLastPageFooterBackgroundComponent();
+
+    /**
+     * <p>getSummaryBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getSummaryBackgroundComponent();
+
+    /**
+     * <p>getNoDataBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getNoDataBackgroundComponent();
+
+    /**
+     * <p>getBackgroundBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getBackgroundBackgroundComponent();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIScriptlet.java
new file mode 100644
index 0000000..004987b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIScriptlet.java
@@ -0,0 +1,106 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+/**
+ * <p>DRIScriptlet interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIScriptlet {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * Called before the report is initialized.
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void beforeReportInit(ReportParameters reportParameters);
+
+    /**
+     * Called after the report is initialized.
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void afterReportInit(ReportParameters reportParameters);
+
+    /**
+     * Called before each page is initialized.
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void beforePageInit(ReportParameters reportParameters);
+
+    /**
+     * Called after each page is initialized.
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void afterPageInit(ReportParameters reportParameters);
+
+    /**
+     * Called before each column is initialized.
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void beforeColumnInit(ReportParameters reportParameters);
+
+    /**
+     * Called after each column is initialized.
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void afterColumnInit(ReportParameters reportParameters);
+
+    /**
+     * Called before a group is initialized.
+     *
+     * @param groupName        the group name
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void beforeGroupInit(String groupName, ReportParameters reportParameters);
+
+    /**
+     * Called after a group is initialized.
+     *
+     * @param groupName        the group name
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void afterGroupInit(String groupName, ReportParameters reportParameters);
+
+    /**
+     * Called before evaluating each detail.
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void beforeDetailEval(ReportParameters reportParameters);
+
+    /**
+     * Called after evaluating each detail.
+     *
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public void afterDetailEval(ReportParameters reportParameters);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISort.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISort.java
new file mode 100644
index 0000000..dd5d98e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISort.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRISort interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRISort extends Serializable {
+
+    /**
+     * <p>getExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getExpression();
+
+    /**
+     * <p>getOrderType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     */
+    public OrderType getOrderType();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISubtotal.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISubtotal.java
new file mode 100644
index 0000000..05dd3d4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISubtotal.java
@@ -0,0 +1,98 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.constant.SubtotalPosition;
+import net.sf.dynamicreports.report.definition.column.DRIColumn;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRISubtotal interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRISubtotal<T> extends DRIExpression<T>, DRIValue<T> {
+
+    /**
+     * <p>getShowInColumn.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
+     */
+    public DRIColumn<?> getShowInColumn();
+
+    /**
+     * <p>getValueField.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+     */
+    public DRITextField<T> getValueField();
+
+    /**
+     * <p>getLabelExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getLabelExpression();
+
+    /**
+     * <p>getLabelStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getLabelStyle();
+
+    /**
+     * <p>getLabelPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Position} object.
+     */
+    public Position getLabelPosition();
+
+    /**
+     * <p>getLabelWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getLabelWidth();
+
+    /**
+     * <p>getLabelWidthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public ComponentDimensionType getLabelWidthType();
+
+    /**
+     * <p>getPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SubtotalPosition} object.
+     */
+    public SubtotalPosition getPosition();
+
+    /**
+     * <p>getGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    public DRIGroup getGroup();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsCustomizer.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsCustomizer.java
new file mode 100644
index 0000000..b6902f9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsCustomizer.java
@@ -0,0 +1,74 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>DRITableOfContentsCustomizer interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRITableOfContentsCustomizer extends Serializable {
+
+    /**
+     * <p>setReport.</p>
+     *
+     * @param report a {@link net.sf.dynamicreports.report.builder.ReportBuilder} object.
+     */
+    public void setReport(ReportBuilder<?> report);
+
+    /**
+     * <p>setHeadingList.</p>
+     *
+     * @param headingList a {@link java.util.List} object.
+     */
+    public void setHeadingList(List<JasperTocHeading> headingList);
+
+    /**
+     * <p>setHeadings.</p>
+     *
+     * @param headings a int.
+     */
+    public void setHeadings(int headings);
+
+    /**
+     * <p>setLevels.</p>
+     *
+     * @param levels a int.
+     */
+    public void setLevels(int levels);
+
+    /**
+     * <p>customize.</p>
+     */
+    public void customize();
+
+    /**
+     * <p>getPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TableOfContentsPosition} object.
+     */
+    public TableOfContentsPosition getPosition();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsHeading.java
new file mode 100644
index 0000000..e2423ec
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsHeading.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRITableOfContentsHeading interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRITableOfContentsHeading extends Serializable {
+
+    /**
+     * <p>getParentHeading.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsHeading} object.
+     */
+    public DRITableOfContentsHeading getParentHeading();
+
+    /**
+     * <p>getLabelExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<String> getLabelExpression();
+
+    /**
+     * <p>getCustomValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getCustomValueExpression();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITemplateDesign.java
new file mode 100644
index 0000000..29f574a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITemplateDesign.java
@@ -0,0 +1,233 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>DRITemplateDesign interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRITemplateDesign<T> extends Serializable {
+
+    /**
+     * <p>getReportName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getReportName();
+
+    /**
+     * <p>getFields.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIField<?>> getFields();
+
+    /**
+     * <p>isDefinedParameter.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @return a boolean.
+     */
+    public boolean isDefinedParameter(String name);
+
+    /**
+     * <p>getResourceBundleName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getResourceBundleName();
+
+    /**
+     * <p>getIgnorePagination.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnorePagination();
+
+    /**
+     * <p>getWhenNoDataType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+     */
+    public WhenNoDataType getWhenNoDataType();
+
+    /**
+     * <p>getWhenResourceMissingType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     */
+    public WhenResourceMissingType getWhenResourceMissingType();
+
+    /**
+     * <p>getTitleOnANewPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getTitleOnANewPage();
+
+    /**
+     * <p>getSummaryOnANewPage.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getSummaryOnANewPage();
+
+    /**
+     * <p>getSummaryWithPageHeaderAndFooter.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getSummaryWithPageHeaderAndFooter();
+
+    /**
+     * <p>getFloatColumnFooter.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getFloatColumnFooter();
+
+    /**
+     * <p>getPageWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageWidth();
+
+    /**
+     * <p>getPageHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageHeight();
+
+    /**
+     * <p>getPageOrientation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     */
+    public PageOrientation getPageOrientation();
+
+    /**
+     * <p>getPageMargin.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIMargin} object.
+     */
+    public DRIMargin getPageMargin();
+
+    /**
+     * <p>getPageColumnsPerPage.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageColumnsPerPage();
+
+    /**
+     * <p>getPageColumnSpace.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageColumnSpace();
+
+    /**
+     * <p>getPageColumnWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageColumnWidth();
+
+    /**
+     * <p>getTitleComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getTitleComponentsCount();
+
+    /**
+     * <p>getPageHeaderComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getPageHeaderComponentsCount();
+
+    /**
+     * <p>getPageFooterComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getPageFooterComponentsCount();
+
+    /**
+     * <p>getColumnHeaderComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getColumnHeaderComponentsCount();
+
+    /**
+     * <p>getColumnFooterComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getColumnFooterComponentsCount();
+
+    /**
+     * <p>getLastPageFooterComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getLastPageFooterComponentsCount();
+
+    /**
+     * <p>getSummaryComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getSummaryComponentsCount();
+
+    /**
+     * <p>getNoDataComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getNoDataComponentsCount();
+
+    /**
+     * <p>getBackgroundComponentsCount.</p>
+     *
+     * @return a int.
+     */
+    public int getBackgroundComponentsCount();
+
+    /**
+     * <p>getDesign.</p>
+     *
+     * @return a T object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public T getDesign() throws DRException;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIValue.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIValue.java
new file mode 100644
index 0000000..bbf16c4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIValue.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+/**
+ * <p>DRIValue interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIValue<T> {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIVariable.java
new file mode 100644
index 0000000..16f321a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIVariable.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIVariable interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIVariable<T> extends DRIExpression<T>, DRIValue<T> {
+
+    /**
+     * <p>getCalculation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public Calculation getCalculation();
+
+    /**
+     * <p>getResetType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     */
+    public Evaluation getResetType();
+
+    /**
+     * <p>getResetGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    public DRIGroup getResetGroup();
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getValueExpression();
+
+    /**
+     * <p>getInitialValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getInitialValueExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/ReportParameters.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/ReportParameters.java
new file mode 100644
index 0000000..b32a42c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/ReportParameters.java
@@ -0,0 +1,182 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition;
+
+import java.sql.Connection;
+import java.util.Locale;
+
+/**
+ * <p>ReportParameters interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface ReportParameters {
+    /**
+     * Constant <code>CROSSTAB_ROW_COUNTER="CROSSTAB_ROW_NUMBER"</code>
+     */
+    public static final String CROSSTAB_ROW_COUNTER = "CROSSTAB_ROW_NUMBER";
+
+    /**
+     * <p>getValue.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @param <T>  a T object.
+     * @return a T object.
+     */
+    public <T> T getValue(String name);
+
+    /**
+     * <p>getValue.</p>
+     *
+     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param <T>   a T object.
+     * @return a T object.
+     */
+    public <T> T getValue(DRIValue<T> value);
+
+    /**
+     * <p>getFieldValue.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @param <T>  a T object.
+     * @return a T object.
+     */
+    public <T> T getFieldValue(String name);
+
+    /**
+     * <p>getVariableValue.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @param <T>  a T object.
+     * @return a T object.
+     */
+    public <T> T getVariableValue(String name);
+
+    /**
+     * <p>getParameterValue.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @param <T>  a T object.
+     * @return a T object.
+     */
+    public <T> T getParameterValue(String name);
+
+    /**
+     * <p>getPageNumber.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageNumber();
+
+    /**
+     * <p>getColumnNumber.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getColumnNumber();
+
+    /**
+     * <p>getReportRowNumber.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getReportRowNumber();
+
+    /**
+     * <p>getPageRowNumber.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageRowNumber();
+
+    /**
+     * <p>getColumnRowNumber.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getColumnRowNumber();
+
+    /**
+     * <p>getCrosstabRowNumber.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getCrosstabRowNumber();
+
+    /**
+     * <p>getGroupCount.</p>
+     *
+     * @param groupName a {@link java.lang.String} object.
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getGroupCount(String groupName);
+
+    /**
+     * <p>getConnection.</p>
+     *
+     * @return a {@link java.sql.Connection} object.
+     */
+    public Connection getConnection();
+
+    /**
+     * <p>getLocale.</p>
+     *
+     * @return a {@link java.util.Locale} object.
+     */
+    public Locale getLocale();
+
+    /**
+     * <p>getScriptlet.</p>
+     *
+     * @param name a {@link java.lang.String} object.
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIScriptlet} object.
+     */
+    public DRIScriptlet getScriptlet(String name);
+
+    /**
+     * <p>getMessage.</p>
+     *
+     * @param key a {@link java.lang.String} object.
+     * @return a {@link java.lang.String} object.
+     */
+    public String getMessage(String key);
+
+    /**
+     * <p>getMessage.</p>
+     *
+     * @param key       a {@link java.lang.String} object.
+     * @param arguments an array of {@link java.lang.Object} objects.
+     * @return a {@link java.lang.String} object.
+     */
+    public String getMessage(String key, Object[] arguments);
+
+    /**
+     * <p>getMasterParameters.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     */
+    public ReportParameters getMasterParameters();
+
+    /**
+     * <p>getSubreportWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getSubreportWidth();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIBooleanColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIBooleanColumn.java
new file mode 100644
index 0000000..8cf197c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIBooleanColumn.java
@@ -0,0 +1,32 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.column;
+
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIBooleanColumn interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIBooleanColumn extends DRIExpression<Boolean>, DRIColumn<DRIBooleanField>, DRIValue<Boolean> {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIColumn.java
new file mode 100644
index 0000000..eba7b3e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIColumn.java
@@ -0,0 +1,109 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.column;
+
+import java.util.List;
+
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.component.DRIComponent;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRIColumn interface.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public interface DRIColumn<T extends DRIComponent> extends DRIColumnGridComponent {
+
+    /**
+     * <p>getComponent.</p>
+     *
+     * @return a T object.
+     */
+    T getComponent();
+
+    /**
+     * <p>getTitleExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<?> getTitleExpression();
+
+    /**
+     * <p>getTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    DRIReportStyle getTitleStyle();
+
+    /**
+     * <p>getTitleHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    Integer getTitleHeight();
+
+    /**
+     * <p>getTitleHeightType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    ComponentDimensionType getTitleHeightType();
+
+    /**
+     * <p>getTitleRows.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    Integer getTitleRows();
+
+    /**
+     * <p>getTitleStretchWithOverflow.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #getTitleTextAdjust()}
+     */
+    @Deprecated
+    Boolean getTitleStretchWithOverflow();
+
+    /**
+     * <p>getTitlePropertyExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    List<DRIPropertyExpression> getTitlePropertyExpressions();
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    String getName();
+
+    /**
+     * <p>getTitleTextAdjust.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    TextAdjust getTitleTextAdjust();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIValueColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIValueColumn.java
new file mode 100644
index 0000000..980b867
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIValueColumn.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.column;
+
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.component.DRITextField;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIValueColumn interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIValueColumn<T> extends DRIExpression<T>, DRIColumn<DRITextField<T>>, DRIValue<T> {
+
+    /**
+     * <p>getPrintRepeatedDetailValues.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getPrintRepeatedDetailValues();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBooleanField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBooleanField.java
new file mode 100644
index 0000000..4adbbe9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBooleanField.java
@@ -0,0 +1,81 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIBooleanField interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIBooleanField extends DRIHyperLinkComponent {
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Boolean> getValueExpression();
+
+    /**
+     * <p>getComponentType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+     */
+    public BooleanComponentType getComponentType();
+
+    /**
+     * <p>getEmptyWhenNullValue.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getEmptyWhenNullValue();
+
+    /**
+     * <p>getImageWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getImageWidth();
+
+    /**
+     * <p>getImageHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getImageHeight();
+
+    /**
+     * <p>getHorizontalImageAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public HorizontalImageAlignment getHorizontalImageAlignment();
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public HorizontalTextAlignment getHorizontalTextAlignment();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBreak.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBreak.java
new file mode 100644
index 0000000..9f0a452
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBreak.java
@@ -0,0 +1,37 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.BreakType;
+
+/**
+ * <p>DRIBreak interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIBreak extends DRIComponent {
+
+    /**
+     * <p>getType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     */
+    public BreakType getType();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIComponent.java
new file mode 100644
index 0000000..4ad35f9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIComponent.java
@@ -0,0 +1,70 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.definition.DRITableOfContentsHeading;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>DRIComponent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIComponent extends Serializable {
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getStyle();
+
+    /**
+     * <p>getPrintWhenExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Boolean> getPrintWhenExpression();
+
+    /**
+     * <p>getRemoveLineWhenBlank.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getRemoveLineWhenBlank();
+
+    /**
+     * <p>getPropertyExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIPropertyExpression> getPropertyExpressions();
+
+    /**
+     * <p>getTableOfContentsHeading.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsHeading} object.
+     */
+    public DRITableOfContentsHeading getTableOfContentsHeading();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRICurrentDate.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRICurrentDate.java
new file mode 100644
index 0000000..3ec5339
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRICurrentDate.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+/**
+ * <p>DRICurrentDate interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICurrentDate extends DRIFormatField {
+
+    /**
+     * <p>getPattern.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPattern();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIDimensionComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIDimensionComponent.java
new file mode 100644
index 0000000..45dcb89
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIDimensionComponent.java
@@ -0,0 +1,95 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+
+/**
+ * <p>DRIDimensionComponent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDimensionComponent extends DRIComponent {
+
+    /**
+     * <p>getWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getWidth();
+
+    /**
+     * <p>getHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getHeight();
+
+    /**
+     * <p>getWidthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public ComponentDimensionType getWidthType();
+
+    /**
+     * <p>getHeightType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public ComponentDimensionType getHeightType();
+
+    /**
+     * <p>getPositionType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     */
+    public ComponentPositionType getPositionType();
+
+    /**
+     * <p>getStretchType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     */
+    public StretchType getStretchType();
+
+    /**
+     * <p>getPrintInFirstWholeBand.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getPrintInFirstWholeBand();
+
+    /**
+     * <p>getPrintWhenDetailOverflows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getPrintWhenDetailOverflows();
+
+    /**
+     * <p>getPrintWhenGroupChanges.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    public DRIGroup getPrintWhenGroupChanges();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIEllipse.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIEllipse.java
new file mode 100644
index 0000000..ffff5bb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIEllipse.java
@@ -0,0 +1,37 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.definition.style.DRIPen;
+
+/**
+ * <p>DRIEllipse interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIEllipse extends DRIDimensionComponent {
+
+    /**
+     * <p>getPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     */
+    public DRIPen getPen();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFiller.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFiller.java
new file mode 100644
index 0000000..e2f3424
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFiller.java
@@ -0,0 +1,27 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+/**
+ * <p>DRIFiller interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIFiller extends DRIDimensionComponent {
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFormatField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFormatField.java
new file mode 100644
index 0000000..9e8826f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFormatField.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIFormatField interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIFormatField extends DRIHyperLinkComponent {
+
+    /**
+     * <p>getFormatExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<String> getFormatExpression();
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public HorizontalTextAlignment getHorizontalTextAlignment();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIGenericElement.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIGenericElement.java
new file mode 100644
index 0000000..c800b50
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIGenericElement.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+
+import java.util.List;
+
+/**
+ * <p>DRIGenericElement interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIGenericElement extends DRIDimensionComponent {
+
+    /**
+     * <p>getGenericElementNamespace.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getGenericElementNamespace();
+
+    /**
+     * <p>getGenericElementName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getGenericElementName();
+
+    /**
+     * <p>getParameterExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIParameterExpression> getParameterExpressions();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIHyperLinkComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIHyperLinkComponent.java
new file mode 100644
index 0000000..bd66222
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIHyperLinkComponent.java
@@ -0,0 +1,51 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.definition.DRIHyperLink;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIHyperLinkComponent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIHyperLinkComponent extends DRIDimensionComponent {
+
+    /**
+     * <p>getAnchorNameExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<String> getAnchorNameExpression();
+
+    /**
+     * <p>getBookmarkLevel.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getBookmarkLevel();
+
+    /**
+     * <p>getHyperLink.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIHyperLink} object.
+     */
+    public DRIHyperLink getHyperLink();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIImage.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIImage.java
new file mode 100644
index 0000000..aeac11f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIImage.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIImage interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIImage extends DRIHyperLinkComponent {
+
+    /**
+     * <p>getImageExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getImageExpression();
+
+    /**
+     * <p>getImageScale.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     */
+    public ImageScale getImageScale();
+
+    /**
+     * <p>getUsingCache.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getUsingCache();
+
+    /**
+     * <p>getLazy.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getLazy();
+
+    /**
+     * <p>getHorizontalImageAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public HorizontalImageAlignment getHorizontalImageAlignment();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRILine.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRILine.java
new file mode 100644
index 0000000..a402f9d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRILine.java
@@ -0,0 +1,45 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.LineDirection;
+import net.sf.dynamicreports.report.definition.style.DRIPen;
+
+/**
+ * <p>DRILine interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRILine extends DRIDimensionComponent {
+
+    /**
+     * <p>getDirection.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     */
+    public LineDirection getDirection();
+
+    /**
+     * <p>getPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     */
+    public DRIPen getPen();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIList.java
new file mode 100644
index 0000000..a6f9f29
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIList.java
@@ -0,0 +1,59 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.ListType;
+
+import java.util.List;
+
+/**
+ * <p>DRIList interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIList extends DRIDimensionComponent {
+
+    /**
+     * <p>getListCells.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIListCell> getListCells();
+
+    /**
+     * <p>getType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public ListType getType();
+
+    /**
+     * <p>getGap.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getGap();
+
+    /**
+     * <p>getBackgroundComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getBackgroundComponent();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIListCell.java
new file mode 100644
index 0000000..8a7fc46
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIListCell.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIListCell interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIListCell extends Serializable {
+
+    /**
+     * <p>getHorizontalAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     */
+    public HorizontalCellComponentAlignment getHorizontalAlignment();
+
+    /**
+     * <p>getVerticalAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     */
+    public VerticalCellComponentAlignment getVerticalAlignment();
+
+    /**
+     * <p>getComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getComponent();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMap.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMap.java
new file mode 100644
index 0000000..8932423
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMap.java
@@ -0,0 +1,51 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIMap interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIMap extends DRIDimensionComponent {
+
+    /**
+     * <p>getLatitudeExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Float> getLatitudeExpression();
+
+    /**
+     * <p>getLongitudeExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Float> getLongitudeExpression();
+
+    /**
+     * <p>getZoomExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Integer> getZoomExpression();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMultiPageList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMultiPageList.java
new file mode 100644
index 0000000..58460e7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMultiPageList.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.SplitType;
+
+import java.util.List;
+
+/**
+ * <p>DRIMultiPageList interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIMultiPageList extends DRIDimensionComponent {
+
+    /**
+     * <p>getComponents.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIComponent> getComponents();
+
+    /**
+     * <p>getSplitType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     */
+    public SplitType getSplitType();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageNumber.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageNumber.java
new file mode 100644
index 0000000..0576577
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageNumber.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+/**
+ * <p>DRIPageNumber interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIPageNumber extends DRIFormatField {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageXofY.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageXofY.java
new file mode 100644
index 0000000..f6f54af
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageXofY.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+
+/**
+ * <p>DRIPageXofY interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIPageXofY extends DRIFormatField {
+
+    /**
+     * <p>getPageXWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageXWidth();
+
+    /**
+     * <p>getPageXWidthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public ComponentDimensionType getPageXWidthType();
+
+    /**
+     * <p>getPageYWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getPageYWidth();
+
+    /**
+     * <p>getPageYWidthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    public ComponentDimensionType getPageYWidthType();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIRectangle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIRectangle.java
new file mode 100644
index 0000000..914484e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIRectangle.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.definition.style.DRIPen;
+
+/**
+ * <p>DRIRectangle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIRectangle extends DRIDimensionComponent {
+
+    /**
+     * <p>getRadius.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getRadius();
+
+    /**
+     * <p>getPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     */
+    public DRIPen getPen();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRISubreport.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRISubreport.java
new file mode 100644
index 0000000..befa6a8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRISubreport.java
@@ -0,0 +1,67 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+import java.sql.Connection;
+import java.util.Map;
+
+/**
+ * <p>DRISubreport interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRISubreport extends DRIDimensionComponent {
+
+    /**
+     * <p>getReportExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getReportExpression();
+
+    /**
+     * <p>getParametersExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Map<String, Object>> getParametersExpression();
+
+    /**
+     * <p>getConnectionExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Connection> getConnectionExpression();
+
+    /**
+     * <p>getDataSourceExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getDataSourceExpression();
+
+    /**
+     * <p>getRunToBottom.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getRunToBottom();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITextField.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITextField.java
new file mode 100644
index 0000000..824157e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITextField.java
@@ -0,0 +1,136 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.DRIGroup;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+
+/**
+ * <p>DRITextField interface.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public interface DRITextField<T> extends DRIHyperLinkComponent {
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<T> getValueExpression();
+
+    /**
+     * <p>getPattern.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    String getPattern();
+
+    /**
+     * <p>getPatternExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<String> getPatternExpression();
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    HorizontalTextAlignment getHorizontalTextAlignment();
+
+    /**
+     * <p>getValueFormatter.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     */
+    DRIValueFormatter<?, ? super T> getValueFormatter();
+
+    /**
+     * <p>getDataType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    DRIDataType<? super T, T> getDataType();
+
+    /**
+     * <p>getColumns.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    Integer getColumns();
+
+    /**
+     * <p>getRows.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    Integer getRows();
+
+    /**
+     * <p>getEvaluationTime.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     */
+    Evaluation getEvaluationTime();
+
+    /**
+     * <p>getEvaluationGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     */
+    DRIGroup getEvaluationGroup();
+
+    /**
+     * <p>getMarkup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     */
+    Markup getMarkup();
+
+    /**
+     * <p>getStretchWithOverflow.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     * @deprecated replaced {@link #getTextAdjust()}
+     */
+    @Deprecated
+    Boolean getStretchWithOverflow();
+
+    /**
+     * <p>getPrintRepeatedValues.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    Boolean getPrintRepeatedValues();
+
+    /**
+     * <p>getTextAdjust.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    TextAdjust getTextAdjust();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITotalPages.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITotalPages.java
new file mode 100644
index 0000000..0bdaf22
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITotalPages.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+/**
+ * <p>DRITotalPages interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRITotalPages extends DRIFormatField {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyList.java
new file mode 100644
index 0000000..725a007
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyList.java
@@ -0,0 +1,37 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import java.util.List;
+
+/**
+ * <p>DRIXyList interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIXyList extends DRIDimensionComponent {
+
+    /**
+     * <p>getXyListCells.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIXyListCell> getXyListCells();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyListCell.java
new file mode 100644
index 0000000..cac33f7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyListCell.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.component;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIXyListCell interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIXyListCell extends Serializable {
+
+    /**
+     * <p>getX.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getX();
+
+    /**
+     * <p>getY.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getY();
+
+    /**
+     * <p>getComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     */
+    public DRIComponent getComponent();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstab.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstab.java
new file mode 100644
index 0000000..901e8fc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstab.java
@@ -0,0 +1,195 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+
+import java.util.List;
+
+/**
+ * <p>DRICrosstab interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICrosstab extends DRIDimensionComponent {
+
+    /**
+     * <p>getDataset.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabDataset} object.
+     */
+    public DRICrosstabDataset getDataset();
+
+    /**
+     * <p>isRepeatColumnHeaders.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean isRepeatColumnHeaders();
+
+    /**
+     * <p>isRepeatRowHeaders.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean isRepeatRowHeaders();
+
+    /**
+     * <p>getColumnBreakOffset.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getColumnBreakOffset();
+
+    /**
+     * <p>getIgnoreWidth.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getIgnoreWidth();
+
+    /**
+     * <p>getRunDirection.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     */
+    public RunDirection getRunDirection();
+
+    /**
+     * <p>getCellWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getCellWidth();
+
+    /**
+     * <p>getCellHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getCellHeight();
+
+    /**
+     * <p>getHighlightOddRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getHighlightOddRows();
+
+    /**
+     * <p>getOddRowStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     */
+    public DRISimpleStyle getOddRowStyle();
+
+    /**
+     * <p>getHighlightEvenRows.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getHighlightEvenRows();
+
+    /**
+     * <p>getEvenRowStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     */
+    public DRISimpleStyle getEvenRowStyle();
+
+    /**
+     * <p>getGroupStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGroupStyle();
+
+    /**
+     * <p>getGroupTotalStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGroupTotalStyle();
+
+    /**
+     * <p>getGrandTotalStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getGrandTotalStyle();
+
+    /**
+     * <p>getCellStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getCellStyle();
+
+    /**
+     * <p>getMeasureTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getMeasureTitleStyle();
+
+    /**
+     * <p>getWhenNoDataCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellContent} object.
+     */
+    public DRICrosstabCellContent getWhenNoDataCell();
+
+    /**
+     * <p>getHeaderCell.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellContent} object.
+     */
+    public DRICrosstabCellContent getHeaderCell();
+
+    /**
+     * <p>getColumnGroups.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRICrosstabColumnGroup<?>> getColumnGroups();
+
+    /**
+     * <p>getRowGroups.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRICrosstabRowGroup<?>> getRowGroups();
+
+    /**
+     * <p>getVariables.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRICrosstabVariable<?>> getVariables();
+
+    /**
+     * <p>getMeasures.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRICrosstabMeasure<?>> getMeasures();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java
new file mode 100644
index 0000000..2e0c0bd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+import net.sf.dynamicreports.report.definition.component.DRIList;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRICrosstabCellContent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICrosstabCellContent extends Serializable {
+
+    /**
+     * <p>getList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+     */
+    public DRIList getList();
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getStyle();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java
new file mode 100644
index 0000000..f72452d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java
@@ -0,0 +1,52 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRICrosstabCellStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICrosstabCellStyle extends Serializable {
+
+    /**
+     * <p>getRowGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+     */
+    public DRICrosstabRowGroup<?> getRowGroup();
+
+    /**
+     * <p>getColumnGroup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+     */
+    public DRICrosstabColumnGroup<?> getColumnGroup();
+
+    /**
+     * <p>getStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getStyle();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java
new file mode 100644
index 0000000..4763279
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java
@@ -0,0 +1,41 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+/**
+ * <p>DRICrosstabColumnGroup interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICrosstabColumnGroup<T> extends DRICrosstabGroup<T> {
+
+    /**
+     * <p>getHeaderHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getHeaderHeight();
+
+    /**
+     * <p>getTotalHeaderWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getTotalHeaderWidth();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java
new file mode 100644
index 0000000..6363de3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java
@@ -0,0 +1,45 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+import net.sf.dynamicreports.report.definition.DRIDataset;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRICrosstabDataset interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICrosstabDataset extends Serializable {
+
+    /**
+     * <p>getSubDataset.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     */
+    public DRIDataset getSubDataset();
+
+    /**
+     * <p>getDataPreSorted.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getDataPreSorted();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java
new file mode 100644
index 0000000..a226fc3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java
@@ -0,0 +1,188 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+import java.util.Comparator;
+import java.util.List;
+
+import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.DRIHyperLink;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRICrosstabGroup interface.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public interface DRICrosstabGroup<T> extends DRISystemExpression<T> {
+
+    /** {@inheritDoc} */
+    @Override String getName();
+
+    /**
+     * <p>getHeaderPattern.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    String getHeaderPattern();
+
+    /**
+     * <p>getHeaderHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    HorizontalTextAlignment getHeaderHorizontalTextAlignment();
+
+    /**
+     * <p>getHeaderValueFormatter.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     */
+    DRIValueFormatter<?, ? super T> getHeaderValueFormatter();
+
+    /**
+     * <p>getHeaderStretchWithOverflow.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #getHeaderTextAdjust()}
+     */
+    @Deprecated
+    Boolean getHeaderStretchWithOverflow();
+
+    /**
+     * <p>getHeaderTextAdjust.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    TextAdjust getHeaderTextAdjust();
+
+    /**
+     * <p>getHeaderHyperLink.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIHyperLink} object.
+     */
+    DRIHyperLink getHeaderHyperLink();
+
+    /**
+     * <p>getHeaderStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    DRIReportStyle getHeaderStyle();
+
+    /**
+     * <p>getHeaderPropertyExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    List<DRIPropertyExpression> getHeaderPropertyExpressions();
+
+    /**
+     * <p>getShowTotal.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    Boolean getShowTotal();
+
+    /**
+     * <p>getTotalPosition.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     */
+    CrosstabTotalPosition getTotalPosition();
+
+    /**
+     * <p>getTotalHeaderExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<?> getTotalHeaderExpression();
+
+    /**
+     * <p>getTotalHeaderStretchWithOverflow.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #getTotalHeaderTextAdjust()}
+     */
+    @Deprecated Boolean getTotalHeaderStretchWithOverflow();
+
+    /**
+     * <p>getTotalHeaderTextAdjust.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    TextAdjust getTotalHeaderTextAdjust();
+
+    /**
+     * <p>getTotalHeaderStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    DRIReportStyle getTotalHeaderStyle();
+
+    /**
+     * <p>getTotalHeaderPropertyExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    List<DRIPropertyExpression> getTotalHeaderPropertyExpressions();
+
+    /**
+     * <p>getExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<T> getExpression();
+
+    /**
+     * <p>getDataType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    DRIDataType<? super T, T> getDataType();
+
+    /**
+     * <p>getOrderByExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<? extends Comparable<?>> getOrderByExpression();
+
+    /**
+     * <p>getOrderType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     */
+    OrderType getOrderType();
+
+    /**
+     * <p>getComparatorExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<? extends Comparator<?>> getComparatorExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java
new file mode 100644
index 0000000..490cbbe
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java
@@ -0,0 +1,131 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+import java.io.Serializable;
+import java.util.List;
+
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.DRIHyperLink;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRICrosstabMeasure interface.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public interface DRICrosstabMeasure<T> extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    String getName();
+
+    /**
+     * <p>getDataType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     */
+    DRIDataType<? super T, T> getDataType();
+
+    /**
+     * <p>getExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<?> getExpression();
+
+    /**
+     * <p>getPattern.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    String getPattern();
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    HorizontalTextAlignment getHorizontalTextAlignment();
+
+    /**
+     * <p>getValueFormatter.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     */
+    DRIValueFormatter<?, ? super T> getValueFormatter();
+
+    /**
+     * <p>getStretchWithOverflow.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #getTextAdjust()}
+     */
+    @Deprecated Boolean getStretchWithOverflow();
+
+    /**
+     * <p>getTextAdjust.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    TextAdjust getTextAdjust();
+
+    /**
+     * <p>getHyperLink.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.DRIHyperLink} object.
+     */
+    DRIHyperLink getHyperLink();
+
+    /**
+     * <p>getPropertyExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    List<DRIPropertyExpression> getPropertyExpressions();
+
+    /**
+     * <p>getStyles.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    List<DRICrosstabCellStyle> getStyles();
+
+    /**
+     * <p>getTitleExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<?> getTitleExpression();
+
+    /**
+     * <p>getTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    DRIReportStyle getTitleStyle();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java
new file mode 100644
index 0000000..526e729
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java
@@ -0,0 +1,41 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+/**
+ * <p>DRICrosstabRowGroup interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICrosstabRowGroup<T> extends DRICrosstabGroup<T> {
+
+    /**
+     * <p>getHeaderWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getHeaderWidth();
+
+    /**
+     * <p>getTotalHeaderHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getTotalHeaderHeight();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java
new file mode 100644
index 0000000..5868b30
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.crosstab;
+
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
+
+/**
+ * <p>DRICrosstabVariable interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRICrosstabVariable<T> extends DRISystemExpression<T>, DRIValue<T> {
+
+    /** {@inheritDoc} */
+    @Override
+    public Class<? super T> getValueClass();
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getValueExpression();
+
+    /**
+     * <p>getCalculation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     */
+    public Calculation getCalculation();
+
+    /**
+     * <p>getPercentageType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     */
+    public CrosstabPercentageType getPercentageType();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/datatype/DRIDataType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/datatype/DRIDataType.java
new file mode 100644
index 0000000..495a3a5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/datatype/DRIDataType.java
@@ -0,0 +1,121 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.datatype;
+
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.report.exception.DRException;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+/**
+ * <p>DRIDataType interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIDataType<U, T extends U> extends Serializable {
+
+    /**
+     * <p>getPattern.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPattern();
+
+    /**
+     * <p>getValueFormatter.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     */
+    public DRIValueFormatter<?, ? extends U> getValueFormatter();
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public HorizontalTextAlignment getHorizontalTextAlignment();
+
+    /**
+     * <p>valueToString.</p>
+     *
+     * @param value  a U object.
+     * @param locale a {@link java.util.Locale} object.
+     * @return a {@link java.lang.String} object.
+     */
+    public String valueToString(U value, Locale locale);
+
+    /**
+     * <p>valueToString.</p>
+     *
+     * @param value            a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a {@link java.lang.String} object.
+     */
+    public String valueToString(DRIValue<? extends U> value, ReportParameters reportParameters);
+
+    /**
+     * <p>valueToString.</p>
+     *
+     * @param name             a {@link java.lang.String} object.
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a {@link java.lang.String} object.
+     */
+    public String valueToString(String name, ReportParameters reportParameters);
+
+    /**
+     * <p>stringToValue.</p>
+     *
+     * @param value  a {@link java.lang.String} object.
+     * @param locale a {@link java.util.Locale} object.
+     * @return a T object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public T stringToValue(String value, Locale locale) throws DRException;
+
+    /**
+     * <p>stringToValue.</p>
+     *
+     * @param value            a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a T object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public T stringToValue(DRIValue<String> value, ReportParameters reportParameters) throws DRException;
+
+    /**
+     * <p>stringToValue.</p>
+     *
+     * @param name             a {@link java.lang.String} object.
+     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a T object.
+     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     */
+    public T stringToValue(String name, ReportParameters reportParameters) throws DRException;
+
+    /**
+     * <p>getValueClass.</p>
+     *
+     * @return a {@link java.lang.Class} object.
+     */
+    public Class<T> getValueClass();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIComplexExpression.java
new file mode 100644
index 0000000..37d142d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIComplexExpression.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.expression;
+
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.util.List;
+
+/**
+ * A complex implementation of an expression.<br/> The difference between a simple and complex expression is that a complex expression allows registering additional fields or variables that are not
+ * defined in the report and are needed for calculating the value.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIComplexExpression<T> extends DRIExpression<T> {
+
+    /**
+     * <p>getExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRIExpression<?>> getExpressions();
+
+    /**
+     * Evaluates the expression.
+     *
+     * @param values           the values of the registered expressions
+     * @param reportParameters access to report fields, variables, parameters, expressions, and other report values
+     * @return the result of the expression evaluation
+     */
+    public T evaluate(List<?> values, ReportParameters reportParameters);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIExpression.java
new file mode 100644
index 0000000..f91d3f2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIExpression.java
@@ -0,0 +1,44 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.expression;
+
+import java.io.Serializable;
+
+/**
+ * Expressions are used to define various calculations, conditions, text field content, specific report groups, etc. Every expression can access the declared report fields, variables and other
+ * expressions and get their values to calculate the expression value.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIExpression<T> extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueClass.</p>
+     *
+     * @return a {@link java.lang.Class} object.
+     */
+    public Class<? super T> getValueClass();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIJasperExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIJasperExpression.java
new file mode 100644
index 0000000..9f3ad68
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIJasperExpression.java
@@ -0,0 +1,34 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.expression;
+
+/**
+ * This expression allows declaring an expression in a Jasper native syntax. Knowledge of the jasper syntax is also required for proper use.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIJasperExpression<T> extends DRIExpression<T> {
+
+    /**
+     * Gets the jasper expression.
+     *
+     * @return the jasper expression
+     */
+    public String getExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIParameterExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIParameterExpression.java
new file mode 100644
index 0000000..bd1a100
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIParameterExpression.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.expression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIParameterExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIParameterExpression extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<?> getValueExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIPropertyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIPropertyExpression.java
new file mode 100644
index 0000000..a95d7c1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIPropertyExpression.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.expression;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIPropertyExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIPropertyExpression extends Serializable {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getValueExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<String> getValueExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISimpleExpression.java
new file mode 100644
index 0000000..83a76a6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISimpleExpression.java
@@ -0,0 +1,38 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.expression;
+
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+/**
+ * The basic and the simplest implementation of an expression.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRISimpleExpression<T> extends DRIValue<T>, DRIExpression<T> {
+
+    /**
+     * Evaluates the expression.
+     *
+     * @param reportParameters access to report fields, variables, parameters, expressions, and other report values
+     * @return the result of the expression evaluation
+     */
+    public T evaluate(ReportParameters reportParameters);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISystemExpression.java
new file mode 100644
index 0000000..2b2afe2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISystemExpression.java
@@ -0,0 +1,27 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.expression;
+
+/**
+ * <p>DRISystemExpression interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRISystemExpression<T> extends DRIExpression<T> {
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIValueFormatter.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIValueFormatter.java
new file mode 100644
index 0000000..dacfdd2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIValueFormatter.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.expression;
+
+import net.sf.dynamicreports.report.definition.ReportParameters;
+
+import java.io.Serializable;
+
+/**
+ * The purpose of this expression is to format a value only.<br/> For instance, when it is necessary to display a currency next to the value or just show a value in another format.<br/> It can be
+ * applied in any report column, group, subtotal, or text field component.
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIValueFormatter<T, U> extends Serializable {
+
+    /**
+     * Evaluates the format expression.
+     *
+     * @param value            the value to be formatted
+     * @param reportParameters access to report fields, variables, parameters, expressions, and other report values
+     * @return the formatted value
+     */
+    public T format(U value, ReportParameters reportParameters);
+
+    /**
+     * <p>getValueClass.</p>
+     *
+     * @return a {@link java.lang.Class} object.
+     */
+    public Class<T> getValueClass();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGrid.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGrid.java
new file mode 100644
index 0000000..4681fff
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGrid.java
@@ -0,0 +1,36 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.grid;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIColumnGrid interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIColumnGrid extends Serializable {
+
+    /**
+     * <p>getList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridList} object.
+     */
+    public DRIColumnGridList getList();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridComponent.java
new file mode 100644
index 0000000..ca22fcf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridComponent.java
@@ -0,0 +1,30 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.grid;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIColumnGridComponent interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIColumnGridComponent extends Serializable {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridList.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridList.java
new file mode 100644
index 0000000..4b218a6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridList.java
@@ -0,0 +1,52 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.grid;
+
+import net.sf.dynamicreports.report.constant.ListType;
+
+import java.util.List;
+
+/**
+ * <p>DRIColumnGridList interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIColumnGridList extends DRIColumnGridComponent {
+
+    /**
+     * <p>getListCells.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIColumnGridListCell> getListCells();
+
+    /**
+     * <p>getType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     */
+    public ListType getType();
+
+    /**
+     * <p>getGap.</p>
+     *
+     * @return a int.
+     */
+    public int getGap();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridListCell.java
new file mode 100644
index 0000000..45e7044
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridListCell.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.grid;
+
+import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIColumnGridListCell interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIColumnGridListCell extends Serializable {
+
+    /**
+     * <p>getHorizontalAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     */
+    public HorizontalCellComponentAlignment getHorizontalAlignment();
+
+    /**
+     * <p>getVerticalAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     */
+    public VerticalCellComponentAlignment getVerticalAlignment();
+
+    /**
+     * <p>getComponent.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     */
+    public DRIColumnGridComponent getComponent();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java
new file mode 100644
index 0000000..a9ff833
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java
@@ -0,0 +1,121 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.grid;
+
+import java.util.List;
+
+import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+
+/**
+ * <p>DRIColumnTitleGroup interface.</p>
+ *
+ * @author Ricardo Mariaca, Jan Moxter
+ * 
+ */
+public interface DRIColumnTitleGroup extends DRIColumnGridComponent {
+
+    /**
+     * <p>getList.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridList} object.
+     */
+    DRIColumnGridList getList();
+
+    /**
+     * <p>getTitleExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    DRIExpression<?> getTitleExpression();
+
+    /**
+     * <p>getTitleStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    DRIReportStyle getTitleStyle();
+
+    /**
+     * <p>getTitleWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    Integer getTitleWidth();
+
+    /**
+     * <p>getTitleWidthType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    ComponentDimensionType getTitleWidthType();
+
+    /**
+     * <p>getTitleColumns.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    Integer getTitleColumns();
+
+    /**
+     * <p>getTitleHeight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    Integer getTitleHeight();
+
+    /**
+     * <p>getTitleHeightType.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     */
+    ComponentDimensionType getTitleHeightType();
+
+    /**
+     * <p>getTitleRows.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    Integer getTitleRows();
+
+    /**
+     * <p>getTitleStretchWithOverflow.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     * @deprecated replaced by {@link #getTitleTextAdjust()}
+     */
+    @Deprecated
+    Boolean getTitleStretchWithOverflow();
+
+    /**
+     * <p>getTitleTextAdjust.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     */
+    TextAdjust getTitleTextAdjust();
+
+    /**
+     * <p>getTitlePropertyExpressions.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    List<DRIPropertyExpression> getTitlePropertyExpressions();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBaseStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBaseStyle.java
new file mode 100644
index 0000000..97da44d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBaseStyle.java
@@ -0,0 +1,151 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.constant.Rotation;
+import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
+import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+/**
+ * <p>DRIBaseStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIBaseStyle extends Serializable {
+
+    /**
+     * <p>getForegroundColor.</p>
+     *
+     * @return a {@link java.awt.Color} object.
+     */
+    public Color getForegroundColor();
+
+    /**
+     * <p>getBackgroundColor.</p>
+     *
+     * @return a {@link java.awt.Color} object.
+     */
+    public Color getBackgroundColor();
+
+    /**
+     * <p>getRadius.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getRadius();
+
+    /**
+     * <p>getImageScale.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     */
+    public ImageScale getImageScale();
+
+    /**
+     * <p>getHorizontalImageAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     */
+    public HorizontalImageAlignment getHorizontalImageAlignment();
+
+    /**
+     * <p>getVerticalImageAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     */
+    public VerticalImageAlignment getVerticalImageAlignment();
+
+    /**
+     * <p>getHorizontalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     */
+    public HorizontalTextAlignment getHorizontalTextAlignment();
+
+    /**
+     * <p>getVerticalTextAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     */
+    public VerticalTextAlignment getVerticalTextAlignment();
+
+    /**
+     * <p>getBorder.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIBorder} object.
+     */
+    public DRIBorder getBorder();
+
+    /**
+     * <p>getPadding.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPadding} object.
+     */
+    public DRIPadding getPadding();
+
+    /**
+     * <p>getFont.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+     */
+    public DRIFont getFont();
+
+    /**
+     * <p>getRotation.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     */
+    public Rotation getRotation();
+
+    /**
+     * <p>getPattern.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPattern();
+
+    /**
+     * <p>getMarkup.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     */
+    public Markup getMarkup();
+
+    /**
+     * <p>getParagraph.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIParagraph} object.
+     */
+    public DRIParagraph getParagraph();
+
+    /**
+     * <p>getLinePen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     */
+    public DRIPen getLinePen();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBorder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBorder.java
new file mode 100644
index 0000000..3fce8b8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBorder.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIBorder interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIBorder extends Serializable {
+
+    /**
+     * <p>getTopPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     */
+    public DRIPen getTopPen();
+
+    /**
+     * <p>getLeftPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     */
+    public DRIPen getLeftPen();
+
+    /**
+     * <p>getBottomPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     */
+    public DRIPen getBottomPen();
+
+    /**
+     * <p>getRightPen.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     */
+    public DRIPen getRightPen();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIConditionalStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIConditionalStyle.java
new file mode 100644
index 0000000..242a9bf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIConditionalStyle.java
@@ -0,0 +1,36 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+
+/**
+ * <p>DRIConditionalStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIConditionalStyle extends DRIBaseStyle {
+
+    /**
+     * <p>getConditionExpression.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     */
+    public DRIExpression<Boolean> getConditionExpression();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIFont.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIFont.java
new file mode 100644
index 0000000..f60ca2c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIFont.java
@@ -0,0 +1,92 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIFont interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIFont extends Serializable {
+
+    /**
+     * <p>getFontName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getFontName();
+
+    /**
+     * <p>getBold.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getBold();
+
+    /**
+     * <p>getItalic.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getItalic();
+
+    /**
+     * <p>getUnderline.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getUnderline();
+
+    /**
+     * <p>getStrikeThrough.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getStrikeThrough();
+
+    /**
+     * <p>getFontSize.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getFontSize();
+
+    /**
+     * <p>getPdfFontName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPdfFontName();
+
+    /**
+     * <p>getPdfEncoding.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getPdfEncoding();
+
+    /**
+     * <p>getPdfEmbedded.</p>
+     *
+     * @return a {@link java.lang.Boolean} object.
+     */
+    public Boolean getPdfEmbedded();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPadding.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPadding.java
new file mode 100644
index 0000000..efa3423
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPadding.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIPadding interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIPadding extends Serializable {
+
+    /**
+     * <p>getTop.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getTop();
+
+    /**
+     * <p>getLeft.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getLeft();
+
+    /**
+     * <p>getBottom.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getBottom();
+
+    /**
+     * <p>getRight.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getRight();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIParagraph.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIParagraph.java
new file mode 100644
index 0000000..7287e10
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIParagraph.java
@@ -0,0 +1,95 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import net.sf.dynamicreports.report.constant.LineSpacing;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>DRIParagraph interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIParagraph extends Serializable {
+
+    /**
+     * <p>getLineSpacing.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     */
+    public LineSpacing getLineSpacing();
+
+    /**
+     * <p>getLineSpacingSize.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getLineSpacingSize();
+
+    /**
+     * <p>getFirstLineIndent.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getFirstLineIndent();
+
+    /**
+     * <p>getLeftIndent.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getLeftIndent();
+
+    /**
+     * <p>getRightIndent.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getRightIndent();
+
+    /**
+     * <p>getSpacingBefore.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getSpacingBefore();
+
+    /**
+     * <p>getSpacingAfter.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getSpacingAfter();
+
+    /**
+     * <p>getTabStopWidth.</p>
+     *
+     * @return a {@link java.lang.Integer} object.
+     */
+    public Integer getTabStopWidth();
+
+    /**
+     * <p>getTabStops.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<DRITabStop> getTabStops();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPen.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPen.java
new file mode 100644
index 0000000..a891854
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPen.java
@@ -0,0 +1,53 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import net.sf.dynamicreports.report.constant.LineStyle;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+/**
+ * <p>DRIPen interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIPen extends Serializable {
+
+    /**
+     * <p>getLineWidth.</p>
+     *
+     * @return a {@link java.lang.Float} object.
+     */
+    public Float getLineWidth();
+
+    /**
+     * <p>getLineStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     */
+    public LineStyle getLineStyle();
+
+    /**
+     * <p>getLineColor.</p>
+     *
+     * @return a {@link java.awt.Color} object.
+     */
+    public Color getLineColor();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIReportStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIReportStyle.java
new file mode 100644
index 0000000..d608cb7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIReportStyle.java
@@ -0,0 +1,30 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRIReportStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIReportStyle extends Serializable {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRISimpleStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRISimpleStyle.java
new file mode 100644
index 0000000..e436830
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRISimpleStyle.java
@@ -0,0 +1,28 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+/**
+ * <p>DRISimpleStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRISimpleStyle extends DRIBaseStyle {
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIStyle.java
new file mode 100644
index 0000000..9f8357f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIStyle.java
@@ -0,0 +1,50 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import java.util.List;
+
+/**
+ * <p>DRIStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRIStyle extends DRIBaseStyle, DRIReportStyle {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+    /**
+     * <p>getParentStyle.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     */
+    public DRIReportStyle getParentStyle();
+
+    /**
+     * <p>getConditionalStyles.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<? extends DRIConditionalStyle> getConditionalStyles();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITabStop.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITabStop.java
new file mode 100644
index 0000000..3e88e03
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITabStop.java
@@ -0,0 +1,45 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+import net.sf.dynamicreports.report.constant.TabStopAlignment;
+
+import java.io.Serializable;
+
+/**
+ * <p>DRITabStop interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRITabStop extends Serializable {
+
+    /**
+     * <p>getPosition.</p>
+     *
+     * @return a int.
+     */
+    public int getPosition();
+
+    /**
+     * <p>getAlignment.</p>
+     *
+     * @return a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     */
+    public TabStopAlignment getAlignment();
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITemplateStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITemplateStyle.java
new file mode 100644
index 0000000..ffe1618
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITemplateStyle.java
@@ -0,0 +1,35 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.definition.style;
+
+/**
+ * <p>DRITemplateStyle interface.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public interface DRITemplateStyle extends DRIReportStyle {
+
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName();
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRException.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRException.java
new file mode 100644
index 0000000..9972430
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRException.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.exception;
+
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRException class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRException extends Exception {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for DRException.</p>
+     *
+     * @param message a {@link java.lang.String} object.
+     */
+    public DRException(String message) {
+        super(message);
+    }
+
+    /**
+     * <p>Constructor for DRException.</p>
+     *
+     * @param cause a {@link java.lang.Throwable} object.
+     */
+    public DRException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * <p>Constructor for DRException.</p>
+     *
+     * @param message a {@link java.lang.String} object.
+     * @param cause   a {@link java.lang.Throwable} object.
+     */
+    public DRException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRReportException.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRReportException.java
new file mode 100644
index 0000000..d200bc8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRReportException.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.report.exception;
+
+import net.sf.dynamicreports.report.constant.Constants;
+
+/**
+ * <p>DRReportException class.</p>
+ *
+ * @author Ricardo Mariaca
+ * 
+ */
+public class DRReportException extends RuntimeException {
+    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+    /**
+     * <p>Constructor for DRReportException.</p>
+     *
+     * @param message a {@link java.lang.String} object.
+     */
+    public DRReportException(String message) {
+        super(message);
+    }
+
+    /**
+     * <p>Constructor for DRReportException.</p>
+     *
+     * @param cause a {@link java.lang.Throwable} object.
+     */
+    public DRReportException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * <p>Constructor for DRReportException.</p>
+     *
+     * @param message a {@link java.lang.String} object.
+     * @param cause   a {@link java.lang.Throwable} object.
+     */
+    public DRReportException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/dynamicreports-messages.properties b/dynamicreports-core-for-grid-exporter/src/main/resources/dynamicreports-messages.properties
new file mode 100644
index 0000000..325400e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/dynamicreports-messages.properties
@@ -0,0 +1,11 @@
+page_x_of_y={0} of {1}
+page_x_slash_y={0}/{1}
+total_pages={0}
+page_number={0}
+current_date={0}
+total=Total
+true=True
+false=False
+yes=Yes
+no=No
+table_of_contents=Table of contents
\ No newline at end of file
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/fonts.xml b/dynamicreports-core-for-grid-exporter/src/main/resources/fonts.xml
new file mode 100644
index 0000000..e48e79a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/fonts.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fontFamilies>
+
+    <fontFamily name="SansSerif">
+        <exportFonts>
+            <export key="net.sf.jasperreports.html">Arial, Helvetica, sans-serif</export>
+        </exportFonts>
+    </fontFamily>
+
+    <fontFamily name="Serif">
+        <exportFonts>
+            <export key="net.sf.jasperreports.html">'Times New Roman', Times, serif</export>
+        </exportFonts>
+    </fontFamily>
+
+    <fontFamily name="Monospaced">
+        <exportFonts>
+            <export key="net.sf.jasperreports.html">'Courier New', Courier, monospace</export>
+        </exportFonts>
+    </fontFamily>
+
+</fontFamilies>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/jasperreports_extension.properties b/dynamicreports-core-for-grid-exporter/src/main/resources/jasperreports_extension.properties
new file mode 100644
index 0000000..57fe439
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/jasperreports_extension.properties
@@ -0,0 +1,2 @@
+net.sf.jasperreports.extension.registry.factory.system.font.families=net.sf.dynamicreports.jasper.base.JasperSystemFontExtensionsRegistryFactory
+net.sf.jasperreports.extension.system.font.families.drfonts=fonts.xml
\ No newline at end of file
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xjb b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xjb
new file mode 100644
index 0000000..f88b620
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xjb
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xmlns="https://jakarta.ee/xml/ns/jaxb" version="3.0"
+          xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd">
+
+    <bindings schemaLocation="dynamicreports.xsd" node="/xsd:schema">
+        <schemaBindings>
+            <package name="net.sf.dynamicreports.report.defaults.xml"/>
+            <nameXmlTransform>
+                <typeName prefix="Xml"/>
+            </nameXmlTransform>
+        </schemaBindings>
+    </bindings>
+</bindings>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xsd b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xsd
new file mode 100644
index 0000000..a89bc60
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xsd
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="DynamicReports" type="DynamicReports">
+    </xs:element>
+
+    <xs:complexType name="DynamicReports">
+        <xs:sequence>
+            <xs:element name="font" type="Font" minOccurs="0"/>
+
+            <xs:element name="bigDecimalType" type="DataType" minOccurs="0"/>
+            <xs:element name="bigIntegerType" type="DataType" minOccurs="0"/>
+            <xs:element name="byteType" type="DataType" minOccurs="0"/>
+            <xs:element name="doubleType" type="DataType" minOccurs="0"/>
+            <xs:element name="floatType" type="DataType" minOccurs="0"/>
+            <xs:element name="integerType" type="DataType" minOccurs="0"/>
+            <xs:element name="longType" type="DataType" minOccurs="0"/>
+            <xs:element name="shortType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateYearToMonthType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateYearToHourType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateYearToMinuteType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateYearToSecondType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateYearToFractionType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateYearType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateMonthType" type="DataType" minOccurs="0"/>
+            <xs:element name="dateDayType" type="DataType" minOccurs="0"/>
+            <xs:element name="timeHourToMinuteType" type="DataType" minOccurs="0"/>
+            <xs:element name="timeHourToSecondType" type="DataType" minOccurs="0"/>
+            <xs:element name="timeHourToFractionType" type="DataType" minOccurs="0"/>
+            <xs:element name="percentageType" type="DataType" minOccurs="0"/>
+            <xs:element name="booleanType" type="DataType" minOccurs="0"/>
+            <xs:element name="characterType" type="DataType" minOccurs="0"/>
+            <xs:element name="stringType" type="DataType" minOccurs="0"/>
+
+            <xs:element name="loadSystemFonts" type="xs:boolean" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="Font">
+        <xs:attribute name="fontName" type="xs:string"/>
+        <xs:attribute name="fontSize" type="xs:int"/>
+        <xs:attribute name="pdfFontName" type="xs:string"/>
+        <xs:attribute name="pdfEncoding" type="xs:string"/>
+        <xs:attribute name="pdfEmbedded" type="xs:boolean"/>
+    </xs:complexType>
+
+    <xs:complexType name="DataType">
+        <xs:attribute name="pattern" type="xs:string"/>
+        <xs:attribute name="horizontalAlignment" type="HorizontalAlignment"/>
+    </xs:complexType>
+
+    <xs:simpleType name="HorizontalAlignment">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="LEFT"/>
+            <xs:enumeration value="CENTER"/>
+            <xs:enumeration value="RIGHT"/>
+            <xs:enumeration value="JUSTIFIED"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_green.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_green.svg
new file mode 100644
index 0000000..6f9f13b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_green.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://web.resource.org/cc/"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        width="159.60748"
+        height="159.60748"
+        id="svg1968"
+        sodipodi:version="0.32"
+        inkscape:version="0.44"
+        version="1.0"
+        sodipodi:docbase="C:\Documents and Settings\Molumen\Desktop"
+        sodipodi:docname="green_square_icon.svg">
+    <defs
+            id="defs1970">
+        <linearGradient
+                inkscape:collect="always"
+                id="linearGradient2055">
+            <stop
+                    style="stop-color:#eeeeec;stop-opacity:1;"
+                    offset="0"
+                    id="stop2057"/>
+            <stop
+                    style="stop-color:#eeeeec;stop-opacity:0;"
+                    offset="1"
+                    id="stop2059"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient2055"
+                id="linearGradient2061"
+                x1="414.44666"
+                y1="535.74768"
+                x2="417.98221"
+                y2="602.92285"
+                gradientUnits="userSpaceOnUse"/>
+        <linearGradient
+                inkscape:collect="always"
+                id="linearGradient2063">
+            <stop
+                    style="stop-color:#eeeeec;stop-opacity:1;"
+                    offset="0"
+                    id="stop2065"/>
+            <stop
+                    style="stop-color:#eeeeec;stop-opacity:0;"
+                    offset="1"
+                    id="stop2067"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient2063"
+                id="linearGradient2069"
+                x1="470.51016"
+                y1="698.3822"
+                x2="471.52029"
+                y2="609.9939"
+                gradientUnits="userSpaceOnUse"/>
+    </defs>
+    <sodipodi:namedview
+            id="base"
+            pagecolor="#ffffff"
+            bordercolor="#666666"
+            borderopacity="1.0"
+            gridtolerance="10000"
+            guidetolerance="10"
+            objecttolerance="10"
+            inkscape:pageopacity="0.0"
+            inkscape:pageshadow="2"
+            inkscape:zoom="1.979899"
+            inkscape:cx="102.48001"
+            inkscape:cy="80.572383"
+            inkscape:document-units="px"
+            inkscape:current-layer="layer1"
+            inkscape:window-width="853"
+            inkscape:window-height="569"
+            inkscape:window-x="596"
+            inkscape:window-y="30"/>
+    <metadata
+            id="metadata1973">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+                <dc:subject>
+                    <rdf:Bag>
+                        <rdf:li>icon</rdf:li>
+                        <rdf:li>button</rdf:li>
+                        <rdf:li>submit</rdf:li>
+                        <rdf:li>add</rdf:li>
+                        <rdf:li>ok</rdf:li>
+                        <rdf:li>green</rdf:li>
+                        <rdf:li>yes</rdf:li>
+                        <rdf:li>positive</rdf:li>
+                        <rdf:li>good</rdf:li>
+                        <rdf:li>confirm</rdf:li>
+                    </rdf:Bag>
+                </dc:subject>
+                <dc:creator>
+                    <cc:Agent>
+                        <dc:title>Lumen Design Studio</dc:title>
+                    </cc:Agent>
+                </dc:creator>
+                <dc:contributor>
+                    <cc:Agent>
+                        <dc:title>Lumen Design Studio</dc:title>
+                    </cc:Agent>
+                </dc:contributor>
+                <cc:license
+                        rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+                <dc:title>round submit icon</dc:title>
+                <dc:description>green round submit icon</dc:description>
+            </cc:Work>
+            <cc:License
+                    rdf:about="http://web.resource.org/cc/PublicDomain">
+                <cc:permits
+                        rdf:resource="http://web.resource.org/cc/Reproduction"/>
+                <cc:permits
+                        rdf:resource="http://web.resource.org/cc/Distribution"/>
+                <cc:permits
+                        rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+            </cc:License>
+        </rdf:RDF>
+    </metadata>
+    <g
+            inkscape:label="Layer 1"
+            inkscape:groupmode="layer"
+            id="layer1"
+            transform="translate(-394.8348,-342.3994)">
+        <g
+                transform="matrix(0.9,0,0,0.9,72.7396,-118.4149)"
+                id="g2084">
+            <path
+                    transform="matrix(0.306862,0,0,0.306862,328.6317,428.9959)"
+                    d="M 634.28571 559.50507 A 250 250 0 1 1  134.28571,559.50507 A 250 250 0 1 1  634.28571 559.50507 z"
+                    sodipodi:ry="250"
+                    sodipodi:rx="250"
+                    sodipodi:cy="559.50507"
+                    sodipodi:cx="384.28571"
+                    id="path1954"
+                    style="fill:#8ae234;fill-opacity:1;fill-rule:evenodd;stroke:#73d216;stroke-width:20.127882;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                    sodipodi:type="arc"/>
+            <path
+                    sodipodi:nodetypes="cccc"
+                    id="path1956"
+                    d="M 465.20401,668.93136 C 484.25065,663.82784 499.37724,651.27316 508.43271,635.10742 C 523.1404,600.28933 468.2659,681.80733 422.94143,666.99805 C 436.11746,671.83026 450.75472,672.80304 465.20401,668.93136 z "
+                    style="fill:url(#linearGradient2069);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+            <path
+                    style="fill:url(#linearGradient2061);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                    d="M 446.67133,529.36222 C 407.23429,529.36222 375.22913,562.20957 375.22913,602.68438 C 375.22913,608.15829 375.83658,613.48618 376.94663,618.61875 C 416.15174,543.15095 458.39222,590.65582 512.85368,575.07214 C 502.21825,548.27438 476.58935,529.36222 446.67133,529.36222 z "
+                    id="path1958"
+                    sodipodi:nodetypes="ccccc"/>
+        </g>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_red.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_red.svg
new file mode 100644
index 0000000..d689377
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_red.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://web.resource.org/cc/"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        width="159.60748"
+        height="159.60748"
+        id="svg2046"
+        sodipodi:version="0.32"
+        inkscape:version="0.44"
+        version="1.0"
+        sodipodi:docbase="C:\Documents and Settings\Molumen\Desktop"
+        sodipodi:docname="round_error_warning_icon.svg">
+    <defs
+            id="defs2048">
+        <linearGradient
+                inkscape:collect="always"
+                id="linearGradient5190">
+            <stop
+                    style="stop-color:#ffffff;stop-opacity:1"
+                    offset="0"
+                    id="stop5192"/>
+            <stop
+                    style="stop-color:#ff0000;stop-opacity:1"
+                    offset="1"
+                    id="stop5194"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient5190"
+                id="linearGradient2109"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="matrix(0.312273,0,0,0.320491,127.55,434.3769)"
+                x1="264.582"
+                y1="296.37491"
+                x2="380.6846"
+                y2="553.74487"/>
+        <linearGradient
+                inkscape:collect="always"
+                id="linearGradient5197">
+            <stop
+                    style="stop-color:#ffffff;stop-opacity:1"
+                    offset="0"
+                    id="stop5199"/>
+            <stop
+                    style="stop-color:#ff0000;stop-opacity:1"
+                    offset="1"
+                    id="stop5201"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient5197"
+                id="linearGradient2107"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="matrix(-0.301633,8.082223e-2,-8.294933e-2,-0.30957,402.8575,730.1118)"
+                x1="249.48328"
+                y1="262.87494"
+                x2="272.02597"
+                y2="427.54285"/>
+    </defs>
+    <sodipodi:namedview
+            id="base"
+            pagecolor="#ffffff"
+            bordercolor="#666666"
+            borderopacity="1.0"
+            gridtolerance="10000"
+            guidetolerance="10"
+            objecttolerance="10"
+            inkscape:pageopacity="0.0"
+            inkscape:pageshadow="2"
+            inkscape:zoom="1.4"
+            inkscape:cx="85.853793"
+            inkscape:cy="82.99359"
+            inkscape:document-units="px"
+            inkscape:current-layer="layer1"
+            inkscape:window-width="853"
+            inkscape:window-height="569"
+            inkscape:window-x="606"
+            inkscape:window-y="124"/>
+    <metadata
+            id="metadata2051">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+                <dc:title>round error warning button</dc:title>
+                <dc:creator>
+                    <cc:Agent>
+                        <dc:title>Lumen Design Studio</dc:title>
+                    </cc:Agent>
+                </dc:creator>
+                <dc:contributor>
+                    <cc:Agent>
+                        <dc:title>Lumen Design Studio</dc:title>
+                    </cc:Agent>
+                </dc:contributor>
+                <dc:description>error warning icon</dc:description>
+                <dc:subject>
+                    <rdf:Bag>
+                        <rdf:li>error</rdf:li>
+                        <rdf:li>icon</rdf:li>
+                        <rdf:li>button</rdf:li>
+                        <rdf:li>red</rdf:li>
+                        <rdf:li>stop</rdf:li>
+                        <rdf:li>no</rdf:li>
+                        <rdf:li>warning</rdf:li>
+                        <rdf:li>negative</rdf:li>
+                        <rdf:li>delete</rdf:li>
+                        <rdf:li>cancel</rdf:li>
+                    </rdf:Bag>
+                </dc:subject>
+                <cc:license
+                        rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+            </cc:Work>
+            <cc:License
+                    rdf:about="http://web.resource.org/cc/PublicDomain">
+                <cc:permits
+                        rdf:resource="http://web.resource.org/cc/Reproduction"/>
+                <cc:permits
+                        rdf:resource="http://web.resource.org/cc/Distribution"/>
+                <cc:permits
+                        rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+            </cc:License>
+        </rdf:RDF>
+    </metadata>
+    <g
+            inkscape:label="Layer 1"
+            inkscape:groupmode="layer"
+            id="layer1"
+            transform="translate(-311.6248,-429.7013)">
+        <g
+                id="g2100"
+                transform="matrix(0.9,0,0,0.9,170.4421,-31.11303)">
+            <path
+                    sodipodi:type="arc"
+                    style="fill:red;fill-opacity:1;fill-rule:evenodd;stroke:#cb0000;stroke-width:20.127882;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                    id="path2174"
+                    sodipodi:cx="384.28571"
+                    sodipodi:cy="559.50507"
+                    sodipodi:rx="250"
+                    sodipodi:ry="250"
+                    d="M 634.28571 559.50507 A 250 250 0 1 1  134.28571,559.50507 A 250 250 0 1 1  634.28571 559.50507 z"
+                    transform="matrix(0.306862,0,0,0.306862,127.6178,428.9959)"/>
+            <path
+                    style="fill:url(#linearGradient2107);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                    d="M 264.19015,668.93136 C 283.23679,663.82784 298.36338,651.27316 307.41885,635.10742 C 322.12654,600.28933 267.25204,681.80733 221.92757,666.99805 C 235.1036,671.83026 249.74086,672.80304 264.19015,668.93136 z "
+                    id="path2540"
+                    sodipodi:nodetypes="cccc"/>
+            <path
+                    sodipodi:nodetypes="ccccc"
+                    id="path2197"
+                    d="M 245.65747,529.36222 C 206.22043,529.36222 174.21527,562.20957 174.21527,602.68438 C 174.21527,608.15829 174.82272,613.48618 175.93277,618.61875 C 215.13788,543.15095 257.37836,590.65582 311.83982,575.07214 C 301.20439,548.27438 275.57549,529.36222 245.65747,529.36222 z "
+                    style="fill:url(#linearGradient2109);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        </g>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_false.svg
new file mode 100644
index 0000000..9f3f8ea
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_false.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns="http://www.w3.org/2000/svg"
+        version="1.0"
+        width="32"
+        height="32"
+        id="svg2">
+    <defs
+            id="defs4">
+        <linearGradient
+                id="linearGradient3289">
+            <stop
+                    id="stop3291"
+                    style="stop-color:#be0000;stop-opacity:1"
+                    offset="0"/>
+            <stop
+                    id="stop3293"
+                    style="stop-color:#e53700;stop-opacity:1"
+                    offset="1"/>
+        </linearGradient>
+        <linearGradient
+                id="linearGradient3279">
+            <stop
+                    id="stop3281"
+                    style="stop-color:#fe0000;stop-opacity:1"
+                    offset="0"/>
+            <stop
+                    id="stop3283"
+                    style="stop-color:#fec7b5;stop-opacity:1"
+                    offset="1"/>
+        </linearGradient>
+        <linearGradient
+                x1="25.606659"
+                y1="28.449244"
+                x2="3.5864811"
+                y2="6.4290657"
+                id="linearGradient3287"
+                xlink:href="#linearGradient3279"
+                gradientUnits="userSpaceOnUse"/>
+        <linearGradient
+                x1="26.645752"
+                y1="29.573856"
+                x2="2.4886627"
+                y2="5.4167671"
+                id="linearGradient3295"
+                xlink:href="#linearGradient3289"
+                gradientUnits="userSpaceOnUse"/>
+        <linearGradient
+                x1="25.606659"
+                y1="28.449244"
+                x2="3.5864811"
+                y2="6.4290657"
+                id="linearGradient3299"
+                xlink:href="#linearGradient3279"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="translate(359.65123,517.12194)"/>
+        <linearGradient
+                x1="26.645752"
+                y1="29.573856"
+                x2="2.4886627"
+                y2="5.4167671"
+                id="linearGradient3301"
+                xlink:href="#linearGradient3289"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="translate(359.65123,517.12194)"/>
+        <linearGradient
+                x1="26.645752"
+                y1="29.573856"
+                x2="2.4886627"
+                y2="5.4167671"
+                id="linearGradient3307"
+                xlink:href="#linearGradient3289"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="translate(359.65123,517.12194)"/>
+    </defs>
+    <g
+            transform="translate(-359,-516.36218)"
+            id="layer1">
+        <path
+                d="M 6.53125,1.46875 L 1.46875,6.53125 L 11.03125,16.125 L 1.46875,25.6875 L 6.53125,30.75 L 16.09375,21.1875 L 25.65625,30.75 L 30.71875,25.6875 L 21.15625,16.125 L 30.71875,6.53125 L 25.65625,1.46875 L 16.09375,11.03125 L 6.53125,1.46875 z"
+                transform="translate(359,516.36218)"
+                id="rect2504"
+                style="opacity:1;fill:url(#linearGradient3287);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3295);stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_true.svg
new file mode 100644
index 0000000..ece0533
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_true.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        width="128"
+        height="128"
+        id="svg2"
+        version="1.1"
+        inkscape:version="0.48.0 r9654"
+        sodipodi:docname="New document 1">
+    <defs
+            id="defs4">
+        <linearGradient
+                inkscape:collect="always"
+                id="linearGradient3953">
+            <stop
+                    style="stop-color:#ffffff;stop-opacity:1;"
+                    offset="0"
+                    id="stop3955"/>
+            <stop
+                    style="stop-color:#ffffff;stop-opacity:0;"
+                    offset="1"
+                    id="stop3957"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                id="linearGradient3927">
+            <stop
+                    style="stop-color:#ffffff;stop-opacity:1;"
+                    offset="0"
+                    id="stop3929"/>
+            <stop
+                    style="stop-color:#ffffff;stop-opacity:0;"
+                    offset="1"
+                    id="stop3931"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                id="linearGradient3871">
+            <stop
+                    style="stop-color:#00aa00;stop-opacity:1;"
+                    offset="0"
+                    id="stop3873"/>
+            <stop
+                    id="stop3879"
+                    offset="0.29523575"
+                    style="stop-color:#00ff00;stop-opacity:1"/>
+            <stop
+                    style="stop-color:#d5ffd5;stop-opacity:1"
+                    offset="1"
+                    id="stop3875"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3871"
+                id="linearGradient3877"
+                x1="8"
+                y1="73.737183"
+                x2="86.24353"
+                y2="2.4637082"
+                gradientUnits="userSpaceOnUse"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3871"
+                id="linearGradient3924"
+                gradientUnits="userSpaceOnUse"
+                x1="8"
+                y1="73.737183"
+                x2="86.24353"
+                y2="2.4637082"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3927"
+                id="linearGradient3933"
+                x1="47.125"
+                y1="4.515625"
+                x2="47.125"
+                y2="79.831711"
+                gradientUnits="userSpaceOnUse"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3927"
+                id="linearGradient3947"
+                gradientUnits="userSpaceOnUse"
+                x1="47.125"
+                y1="4.515625"
+                x2="47.125"
+                y2="79.831711"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3927"
+                id="linearGradient3951"
+                gradientUnits="userSpaceOnUse"
+                x1="47.125"
+                y1="4.515625"
+                x2="47.125"
+                y2="79.831711"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3953"
+                id="linearGradient3959"
+                x1="47.125"
+                y1="4.515625"
+                x2="60.753372"
+                y2="59.765625"
+                gradientUnits="userSpaceOnUse"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3871"
+                id="linearGradient3982"
+                gradientUnits="userSpaceOnUse"
+                x1="8"
+                y1="73.737183"
+                x2="86.24353"
+                y2="2.4637082"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3927"
+                id="linearGradient3984"
+                gradientUnits="userSpaceOnUse"
+                x1="47.125"
+                y1="4.515625"
+                x2="47.125"
+                y2="79.831711"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3953"
+                id="linearGradient3986"
+                gradientUnits="userSpaceOnUse"
+                x1="47.125"
+                y1="4.515625"
+                x2="60.753372"
+                y2="59.765625"/>
+    </defs>
+    <sodipodi:namedview
+            id="base"
+            pagecolor="#ffffff"
+            bordercolor="#666666"
+            borderopacity="1.0"
+            inkscape:pageopacity="0.0"
+            inkscape:pageshadow="2"
+            inkscape:zoom="1"
+            inkscape:cx="63.389495"
+            inkscape:cy="78.026004"
+            inkscape:document-units="px"
+            inkscape:current-layer="layer1"
+            showgrid="false"
+            inkscape:window-width="1280"
+            inkscape:window-height="965"
+            inkscape:window-x="-4"
+            inkscape:window-y="-4"
+            inkscape:window-maximized="1">
+        <inkscape:grid
+                type="xygrid"
+                id="grid2994"
+                empspacing="5"
+                visible="true"
+                enabled="true"
+                snapvisiblegridlinesonly="true"/>
+    </sodipodi:namedview>
+    <metadata
+            id="metadata7">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+                <dc:title></dc:title>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <g
+            inkscape:label="Layer 1"
+            inkscape:groupmode="layer"
+            id="layer1"
+            transform="translate(0,-924.36217)">
+        <g
+                id="g3977"
+                transform="matrix(1.8812515,0,0,1.8812515,-10.224935,899.05489)">
+            <path
+                    style="opacity:0.65158374;fill:#000000;fill-opacity:1;stroke:none;"
+                    d="m 20,42.362183 10,10 30,-30 10,10 -40,40 -20,-20 z"
+                    id="path3881"
+                    inkscape:connector-curvature="0"
+                    sodipodi:nodetypes="ccccccc"/>
+            <path
+                    sodipodi:nodetypes="ccccccc"
+                    inkscape:connector-curvature="0"
+                    id="path2996"
+                    d="m 20,42.362183 10,10 30,-30 10,10 -40,40 -20,-20 z"
+                    style="fill:url(#linearGradient3982);fill-opacity:1;stroke:none"/>
+            <path
+                    d="M 60,23.5 32.65625,50.84375 c 0.663739,-0.129711 1.331286,-0.255418 2,-0.375 3.364578,-0.601669 7.526087,-1.246737 10.90625,-1.6875 2.645343,-0.344944 5.103246,-0.59175 7.65625,-0.75 L 68.875,32.375 60,23.5 z m -40,20 -8.875,8.875 3.15625,3.15625 C 18.877656,54.179274 23.499328,52.749738 28.25,51.75 L 20,43.5 z"
+                    id="path3949"
+                    style="fill:url(#linearGradient3984);fill-opacity:1;stroke:url(#linearGradient3986);stroke-width:0.26578051;"
+                    inkscape:original="M 60 22.375 L 30.25 52.125 C 31.759428 51.832546 33.268641 51.520491 34.78125 51.25 C 38.131586 50.650878 42.292564 50.001114 45.65625 49.5625 C 48.40866 49.203595 50.940177 48.935357 53.59375 48.78125 L 70 32.375 L 60 22.375 z M 20 42.375 L 10 52.375 L 14.03125 56.40625 C 19.237958 54.881463 24.442107 53.235169 29.78125 52.21875 C 29.80132 52.21495 29.82368 52.22255 29.84375 52.21875 L 20 42.375 z "
+                    inkscape:radius="-0.79549515"
+                    sodipodi:type="inkscape:offset"/>
+        </g>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_false.svg
new file mode 100644
index 0000000..f2632bc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_false.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" width="128" height="128" id="svg4252">
+    <metadata>
+        <rdf:RDF xmlns:cc="http://web.resource.org/cc/"
+                 xmlns:dc="http://purl.org/dc/elements/1.1/"
+                 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <cc:Work rdf:about="">
+                <dc:title>Delete icon</dc:title>
+                <dc:description>Red round glosy Delete icon</dc:description>
+                <dc:subject>
+                    <rdf:Bag>
+                        <rdf:li>delete</rdf:li>
+                        <rdf:li>no</rdf:li>
+                        <rdf:li>no access</rdf:li>
+                        <rdf:li>denied</rdf:li>
+                        <rdf:li>red</rdf:li>
+                        <rdf:li>round</rdf:li>
+                        <rdf:li>glosy</rdf:li>
+                        <rdf:li>button</rdf:li>
+                        <rdf:li>icon</rdf:li>
+                    </rdf:Bag>
+                </dc:subject>
+                <dc:publisher>
+                    <cc:Agent rdf:about="http://www.openclipart.org">
+                        <dc:title>Open Clip Art Library</dc:title>
+                    </cc:Agent>
+                </dc:publisher>
+                <dc:creator>
+                    <cc:Agent>
+                        <dc:title>Jakub Jankiewicz</dc:title>
+                    </cc:Agent>
+                </dc:creator>
+                <dc:rights>
+                    <cc:Agent>
+                        <dc:title>Jakub Jankiewicz</dc:title>
+                    </cc:Agent>
+                </dc:rights>
+                <dc:date></dc:date>
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+                <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+                <dc:language>pl</dc:language>
+            </cc:Work>
+            <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+                <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+                <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+                <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+            </cc:License>
+        </rdf:RDF>
+    </metadata>
+    <defs id="defs4254">
+        <linearGradient x1="302.73621" y1="377.9527" x2="311.27377" y2="390.78342" id="linearGradient4206" xlink:href="#linearGradient4554" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(5.2961708,0,0,4.9974862,-1603.0989,-1873.1257)"/>
+        <linearGradient id="linearGradient4554">
+            <stop id="stop4556" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+            <stop id="stop4558" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="401.93405" y1="376.13748" x2="414.38986" y2="390.49332" id="linearGradient4222" xlink:href="#linearGradient4738" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(2.7131949,0,0,2.7134878,-1075.9729,-978.37049)"/>
+        <linearGradient id="linearGradient4738">
+            <stop id="stop4740" style="stop-color:#ffffff;stop-opacity:0.7265625" offset="0"/>
+            <stop id="stop4742" style="stop-color:#ffffff;stop-opacity:1" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="314.56537" y1="369.97995" x2="332.02466" y2="387.43924" id="linearGradient4213" xlink:href="#linearGradient4568" gradientUnits="userSpaceOnUse"/>
+        <linearGradient id="linearGradient4568">
+            <stop id="stop4570" style="stop-color:#118909;stop-opacity:1" offset="0"/>
+            <stop id="stop4572" style="stop-color:#084c06;stop-opacity:1" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="401.93405" y1="376.13748" x2="414.38986" y2="390.49332" id="linearGradient2355" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.999946,0,0,1.00005,-219.815,-158.745)"/>
+        <linearGradient x1="302.73621" y1="377.9527" x2="311.27377" y2="390.78342" id="linearGradient2352" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.9519,0,0,1.84182,-426.217,-488.523)"/>
+        <linearGradient x1="302.73621" y1="377.9527" x2="311.27377" y2="390.78342" id="linearGradient2347" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.9519,0,0,1.84182,-341.04,-488.523)"/>
+        <linearGradient x1="786.64636" y1="302.44009" x2="818.39136" y2="338.76443" id="linearGradient2344" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.705519,0,0,0.956752,-290.58,-78.4396)"/>
+        <linearGradient x1="838.01013" y1="-320.49728" x2="909.21588" y2="-321.47269" id="linearGradient2339" xlink:href="#linearGradient4886" gradientUnits="userSpaceOnUse"
+                        gradientTransform="translate(-396.865,167.424)"/>
+        <linearGradient x1="1313.4297" y1="237.96057" x2="1333.0073" y2="258.76886" id="linearGradient2336" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.638597,0,0,1.56593,-399.067,-160.899)"/>
+        <linearGradient x1="808.12592" y1="362.58139" x2="832.68341" y2="400.04047" id="linearGradient2332" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="translate(-399.013,-162.24)"/>
+        <linearGradient x1="621.35413" y1="387.40463" x2="649.37592" y2="424.72763" id="linearGradient2328" xlink:href="#linearGradient5028" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.06143,0,0,0.942122,-312.58,-154.341)"/>
+        <linearGradient x1="714.00201" y1="328.40942" x2="745.21838" y2="359.15051" id="linearGradient2325" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.901725,0,0,1.10898,-312.58,-154.341)"/>
+        <linearGradient x1="786.64636" y1="302.44009" x2="818.39136" y2="338.76443" id="linearGradient2322" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.645848,0,0,0.875833,-151.443,-50.6101)"/>
+        <linearGradient x1="786.64636" y1="302.44009" x2="818.39136" y2="338.76443" id="linearGradient2318" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.705519,0,0,0.956752,-378.254,132.783)"/>
+        <linearGradient x1="1313.4297" y1="237.96057" x2="1333.0073" y2="258.76886" id="linearGradient2316" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.638597,0,0,1.56593,-305.377,53.8182)"/>
+        <linearGradient x1="786.64636" y1="302.44009" x2="818.39136" y2="338.76443" id="linearGradient2314" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.645848,0,0,0.875833,18.0749,154.377)"/>
+        <linearGradient x1="621.35413" y1="387.40463" x2="649.37592" y2="424.72763" id="linearGradient6125" xlink:href="#linearGradient5028" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.06143,0,0,0.942122,-143.062,50.646)"/>
+        <linearGradient id="linearGradient5028">
+            <stop id="stop5030" style="stop-color:#fffd26;stop-opacity:1" offset="0"/>
+            <stop id="stop5032" style="stop-color:#967f00;stop-opacity:1" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="714.00201" y1="328.40942" x2="745.21838" y2="359.15051" id="linearGradient6127" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.901725,0,0,1.10898,-143.062,50.646)"/>
+        <linearGradient id="linearGradient4554-6">
+            <stop id="stop4556-6" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+            <stop id="stop4558-2" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+        </linearGradient>
+        <linearGradient id="linearGradient4738-8">
+            <stop id="stop4740-5" style="stop-color:#ffffff;stop-opacity:0.72656202" offset="0"/>
+            <stop id="stop4742-1" style="stop-color:#ffffff;stop-opacity:1" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="838.01013" y1="-320.49728" x2="909.21588" y2="-321.47269" id="linearGradient3691" xlink:href="#linearGradient4886" gradientUnits="userSpaceOnUse"
+                        gradientTransform="translate(-178.788,253.002)"/>
+        <linearGradient id="linearGradient4886">
+            <stop id="stop4888" style="stop-color:#1c97e1;stop-opacity:1" offset="0"/>
+            <stop id="stop4890" style="stop-color:#006798;stop-opacity:1" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="808.12592" y1="362.58139" x2="832.68341" y2="400.04047" id="linearGradient3695" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="translate(-305.322,52.4772)"/>
+        <linearGradient x1="314.56537" y1="369.97995" x2="332.02466" y2="387.43924" id="linearGradient3709" xlink:href="#linearGradient4886" gradientUnits="userSpaceOnUse"/>
+        <linearGradient x1="302.73621" y1="377.9527" x2="311.27377" y2="390.78342" id="linearGradient3711" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.9519,0,0,1.84182,-428.714,-277.301)"/>
+        <linearGradient x1="314.56537" y1="369.97995" x2="332.02466" y2="387.43924" id="linearGradient4693" xlink:href="#linearGradient4568-0" gradientUnits="userSpaceOnUse"/>
+        <linearGradient id="linearGradient4568-0">
+            <stop id="stop4570-4" style="stop-color:#e12b1c;stop-opacity:1" offset="0"/>
+            <stop id="stop4572-0" style="stop-color:#980b00;stop-opacity:1" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="401.93405" y1="376.13748" x2="414.38986" y2="390.49332" id="linearGradient4744" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="scale(0.999946,1.00005)"/>
+        <linearGradient x1="302.73621" y1="377.9527" x2="311.27377" y2="390.78342" id="linearGradient4733" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.9519,0,0,1.84182,-206.402,-329.778)"/>
+        <linearGradient x1="786.64636" y1="302.44009" x2="818.39136" y2="338.76443" id="linearGradient3374" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.645848,0,0,0.875833,-368.71173,-205.68772)"/>
+        <linearGradient x1="714.00201" y1="328.40942" x2="745.21838" y2="359.15051" id="linearGradient3377" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.901725,0,0,1.10898,-529.84873,-309.41862)"/>
+        <linearGradient x1="621.35413" y1="387.40463" x2="649.37592" y2="424.72763" id="linearGradient3380" xlink:href="#linearGradient5028" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.06143,0,0,0.942122,-529.84873,-309.41862)"/>
+        <linearGradient x1="808.12592" y1="362.58139" x2="832.68341" y2="400.04047" id="linearGradient3384" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="translate(-616.28173,-317.31762)"/>
+        <linearGradient x1="1313.4297" y1="237.96057" x2="1333.0073" y2="258.76886" id="linearGradient3387" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.638597,0,0,1.56593,-616.33573,-315.97662)"/>
+        <linearGradient x1="838.01013" y1="-320.49728" x2="909.21588" y2="-321.47269" id="linearGradient3390" xlink:href="#linearGradient4886" gradientUnits="userSpaceOnUse"
+                        gradientTransform="translate(-660.15375,211.39981)"/>
+        <linearGradient x1="786.64636" y1="302.44009" x2="818.39136" y2="338.76443" id="linearGradient3394" xlink:href="#linearGradient4738-8" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(0.705519,0,0,0.956752,-507.84873,-233.51722)"/>
+        <linearGradient x1="302.73621" y1="377.9527" x2="311.27377" y2="390.78342" id="linearGradient3397" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.9519,0,0,1.84182,-558.30873,-643.60062)"/>
+        <linearGradient x1="302.73621" y1="377.9527" x2="311.27377" y2="390.78342" id="linearGradient3402" xlink:href="#linearGradient4554-6" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(4.7172872,0,0,4.4512495,-1427.8757,-1668.3879)"/>
+        <linearGradient x1="314.56537" y1="369.97995" x2="332.02466" y2="387.43924" id="linearGradient3409" xlink:href="#linearGradient4568-0" gradientUnits="userSpaceOnUse"/>
+    </defs>
+    <path d="m 339.53775,378.05789 a 13.966679,13.966679 0 1 1 -27.93335,0 13.966679,13.966679 0 1 1 27.93335,0 z" transform="matrix(4.582335,0,0,4.582335,-1427.8757,-1668.3879)" id="path4531-9"
+          style="fill:#b4281c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.625;marker:none;visibility:visible;display:inline;overflow:visible"/>
+    <path d="m 339.53775,378.05789 a 13.966679,13.966679 0 1 1 -27.93335,0 13.966679,13.966679 0 1 1 27.93335,0 z" transform="matrix(4.1838585,0,0,4.1838585,-1298.1485,-1517.746)" id="path4533-6"
+          style="fill:url(#linearGradient3409);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.324922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"/>
+    <path d="m 63.960688,5.5974392 c -32.255982,0 -58.424852,26.1688238 -58.424812,58.4248068 0,15.497687 6.32454,29.346583 16.18139,39.809054 5.12077,-42.294602 40.818036,-75.178969 84.486844,-75.178969 1.17747,0 2.27081,0.23926 3.43676,0.286387 C 98.955303,15.040641 82.833921,5.5974392 63.960688,5.5974392 z"
+          id="path4537-8" style="fill:url(#linearGradient3402);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.616072;marker:none;visibility:visible;display:inline;overflow:visible"/>
+    <path d="m 26.621866,72.59933 c -6e-5,0.76161 0.6704,1.288794 1.43196,1.28876 l 71.885412,-1.7e-5 c 0.761592,0 1.431912,-0.527251 1.431962,-1.28876 l 0,-17.183761 c 4e-5,-0.761629 -0.67035,-1.432019 -1.431978,-1.431983 l -71.885346,1.7e-5 c -0.76161,-5.3e-5 -1.43201,0.670353 -1.43196,1.431966 l 0,17.183761 -5e-5,1.7e-5 z"
+          id="rect4574-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.616072;marker:none;visibility:visible;display:inline;overflow:visible"/>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_true.svg
new file mode 100644
index 0000000..df85d69
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_true.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" width="128" height="128" id="svg4252">
+    <metadata>
+        <rdf:RDF xmlns:cc="http://web.resource.org/cc/"
+                 xmlns:dc="http://purl.org/dc/elements/1.1/"
+                 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <cc:Work rdf:about="">
+                <dc:title>OK icon</dc:title>
+                <dc:description>Green round glosy OK icon</dc:description>
+                <dc:subject>
+                    <rdf:Bag>
+                        <rdf:li>ok</rdf:li>
+                        <rdf:li>check</rdf:li>
+                        <rdf:li>icon</rdf:li>
+                        <rdf:li>green</rdf:li>
+                        <rdf:li>round</rdf:li>
+                        <rdf:li>glosy</rdf:li>
+                        <rdf:li>button</rdf:li>
+                    </rdf:Bag>
+                </dc:subject>
+                <dc:publisher>
+                    <cc:Agent rdf:about="http://www.openclipart.org">
+                        <dc:title>Open Clip Art Library</dc:title>
+                    </cc:Agent>
+                </dc:publisher>
+                <dc:creator>
+                    <cc:Agent>
+                        <dc:title>Jakub Jankiewicz</dc:title>
+                    </cc:Agent>
+                </dc:creator>
+                <dc:rights>
+                    <cc:Agent>
+                        <dc:title>Jakub Jankiewicz</dc:title>
+                    </cc:Agent>
+                </dc:rights>
+                <dc:date></dc:date>
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+                <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+                <dc:language>pl</dc:language>
+            </cc:Work>
+            <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+                <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+                <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+                <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+            </cc:License>
+        </rdf:RDF>
+    </metadata>
+    <defs id="defs4254">
+        <linearGradient x1="302.73621" y1="377.9527" x2="311.27377" y2="390.78342" id="linearGradient4206" xlink:href="#linearGradient4554" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(5.2961708,0,0,4.9974862,-1603.0989,-1873.1257)"/>
+        <linearGradient id="linearGradient4554">
+            <stop id="stop4556" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+            <stop id="stop4558" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="401.93405" y1="376.13748" x2="414.38986" y2="390.49332" id="linearGradient4222" xlink:href="#linearGradient4738" gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(2.7131949,0,0,2.7134878,-1075.9729,-978.37049)"/>
+        <linearGradient id="linearGradient4738">
+            <stop id="stop4740" style="stop-color:#ffffff;stop-opacity:0.7265625" offset="0"/>
+            <stop id="stop4742" style="stop-color:#ffffff;stop-opacity:1" offset="1"/>
+        </linearGradient>
+        <linearGradient x1="314.56537" y1="369.97995" x2="332.02466" y2="387.43924" id="linearGradient4213" xlink:href="#linearGradient4568" gradientUnits="userSpaceOnUse"/>
+        <linearGradient id="linearGradient4568">
+            <stop id="stop4570" style="stop-color:#118909;stop-opacity:1" offset="0"/>
+            <stop id="stop4572" style="stop-color:#084c06;stop-opacity:1" offset="1"/>
+        </linearGradient>
+    </defs>
+    <g transform="matrix(0.89069721,0,0,0.89069721,3.6618346e-5,0.04842997)" id="layer1">
+        <path d="m 339.53775,378.05789 a 13.966679,13.966679 0 1 1 -27.93335,0 13.966679,13.966679 0 1 1 27.93335,0 z" transform="matrix(5.1446606,0,0,5.1446606,-1603.0989,-1873.1257)" id="path4531"
+              style="fill:#084c06;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.625;marker:none;visibility:visible;display:inline;overflow:visible"/>
+        <path d="m 339.53775,378.05789 a 13.966679,13.966679 0 1 1 -27.93335,0 13.966679,13.966679 0 1 1 27.93335,0 z" transform="matrix(4.6972957,0,0,4.6972957,-1457.4507,-1703.9962)" id="path4533"
+              style="fill:url(#linearGradient4213);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.32492188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"/>
+        <path d="m 39.649739,58.140662 c -0.416752,0 -1.10107,0.251488 -1.403395,0.565849 L 24.773752,72.459332 c -0.60447,0.610757 -0.603572,1.362528 0,1.965202 l 21.176669,20.112782 13.75327,13.753724 c 0.305379,0.30537 0.705964,0.55686 1.122716,0.55686 0.308073,0 0.599979,-0.32334 0.841588,-0.55686 L 75.421265,94.818444 118.92651,51.312752 c 0.61255,-0.601775 0.61076,-1.640961 0,-2.245431 L 105.17324,35.314499 c -0.61076,-0.601776 -1.3619,-0.610757 -1.96475,0 L 60.825958,77.696577 40.772006,58.706511 C 40.469321,58.401132 40.066042,58.140662 39.64929,58.140662 z"
+              id="rect4574" style="fill:url(#linearGradient4222);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none;visibility:visible;display:inline;overflow:visible"/>
+        <path d="m 71.809802,6.2837595 c -36.214325,0 -65.5944541,29.3810275 -65.5943643,65.5953525 0,17.398505 7.1005943,32.946768 18.1670703,44.693078 5.749114,-47.484599 45.82702,-84.40399 94.854592,-84.40399 1.32202,0 2.54955,0.269452 3.85855,0.323342 C 111.09875,16.887587 92.999137,6.2855559 71.809802,6.2855559 z"
+              id="path4537" style="fill:url(#linearGradient4206);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none;visibility:visible;display:inline;overflow:visible"/>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_false.svg
new file mode 100644
index 0000000..2d6730b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_false.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://web.resource.org/cc/"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        width="32"
+        height="32"
+        id="svg2"
+        sodipodi:version="0.32"
+        inkscape:version="0.44.1"
+        version="1.0"
+        sodipodi:docbase="E:\Vektorgrafiken\myOwn\Symb"
+        sodipodi:docname="false.svg"
+        inkscape:export-filename="E:\Vektorgrafiken\myOwn\Symb\false.png"
+        inkscape:export-xdpi="45"
+        inkscape:export-ydpi="45">
+    <defs
+            id="defs4">
+        <linearGradient
+                id="linearGradient13658">
+            <stop
+                    style="stop-color:white;stop-opacity:1;"
+                    offset="0"
+                    id="stop13660"/>
+            <stop
+                    style="stop-color:#ebebeb;stop-opacity:1;"
+                    offset="1"
+                    id="stop13662"/>
+        </linearGradient>
+        <linearGradient
+                id="linearGradient12765">
+            <stop
+                    style="stop-color:#ff2700;stop-opacity:1;"
+                    offset="0"
+                    id="stop12767"/>
+            <stop
+                    style="stop-color:#a00200;stop-opacity:1;"
+                    offset="1"
+                    id="stop12769"/>
+        </linearGradient>
+        <linearGradient
+                id="linearGradient9178">
+            <stop
+                    style="stop-color:#ff3700;stop-opacity:1;"
+                    offset="0"
+                    id="stop9180"/>
+            <stop
+                    style="stop-color:#d10100;stop-opacity:1;"
+                    offset="1"
+                    id="stop9182"/>
+        </linearGradient>
+        <linearGradient
+                id="linearGradient5584">
+            <stop
+                    style="stop-color:#d13800;stop-opacity:1;"
+                    offset="0"
+                    id="stop5586"/>
+            <stop
+                    style="stop-color:#d10000;stop-opacity:1;"
+                    offset="1"
+                    id="stop5588"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient5584"
+                id="linearGradient5590"
+                x1="150.34462"
+                y1="279.38467"
+                x2="168.2451"
+                y2="294.41068"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="translate(-61.25,14.55357)"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient12765"
+                id="linearGradient12771"
+                x1="-61.539711"
+                y1="-3.6558013"
+                x2="-40.597286"
+                y2="15.362056"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="translate(66.57742,9.655801)"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient13658"
+                id="linearGradient13664"
+                x1="3.3509588"
+                y1="3.8856263"
+                x2="28.430292"
+                y2="27.278484"
+                gradientUnits="userSpaceOnUse"/>
+    </defs>
+    <sodipodi:namedview
+            id="base"
+            pagecolor="#ffffff"
+            bordercolor="#666666"
+            borderopacity="1.0"
+            inkscape:pageopacity="0.0"
+            inkscape:pageshadow="2"
+            inkscape:zoom="0.98994949"
+            inkscape:cx="62.317793"
+            inkscape:cy="-34.571263"
+            inkscape:document-units="px"
+            inkscape:current-layer="layer1"
+            showguides="true"
+            inkscape:guide-bbox="true"
+            width="32px"
+            height="32px"
+            inkscape:window-width="1280"
+            inkscape:window-height="744"
+            inkscape:window-x="-4"
+            inkscape:window-y="-4"/>
+    <metadata
+            id="metadata7">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <g
+            inkscape:label="Ebene 1"
+            inkscape:groupmode="layer"
+            id="layer1">
+        <g
+                id="g13674"
+                transform="matrix(0.992,0,0,0.992,5.935625e-2,1.117239e-2)">
+            <path
+                    id="rect11855"
+                    d="M 6.9910716,0.41071431 C 6.6037476,0.45170731 6.2384516,0.59848231 5.9598216,0.87946431 L 0.95982158,5.9107144 C 0.21680358,6.6599991 0.34872158,8.0108356 1.2410716,8.9107144 L 8.2723216,15.973214 L 8.2723216,16.160714 L 1.1160716,23.254464 C 0.21619258,24.146817 0.085538583,25.480197 0.83482158,26.223214 L 5.8973216,31.191964 C 6.6466066,31.934982 7.9661926,31.834317 8.8660716,30.941964 L 16.022321,23.816964 L 23.209821,31.066964 C 24.102173,31.966843 25.435554,32.097499 26.178571,31.348214 L 31.178571,26.285714 C 31.921589,25.536429 31.789676,24.216844 30.897321,23.316964 L 23.803571,16.160714 L 23.803571,16.098214 L 31.022321,8.9419644 C 31.9222,8.049612 32.052859,6.7474819 31.303571,6.0044644 L 26.272321,1.0044643 C 25.523036,0.26144631 24.172198,0.39336231 23.272321,1.2857143 L 16.147321,8.3794644 L 16.084821,8.3794644 L 8.9285716,1.1607143 C 8.3708516,0.59829031 7.6366126,0.34239331 6.9910716,0.41071431 z "
+                    style="opacity:1;fill:url(#linearGradient13664);fill-opacity:1;stroke:#8a0000;stroke-width:0.60001051;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+            <path
+                    id="rect11874"
+                    d="M 7.1874998,3.7803054 C 7.0081378,3.7608244 6.8412588,3.8140474 6.7187498,3.9365554 L 3.9374998,6.7178054 C 3.6924818,6.9628234 3.7577738,7.4130804 4.0624998,7.7178054 L 12.34375,15.999055 L 4.0624998,24.280305 C 3.7577728,24.585032 3.6924818,25.035288 3.9374998,25.280305 L 6.7187498,28.061555 C 6.9637678,28.306573 7.4140228,28.272532 7.7187498,27.967805 L 16,19.686555 L 24.28125,27.967805 C 24.585977,28.272532 25.036232,28.306573 25.28125,28.061555 L 28.0625,25.280305 C 28.307518,25.035287 28.242227,24.585033 27.9375,24.280305 L 19.65625,15.999055 L 27.9375,7.7178054 C 28.242227,7.4130784 28.307518,6.9628194 28.0625,6.7178054 L 25.28125,3.9365554 C 25.036232,3.6915374 24.585977,3.7568254 24.28125,4.0615554 L 16,12.342805 L 7.7187498,4.0615554 C 7.5663868,3.9091924 7.3668618,3.7997864 7.1874998,3.7803054 z "
+                    style="opacity:1;fill:url(#linearGradient12771);fill-opacity:1;stroke:none;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+        </g>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_true.svg
new file mode 100644
index 0000000..c39e423
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_true.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://web.resource.org/cc/"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        width="32"
+        height="32"
+        id="svg13706"
+        sodipodi:version="0.32"
+        inkscape:version="0.44.1"
+        version="1.0"
+        sodipodi:docbase="E:\Bilder\Eigene\scalable\actions"
+        sodipodi:docname="apply.svg"
+        inkscape:export-filename="E:\Bilder\Eigene\32x32\actions\apply.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90">
+    <defs
+            id="defs13708">
+        <linearGradient
+                id="linearGradient19986">
+            <stop
+                    style="stop-color:#05b600;stop-opacity:1;"
+                    offset="0"
+                    id="stop19988"/>
+            <stop
+                    style="stop-color:#037800;stop-opacity:1;"
+                    offset="1"
+                    id="stop19990"/>
+        </linearGradient>
+        <linearGradient
+                id="linearGradient12765">
+            <stop
+                    style="stop-color:#ff2700;stop-opacity:1;"
+                    offset="0"
+                    id="stop12767"/>
+            <stop
+                    style="stop-color:#a00200;stop-opacity:1;"
+                    offset="1"
+                    id="stop12769"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient12765"
+                id="linearGradient12771"
+                x1="-61.539711"
+                y1="-3.6558013"
+                x2="-40.597286"
+                y2="15.362056"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="translate(66.57742,9.655801)"/>
+        <linearGradient
+                id="linearGradient13658">
+            <stop
+                    style="stop-color:white;stop-opacity:1;"
+                    offset="0"
+                    id="stop13660"/>
+            <stop
+                    style="stop-color:#ebebeb;stop-opacity:1;"
+                    offset="1"
+                    id="stop13662"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient13658"
+                id="linearGradient13664"
+                x1="3.3509588"
+                y1="3.8856263"
+                x2="28.430292"
+                y2="27.278484"
+                gradientUnits="userSpaceOnUse"/>
+    </defs>
+    <sodipodi:namedview
+            id="base"
+            pagecolor="#ffffff"
+            bordercolor="#666666"
+            borderopacity="1.0"
+            inkscape:pageopacity="0.0"
+            inkscape:pageshadow="2"
+            inkscape:zoom="0.9899495"
+            inkscape:cx="13.619984"
+            inkscape:cy="-71.625658"
+            inkscape:document-units="px"
+            inkscape:current-layer="layer1"
+            width="32px"
+            height="32px"
+            showguides="true"
+            inkscape:guide-bbox="true"
+            inkscape:window-width="1280"
+            inkscape:window-height="744"
+            inkscape:window-x="-4"
+            inkscape:window-y="-4"/>
+    <metadata
+            id="metadata13711">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <g
+            inkscape:label="Ebene 1"
+            inkscape:groupmode="layer"
+            id="layer1">
+        <path
+                style="opacity:1;fill:white;fill-opacity:1;stroke:#00461b;stroke-width:0.59999996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 24.803571,0.80357146 C 24.314868,0.77619506 23.771217,1.0861266 23.459821,1.6160715 L 12.834821,19.709822 L 12.366071,19.709822 L 5.1473215,15.678572 C 4.9102235,15.546689 4.5912195,15.646169 4.4285715,15.897322 L 0.61160728,21.870536 C 0.44896128,22.12169 0.49950928,22.560081 0.73660724,22.691965 L 15.522321,31.084822 C 16.101118,31.424922 16.919628,31.135165 17.334821,30.428572 L 31.491071,6.3348215 C 31.906264,5.6282285 31.757369,4.7686725 31.178571,4.4285715 L 25.272321,0.95982146 C 25.127622,0.87479636 24.966472,0.81269696 24.803571,0.80357146 z "
+                id="rect19049"
+                sodipodi:nodetypes="cccccccccccccc"/>
+        <path
+                style="opacity:1;fill:#007308;fill-opacity:1;stroke:none;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 26.330357,3.1696429 C 25.988613,3.1103238 25.626558,3.2975374 25.424107,3.6383929 L 13.848214,23.147322 L 6.2053571,18.669643 C 5.677461,18.369885 5.0301064,18.452838 4.7366071,18.888393 L 3.1741071,21.200893 C 2.8806076,21.636447 3.083711,22.244885 3.6116071,22.544643 L 13.924107,28.388393 C 14.127144,28.503684 14.335124,28.545668 14.549107,28.544643 C 14.916473,28.653289 15.328431,28.509934 15.549107,28.138393 L 28.736607,5.9196429 C 29.006542,5.4651689 28.899955,4.8589815 28.486607,4.5758929 L 26.642857,3.3258929 C 26.53952,3.2551208 26.444272,3.1894159 26.330357,3.1696429 z "
+                id="rect19085"
+                sodipodi:nodetypes="cccccccccccccc"/>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean4_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean4_false.svg
new file mode 100644
index 0000000..0bdee01
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean4_false.svg
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        width="36.000000px"
+        height="36.000000px"
+        id="svg2"
+        sodipodi:version="0.32"
+        inkscape:version="0.48.0 r9654"
+        sodipodi:docname="Remove-349235435.svg"
+        inkscape:export-filename="/datas/wiki/add.png"
+        inkscape:export-xdpi="90.000000"
+        inkscape:export-ydpi="90.000000"
+        inkscape:output_extension="org.inkscape.output.svg.inkscape"
+        version="1.1">
+    <defs
+            id="defs4">
+        <linearGradient
+                id="linearGradient3776">
+            <stop
+                    id="stop3778"
+                    offset="0.0000000"
+                    style="stop-color:#ffa5a5;stop-opacity:1"/>
+            <stop
+                    id="stop3780"
+                    offset="1.0000000"
+                    style="stop-color:#bc1414;stop-opacity:0"/>
+        </linearGradient>
+        <linearGradient
+                id="linearGradient1365">
+            <stop
+                    id="stop1367"
+                    offset="0.0000000"
+                    style="stop-color:#f00a0a;stop-opacity:1"/>
+            <stop
+                    id="stop1370"
+                    offset="1.0000000"
+                    style="stop-color:#640000;stop-opacity:1"/>
+        </linearGradient>
+        <linearGradient
+                id="linearGradient1352">
+            <stop
+                    style="stop-color:#980707;stop-opacity:1"
+                    offset="0.0000000"
+                    id="stop1354"/>
+            <stop
+                    style="stop-color:#510202;stop-opacity:1"
+                    offset="1.0000000"
+                    id="stop1356"/>
+        </linearGradient>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient3776"
+                id="linearGradient3000"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="matrix(0.58147,-0.58147,0.58147,0.58147,-19.214087,18)"
+                x1="32.682953"
+                y1="19.206007"
+                x2="27.468960"
+                y2="49.282398"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient1365"
+                id="linearGradient3003"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="matrix(0.58147,-0.58147,0.58147,0.58147,-19.209158,18)"
+                x1="36.463844"
+                y1="6.1829467"
+                x2="27.573986"
+                y2="57.789398"/>
+        <linearGradient
+                inkscape:collect="always"
+                xlink:href="#linearGradient1352"
+                id="linearGradient3006"
+                gradientUnits="userSpaceOnUse"
+                gradientTransform="matrix(0.58147,-0.58147,0.58147,0.58147,-19.214609,18.00115)"
+                x1="36.304314"
+                y1="6.2060790"
+                x2="27.493591"
+                y2="57.587868"/>
+    </defs>
+    <sodipodi:namedview
+            id="base"
+            pagecolor="#ffffff"
+            bordercolor="#666666"
+            borderopacity="1.0"
+            inkscape:pageopacity="0.0"
+            inkscape:pageshadow="2"
+            inkscape:zoom="1"
+            inkscape:cx="13.594425"
+            inkscape:cy="18.298015"
+            inkscape:document-units="px"
+            inkscape:current-layer="layer1"
+            showgrid="false"
+            inkscape:grid-bbox="true"
+            inkscape:grid-points="true"
+            inkscape:window-width="1156"
+            inkscape:window-height="693"
+            inkscape:window-x="22"
+            inkscape:window-y="22"
+            showguides="false"
+            inkscape:window-maximized="0">
+        <inkscape:grid
+                id="GridFromPre046Settings"
+                type="xygrid"
+                originx="0px"
+                originy="0px"
+                spacingx="1px"
+                spacingy="1px"
+                color="#0000ff"
+                empcolor="#0000ff"
+                opacity="0.2"
+                empopacity="0.4"
+                empspacing="4"/>
+    </sodipodi:namedview>
+    <metadata
+            id="metadata7">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+                <dc:title>Add</dc:title>
+                <dc:date>2005-10-30</dc:date>
+                <dc:creator>
+                    <cc:Agent>
+                        <dc:title>Jean-Victor Balin</dc:title>
+                    </cc:Agent>
+                </dc:creator>
+                <dc:description>jean.victor.balin@gmail.com</dc:description>
+                <cc:license
+                        rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+                <dc:subject>
+                    <rdf:Bag>
+                        <rdf:li>icon</rdf:li>
+                        <rdf:li>add</rdf:li>
+                        <rdf:li>plus</rdf:li>
+                    </rdf:Bag>
+                </dc:subject>
+                <dc:language>fr-FR</dc:language>
+            </cc:Work>
+            <cc:License
+                    rdf:about="http://creativecommons.org/licenses/publicdomain/">
+                <cc:permits
+                        rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+                <cc:permits
+                        rdf:resource="http://creativecommons.org/ns#Distribution"/>
+                <cc:permits
+                        rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+            </cc:License>
+        </rdf:RDF>
+    </metadata>
+    <g
+            inkscape:label="Calque 1"
+            inkscape:groupmode="layer"
+            id="layer1">
+        <path
+                inkscape:connector-curvature="0"
+                style="fill:url(#linearGradient3006);fill-opacity:1;stroke:none"
+                d="m 0.500567,21.392081 c 0.05084,0.542535 0.508712,0.955739 1.0536,0.950811 l 12.103565,0 8.685785,1e-6 12.103563,-1e-6 c 0.279833,0.0013 0.548584,-0.109269 0.746458,-0.307143 0.197874,-0.197874 0.308456,-0.466625 0.307143,-0.746457 l 0,-6.578583 c 0.0013,-0.279833 -0.109269,-0.548584 -0.307143,-0.746458 -0.197874,-0.197874 -0.466625,-0.308457 -0.746458,-0.307143 l -12.103563,-10e-7 -8.685785,10e-7 -12.103565,0 c -0.279832,-0.0013 -0.548583,0.109269 -0.746457,0.307143 -0.197874,0.197874 -0.308456,0.466625 -0.307144,0.746458 l 0,6.578583 c -0.0017,0.03424 -0.0017,0.06855 1e-6,0.102789 z"
+                id="path1349"
+                sodipodi:nodetypes="cccccsccsccccsccc"/>
+        <path
+                inkscape:connector-curvature="0"
+                style="fill:url(#linearGradient3003);fill-opacity:1;stroke:none"
+                d="m 1.429756,14.873861 c -0.0867,0.148461 -0.129227,0.318581 -0.122593,0.490375 l 0,5.271528 c 0.0023,0.495541 0.403479,0.896677 0.89902,0.899021 l 12.259369,0 7.069569,0 12.259369,0 c 0.495541,-0.0023 0.896676,-0.40348 0.89902,-0.899021 l 0,-5.271528 c -0.0023,-0.495541 -0.40348,-0.896677 -0.89902,-0.899021 l -12.259369,0 -7.069569,0 -12.259369,0 c -0.312027,-0.0071 -0.605595,0.147444 -0.776427,0.408646 z"
+                id="path1468"
+                sodipodi:nodetypes="cccccccccccccc"/>
+        <path
+                inkscape:connector-curvature="0"
+                style="fill:url(#linearGradient3000);fill-opacity:1;stroke:none"
+                d="m 1.981092,15.262074 c -0.01422,0.03214 -0.0212,0.06702 -0.02043,0.102162 l 0,5.271528 c 0.0021,0.04384 0.01627,0.08624 0.04087,0.122594 0.02273,0.04375 0.05841,0.07943 0.102161,0.102161 0.03214,0.01422 0.06702,0.0212 0.102162,0.02043 l 31.588308,-8e-6 c 0.04384,-0.0021 0.08624,-0.01627 0.122594,-0.04087 0.04375,-0.02273 0.07943,-0.05841 0.102162,-0.102161 0.01422,-0.03214 0.0212,-0.06702 0.02043,-0.102162 l 0,-5.271528 c -0.0021,-0.04384 -0.01627,-0.08624 -0.04087,-0.122594 -0.02273,-0.04375 -0.05841,-0.07943 -0.102161,-0.102161 -0.03214,-0.01422 -0.06702,-0.0212 -0.102162,-0.02043 l -12.504556,0 -0.417216,0.01251 -5.761906,8e-6 -0.400074,-0.01251 -12.504556,0 c -0.04384,0.0021 -0.08624,0.01627 -0.122594,0.04087 -0.04376,0.02273 -0.07943,0.05841 -0.102162,0.102161 z"
+                id="path1472"
+                sodipodi:nodetypes="ccccccccccccccccccccc"/>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox1_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox1_true.svg
new file mode 100644
index 0000000..03f6339
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox1_true.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://web.resource.org/cc/"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        version="1.0"
+        width="48"
+        height="48"
+        id="svg2"
+        sodipodi:version="0.32"
+        inkscape:version="0.45.1"
+        sodipodi:docname="check.svg"
+        sodipodi:docbase="/home/sergey/pix/shared"
+        inkscape:output_extension="org.inkscape.output.svg.inkscape"
+        inkscape:export-filename="/home/sergey/pix/shared/check.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90">
+    <metadata
+            id="metadata8">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <sodipodi:namedview
+            inkscape:window-height="621"
+            inkscape:window-width="948"
+            inkscape:pageshadow="2"
+            inkscape:pageopacity="0.0"
+            guidetolerance="10.0"
+            gridtolerance="10.0"
+            objecttolerance="10.0"
+            borderopacity="1.0"
+            bordercolor="#666666"
+            pagecolor="#ffffff"
+            id="base"
+            inkscape:zoom="4.2395833"
+            inkscape:cx="29.780401"
+            inkscape:cy="17.464263"
+            inkscape:window-x="0"
+            inkscape:window-y="25"
+            inkscape:current-layer="svg2"/>
+    <defs
+            id="defs4"/>
+    <g
+            id="layer1"
+            transform="translate(-4.25,1.1205316)">
+        <path
+                d="M 4.25,4.46875 L 4.25,43.15625 L 42.9375,43.15625 L 42.9375,4.46875 L 4.25,4.46875 z M 10.5625,10.03125 L 36.625,10.03125 L 36.625,37.625 L 10.5625,37.625 L 10.5625,10.03125 z "
+                style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                id="rect2160"/>
+        <path
+                d="M 16.039374,15.645287 L 21.897536,32.485324 L 43.247293,3.3794684"
+                style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:9;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                id="path2170"/>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox2_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox2_true.svg
new file mode 100644
index 0000000..e6781e7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox2_true.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://web.resource.org/cc/"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        version="1.0"
+        width="48"
+        height="48"
+        id="svg2"
+        sodipodi:version="0.32"
+        inkscape:version="0.45.1"
+        sodipodi:docname="check.svg"
+        sodipodi:docbase="/home/sergey/pix/shared"
+        inkscape:output_extension="org.inkscape.output.svg.inkscape"
+        inkscape:export-filename="/home/sergey/pix/shared/check.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90">
+    <metadata
+            id="metadata8">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <sodipodi:namedview
+            inkscape:window-height="621"
+            inkscape:window-width="948"
+            inkscape:pageshadow="2"
+            inkscape:pageopacity="0.0"
+            guidetolerance="10.0"
+            gridtolerance="10.0"
+            objecttolerance="10.0"
+            borderopacity="1.0"
+            bordercolor="#666666"
+            pagecolor="#ffffff"
+            id="base"
+            inkscape:zoom="4.2395833"
+            inkscape:cx="29.780401"
+            inkscape:cy="17.464263"
+            inkscape:window-x="0"
+            inkscape:window-y="25"
+            inkscape:current-layer="svg2"/>
+    <defs
+            id="defs4"/>
+    <g
+            id="g2159"
+            transform="translate(-4.25,1.1205316)">
+        <path
+                id="path2161"
+                style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 4.25,4.46875 L 4.25,43.15625 L 42.9375,43.15625 L 42.9375,4.46875 L 4.25,4.46875 z M 10.5625,10.03125 L 36.625,10.03125 L 36.625,37.625 L 10.5625,37.625 L 10.5625,10.03125 z "/>
+        <path
+                id="path2163"
+                style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:9;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 12.698519,40.50498 L 36.878743,11.634997 M 14.152396,14.230054 L 36.285742,36.25928"
+                sodipodi:nodetypes="cccc"/>
+    </g>
+</svg>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox_false.svg
new file mode 100644
index 0000000..4d2e4fd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox_false.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://web.resource.org/cc/"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns="http://www.w3.org/2000/svg"
+        version="1.0"
+        width="48"
+        height="48"
+        id="svg2"
+        sodipodi:version="0.32"
+        inkscape:version="0.45.1"
+        sodipodi:docname="check.svg"
+        sodipodi:docbase="/home/sergey/pix/shared"
+        inkscape:output_extension="org.inkscape.output.svg.inkscape"
+        inkscape:export-filename="/home/sergey/pix/shared/check.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90">
+    <metadata
+            id="metadata8">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <sodipodi:namedview
+            inkscape:window-height="621"
+            inkscape:window-width="948"
+            inkscape:pageshadow="2"
+            inkscape:pageopacity="0.0"
+            guidetolerance="10.0"
+            gridtolerance="10.0"
+            objecttolerance="10.0"
+            borderopacity="1.0"
+            bordercolor="#666666"
+            pagecolor="#ffffff"
+            id="base"
+            inkscape:zoom="4.2395833"
+            inkscape:cx="29.780401"
+            inkscape:cy="17.464263"
+            inkscape:window-x="0"
+            inkscape:window-y="25"
+            inkscape:current-layer="svg2"/>
+    <defs
+            id="defs4"/>
+    <g
+            id="g2159"
+            transform="translate(-4.25,1.1205316)">
+        <path
+                id="path2161"
+                style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 4.25,4.46875 L 4.25,43.15625 L 42.9375,43.15625 L 42.9375,4.46875 L 4.25,4.46875 z M 10.5625,10.03125 L 36.625,10.03125 L 36.625,37.625 L 10.5625,37.625 L 10.5625,10.03125 z "/>
+    </g>
+</svg>

From d5c11b685b060e4444e70626726596a9a986d7c7 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 12:51:35 +0200
Subject: [PATCH 07/21] Added tests

---
 CHANGELOG.md                                  |   4 +
 dynamicreports-core-for-grid-exporter/pom.xml |  20 +
 .../transformation/ComponentTransform.java    |  17 -
 .../transformation/CustomBatikRenderer.java   |  61 --
 .../expressions/BooleanImageExpression.java   | 113 ---
 .../JasperConcatenatedReportBuilder.java      | 204 ++---
 .../jasper/builder/JasperReportBuilder.java   | 376 ++++----
 .../builder/export/ExporterBuilders.java      | 310 +++----
 .../jasper/builder/export/Exporters.java      | 310 +++----
 .../transformation/ExporterTransform.java     | 849 +++++++++++-------
 .../report/constant/BooleanComponentType.java |  40 +-
 .../jasper/base/JasperCustomValuesTest.java   |  67 ++
 .../report/ReportUtilsTest.java               |  81 ++
 .../builder/style/StyleBuildersTest.java      | 107 +++
 .../test/base/ConditionsTest.java             | 248 +++++
 .../test/base/DataTypeTest.java               | 161 ++++
 .../test/base/DefaultsTest.java               | 124 +++
 .../test/bugs/Bug_2997586_Test.java           |  55 ++
 .../test/design/AbstractBandTest.java         | 128 +++
 .../test/design/DesignReportBuilder.java}     |  21 +-
 .../design/DesignTestTemplateDesign.java}     |  11 +-
 .../design/position/ColumnPosition1Test.java  |  67 ++
 .../design/position/ColumnPosition2Test.java  |  93 ++
 .../position/HorizontalListPositionTest.java  |  68 ++
 .../design/position/SubtotalPositionTest.java | 123 +++
 .../position/VerticalListPositionTest.java    |  71 ++
 .../design/report/BandBackgroundTest.java     | 171 ++++
 .../test/design/report/ExceptionTest.java     | 114 +++
 .../design/report/ReportTemplateTest.java     | 357 ++++++++
 .../design/report/TemplateDesignTest.java     | 290 ++++++
 .../AbstractJasperCrosstabPositionTest.java   |  73 ++
 .../AbstractJasperCrosstabStyleTest.java      | 135 +++
 .../AbstractJasperCrosstabValueTest.java      | 104 +++
 .../jasper/AbstractJasperPositionTest.java    | 150 ++++
 .../test/jasper/AbstractJasperStyleTest.java  | 329 +++++++
 .../test/jasper/AbstractJasperTest.java       | 253 ++++++
 .../test/jasper/AbstractJasperValueTest.java  | 252 ++++++
 .../test/jasper/JasperTestUtils.java          | 137 +++
 .../jasper/column/BooleanColumn1Test.java     |  81 ++
 .../jasper/column/BooleanColumn2Test.java     |  80 ++
 .../column/BooleanColumnPosition1Test.java    |  65 ++
 .../column/BooleanColumnPosition2Test.java    |  64 ++
 .../column/BooleanColumnPosition3Test.java    |  66 ++
 .../column/BooleanColumnPosition4Test.java    |  67 ++
 .../column/BooleanColumnPosition5Test.java    |  68 ++
 .../test/jasper/column/Column1Test.java       | 137 +++
 .../test/jasper/column/Column2Test.java       |  99 ++
 .../test/jasper/column/Column3Test.java       | 126 +++
 .../test/jasper/column/Column4Test.java       |  74 ++
 .../test/jasper/column/ColumnGridTest.java    |  80 ++
 .../jasper/column/ColumnPosition1Test.java    |  79 ++
 .../jasper/column/ColumnPosition2Test.java    |  95 ++
 .../jasper/column/ColumnTitleGroup1Test.java  |  76 ++
 .../jasper/column/ColumnTitleGroup2Test.java  |  74 ++
 .../jasper/column/ColumnTitleGroup3Test.java  |  77 ++
 .../column/ColumnTitleGroupPosition1Test.java |  86 ++
 .../column/ColumnTitleGroupPosition2Test.java |  77 ++
 .../column/ColumnTitleGroupPosition3Test.java |  77 ++
 .../column/ColumnTitleGroupPosition4Test.java |  91 ++
 .../column/ColumnTitleGroupPosition5Test.java |  88 ++
 .../column/ColumnTitleGroupPosition6Test.java |  73 ++
 .../column/ComponentColumnPositionTest.java   |  97 ++
 .../test/jasper/column/EmptyColumnTest.java   | 101 +++
 .../jasper/column/ExpressionColumnTest.java   | 137 +++
 .../jasper/column/PercentageColumnTest.java   |  90 ++
 .../test/jasper/component/BreakTest.java      |  82 ++
 .../test/jasper/component/Component1Test.java |  97 ++
 .../test/jasper/component/Component2Test.java |  99 ++
 .../test/jasper/component/Component3Test.java |  86 ++
 .../jasper/component/ComponentStyleTest.java  |  76 ++
 .../test/jasper/component/Image1Test.java     | 105 +++
 .../test/jasper/component/Image2Test.java     |  89 ++
 .../test/jasper/component/List1Test.java      | 195 ++++
 .../test/jasper/component/List2Test.java      |  75 ++
 .../test/jasper/component/List3Test.java      | 128 +++
 .../ListBackgroundComponentTest.java          | 102 +++
 .../component/ListComponentGroupTypeTest.java |  57 ++
 .../component/ListFixedComponents1Test.java   |  46 +
 .../component/ListFixedComponents2Test.java   |  46 +
 .../test/jasper/component/ListGapTest.java    |  48 +
 .../jasper/component/MultiPageList1Test.java  |  67 ++
 .../jasper/component/MultiPageList2Test.java  |  78 ++
 .../jasper/component/MultiPageList3Test.java  |  79 ++
 .../jasper/component/MultiPageList4Test.java  | 100 +++
 .../jasper/component/PageNumber1Test.java     |  59 ++
 .../jasper/component/PageNumber2Test.java     |  74 ++
 .../jasper/component/PageNumber3Test.java     | 138 +++
 .../jasper/component/PageNumber4Test.java     |  76 ++
 .../jasper/component/PageNumber5Test.java     |  76 ++
 .../jasper/component/PageNumber6Test.java     |  64 ++
 .../component/PageNumberPositionTest.java     |  95 ++
 .../test/jasper/component/TextField1Test.java |  76 ++
 .../test/jasper/component/TextField2Test.java |  60 ++
 .../test/jasper/component/TextField3Test.java |  73 ++
 .../test/jasper/component/TextField4Test.java |  77 ++
 .../test/jasper/component/TextField5Test.java |  66 ++
 .../test/jasper/component/TextField6Test.java |  65 ++
 .../test/jasper/component/TextField7Test.java |  80 ++
 .../jasper/component/VerticalListTest.java    |  58 ++
 .../test/jasper/component/XyListTest.java     |  88 ++
 .../test/jasper/crosstab/Crosstab1Test.java   | 191 ++++
 .../test/jasper/crosstab/Crosstab2Test.java   | 153 ++++
 .../test/jasper/crosstab/Crosstab3Test.java   | 122 +++
 .../test/jasper/crosstab/Crosstab4Test.java   | 108 +++
 .../test/jasper/crosstab/Crosstab5Test.java   | 207 +++++
 .../test/jasper/crosstab/Crosstab6Test.java   | 117 +++
 .../test/jasper/crosstab/Crosstab7Test.java   | 118 +++
 .../crosstab/CrosstabPosition10Test.java      |  86 ++
 .../crosstab/CrosstabPosition1Test.java       | 121 +++
 .../crosstab/CrosstabPosition2Test.java       | 117 +++
 .../crosstab/CrosstabPosition3Test.java       | 122 +++
 .../crosstab/CrosstabPosition4Test.java       | 114 +++
 .../crosstab/CrosstabPosition5Test.java       | 127 +++
 .../crosstab/CrosstabPosition6Test.java       |  96 ++
 .../crosstab/CrosstabPosition7Test.java       |  98 ++
 .../crosstab/CrosstabPosition8Test.java       |  94 ++
 .../crosstab/CrosstabPosition9Test.java       |  85 ++
 .../jasper/crosstab/CrosstabStyle1Test.java   | 130 +++
 .../jasper/crosstab/CrosstabStyle2Test.java   | 133 +++
 .../jasper/crosstab/CrosstabStyle3Test.java   |  92 ++
 .../jasper/crosstab/CrosstabStyle4Test.java   | 174 ++++
 .../jasper/crosstab/CrosstabStyle5Test.java   | 116 +++
 .../jasper/crosstab/CrosstabStyle6Test.java   | 111 +++
 .../test/jasper/crosstab/CrosstabTest.java    |  77 ++
 .../crosstab/CrosstabWhenNoDataTest.java      |  63 ++
 .../crosstab/ExpressionCrosstabTest.java      | 153 ++++
 .../crosstab/GroupExpressionCrosstabTest.java | 183 ++++
 .../crosstab/HyperLinkCrosstabTest.java       | 161 ++++
 .../jasper/crosstab/OrderCrosstabTest.java    |  97 ++
 .../jasper/dataset/CrosstabDataset1Test.java  | 153 ++++
 .../jasper/dataset/CrosstabDataset2Test.java  | 137 +++
 .../jasper/dataset/CrosstabDataset3Test.java  | 168 ++++
 .../dataset/CrosstabDatasetStyleTest.java     | 146 +++
 .../jasper/datasource/DatabaseReportTest.java |  98 ++
 .../datasource/DatabaseSubreportTest.java     | 130 +++
 .../test/jasper/datasource/FilterTest.java    | 154 ++++
 .../jasper/datasource/SubDatasourceTest.java  | 122 +++
 .../test/jasper/datasource/XmlReportTest.java | 117 +++
 .../test/jasper/group/CustomGroupTest.java    |  93 ++
 .../test/jasper/group/DataTypeGroupTest.java  |  76 ++
 .../test/jasper/group/Group1Test.java         | 126 +++
 .../test/jasper/group/Group2Test.java         | 109 +++
 .../test/jasper/group/Group3Test.java         |  64 ++
 .../test/jasper/group/GroupPosition1Test.java |  71 ++
 .../test/jasper/group/GroupPosition2Test.java |  91 ++
 .../test/jasper/group/GroupPosition3Test.java | 100 +++
 .../jasper/group/PercentageGroup1Test.java    |  74 ++
 .../jasper/group/PercentageGroup2Test.java    | 149 +++
 .../test/jasper/report/BandTest.java          | 167 ++++
 .../test/jasper/report/ColumnGridTest.java    | 124 +++
 .../jasper/report/ColumnsPerPageTest.java     | 164 ++++
 .../report/ConcatenatedReport1Test.java       |  84 ++
 .../report/ConcatenatedReport2Test.java       | 100 +++
 .../report/ConcatenatedReport3Test.java       |  85 ++
 .../report/ConcatenatedReport4Test.java       |  79 ++
 .../report/ConcatenatedReport5Test.java       | 104 +++
 .../test/jasper/report/CustomFontTest.java    |  71 ++
 .../test/jasper/report/DetailBand1Test.java   |  69 ++
 .../test/jasper/report/DetailBand2Test.java   |  63 ++
 .../test/jasper/report/ExportTest.java        | 114 +++
 .../test/jasper/report/ExpressionTest.java    |  91 ++
 .../test/jasper/report/FieldDataTypeTest.java | 194 ++++
 .../test/jasper/report/HyperLinkTest.java     |  82 ++
 .../jasper/report/IgnorePageWidthTest.java    |  92 ++
 .../jasper/report/IgnorePaginationTest.java   |  64 ++
 .../jasper/report/JasperExpressionTest.java   |  89 ++
 .../test/jasper/report/ListDataTypeTest.java  |  73 ++
 .../test/jasper/report/MarkupTest.java        |  71 ++
 .../test/jasper/report/NoDataSectionTest.java |  43 +
 .../jasper/report/NoDetailSectionTest.java}   |  31 +-
 .../test/jasper/report/ParametersTest.java    |  95 ++
 .../report/PrintWhenExpressionTest.java       |  55 ++
 .../test/jasper/report/Report1Test.java       | 136 +++
 .../test/jasper/report/Report2Test.java       |  79 ++
 .../test/jasper/report/Report3Test.java       |  68 ++
 .../test/jasper/report/Report4Test.java       |  66 ++
 .../test/jasper/report/Report5Test.java       | 100 +++
 .../jasper/report/ReportBackground1Test.java  |  47 +
 .../jasper/report/ReportBackground2Test.java  |  45 +
 .../jasper/report/ReportBackground3Test.java  |  46 +
 .../test/jasper/report/TitleTest.java         |  87 ++
 .../jasper/report/ValueTypeNamesTest.java     |  81 ++
 .../test/jasper/report/VariableTest.java      |  58 ++
 .../test/jasper/report/VirtualizerTest.java   |  56 ++
 .../test/jasper/style/BandStyle1Test.java     | 152 ++++
 .../test/jasper/style/BandStyle2Test.java     | 143 +++
 .../test/jasper/style/BandStyle3Test.java     | 131 +++
 .../test/jasper/style/DefaultFontTest.java    |  79 ++
 .../test/jasper/style/Style1Test.java         | 180 ++++
 .../test/jasper/style/Style2Test.java         |  93 ++
 .../test/jasper/style/Style3Test.java         |  95 ++
 .../test/jasper/style/Style4Test.java         |  83 ++
 .../test/jasper/style/Style5Test.java         |  64 ++
 .../test/jasper/style/Style6Test.java         |  99 ++
 .../test/jasper/style/Style7Test.java         |  83 ++
 .../test/jasper/style/Style8Test.java         | 103 +++
 .../test/jasper/style/Style9Test.java         |  60 ++
 .../test/jasper/style/StyleNamesTest.java     |  89 ++
 .../test/jasper/style/TemplateStyle1Test.java | 192 ++++
 .../test/jasper/style/TemplateStyle2Test.java | 102 +++
 .../test/jasper/style/TemplateStyle3Test.java | 175 ++++
 .../test/jasper/style/TemplateStyle4Test.java | 107 +++
 .../test/jasper/style/TemplateStyle5Test.java |  64 ++
 .../test/jasper/style/TemplateStyle6Test.java |  68 ++
 .../subreport/JasperSubreport2Test.java       | 114 +++
 .../jasper/subreport/JasperSubreportTest.java | 157 ++++
 .../test/jasper/subreport/Subreport2Test.java | 124 +++
 .../test/jasper/subreport/Subreport3Test.java | 102 +++
 .../test/jasper/subreport/Subreport4Test.java |  99 ++
 .../test/jasper/subreport/Subreport5Test.java | 107 +++
 .../test/jasper/subreport/Subreport6Test.java |  87 ++
 .../subreport/SubreportPositionTest.java      | 165 ++++
 .../test/jasper/subreport/SubreportTest.java  | 154 ++++
 .../subtotal/GroupCustomSubtotal1Test.java    | 136 +++
 .../subtotal/GroupCustomSubtotal2Test.java    | 117 +++
 .../jasper/subtotal/GroupSubtotal1Test.java   | 102 +++
 .../jasper/subtotal/GroupSubtotal2Test.java   |  85 ++
 .../subtotal/PercentageSubtotalTest.java      |  73 ++
 .../test/jasper/subtotal/Subtotal1Test.java   | 195 ++++
 .../test/jasper/subtotal/Subtotal2Test.java   | 173 ++++
 .../subtotal/SubtotalPosition1Test.java       |  61 ++
 .../subtotal/SubtotalPosition2Test.java       | 108 +++
 .../subtotal/SubtotalPosition3Test.java       |  74 ++
 .../subtotal/SubtotalPosition4Test.java       |  84 ++
 .../subtotal/SubtotalPosition5Test.java       |  90 ++
 .../tableofcontents/TableOfContents1Test.java | 209 +++++
 .../tableofcontents/TableOfContents2Test.java | 257 ++++++
 .../tableofcontents/TableOfContents3Test.java | 257 ++++++
 .../tableofcontents/TableOfContents4Test.java |  92 ++
 .../tableofcontents/TableOfContents5Test.java |  62 ++
 .../tableofcontents/TableOfContents6Test.java | 171 ++++
 .../tableofcontents/TableOfContents7Test.java |  72 ++
 .../tableofcontents/TableOfContents8Test.java |  73 ++
 .../tableofcontents/TableOfContents9Test.java |  66 ++
 .../TableOfContentsPosition1Test.java         | 120 +++
 .../TableOfContentsPosition2Test.java         |  94 ++
 .../TableOfContentsPosition3Test.java         |  79 ++
 .../TableOfContentsPosition4Test.java         |  75 ++
 .../TableOfContentsPosition5Test.java         |  86 ++
 .../TableOfContentsStyleTest.java             |  96 ++
 .../templatedesign/ReportScriptlet.java       |  72 ++
 .../templatedesign/TemplateDesign1Test.java   |  85 ++
 .../templatedesign/TemplateDesign2Test.java   |  90 ++
 .../templatedesign/TemplateDesign3Test.java   |  71 ++
 .../templatedesign/TemplateDesign4Test.java   |  76 ++
 .../templatedesign/TemplateDesign5Test.java   |  85 ++
 .../TemplateDesignPosition1Test.java          |  77 ++
 .../TemplateDesignPosition2Test.java          |  64 ++
 .../TemplateDesignPosition3Test.java          |  78 ++
 .../TemplateDesignPosition4Test.java          |  84 ++
 .../src/test/resources/customfonts.xml        |  17 +
 .../resources/dynamicreports-defaults.xml     |   4 +
 .../dynamicreports-messages_es.properties     |   2 +
 .../jasperreports_extension.properties        |   3 +
 .../test/base/dynamicreports-defaults.xml     |  31 +
 .../dynamicreports/test/fonts/Arimo-Bold.ttf  | Bin 0 -> 438516 bytes
 .../test/fonts/Arimo-Italic.ttf               | Bin 0 -> 440740 bytes
 .../test/fonts/Arimo-License.txt              | 202 +++++
 .../test/fonts/Arimo-Regular.ttf              | Bin 0 -> 436180 bytes
 .../test/fonts/FreeUniversal-License.txt      |  91 ++
 .../test/fonts/FreeUniversal-Regular.ttf      | Bin 0 -> 36780 bytes
 .../test/jasper/component/dynamicreports.png  | Bin 0 -> 14987 bytes
 .../test/jasper/datasource/data.xml           |  11 +
 .../test/jasper/report/test.properties        |   1 +
 .../test/jasper/style/StyleTemplate1.jrtx     |  29 +
 .../test/jasper/style/StyleTemplate2.jrtx     |  15 +
 .../jasper/subreport/detailsubreport.jrxml    |  27 +
 .../test/jasper/subreport/subreport1.jrxml    |  37 +
 .../test/jasper/subreport/subreport2.jrxml    |  54 ++
 .../test/jasper/subreport/subreport3.jrxml    |  65 ++
 .../test/jasper/subreport/subreport4.jrxml    |  30 +
 .../jasper/subreport/titlesubreport.jrxml     |  28 +
 .../templatedesign/templatedesign1.jrxml      |  63 ++
 .../templatedesign/templatedesign2.jrxml      |  30 +
 .../templatedesign/templatedesign3.jrxml      |  30 +
 .../templatedesign/templatedesign4.jrxml      |  30 +
 .../templatedesign/templatedesign5.jrxml      |  63 ++
 .../templatedesign/templatedesign6.jrxml      |  25 +
 278 files changed, 26979 insertions(+), 1185 deletions(-)
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CustomBatikRenderer.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanImageExpression.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/jasper/base/JasperCustomValuesTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/ReportUtilsTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/builder/style/StyleBuildersTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/ConditionsTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DataTypeTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DefaultsTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/bugs/Bug_2997586_Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/AbstractBandTest.java
 rename dynamicreports-core-for-grid-exporter/src/{main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsExporter.java => test/java/net/sf/dynamicreports/test/design/DesignReportBuilder.java} (61%)
 rename dynamicreports-core-for-grid-exporter/src/{main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsExporter.java => test/java/net/sf/dynamicreports/test/design/DesignTestTemplateDesign.java} (77%)
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/HorizontalListPositionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/SubtotalPositionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/VerticalListPositionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/BandBackgroundTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ExceptionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ReportTemplateTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/TemplateDesignTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperPositionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperStyleTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperValueTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/JasperTestUtils.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnGridTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/EmptyColumnTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ExpressionColumnTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/PercentageColumnTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/BreakTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ComponentStyleTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListGapTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumberPositionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField7Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/VerticalListTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/XyListTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab7Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseReportTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/FilterTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/SubDatasourceTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/XmlReportTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/CustomGroupTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/DataTypeGroupTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/BandTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnGridTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnsPerPageTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/CustomFontTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExportTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExpressionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/FieldDataTypeTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/HyperLinkTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePageWidthTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePaginationTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/JasperExpressionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ListDataTypeTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/MarkupTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDataSectionTest.java
 rename dynamicreports-core-for-grid-exporter/src/{main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsExporterBuilder.java => test/java/net/sf/dynamicreports/test/jasper/report/NoDetailSectionTest.java} (57%)
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ParametersTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/TitleTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ValueTypeNamesTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VariableTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VirtualizerTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/DefaultFontTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style7Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style8Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style9Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/StyleNamesTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreportTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportPositionTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/customfonts.xml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-defaults.xml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-messages_es.properties
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/jasperreports_extension.properties
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/base/dynamicreports-defaults.xml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Bold.ttf
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Italic.ttf
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-License.txt
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Regular.ttf
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-License.txt
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-Regular.ttf
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/component/dynamicreports.png
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/datasource/data.xml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/report/test.properties
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate1.jrtx
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate2.jrtx
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/detailsubreport.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport1.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport2.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport3.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport4.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/titlesubreport.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b47c85d..8fa0914 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ Initial release of the fork
     * ``net.sf.barcode4j:barcode4j``
     * ``com.google.zxing:core``
   * Removed charts subsystem
+  * Removed boolean to image subsystem
+    * ``org.apache.xmlgraphics:batik-bridge``
+  * Dropped support for ``XLS`` as the required dependency was never shipped
+    * ``XLSX`` still works as expected
   * Removed ``org.apache.commons:commons-text`` as it was only used on a single unused line of code
 * Update dependencies to lastest versions
 * Fixed compile errors
diff --git a/dynamicreports-core-for-grid-exporter/pom.xml b/dynamicreports-core-for-grid-exporter/pom.xml
index cf697e2..688062f 100644
--- a/dynamicreports-core-for-grid-exporter/pom.xml
+++ b/dynamicreports-core-for-grid-exporter/pom.xml
@@ -85,22 +85,38 @@
 	</distributionManagement>
 
 	<dependencies>
+		<!-- XML API -->
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
 			<version>4.0.0</version>
 		</dependency>
+		<!-- ...and default implementation -->
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>4.0.2</version>
+		</dependency>
 
+		<!-- Used for reports -->
 		<dependency>
 			<groupId>net.sf.jasperreports</groupId>
 			<artifactId>jasperreports</artifactId>
 			<version>6.20.5</version>
 		</dependency>
+		<!-- Use for validation and minor shorthand methods -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.12.0</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.9.2</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -225,6 +241,10 @@
 				</executions>
 			</plugin>
 
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M9</version>
+			</plugin>
 		</plugins>
 	</build>
 	<profiles>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java
index 4fba763..a2a47ba 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java
@@ -47,7 +47,6 @@
 import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
 import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
 import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.design.transformation.expressions.BooleanImageExpression;
 import net.sf.dynamicreports.design.transformation.expressions.BooleanTextValueFormatter;
 import net.sf.dynamicreports.design.transformation.expressions.CurrentDateExpression;
 import net.sf.dynamicreports.design.transformation.expressions.MultiPageListDataSourceExpression;
@@ -58,7 +57,6 @@
 import net.sf.dynamicreports.report.base.DRGroup;
 import net.sf.dynamicreports.report.base.DRHyperLink;
 import net.sf.dynamicreports.report.base.component.DRHyperLinkComponent;
-import net.sf.dynamicreports.report.base.component.DRImage;
 import net.sf.dynamicreports.report.base.component.DRList;
 import net.sf.dynamicreports.report.base.component.DRTextField;
 import net.sf.dynamicreports.report.base.style.DRPen;
@@ -75,7 +73,6 @@
 import net.sf.dynamicreports.report.constant.Evaluation;
 import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
 import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
 import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
 import net.sf.dynamicreports.report.definition.DRIGroup;
 import net.sf.dynamicreports.report.definition.DRIHyperLink;
@@ -699,20 +696,6 @@ protected DRDesignComponent booleanField(final DRIBooleanField booleanField, fin
                 textField.setValueFormatter(new BooleanTextValueFormatter(keyTrue, keyFalse, emptyWhenNullValue));
                 component = textField;
                 break;
-            case IMAGE_STYLE_1:
-            case IMAGE_STYLE_2:
-            case IMAGE_STYLE_3:
-            case IMAGE_STYLE_4:
-            case IMAGE_CHECKBOX_1:
-            case IMAGE_CHECKBOX_2:
-            case IMAGE_BALL:
-                final DRImage image = new DRImage();
-                image.setImageScale(ImageScale.CLIP);
-                final int width = this.accessor.getTemplateTransform().getBooleanImageWidth(booleanField);
-                final int height = this.accessor.getTemplateTransform().getBooleanImageHeight(booleanField);
-                image.setImageExpression(new BooleanImageExpression(booleanField, emptyWhenNullValue, width, height));
-                component = image;
-                break;
             default:
                 throw new DRDesignReportException("Boolean component type " + componentType.name() + " not supported");
         }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CustomBatikRenderer.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CustomBatikRenderer.java
deleted file mode 100644
index 4a23b1c..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CustomBatikRenderer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package net.sf.dynamicreports.design.transformation;
-
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JasperReportsContext;
-import net.sf.jasperreports.engine.util.JRLoader;
-import net.sf.jasperreports.renderers.SimpleDataRenderer;
-import net.sf.jasperreports.renderers.WrappingSvgDataToGraphics2DRenderer;
-
-import java.awt.Dimension;
-import java.awt.geom.Dimension2D;
-import java.net.URL;
-
-/**
- * <p>CustomBatikRenderer class.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public class CustomBatikRenderer extends WrappingSvgDataToGraphics2DRenderer {
-    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
-
-    private Dimension dimension;
-
-    /**
-     * <p>Constructor for CustomBatikRenderer.</p>
-     *
-     * @param svgURL a {@link java.net.URL} object.
-     * @param width  a int.
-     * @param height a int.
-     * @throws net.sf.jasperreports.engine.JRException if any.
-     */
-    public CustomBatikRenderer(URL svgURL, int width, int height) throws JRException {
-        super(new SimpleDataRenderer(JRLoader.loadBytes(svgURL), null));
-        this.dimension = new Dimension(width, height);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Dimension2D getDimension(JasperReportsContext jasperReportsContext) {
-        return dimension;
-    }
-
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanImageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanImageExpression.java
deleted file mode 100644
index 2abfe5a..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanImageExpression.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package net.sf.dynamicreports.design.transformation.expressions;
-
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.design.transformation.CustomBatikRenderer;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.renderers.Renderable;
-
-import java.util.List;
-
-/**
- * <p>BooleanImageExpression class.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public class BooleanImageExpression extends AbstractComplexExpression<Renderable> {
-    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
-
-    private Renderable imageTrue;
-    private Renderable imageFalse;
-    private boolean emptyWhenNullValue;
-
-    /**
-     * <p>Constructor for BooleanImageExpression.</p>
-     *
-     * @param booleanField       a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
-     * @param emptyWhenNullValue a boolean.
-     * @param width              a int.
-     * @param height             a int.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
-     */
-    public BooleanImageExpression(DRIBooleanField booleanField, boolean emptyWhenNullValue, int width, int height) throws DRException {
-        this.emptyWhenNullValue = emptyWhenNullValue;
-        addExpression(booleanField.getValueExpression());
-        String fileNameTrue;
-        String fileNameFalse;
-        switch (booleanField.getComponentType()) {
-            case IMAGE_STYLE_1:
-                fileNameTrue = "boolean1_true";
-                fileNameFalse = "boolean1_false";
-                break;
-            case IMAGE_STYLE_2:
-                fileNameTrue = "boolean2_true";
-                fileNameFalse = "boolean2_false";
-                break;
-            case IMAGE_STYLE_3:
-                fileNameTrue = "boolean3_true";
-                fileNameFalse = "boolean3_false";
-                break;
-            case IMAGE_STYLE_4:
-                fileNameTrue = "boolean1_true";
-                fileNameFalse = "boolean4_false";
-                break;
-            case IMAGE_CHECKBOX_1:
-                fileNameTrue = "checkbox1_true";
-                fileNameFalse = "checkbox_false";
-                break;
-            case IMAGE_CHECKBOX_2:
-                fileNameTrue = "checkbox2_true";
-                fileNameFalse = "checkbox_false";
-                break;
-            case IMAGE_BALL:
-                fileNameTrue = "ball_green";
-                fileNameFalse = "ball_red";
-                break;
-            default:
-                throw new DRDesignReportException("BooleanComponentType " + booleanField.getComponentType().name() + " not supported");
-        }
-        try {
-            imageTrue = new CustomBatikRenderer(ReportUtils.class.getResource("images/" + fileNameTrue + ".svg"), width, height);
-            imageFalse = new CustomBatikRenderer(ReportUtils.class.getResource("images/" + fileNameFalse + ".svg"), width, height);
-        } catch (JRException e) {
-            throw new DRException(e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Renderable evaluate(List<?> values, ReportParameters reportParameters) {
-        Boolean value = (Boolean) values.get(0);
-        if (emptyWhenNullValue && value == null) {
-            return null;
-        }
-        if (value != null && value) {
-            return imageTrue;
-        } else {
-            return imageFalse;
-        }
-    }
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
index aa8331e..068a83b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
@@ -17,6 +17,20 @@
  */
 package net.sf.dynamicreports.jasper.builder;
 
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Serializable;
+
+import javax.imageio.ImageIO;
+
+import org.apache.commons.lang3.Validate;
+
 import net.sf.dynamicreports.jasper.base.export.AbstractJasperExporter;
 import net.sf.dynamicreports.jasper.base.reporthandler.JasperReportBuilderHandler;
 import net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder;
@@ -30,7 +44,6 @@
 import net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder;
 import net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
 import net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder;
 import net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
 import net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
 import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
@@ -46,18 +59,6 @@
 import net.sf.jasperreports.export.SimpleGraphics2DExporterConfiguration;
 import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
 import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
-import org.apache.commons.lang3.Validate;
-
-import javax.imageio.ImageIO;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.RenderedImage;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Serializable;
 
 /**
  * This report builder allows concatenating several separated reports into one single document. Each report starts on a new page with its own page dimension.
@@ -68,7 +69,7 @@
 public class JasperConcatenatedReportBuilder implements Serializable {
     private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
 
-    private JasperReportHandler jasperReportHandler;
+    private final JasperReportHandler jasperReportHandler;
 
     /**
      * <p>Constructor for JasperConcatenatedReportBuilder.</p>
@@ -82,7 +83,7 @@ public JasperConcatenatedReportBuilder() {
      *
      * @param jasperReportHandler a {@link net.sf.dynamicreports.jasper.definition.JasperReportHandler} object.
      */
-    public JasperConcatenatedReportBuilder(JasperReportHandler jasperReportHandler) {
+    public JasperConcatenatedReportBuilder(final JasperReportHandler jasperReportHandler) {
         this.jasperReportHandler = jasperReportHandler;
     }
 
@@ -92,10 +93,10 @@ public JasperConcatenatedReportBuilder(JasperReportHandler jasperReportHandler)
      * @param jasperReportBuilders a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      */
-    public JasperConcatenatedReportBuilder concatenate(JasperReportBuilder... jasperReportBuilders) {
+    public JasperConcatenatedReportBuilder concatenate(final JasperReportBuilder... jasperReportBuilders) {
         Validate.notNull(jasperReportBuilders, "jasperReportBuilders must not be null");
         Validate.noNullElements(jasperReportBuilders, "jasperReportBuilders must not contains null jasperReportBuilder");
-        jasperReportHandler.concatenate(jasperReportBuilders);
+        this.jasperReportHandler.concatenate(jasperReportBuilders);
         return this;
     }
 
@@ -106,8 +107,8 @@ public JasperConcatenatedReportBuilder concatenate(JasperReportBuilder... jasper
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toPng(OutputStream outputStream) throws DRException {
-        return toPng(outputStream, 1);
+    public JasperConcatenatedReportBuilder toPng(final OutputStream outputStream) throws DRException {
+        return this.toPng(outputStream, 1);
     }
 
     /**
@@ -118,45 +119,45 @@ public JasperConcatenatedReportBuilder toPng(OutputStream outputStream) throws D
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toPng(OutputStream outputStream, float zoom) throws DRException {
+    public JasperConcatenatedReportBuilder toPng(final OutputStream outputStream, final float zoom) throws DRException {
         Validate.notNull(outputStream, "outputStream must not be null");
         Validate.isTrue(zoom > 0, "zoom must be > 0");
 
         int maxWidth = 0;
         int maxHeight = 0;
 
-        for (JasperPrint jasperPrint : jasperReportHandler.getPrintList()) {
-            int pages = jasperPrint.getPages().size();
-            int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
+        for (final JasperPrint jasperPrint : this.jasperReportHandler.getPrintList()) {
+            final int pages = jasperPrint.getPages().size();
+            final int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
             maxWidth += pageWidth * pages + pages - 1 + 2;
-            int height = (int) (jasperPrint.getPageHeight() * zoom) + 2;
+            final int height = (int) (jasperPrint.getPageHeight() * zoom) + 2;
             if (height > maxHeight) {
                 maxHeight = height;
             }
         }
 
-        Image image = new BufferedImage(maxWidth, maxHeight, BufferedImage.TYPE_INT_RGB);
-        Graphics2D g2d = (Graphics2D) image.getGraphics();
+        final Image image = new BufferedImage(maxWidth, maxHeight, BufferedImage.TYPE_INT_RGB);
+        final Graphics2D g2d = (Graphics2D) image.getGraphics();
         g2d.setColor(Color.LIGHT_GRAY);
         g2d.fill(new Rectangle2D.Float(1, 1, maxWidth - 1, maxHeight - 1));
 
         int offset = 1;
-        for (JasperPrint jasperPrint : jasperReportHandler.getPrintList()) {
-            int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
-            int pageHeight = (int) (jasperPrint.getPageHeight() * zoom);
+        for (final JasperPrint jasperPrint : this.jasperReportHandler.getPrintList()) {
+            final int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
+            final int pageHeight = (int) (jasperPrint.getPageHeight() * zoom);
             for (
                 int i = 0; i < jasperPrint.getPages().size(); i++) {
                 try {
-                    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
-                    SimpleGraphics2DExporterOutput exporterOutput = new SimpleGraphics2DExporterOutput();
-                    Image pageImage = new BufferedImage(pageWidth, pageHeight, BufferedImage.TYPE_INT_RGB);
+                    final SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+                    final SimpleGraphics2DExporterOutput exporterOutput = new SimpleGraphics2DExporterOutput();
+                    final Image pageImage = new BufferedImage(pageWidth, pageHeight, BufferedImage.TYPE_INT_RGB);
                     exporterOutput.setGraphics2D((Graphics2D) pageImage.getGraphics());
-                    SimpleGraphics2DReportConfiguration reportExportConfiguration = new SimpleGraphics2DReportConfiguration();
+                    final SimpleGraphics2DReportConfiguration reportExportConfiguration = new SimpleGraphics2DReportConfiguration();
                     reportExportConfiguration.setPageIndex(i);
                     reportExportConfiguration.setZoomRatio(zoom);
-                    SimpleGraphics2DExporterConfiguration exporterConfiguration = new SimpleGraphics2DExporterConfiguration();
+                    final SimpleGraphics2DExporterConfiguration exporterConfiguration = new SimpleGraphics2DExporterConfiguration();
 
-                    JRGraphics2DExporter jrExporter = new JRGraphics2DExporter();
+                    final JRGraphics2DExporter jrExporter = new JRGraphics2DExporter();
                     jrExporter.setExporterInput(exporterInput);
                     jrExporter.setExporterOutput(exporterOutput);
                     jrExporter.setConfiguration(reportExportConfiguration);
@@ -165,14 +166,14 @@ public JasperConcatenatedReportBuilder toPng(OutputStream outputStream, float zo
                     jrExporter.exportReport();
                     ((Graphics2D) image.getGraphics()).drawImage(pageImage, offset, 1, null);
                     offset += pageWidth + 1;
-                } catch (JRException e) {
+                } catch (final JRException e) {
                     throw new DRException(e);
                 }
             }
         }
         try {
             ImageIO.write((RenderedImage) image, "png", outputStream);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new DRException(e);
         }
         return this;
@@ -184,7 +185,7 @@ public JasperConcatenatedReportBuilder toPng(OutputStream outputStream, float zo
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      */
     public JasperConcatenatedReportBuilder continuousPageNumbering() {
-        return setContinuousPageNumbering(true);
+        return this.setContinuousPageNumbering(true);
     }
 
     /**
@@ -193,8 +194,8 @@ public JasperConcatenatedReportBuilder continuousPageNumbering() {
      * @param continuousPageNumbering a boolean.
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      */
-    public JasperConcatenatedReportBuilder setContinuousPageNumbering(boolean continuousPageNumbering) {
-        jasperReportHandler.setContinuousPageNumbering(continuousPageNumbering);
+    public JasperConcatenatedReportBuilder setContinuousPageNumbering(final boolean continuousPageNumbering) {
+        this.jasperReportHandler.setContinuousPageNumbering(continuousPageNumbering);
         return this;
     }
 
@@ -207,8 +208,8 @@ public JasperConcatenatedReportBuilder setContinuousPageNumbering(boolean contin
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toCsv(OutputStream outputStream) throws DRException {
-        return toCsv(Exporters.csvExporter(outputStream));
+    public JasperConcatenatedReportBuilder toCsv(final OutputStream outputStream) throws DRException {
+        return this.toCsv(Exporters.csvExporter(outputStream));
     }
 
     /**
@@ -218,8 +219,8 @@ public JasperConcatenatedReportBuilder toCsv(OutputStream outputStream) throws D
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toCsv(JasperCsvExporterBuilder csvExporterBuilder) throws DRException {
-        return export(csvExporterBuilder);
+    public JasperConcatenatedReportBuilder toCsv(final JasperCsvExporterBuilder csvExporterBuilder) throws DRException {
+        return this.export(csvExporterBuilder);
     }
 
     // docx
@@ -231,8 +232,8 @@ public JasperConcatenatedReportBuilder toCsv(JasperCsvExporterBuilder csvExporte
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toDocx(OutputStream outputStream) throws DRException {
-        return toDocx(Exporters.docxExporter(outputStream));
+    public JasperConcatenatedReportBuilder toDocx(final OutputStream outputStream) throws DRException {
+        return this.toDocx(Exporters.docxExporter(outputStream));
     }
 
     /**
@@ -242,8 +243,8 @@ public JasperConcatenatedReportBuilder toDocx(OutputStream outputStream) throws
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toDocx(JasperDocxExporterBuilder docxExporterBuilder) throws DRException {
-        return export(docxExporterBuilder);
+    public JasperConcatenatedReportBuilder toDocx(final JasperDocxExporterBuilder docxExporterBuilder) throws DRException {
+        return this.export(docxExporterBuilder);
     }
 
     // html
@@ -255,8 +256,8 @@ public JasperConcatenatedReportBuilder toDocx(JasperDocxExporterBuilder docxExpo
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toHtml(OutputStream outputStream) throws DRException {
-        return toHtml(Exporters.htmlExporter(outputStream));
+    public JasperConcatenatedReportBuilder toHtml(final OutputStream outputStream) throws DRException {
+        return this.toHtml(Exporters.htmlExporter(outputStream));
     }
 
     /**
@@ -266,8 +267,8 @@ public JasperConcatenatedReportBuilder toHtml(OutputStream outputStream) throws
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toHtml(JasperHtmlExporterBuilder htmlExporterBuilder) throws DRException {
-        return export(htmlExporterBuilder);
+    public JasperConcatenatedReportBuilder toHtml(final JasperHtmlExporterBuilder htmlExporterBuilder) throws DRException {
+        return this.export(htmlExporterBuilder);
     }
 
     // ods
@@ -279,8 +280,8 @@ public JasperConcatenatedReportBuilder toHtml(JasperHtmlExporterBuilder htmlExpo
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toOds(OutputStream outputStream) throws DRException {
-        return toOds(Exporters.odsExporter(outputStream));
+    public JasperConcatenatedReportBuilder toOds(final OutputStream outputStream) throws DRException {
+        return this.toOds(Exporters.odsExporter(outputStream));
     }
 
     /**
@@ -290,8 +291,8 @@ public JasperConcatenatedReportBuilder toOds(OutputStream outputStream) throws D
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toOds(JasperOdsExporterBuilder odsExporterBuilder) throws DRException {
-        return export(odsExporterBuilder);
+    public JasperConcatenatedReportBuilder toOds(final JasperOdsExporterBuilder odsExporterBuilder) throws DRException {
+        return this.export(odsExporterBuilder);
     }
 
     // odt
@@ -303,8 +304,8 @@ public JasperConcatenatedReportBuilder toOds(JasperOdsExporterBuilder odsExporte
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toOdt(OutputStream outputStream) throws DRException {
-        return toOdt(Exporters.odtExporter(outputStream));
+    public JasperConcatenatedReportBuilder toOdt(final OutputStream outputStream) throws DRException {
+        return this.toOdt(Exporters.odtExporter(outputStream));
     }
 
     /**
@@ -314,8 +315,8 @@ public JasperConcatenatedReportBuilder toOdt(OutputStream outputStream) throws D
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toOdt(JasperOdtExporterBuilder odtExporterBuilder) throws DRException {
-        return export(odtExporterBuilder);
+    public JasperConcatenatedReportBuilder toOdt(final JasperOdtExporterBuilder odtExporterBuilder) throws DRException {
+        return this.export(odtExporterBuilder);
     }
 
     // pdf
@@ -327,8 +328,8 @@ public JasperConcatenatedReportBuilder toOdt(JasperOdtExporterBuilder odtExporte
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toPdf(OutputStream outputStream) throws DRException {
-        return toPdf(Exporters.pdfExporter(outputStream));
+    public JasperConcatenatedReportBuilder toPdf(final OutputStream outputStream) throws DRException {
+        return this.toPdf(Exporters.pdfExporter(outputStream));
     }
 
     /**
@@ -338,8 +339,8 @@ public JasperConcatenatedReportBuilder toPdf(OutputStream outputStream) throws D
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toPdf(JasperPdfExporterBuilder pdfExporterBuilder) throws DRException {
-        return export(pdfExporterBuilder);
+    public JasperConcatenatedReportBuilder toPdf(final JasperPdfExporterBuilder pdfExporterBuilder) throws DRException {
+        return this.export(pdfExporterBuilder);
     }
 
     // rtf
@@ -351,8 +352,8 @@ public JasperConcatenatedReportBuilder toPdf(JasperPdfExporterBuilder pdfExporte
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toRtf(OutputStream outputStream) throws DRException {
-        return toRtf(Exporters.rtfExporter(outputStream));
+    public JasperConcatenatedReportBuilder toRtf(final OutputStream outputStream) throws DRException {
+        return this.toRtf(Exporters.rtfExporter(outputStream));
     }
 
     /**
@@ -362,8 +363,8 @@ public JasperConcatenatedReportBuilder toRtf(OutputStream outputStream) throws D
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toRtf(JasperRtfExporterBuilder rtfExporterBuilder) throws DRException {
-        return export(rtfExporterBuilder);
+    public JasperConcatenatedReportBuilder toRtf(final JasperRtfExporterBuilder rtfExporterBuilder) throws DRException {
+        return this.export(rtfExporterBuilder);
     }
 
     // text
@@ -375,8 +376,8 @@ public JasperConcatenatedReportBuilder toRtf(JasperRtfExporterBuilder rtfExporte
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toText(OutputStream outputStream) throws DRException {
-        return toText(Exporters.textExporter(outputStream));
+    public JasperConcatenatedReportBuilder toText(final OutputStream outputStream) throws DRException {
+        return this.toText(Exporters.textExporter(outputStream));
     }
 
     /**
@@ -386,32 +387,8 @@ public JasperConcatenatedReportBuilder toText(OutputStream outputStream) throws
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toText(JasperTextExporterBuilder textExporterBuilder) throws DRException {
-        return export(textExporterBuilder);
-    }
-
-    // xls
-
-    /**
-     * <p>toXls.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperConcatenatedReportBuilder toXls(OutputStream outputStream) throws DRException {
-        return toXls(Exporters.xlsExporter(outputStream));
-    }
-
-    /**
-     * <p>toXls.</p>
-     *
-     * @param xlsExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperConcatenatedReportBuilder toXls(JasperXlsExporterBuilder xlsExporterBuilder) throws DRException {
-        return export(xlsExporterBuilder);
+    public JasperConcatenatedReportBuilder toText(final JasperTextExporterBuilder textExporterBuilder) throws DRException {
+        return this.export(textExporterBuilder);
     }
 
     // xlsx
@@ -423,8 +400,8 @@ public JasperConcatenatedReportBuilder toXls(JasperXlsExporterBuilder xlsExporte
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toXlsx(OutputStream outputStream) throws DRException {
-        return toXlsx(Exporters.xlsxExporter(outputStream));
+    public JasperConcatenatedReportBuilder toXlsx(final OutputStream outputStream) throws DRException {
+        return this.toXlsx(Exporters.xlsxExporter(outputStream));
     }
 
     /**
@@ -434,8 +411,8 @@ public JasperConcatenatedReportBuilder toXlsx(OutputStream outputStream) throws
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toXlsx(JasperXlsxExporterBuilder xlsxExporterBuilder) throws DRException {
-        return export(xlsxExporterBuilder);
+    public JasperConcatenatedReportBuilder toXlsx(final JasperXlsxExporterBuilder xlsxExporterBuilder) throws DRException {
+        return this.export(xlsxExporterBuilder);
     }
 
     // xml
@@ -447,8 +424,8 @@ public JasperConcatenatedReportBuilder toXlsx(JasperXlsxExporterBuilder xlsxExpo
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toXml(OutputStream outputStream) throws DRException {
-        return toXml(Exporters.xmlExporter(outputStream));
+    public JasperConcatenatedReportBuilder toXml(final OutputStream outputStream) throws DRException {
+        return this.toXml(Exporters.xmlExporter(outputStream));
     }
 
     /**
@@ -458,8 +435,8 @@ public JasperConcatenatedReportBuilder toXml(OutputStream outputStream) throws D
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toXml(JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
-        return export(xmlExporterBuilder);
+    public JasperConcatenatedReportBuilder toXml(final JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
+        return this.export(xmlExporterBuilder);
     }
 
     // pptx
@@ -471,8 +448,8 @@ public JasperConcatenatedReportBuilder toXml(JasperXmlExporterBuilder xmlExporte
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toPptx(OutputStream outputStream) throws DRException {
-        return toPptx(Exporters.pptxExporter(outputStream));
+    public JasperConcatenatedReportBuilder toPptx(final OutputStream outputStream) throws DRException {
+        return this.toPptx(Exporters.pptxExporter(outputStream));
     }
 
     /**
@@ -482,8 +459,8 @@ public JasperConcatenatedReportBuilder toPptx(OutputStream outputStream) throws
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder toPptx(JasperPptxExporterBuilder pptxExporterBuilder) throws DRException {
-        return export(pptxExporterBuilder);
+    public JasperConcatenatedReportBuilder toPptx(final JasperPptxExporterBuilder pptxExporterBuilder) throws DRException {
+        return this.export(pptxExporterBuilder);
     }
 
     /**
@@ -493,14 +470,15 @@ public JasperConcatenatedReportBuilder toPptx(JasperPptxExporterBuilder pptxExpo
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperConcatenatedReportBuilder export(AbstractJasperExporterBuilder<?, ? extends AbstractJasperExporter> exporterBuilder) throws DRException {
+    public JasperConcatenatedReportBuilder export(final AbstractJasperExporterBuilder<?, ? extends AbstractJasperExporter> exporterBuilder) throws DRException {
         Validate.notNull(exporterBuilder, "exporterBuilder must not be null");
         try {
-            ExporterTransform exporterTransform = new ExporterTransform(exporterBuilder.build());
-            @SuppressWarnings("unchecked") Exporter<ExporterInput, ?, ?, ?> exporter = (Exporter<ExporterInput, ?, ?, ?>) exporterTransform.transform();
-            exporter.setExporterInput(SimpleExporterInput.getInstance(jasperReportHandler.getPrintList()));
+            final ExporterTransform exporterTransform = new ExporterTransform(exporterBuilder.build());
+            @SuppressWarnings("unchecked")
+            final Exporter<ExporterInput, ?, ?, ?> exporter = (Exporter<ExporterInput, ?, ?, ?>) exporterTransform.transform();
+            exporter.setExporterInput(SimpleExporterInput.getInstance(this.jasperReportHandler.getPrintList()));
             exporter.exportReport();
-        } catch (JRException e) {
+        } catch (final JRException e) {
             throw new DRException(e);
         }
         return this;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java
index 0476e52..424130a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java
@@ -17,6 +17,25 @@
  */
 package net.sf.dynamicreports.jasper.builder;
 
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.imageio.ImageIO;
+
+import org.apache.commons.lang3.Validate;
+
 import net.sf.dynamicreports.design.base.DRDesignReport;
 import net.sf.dynamicreports.design.definition.DRIDesignReport;
 import net.sf.dynamicreports.jasper.base.JasperReportDesign;
@@ -37,7 +56,6 @@
 import net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder;
 import net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
 import net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder;
 import net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
 import net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
 import net.sf.dynamicreports.jasper.constant.ImageType;
@@ -74,23 +92,6 @@
 import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
 import net.sf.jasperreports.view.JasperDesignViewer;
 import net.sf.jasperreports.view.JasperViewer;
-import org.apache.commons.lang3.Validate;
-
-import javax.imageio.ImageIO;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.awt.image.RenderedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * The most used report builder for creating reports. It allows constructing and customizing the whole report content. A report consists of bands, columns, subtotals, groups, and other parts. Each
@@ -116,7 +117,7 @@ public class JasperReportBuilder extends ReportBuilder<JasperReportBuilder> {
      * <p>Constructor for JasperReportBuilder.</p>
      */
     public JasperReportBuilder() {
-        setTemplateDesign(new JasperEmptyTemplateDesign());
+        this.setTemplateDesign(new JasperEmptyTemplateDesign());
     }
 
     /**
@@ -126,12 +127,12 @@ public JasperReportBuilder() {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder setStartPageNumber(Integer startPageNumber) throws DRException {
+    public JasperReportBuilder setStartPageNumber(final Integer startPageNumber) throws DRException {
         if (this.startPageNumber == startPageNumber) {
             return this;
         }
         this.startPageNumber = startPageNumber;
-        rebuild();
+        this.rebuild();
         return this;
     }
 
@@ -141,8 +142,8 @@ public JasperReportBuilder setStartPageNumber(Integer startPageNumber) throws DR
      * @param collection - the collection values
      * @return a report builder
      */
-    public JasperReportBuilder setDataSource(Collection<?> collection) {
-        return setDataSource(new JRBeanCollectionDataSource(collection));
+    public JasperReportBuilder setDataSource(final Collection<?> collection) {
+        return this.setDataSource(new JRBeanCollectionDataSource(collection));
     }
 
     /**
@@ -151,8 +152,8 @@ public JasperReportBuilder setDataSource(Collection<?> collection) {
      * @param resultSet - the resultSet object
      * @return a report builder
      */
-    public JasperReportBuilder setDataSource(ResultSet resultSet) {
-        return setDataSource(new JRResultSetDataSource(resultSet));
+    public JasperReportBuilder setDataSource(final ResultSet resultSet) {
+        return this.setDataSource(new JRResultSetDataSource(resultSet));
     }
 
     /**
@@ -162,9 +163,9 @@ public JasperReportBuilder setDataSource(ResultSet resultSet) {
      * @param connection - the database connection
      * @return a report builder
      */
-    public JasperReportBuilder setDataSource(String sql, Connection connection) {
+    public JasperReportBuilder setDataSource(final String sql, final Connection connection) {
         Validate.notNull(sql, "sql must not be null");
-        return setDataSource(DynamicReports.query(sql, QueryLanguage.SQL), connection);
+        return this.setDataSource(DynamicReports.query(sql, QueryLanguage.SQL), connection);
     }
 
     /**
@@ -174,12 +175,12 @@ public JasperReportBuilder setDataSource(String sql, Connection connection) {
      * @param connection - the database connection
      * @return a report builder
      */
-    public JasperReportBuilder setDataSource(QueryBuilder query, Connection connection) {
+    public JasperReportBuilder setDataSource(final QueryBuilder query, final Connection connection) {
         Validate.notNull(query, "query must not be null");
         Validate.notNull(connection, "connection must not be null");
-        getObject().setQuery(query.build());
+        this.getObject().setQuery(query.build());
         this.connection = connection;
-        dataSource = null;
+        this.dataSource = null;
         return this;
     }
 
@@ -190,8 +191,8 @@ public JasperReportBuilder setDataSource(QueryBuilder query, Connection connecti
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder setTemplateDesign(InputStream inputStream) throws DRException {
-        return setTemplateDesign(new JasperTemplateDesign(inputStream));
+    public JasperReportBuilder setTemplateDesign(final InputStream inputStream) throws DRException {
+        return this.setTemplateDesign(new JasperTemplateDesign(inputStream));
     }
 
     /**
@@ -201,8 +202,8 @@ public JasperReportBuilder setTemplateDesign(InputStream inputStream) throws DRE
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder setTemplateDesign(File file) throws DRException {
-        return setTemplateDesign(new JasperTemplateDesign(file));
+    public JasperReportBuilder setTemplateDesign(final File file) throws DRException {
+        return this.setTemplateDesign(new JasperTemplateDesign(file));
     }
 
     // template design
@@ -214,8 +215,8 @@ public JasperReportBuilder setTemplateDesign(File file) throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder setTemplateDesign(String fileName) throws DRException {
-        return setTemplateDesign(new JasperTemplateDesign(fileName));
+    public JasperReportBuilder setTemplateDesign(final String fileName) throws DRException {
+        return this.setTemplateDesign(new JasperTemplateDesign(fileName));
     }
 
     /**
@@ -225,8 +226,8 @@ public JasperReportBuilder setTemplateDesign(String fileName) throws DRException
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder setTemplateDesign(JasperDesign jasperDesign) throws DRException {
-        return setTemplateDesign(new JasperTemplateDesign(jasperDesign));
+    public JasperReportBuilder setTemplateDesign(final JasperDesign jasperDesign) throws DRException {
+        return this.setTemplateDesign(new JasperTemplateDesign(jasperDesign));
     }
 
     /**
@@ -236,30 +237,30 @@ public JasperReportBuilder setTemplateDesign(JasperDesign jasperDesign) throws D
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder setTemplateDesign(URL jasperDesignUrl) throws DRException {
-        return setTemplateDesign(new JasperTemplateDesign(jasperDesignUrl));
+    public JasperReportBuilder setTemplateDesign(final URL jasperDesignUrl) throws DRException {
+        return this.setTemplateDesign(new JasperTemplateDesign(jasperDesignUrl));
     }
 
-    private JasperReportBuilder setTemplateDesign(DRITemplateDesign<JasperDesign> templateDesign) {
-        getObject().setTemplateDesign(templateDesign);
+    private JasperReportBuilder setTemplateDesign(final DRITemplateDesign<JasperDesign> templateDesign) {
+        this.getObject().setTemplateDesign(templateDesign);
         return this;
     }
 
     /** {@inheritDoc} */
     @Override
-    public JasperReportBuilder setParameter(String name, Object value) {
+    public JasperReportBuilder setParameter(final String name, final Object value) {
         super.setParameter(name, value);
-        parameters = null;
-        jasperPrint = null;
+        this.parameters = null;
+        this.jasperPrint = null;
         return this;
     }
 
     /** {@inheritDoc} */
     @Override
-    public JasperReportBuilder setParameters(Map<String, Object> parameters) {
+    public JasperReportBuilder setParameters(final Map<String, Object> parameters) {
         super.setParameters(parameters);
         this.parameters = null;
-        jasperPrint = null;
+        this.jasperPrint = null;
         return this;
     }
 
@@ -270,16 +271,16 @@ public JasperReportBuilder setParameters(Map<String, Object> parameters) {
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder rebuild() throws DRException {
-        builded = false;
-        reportDesign = null;
-        jasperDesign = null;
-        jasperReport = null;
-        parameters = null;
-        jasperPrint = null;
-        if (dataSource != null && dataSource instanceof JRRewindableDataSource) {
+        this.builded = false;
+        this.reportDesign = null;
+        this.jasperDesign = null;
+        this.jasperReport = null;
+        this.parameters = null;
+        this.jasperPrint = null;
+        if (this.dataSource != null && this.dataSource instanceof JRRewindableDataSource) {
             try {
-                ((JRRewindableDataSource) dataSource).moveFirst();
-            } catch (JRException e) {
+                ((JRRewindableDataSource)this.dataSource).moveFirst();
+            } catch (final JRException e) {
                 throw new DRException(e);
             }
         }
@@ -287,13 +288,13 @@ public JasperReportBuilder rebuild() throws DRException {
     }
 
     private JasperReportDesign toJasperReportDesign() throws DRException {
-        if (reportDesign == null) {
-            DRIDesignReport report = new DRDesignReport(build());
-            reportDesign = new JasperReportDesign(report, startPageNumber);
-            JasperTransform jasperTransform = new JasperTransform(report, reportDesign);
+        if (this.reportDesign == null) {
+            final DRIDesignReport report = new DRDesignReport(this.build());
+            this.reportDesign = new JasperReportDesign(report, this.startPageNumber);
+            final JasperTransform jasperTransform = new JasperTransform(report, this.reportDesign);
             jasperTransform.transform();
         }
-        return reportDesign;
+        return this.reportDesign;
     }
 
     /**
@@ -303,10 +304,10 @@ private JasperReportDesign toJasperReportDesign() throws DRException {
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
     public JasperDesign toJasperDesign() throws DRException {
-        if (jasperDesign == null) {
-            jasperDesign = toJasperReportDesign().getDesign();
+        if (this.jasperDesign == null) {
+            this.jasperDesign = this.toJasperReportDesign().getDesign();
         }
-        return jasperDesign;
+        return this.jasperDesign;
     }
 
     /**
@@ -316,14 +317,14 @@ public JasperDesign toJasperDesign() throws DRException {
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
     public JasperReport toJasperReport() throws DRException {
-        if (jasperReport == null) {
+        if (this.jasperReport == null) {
             try {
-                jasperReport = JasperCompileManager.compileReport(toJasperDesign());
-            } catch (JRException e) {
+                this.jasperReport = JasperCompileManager.compileReport(this.toJasperDesign());
+            } catch (final JRException e) {
                 throw new DRException(e);
             }
         }
-        return jasperReport;
+        return this.jasperReport;
     }
 
     /**
@@ -333,15 +334,15 @@ public JasperReport toJasperReport() throws DRException {
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
     public Map<String, Object> getJasperParameters() throws DRException {
-        if (parameters == null) {
-            parameters = new HashMap<>();
-            JasperReportDesign jasperReportDesign = toJasperReportDesign();
-            parameters.putAll(jasperReportDesign.getParameters());
-            if (getReport().getParameterValues() != null) {
-                parameters.putAll(getReport().getParameterValues());
+        if (this.parameters == null) {
+            this.parameters = new HashMap<>();
+            final JasperReportDesign jasperReportDesign = this.toJasperReportDesign();
+            this.parameters.putAll(jasperReportDesign.getParameters());
+            if (this.getReport().getParameterValues() != null) {
+                this.parameters.putAll(this.getReport().getParameterValues());
             }
         }
-        return parameters;
+        return this.parameters;
     }
 
     /**
@@ -351,30 +352,30 @@ public Map<String, Object> getJasperParameters() throws DRException {
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
     public JasperPrint toJasperPrint() throws DRException {
-        if (jasperPrint == null) {
-            Map<String, Object> parameters = getJasperParameters();
-            if (virtualizer != null) {
-                parameters.put(JRParameter.REPORT_VIRTUALIZER, virtualizer);
+        if (this.jasperPrint == null) {
+            final Map<String, Object> parameters = this.getJasperParameters();
+            if (this.virtualizer != null) {
+                parameters.put(JRParameter.REPORT_VIRTUALIZER, this.virtualizer);
             }
 
             try {
-                if (connection != null && toJasperReport().getQuery() != null) {
-                    jasperPrint = JasperFillManager.fillReport(toJasperReport(), parameters, connection);
-                } else if (dataSource != null) {
-                    jasperPrint = JasperFillManager.fillReport(toJasperReport(), parameters, dataSource);
+                if (this.connection != null && this.toJasperReport().getQuery() != null) {
+                    this.jasperPrint = JasperFillManager.fillReport(this.toJasperReport(), parameters, this.connection);
+                } else if (this.dataSource != null) {
+                    this.jasperPrint = JasperFillManager.fillReport(this.toJasperReport(), parameters, this.dataSource);
                 } else {
-                    jasperPrint = JasperFillManager.fillReport(toJasperReport(), parameters);
+                    this.jasperPrint = JasperFillManager.fillReport(this.toJasperReport(), parameters);
                 }
 
-                if (toJasperReportDesign().isTableOfContents()) {
-                    JasperTocReport.createTocReport(toJasperReportDesign(), jasperPrint, parameters);
+                if (this.toJasperReportDesign().isTableOfContents()) {
+                    JasperTocReport.createTocReport(this.toJasperReportDesign(), this.jasperPrint, parameters);
                 }
-            } catch (JRException e) {
+            } catch (final JRException e) {
                 throw new DRException(e);
             }
 
         }
-        return jasperPrint;
+        return this.jasperPrint;
     }
 
     /**
@@ -384,7 +385,7 @@ public JasperPrint toJasperPrint() throws DRException {
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder show() throws DRException {
-        JasperViewer.viewReport(toJasperPrint());
+        JasperViewer.viewReport(this.toJasperPrint());
         return this;
     }
 
@@ -395,8 +396,8 @@ public JasperReportBuilder show() throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder show(boolean exitOnClose) throws DRException {
-        JasperViewer.viewReport(toJasperPrint(), exitOnClose, null);
+    public JasperReportBuilder show(final boolean exitOnClose) throws DRException {
+        JasperViewer.viewReport(this.toJasperPrint(), exitOnClose, null);
         return this;
     }
 
@@ -408,8 +409,8 @@ public JasperReportBuilder show(boolean exitOnClose) throws DRException {
      */
     public JasperReportBuilder showJrXml() throws DRException {
         try {
-            JasperDesignViewer.viewReportDesign(toJasperDesign());
-        } catch (JRException e) {
+            JasperDesignViewer.viewReportDesign(this.toJasperDesign());
+        } catch (final JRException e) {
             throw new DRException(e);
         }
         return this;
@@ -422,11 +423,11 @@ public JasperReportBuilder showJrXml() throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toJrXml(OutputStream outputStream) throws DRException {
+    public JasperReportBuilder toJrXml(final OutputStream outputStream) throws DRException {
         Validate.notNull(outputStream, "outputStream must not be null");
         try {
-            JRXmlWriter.writeReport(toJasperDesign(), outputStream, "UTF-8");
-        } catch (JRException e) {
+            JRXmlWriter.writeReport(this.toJasperDesign(), outputStream, "UTF-8");
+        } catch (final JRException e) {
             throw new DRException(e);
         }
         return this;
@@ -439,7 +440,7 @@ public JasperReportBuilder toJrXml(OutputStream outputStream) throws DRException
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder print() throws DRException {
-        return print(true);
+        return this.print(true);
     }
 
     /**
@@ -449,10 +450,10 @@ public JasperReportBuilder print() throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder print(boolean withPrintDialog) throws DRException {
+    public JasperReportBuilder print(final boolean withPrintDialog) throws DRException {
         try {
-            JasperPrintManager.printReport(toJasperPrint(), withPrintDialog);
-        } catch (JRException e) {
+            JasperPrintManager.printReport(this.toJasperPrint(), withPrintDialog);
+        } catch (final JRException e) {
             throw new DRException(e);
         }
         return this;
@@ -464,7 +465,7 @@ public JasperReportBuilder print(boolean withPrintDialog) throws DRException {
      * @param virtualizer a {@link net.sf.jasperreports.engine.JRVirtualizer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      */
-    public JasperReportBuilder setVirtualizer(JRVirtualizer virtualizer) {
+    public JasperReportBuilder setVirtualizer(final JRVirtualizer virtualizer) {
         this.virtualizer = virtualizer;
         return this;
     }
@@ -477,8 +478,8 @@ public JasperReportBuilder setVirtualizer(JRVirtualizer virtualizer) {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toImage(OutputStream outputStream, ImageType imageType) throws DRException {
-        return toImage(Exporters.imageExporter(outputStream, imageType));
+    public JasperReportBuilder toImage(final OutputStream outputStream, final ImageType imageType) throws DRException {
+        return this.toImage(Exporters.imageExporter(outputStream, imageType));
     }
 
     /**
@@ -488,16 +489,16 @@ public JasperReportBuilder toImage(OutputStream outputStream, ImageType imageTyp
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toImage(JasperImageExporterBuilder imageExporterBuilder) throws DRException {
+    public JasperReportBuilder toImage(final JasperImageExporterBuilder imageExporterBuilder) throws DRException {
         Validate.notNull(imageExporterBuilder, "imageExporterBuilder must not be null");
 
-        JasperImageExporter imageExporter = imageExporterBuilder.build();
+        final JasperImageExporter imageExporter = imageExporterBuilder.build();
 
-        JasperPrint jasperPrint = toJasperPrint();
+        final JasperPrint jasperPrint = this.toJasperPrint();
         Integer fromPage = null;
         Integer toPage = null;
         float zoom = 1;
-        String imageType = imageExporter.getImageType().name().toLowerCase();
+        final String imageType = imageExporter.getImageType().name().toLowerCase();
         int offsetX = 0;
         int offsetY = 0;
         int pageGap = 0;
@@ -533,27 +534,27 @@ public JasperReportBuilder toImage(JasperImageExporterBuilder imageExporterBuild
             toPage = jasperPrint.getPages().size();
         }
 
-        int pages = toPage - fromPage;
+        final int pages = toPage - fromPage;
 
-        int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
-        int pageHeight = (int) (jasperPrint.getPageHeight() * zoom);
-        int width = pageWidth * pages + pages - 1 + offsetX * 2;
-        int height = (int) (jasperPrint.getPageHeight() * zoom) + offsetY * 2;
-        Image image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        final int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
+        final int pageHeight = (int) (jasperPrint.getPageHeight() * zoom);
+        final int width = pageWidth * pages + pages - 1 + offsetX * 2;
+        final int height = (int) (jasperPrint.getPageHeight() * zoom) + offsetY * 2;
+        final Image image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
 
         int offset = offsetX;
         for (int i = 0; i < pages; i++) {
             try {
-                SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
-                SimpleGraphics2DExporterOutput exporterOutput = new SimpleGraphics2DExporterOutput();
-                Image pageImage = new BufferedImage(pageWidth, pageHeight, BufferedImage.TYPE_INT_RGB);
+                final SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+                final SimpleGraphics2DExporterOutput exporterOutput = new SimpleGraphics2DExporterOutput();
+                final Image pageImage = new BufferedImage(pageWidth, pageHeight, BufferedImage.TYPE_INT_RGB);
                 exporterOutput.setGraphics2D((Graphics2D) pageImage.getGraphics());
-                SimpleGraphics2DReportConfiguration reportExportConfiguration = new SimpleGraphics2DReportConfiguration();
+                final SimpleGraphics2DReportConfiguration reportExportConfiguration = new SimpleGraphics2DReportConfiguration();
                 reportExportConfiguration.setPageIndex(fromPage);
                 reportExportConfiguration.setZoomRatio(zoom);
-                SimpleGraphics2DExporterConfiguration exporterConfiguration = new SimpleGraphics2DExporterConfiguration();
+                final SimpleGraphics2DExporterConfiguration exporterConfiguration = new SimpleGraphics2DExporterConfiguration();
 
-                JRGraphics2DExporter jrExporter = new JRGraphics2DExporter();
+                final JRGraphics2DExporter jrExporter = new JRGraphics2DExporter();
                 jrExporter.setExporterInput(exporterInput);
                 jrExporter.setExporterOutput(exporterOutput);
                 jrExporter.setConfiguration(reportExportConfiguration);
@@ -563,7 +564,7 @@ public JasperReportBuilder toImage(JasperImageExporterBuilder imageExporterBuild
                 ((Graphics2D) image.getGraphics()).drawImage(pageImage, offset, offsetY, null);
                 fromPage++;
                 offset += pageWidth + pageGap;
-            } catch (JRException e) {
+            } catch (final JRException e) {
                 throw new DRException(e);
             }
         }
@@ -577,7 +578,7 @@ public JasperReportBuilder toImage(JasperImageExporterBuilder imageExporterBuild
             } else {
                 throw new JasperDesignException("ImageExporter output not supported");
             }
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new DRException(e);
         }
         return this;
@@ -592,8 +593,8 @@ public JasperReportBuilder toImage(JasperImageExporterBuilder imageExporterBuild
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toCsv(OutputStream outputStream) throws DRException {
-        return toCsv(Exporters.csvExporter(outputStream));
+    public JasperReportBuilder toCsv(final OutputStream outputStream) throws DRException {
+        return this.toCsv(Exporters.csvExporter(outputStream));
     }
 
     /**
@@ -603,8 +604,8 @@ public JasperReportBuilder toCsv(OutputStream outputStream) throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toCsv(JasperCsvExporterBuilder csvExporterBuilder) throws DRException {
-        return export(csvExporterBuilder);
+    public JasperReportBuilder toCsv(final JasperCsvExporterBuilder csvExporterBuilder) throws DRException {
+        return this.export(csvExporterBuilder);
     }
 
     // csv
@@ -616,8 +617,8 @@ public JasperReportBuilder toCsv(JasperCsvExporterBuilder csvExporterBuilder) th
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toDocx(OutputStream outputStream) throws DRException {
-        return toDocx(Exporters.docxExporter(outputStream));
+    public JasperReportBuilder toDocx(final OutputStream outputStream) throws DRException {
+        return this.toDocx(Exporters.docxExporter(outputStream));
     }
 
     /**
@@ -627,8 +628,8 @@ public JasperReportBuilder toDocx(OutputStream outputStream) throws DRException
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toDocx(JasperDocxExporterBuilder docxExporterBuilder) throws DRException {
-        return export(docxExporterBuilder);
+    public JasperReportBuilder toDocx(final JasperDocxExporterBuilder docxExporterBuilder) throws DRException {
+        return this.export(docxExporterBuilder);
     }
 
     // docx
@@ -640,8 +641,8 @@ public JasperReportBuilder toDocx(JasperDocxExporterBuilder docxExporterBuilder)
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toHtml(OutputStream outputStream) throws DRException {
-        return toHtml(Exporters.htmlExporter(outputStream));
+    public JasperReportBuilder toHtml(final OutputStream outputStream) throws DRException {
+        return this.toHtml(Exporters.htmlExporter(outputStream));
     }
 
     /**
@@ -651,8 +652,8 @@ public JasperReportBuilder toHtml(OutputStream outputStream) throws DRException
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toHtml(JasperHtmlExporterBuilder htmlExporterBuilder) throws DRException {
-        return export(htmlExporterBuilder);
+    public JasperReportBuilder toHtml(final JasperHtmlExporterBuilder htmlExporterBuilder) throws DRException {
+        return this.export(htmlExporterBuilder);
     }
 
     // html
@@ -664,8 +665,8 @@ public JasperReportBuilder toHtml(JasperHtmlExporterBuilder htmlExporterBuilder)
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toOds(OutputStream outputStream) throws DRException {
-        return toOds(Exporters.odsExporter(outputStream));
+    public JasperReportBuilder toOds(final OutputStream outputStream) throws DRException {
+        return this.toOds(Exporters.odsExporter(outputStream));
     }
 
     /**
@@ -675,8 +676,8 @@ public JasperReportBuilder toOds(OutputStream outputStream) throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toOds(JasperOdsExporterBuilder odsExporterBuilder) throws DRException {
-        return export(odsExporterBuilder);
+    public JasperReportBuilder toOds(final JasperOdsExporterBuilder odsExporterBuilder) throws DRException {
+        return this.export(odsExporterBuilder);
     }
 
     // ods
@@ -688,8 +689,8 @@ public JasperReportBuilder toOds(JasperOdsExporterBuilder odsExporterBuilder) th
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toOdt(OutputStream outputStream) throws DRException {
-        return toOdt(Exporters.odtExporter(outputStream));
+    public JasperReportBuilder toOdt(final OutputStream outputStream) throws DRException {
+        return this.toOdt(Exporters.odtExporter(outputStream));
     }
 
     /**
@@ -699,8 +700,8 @@ public JasperReportBuilder toOdt(OutputStream outputStream) throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toOdt(JasperOdtExporterBuilder odtExporterBuilder) throws DRException {
-        return export(odtExporterBuilder);
+    public JasperReportBuilder toOdt(final JasperOdtExporterBuilder odtExporterBuilder) throws DRException {
+        return this.export(odtExporterBuilder);
     }
 
     // odt
@@ -712,8 +713,8 @@ public JasperReportBuilder toOdt(JasperOdtExporterBuilder odtExporterBuilder) th
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toPdf(OutputStream outputStream) throws DRException {
-        return toPdf(Exporters.pdfExporter(outputStream));
+    public JasperReportBuilder toPdf(final OutputStream outputStream) throws DRException {
+        return this.toPdf(Exporters.pdfExporter(outputStream));
     }
 
     /**
@@ -723,8 +724,8 @@ public JasperReportBuilder toPdf(OutputStream outputStream) throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toPdf(JasperPdfExporterBuilder pdfExporterBuilder) throws DRException {
-        return export(pdfExporterBuilder);
+    public JasperReportBuilder toPdf(final JasperPdfExporterBuilder pdfExporterBuilder) throws DRException {
+        return this.export(pdfExporterBuilder);
     }
 
     // pdf
@@ -736,8 +737,8 @@ public JasperReportBuilder toPdf(JasperPdfExporterBuilder pdfExporterBuilder) th
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toRtf(OutputStream outputStream) throws DRException {
-        return toRtf(Exporters.rtfExporter(outputStream));
+    public JasperReportBuilder toRtf(final OutputStream outputStream) throws DRException {
+        return this.toRtf(Exporters.rtfExporter(outputStream));
     }
 
     /**
@@ -747,8 +748,8 @@ public JasperReportBuilder toRtf(OutputStream outputStream) throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toRtf(JasperRtfExporterBuilder rtfExporterBuilder) throws DRException {
-        return export(rtfExporterBuilder);
+    public JasperReportBuilder toRtf(final JasperRtfExporterBuilder rtfExporterBuilder) throws DRException {
+        return this.export(rtfExporterBuilder);
     }
 
     // rtf
@@ -760,8 +761,8 @@ public JasperReportBuilder toRtf(JasperRtfExporterBuilder rtfExporterBuilder) th
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toText(OutputStream outputStream) throws DRException {
-        return toText(Exporters.textExporter(outputStream));
+    public JasperReportBuilder toText(final OutputStream outputStream) throws DRException {
+        return this.toText(Exporters.textExporter(outputStream));
     }
 
     /**
@@ -771,36 +772,12 @@ public JasperReportBuilder toText(OutputStream outputStream) throws DRException
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toText(JasperTextExporterBuilder textExporterBuilder) throws DRException {
-        return export(textExporterBuilder);
+    public JasperReportBuilder toText(final JasperTextExporterBuilder textExporterBuilder) throws DRException {
+        return this.export(textExporterBuilder);
     }
 
     // text
 
-    /**
-     * <p>toXls.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperReportBuilder toXls(OutputStream outputStream) throws DRException {
-        return toXls(Exporters.xlsExporter(outputStream));
-    }
-
-    /**
-     * <p>toXls.</p>
-     *
-     * @param xlsExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperReportBuilder toXls(JasperXlsExporterBuilder xlsExporterBuilder) throws DRException {
-        return export(xlsExporterBuilder);
-    }
-
-    // xls
-
     /**
      * <p>toXlsx.</p>
      *
@@ -808,8 +785,8 @@ public JasperReportBuilder toXls(JasperXlsExporterBuilder xlsExporterBuilder) th
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toXlsx(OutputStream outputStream) throws DRException {
-        return toXlsx(Exporters.xlsxExporter(outputStream));
+    public JasperReportBuilder toXlsx(final OutputStream outputStream) throws DRException {
+        return this.toXlsx(Exporters.xlsxExporter(outputStream));
     }
 
     /**
@@ -819,8 +796,8 @@ public JasperReportBuilder toXlsx(OutputStream outputStream) throws DRException
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toXlsx(JasperXlsxExporterBuilder xlsxExporterBuilder) throws DRException {
-        return export(xlsxExporterBuilder);
+    public JasperReportBuilder toXlsx(final JasperXlsxExporterBuilder xlsxExporterBuilder) throws DRException {
+        return this.export(xlsxExporterBuilder);
     }
 
     // xlsx
@@ -832,8 +809,8 @@ public JasperReportBuilder toXlsx(JasperXlsxExporterBuilder xlsxExporterBuilder)
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toXml(OutputStream outputStream) throws DRException {
-        return toXml(Exporters.xmlExporter(outputStream));
+    public JasperReportBuilder toXml(final OutputStream outputStream) throws DRException {
+        return this.toXml(Exporters.xmlExporter(outputStream));
     }
 
     /**
@@ -843,8 +820,8 @@ public JasperReportBuilder toXml(OutputStream outputStream) throws DRException {
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toXml(JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
-        return export(xmlExporterBuilder);
+    public JasperReportBuilder toXml(final JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
+        return this.export(xmlExporterBuilder);
     }
 
     // xml
@@ -856,8 +833,8 @@ public JasperReportBuilder toXml(JasperXmlExporterBuilder xmlExporterBuilder) th
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toPptx(OutputStream outputStream) throws DRException {
-        return toPptx(Exporters.pptxExporter(outputStream));
+    public JasperReportBuilder toPptx(final OutputStream outputStream) throws DRException {
+        return this.toPptx(Exporters.pptxExporter(outputStream));
     }
 
     /**
@@ -867,8 +844,8 @@ public JasperReportBuilder toPptx(OutputStream outputStream) throws DRException
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder toPptx(JasperPptxExporterBuilder pptxExporterBuilder) throws DRException {
-        return export(pptxExporterBuilder);
+    public JasperReportBuilder toPptx(final JasperPptxExporterBuilder pptxExporterBuilder) throws DRException {
+        return this.export(pptxExporterBuilder);
     }
 
     // pptx
@@ -880,14 +857,15 @@ public JasperReportBuilder toPptx(JasperPptxExporterBuilder pptxExporterBuilder)
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public JasperReportBuilder export(AbstractJasperExporterBuilder<?, ? extends AbstractJasperExporter> exporterBuilder) throws DRException {
+    public JasperReportBuilder export(final AbstractJasperExporterBuilder<?, ? extends AbstractJasperExporter> exporterBuilder) throws DRException {
         Validate.notNull(exporterBuilder, "exporterBuilder must not be null");
         try {
-            ExporterTransform exporterTransform = new ExporterTransform(exporterBuilder.build());
-            @SuppressWarnings("unchecked") Exporter<ExporterInput, ?, ?, ?> exporter = (Exporter<ExporterInput, ?, ?, ?>) exporterTransform.transform();
-            exporter.setExporterInput(new SimpleExporterInput(toJasperPrint()));
+            final ExporterTransform exporterTransform = new ExporterTransform(exporterBuilder.build());
+            @SuppressWarnings("unchecked")
+            final Exporter<ExporterInput, ?, ?, ?> exporter = (Exporter<ExporterInput, ?, ?, ?>) exporterTransform.transform();
+            exporter.setExporterInput(new SimpleExporterInput(this.toJasperPrint()));
             exporter.exportReport();
-        } catch (JRException e) {
+        } catch (final JRException e) {
             throw new DRException(e);
         }
         return this;
@@ -899,7 +877,7 @@ public JasperReportBuilder export(AbstractJasperExporterBuilder<?, ? extends Abs
      * @return a {@link java.sql.Connection} object.
      */
     public Connection getConnection() {
-        return connection;
+        return this.connection;
     }
 
     /**
@@ -908,7 +886,7 @@ public Connection getConnection() {
      * @param connection a {@link java.sql.Connection} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
      */
-    public JasperReportBuilder setConnection(Connection connection) {
+    public JasperReportBuilder setConnection(final Connection connection) {
         Validate.notNull(connection, "connection must not be null");
         this.connection = connection;
         return this;
@@ -920,7 +898,7 @@ public JasperReportBuilder setConnection(Connection connection) {
      * @return a {@link net.sf.jasperreports.engine.JRDataSource} object.
      */
     public JRDataSource getDataSource() {
-        return dataSource;
+        return this.dataSource;
     }
 
     /**
@@ -929,9 +907,9 @@ public JRDataSource getDataSource() {
      * @param dataSource - the JRDataSource object
      * @return a report builder
      */
-    public JasperReportBuilder setDataSource(JRDataSource dataSource) {
+    public JasperReportBuilder setDataSource(final JRDataSource dataSource) {
         this.dataSource = dataSource;
-        connection = null;
+        this.connection = null;
         return this;
     }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java
index d4a5f7e..20790fb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java
@@ -17,526 +17,529 @@
  */
 package net.sf.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.constant.ImageType;
-
 import java.io.File;
 import java.io.OutputStream;
 import java.io.Writer;
 
+import net.sf.dynamicreports.jasper.constant.ImageType;
+
+
 /**
  * A set of methods of creating exporters
  *
  * @author Ricardo Mariaca
- * 
  */
-public class ExporterBuilders {
-
+public class ExporterBuilders
+{
+    
     // csv
-
+    
     /**
      * <p>csvExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
-    public JasperCsvExporterBuilder csvExporter(Writer outputWriter) {
+    public JasperCsvExporterBuilder csvExporter(final Writer outputWriter)
+    {
         return Exporters.csvExporter(outputWriter);
     }
-
+    
     /**
      * <p>csvExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
-    public JasperCsvExporterBuilder csvExporter(OutputStream outputStream) {
+    public JasperCsvExporterBuilder csvExporter(final OutputStream outputStream)
+    {
         return Exporters.csvExporter(outputStream);
     }
-
+    
     /**
      * <p>csvExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
-    public JasperCsvExporterBuilder csvExporter(File outputFile) {
+    public JasperCsvExporterBuilder csvExporter(final File outputFile)
+    {
         return Exporters.csvExporter(outputFile);
     }
-
+    
     /**
      * <p>csvExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
-    public JasperCsvExporterBuilder csvExporter(String outputFileName) {
+    public JasperCsvExporterBuilder csvExporter(final String outputFileName)
+    {
         return Exporters.csvExporter(outputFileName);
     }
-
+    
     // docx
-
+    
     /**
      * <p>docxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
-    public JasperDocxExporterBuilder docxExporter(Writer outputWriter) {
+    public JasperDocxExporterBuilder docxExporter(final Writer outputWriter)
+    {
         return Exporters.docxExporter(outputWriter);
     }
-
+    
     /**
      * <p>docxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
-    public JasperDocxExporterBuilder docxExporter(OutputStream outputStream) {
+    public JasperDocxExporterBuilder docxExporter(final OutputStream outputStream)
+    {
         return Exporters.docxExporter(outputStream);
     }
-
+    
     /**
      * <p>docxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
-    public JasperDocxExporterBuilder docxExporter(File outputFile) {
+    public JasperDocxExporterBuilder docxExporter(final File outputFile)
+    {
         return Exporters.docxExporter(outputFile);
     }
-
+    
     /**
      * <p>docxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
-    public JasperDocxExporterBuilder docxExporter(String outputFileName) {
+    public JasperDocxExporterBuilder docxExporter(final String outputFileName)
+    {
         return Exporters.docxExporter(outputFileName);
     }
-
+    
     // html
-
+    
     /**
      * <p>htmlExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
-    public JasperHtmlExporterBuilder htmlExporter(Writer outputWriter) {
+    public JasperHtmlExporterBuilder htmlExporter(final Writer outputWriter)
+    {
         return Exporters.htmlExporter(outputWriter);
     }
-
+    
     /**
      * <p>htmlExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
-    public JasperHtmlExporterBuilder htmlExporter(OutputStream outputStream) {
+    public JasperHtmlExporterBuilder htmlExporter(final OutputStream outputStream)
+    {
         return Exporters.htmlExporter(outputStream);
     }
-
+    
     /**
      * <p>htmlExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
-    public JasperHtmlExporterBuilder htmlExporter(File outputFile) {
+    public JasperHtmlExporterBuilder htmlExporter(final File outputFile)
+    {
         return Exporters.htmlExporter(outputFile);
     }
-
+    
     /**
      * <p>htmlExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
-    public JasperHtmlExporterBuilder htmlExporter(String outputFileName) {
+    public JasperHtmlExporterBuilder htmlExporter(final String outputFileName)
+    {
         return Exporters.htmlExporter(outputFileName);
     }
-
+    
     // ods
-
+    
     /**
      * <p>odsExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
-    public JasperOdsExporterBuilder odsExporter(Writer outputWriter) {
+    public JasperOdsExporterBuilder odsExporter(final Writer outputWriter)
+    {
         return Exporters.odsExporter(outputWriter);
     }
-
+    
     /**
      * <p>odsExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
-    public JasperOdsExporterBuilder odsExporter(OutputStream outputStream) {
+    public JasperOdsExporterBuilder odsExporter(final OutputStream outputStream)
+    {
         return Exporters.odsExporter(outputStream);
     }
-
+    
     /**
      * <p>odsExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
-    public JasperOdsExporterBuilder odsExporter(File outputFile) {
+    public JasperOdsExporterBuilder odsExporter(final File outputFile)
+    {
         return Exporters.odsExporter(outputFile);
     }
-
+    
     /**
      * <p>odsExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
-    public JasperOdsExporterBuilder odsExporter(String outputFileName) {
+    public JasperOdsExporterBuilder odsExporter(final String outputFileName)
+    {
         return Exporters.odsExporter(outputFileName);
     }
-
+    
     // odt
-
+    
     /**
      * <p>odtExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
-    public JasperOdtExporterBuilder odtExporter(Writer outputWriter) {
+    public JasperOdtExporterBuilder odtExporter(final Writer outputWriter)
+    {
         return Exporters.odtExporter(outputWriter);
     }
-
+    
     /**
      * <p>odtExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
-    public JasperOdtExporterBuilder odtExporter(OutputStream outputStream) {
+    public JasperOdtExporterBuilder odtExporter(final OutputStream outputStream)
+    {
         return Exporters.odtExporter(outputStream);
     }
-
+    
     /**
      * <p>odtExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
-    public JasperOdtExporterBuilder odtExporter(File outputFile) {
+    public JasperOdtExporterBuilder odtExporter(final File outputFile)
+    {
         return Exporters.odtExporter(outputFile);
     }
-
+    
     /**
      * <p>odtExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
-    public JasperOdtExporterBuilder odtExporter(String outputFileName) {
+    public JasperOdtExporterBuilder odtExporter(final String outputFileName)
+    {
         return Exporters.odtExporter(outputFileName);
     }
-
+    
     // pdf
-
+    
     /**
      * <p>pdfExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
-    public JasperPdfExporterBuilder pdfExporter(Writer outputWriter) {
+    public JasperPdfExporterBuilder pdfExporter(final Writer outputWriter)
+    {
         return Exporters.pdfExporter(outputWriter);
     }
-
+    
     /**
      * <p>pdfExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
-    public JasperPdfExporterBuilder pdfExporter(OutputStream outputStream) {
+    public JasperPdfExporterBuilder pdfExporter(final OutputStream outputStream)
+    {
         return Exporters.pdfExporter(outputStream);
     }
-
+    
     /**
      * <p>pdfExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
-    public JasperPdfExporterBuilder pdfExporter(File outputFile) {
+    public JasperPdfExporterBuilder pdfExporter(final File outputFile)
+    {
         return Exporters.pdfExporter(outputFile);
     }
-
+    
     /**
      * <p>pdfExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
-    public JasperPdfExporterBuilder pdfExporter(String outputFileName) {
+    public JasperPdfExporterBuilder pdfExporter(final String outputFileName)
+    {
         return Exporters.pdfExporter(outputFileName);
     }
-
+    
     // rtf
-
+    
     /**
      * <p>rtfExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
-    public JasperRtfExporterBuilder rtfExporter(Writer outputWriter) {
+    public JasperRtfExporterBuilder rtfExporter(final Writer outputWriter)
+    {
         return Exporters.rtfExporter(outputWriter);
     }
-
+    
     /**
      * <p>rtfExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
-    public JasperRtfExporterBuilder rtfExporter(OutputStream outputStream) {
+    public JasperRtfExporterBuilder rtfExporter(final OutputStream outputStream)
+    {
         return Exporters.rtfExporter(outputStream);
     }
-
+    
     /**
      * <p>rtfExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
-    public JasperRtfExporterBuilder rtfExporter(File outputFile) {
+    public JasperRtfExporterBuilder rtfExporter(final File outputFile)
+    {
         return Exporters.rtfExporter(outputFile);
     }
-
+    
     /**
      * <p>rtfExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
-    public JasperRtfExporterBuilder rtfExporter(String outputFileName) {
+    public JasperRtfExporterBuilder rtfExporter(final String outputFileName)
+    {
         return Exporters.rtfExporter(outputFileName);
     }
-
+    
     // text
-
+    
     /**
      * <p>textExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
-    public JasperTextExporterBuilder textExporter(Writer outputWriter) {
+    public JasperTextExporterBuilder textExporter(final Writer outputWriter)
+    {
         return Exporters.textExporter(outputWriter);
     }
-
+    
     /**
      * <p>textExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
-    public JasperTextExporterBuilder textExporter(OutputStream outputStream) {
+    public JasperTextExporterBuilder textExporter(final OutputStream outputStream)
+    {
         return Exporters.textExporter(outputStream);
     }
-
+    
     /**
      * <p>textExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
-    public JasperTextExporterBuilder textExporter(File outputFile) {
+    public JasperTextExporterBuilder textExporter(final File outputFile)
+    {
         return Exporters.textExporter(outputFile);
     }
-
+    
     /**
      * <p>textExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
-    public JasperTextExporterBuilder textExporter(String outputFileName) {
+    public JasperTextExporterBuilder textExporter(final String outputFileName)
+    {
         return Exporters.textExporter(outputFileName);
     }
-
-    // xls
-
-    /**
-     * <p>xlsExporter.</p>
-     *
-     * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     */
-    public JasperXlsExporterBuilder xlsExporter(Writer outputWriter) {
-        return Exporters.xlsExporter(outputWriter);
-    }
-
-    /**
-     * <p>xlsExporter.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     */
-    public JasperXlsExporterBuilder xlsExporter(OutputStream outputStream) {
-        return Exporters.xlsExporter(outputStream);
-    }
-
-    /**
-     * <p>xlsExporter.</p>
-     *
-     * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     */
-    public JasperXlsExporterBuilder xlsExporter(File outputFile) {
-        return Exporters.xlsExporter(outputFile);
-    }
-
-    /**
-     * <p>xlsExporter.</p>
-     *
-     * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     */
-    public JasperXlsExporterBuilder xlsExporter(String outputFileName) {
-        return Exporters.xlsExporter(outputFileName);
-    }
-
+    
     // xlsx
-
+    
     /**
      * <p>xlsxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
-    public JasperXlsxExporterBuilder xlsxExporter(Writer outputWriter) {
+    public JasperXlsxExporterBuilder xlsxExporter(final Writer outputWriter)
+    {
         return Exporters.xlsxExporter(outputWriter);
     }
-
+    
     /**
      * <p>xlsxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
-    public JasperXlsxExporterBuilder xlsxExporter(OutputStream outputStream) {
+    public JasperXlsxExporterBuilder xlsxExporter(final OutputStream outputStream)
+    {
         return Exporters.xlsxExporter(outputStream);
     }
-
+    
     /**
      * <p>xlsxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
-    public JasperXlsxExporterBuilder xlsxExporter(File outputFile) {
+    public JasperXlsxExporterBuilder xlsxExporter(final File outputFile)
+    {
         return Exporters.xlsxExporter(outputFile);
     }
-
+    
     /**
      * <p>xlsxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
-    public JasperXlsxExporterBuilder xlsxExporter(String outputFileName) {
+    public JasperXlsxExporterBuilder xlsxExporter(final String outputFileName)
+    {
         return Exporters.xlsxExporter(outputFileName);
     }
-
+    
     // xml
-
+    
     /**
      * <p>xmlExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
-    public JasperXmlExporterBuilder xmlExporter(Writer outputWriter) {
+    public JasperXmlExporterBuilder xmlExporter(final Writer outputWriter)
+    {
         return Exporters.xmlExporter(outputWriter);
     }
-
+    
     /**
      * <p>xmlExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
-    public JasperXmlExporterBuilder xmlExporter(OutputStream outputStream) {
+    public JasperXmlExporterBuilder xmlExporter(final OutputStream outputStream)
+    {
         return Exporters.xmlExporter(outputStream);
     }
-
+    
     /**
      * <p>xmlExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
-    public JasperXmlExporterBuilder xmlExporter(File outputFile) {
+    public JasperXmlExporterBuilder xmlExporter(final File outputFile)
+    {
         return Exporters.xmlExporter(outputFile);
     }
-
+    
     /**
      * <p>xmlExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
-    public JasperXmlExporterBuilder xmlExporter(String outputFileName) {
+    public JasperXmlExporterBuilder xmlExporter(final String outputFileName)
+    {
         return Exporters.xmlExporter(outputFileName);
     }
-
+    
     // pptx
-
+    
     /**
      * <p>pptxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
-    public JasperPptxExporterBuilder pptxExporter(Writer outputWriter) {
+    public JasperPptxExporterBuilder pptxExporter(final Writer outputWriter)
+    {
         return Exporters.pptxExporter(outputWriter);
     }
-
+    
     /**
      * <p>pptxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
-    public JasperPptxExporterBuilder pptxExporter(OutputStream outputStream) {
+    public JasperPptxExporterBuilder pptxExporter(final OutputStream outputStream)
+    {
         return Exporters.pptxExporter(outputStream);
     }
-
+    
     /**
      * <p>pptxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
-    public JasperPptxExporterBuilder pptxExporter(File outputFile) {
+    public JasperPptxExporterBuilder pptxExporter(final File outputFile)
+    {
         return Exporters.pptxExporter(outputFile);
     }
-
+    
     /**
      * <p>pptxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
-    public JasperPptxExporterBuilder pptxExporter(String outputFileName) {
+    public JasperPptxExporterBuilder pptxExporter(final String outputFileName)
+    {
         return Exporters.pptxExporter(outputFileName);
     }
-
+    
     // image
-
+    
     /**
      * <p>imageExporter.</p>
      *
@@ -544,10 +547,11 @@ public JasperPptxExporterBuilder pptxExporter(String outputFileName) {
      * @param imageType    a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
-    public JasperImageExporterBuilder imageExporter(OutputStream outputStream, ImageType imageType) {
+    public JasperImageExporterBuilder imageExporter(final OutputStream outputStream, final ImageType imageType)
+    {
         return Exporters.imageExporter(outputStream, imageType);
     }
-
+    
     /**
      * <p>imageExporter.</p>
      *
@@ -555,10 +559,11 @@ public JasperImageExporterBuilder imageExporter(OutputStream outputStream, Image
      * @param imageType  a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
-    public JasperImageExporterBuilder imageExporter(File outputFile, ImageType imageType) {
+    public JasperImageExporterBuilder imageExporter(final File outputFile, final ImageType imageType)
+    {
         return Exporters.imageExporter(outputFile, imageType);
     }
-
+    
     /**
      * <p>imageExporter.</p>
      *
@@ -566,7 +571,8 @@ public JasperImageExporterBuilder imageExporter(File outputFile, ImageType image
      * @param imageType      a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
-    public JasperImageExporterBuilder imageExporter(String outputFileName, ImageType imageType) {
+    public JasperImageExporterBuilder imageExporter(final String outputFileName, final ImageType imageType)
+    {
         return Exporters.imageExporter(outputFileName, imageType);
     }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java
index 02b61c7..e50076f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java
@@ -17,526 +17,529 @@
  */
 package net.sf.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.constant.ImageType;
-
 import java.io.File;
 import java.io.OutputStream;
 import java.io.Writer;
 
+import net.sf.dynamicreports.jasper.constant.ImageType;
+
+
 /**
  * A set of methods of creating exporters
  *
  * @author Ricardo Mariaca
- * 
  */
-public class Exporters {
-
+public class Exporters
+{
+    
     // csv
-
+    
     /**
      * <p>csvExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
-    public static JasperCsvExporterBuilder csvExporter(Writer outputWriter) {
+    public static JasperCsvExporterBuilder csvExporter(final Writer outputWriter)
+    {
         return new JasperCsvExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>csvExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
-    public static JasperCsvExporterBuilder csvExporter(OutputStream outputStream) {
+    public static JasperCsvExporterBuilder csvExporter(final OutputStream outputStream)
+    {
         return new JasperCsvExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>csvExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
-    public static JasperCsvExporterBuilder csvExporter(File outputFile) {
+    public static JasperCsvExporterBuilder csvExporter(final File outputFile)
+    {
         return new JasperCsvExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>csvExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
-    public static JasperCsvExporterBuilder csvExporter(String outputFileName) {
+    public static JasperCsvExporterBuilder csvExporter(final String outputFileName)
+    {
         return new JasperCsvExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // docx
-
+    
     /**
      * <p>docxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
-    public static JasperDocxExporterBuilder docxExporter(Writer outputWriter) {
+    public static JasperDocxExporterBuilder docxExporter(final Writer outputWriter)
+    {
         return new JasperDocxExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>docxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
-    public static JasperDocxExporterBuilder docxExporter(OutputStream outputStream) {
+    public static JasperDocxExporterBuilder docxExporter(final OutputStream outputStream)
+    {
         return new JasperDocxExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>docxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
-    public static JasperDocxExporterBuilder docxExporter(File outputFile) {
+    public static JasperDocxExporterBuilder docxExporter(final File outputFile)
+    {
         return new JasperDocxExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>docxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
-    public static JasperDocxExporterBuilder docxExporter(String outputFileName) {
+    public static JasperDocxExporterBuilder docxExporter(final String outputFileName)
+    {
         return new JasperDocxExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // html
-
+    
     /**
      * <p>htmlExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
-    public static JasperHtmlExporterBuilder htmlExporter(Writer outputWriter) {
+    public static JasperHtmlExporterBuilder htmlExporter(final Writer outputWriter)
+    {
         return new JasperHtmlExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>htmlExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
-    public static JasperHtmlExporterBuilder htmlExporter(OutputStream outputStream) {
+    public static JasperHtmlExporterBuilder htmlExporter(final OutputStream outputStream)
+    {
         return new JasperHtmlExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>htmlExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
-    public static JasperHtmlExporterBuilder htmlExporter(File outputFile) {
+    public static JasperHtmlExporterBuilder htmlExporter(final File outputFile)
+    {
         return new JasperHtmlExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>htmlExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
-    public static JasperHtmlExporterBuilder htmlExporter(String outputFileName) {
+    public static JasperHtmlExporterBuilder htmlExporter(final String outputFileName)
+    {
         return new JasperHtmlExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // ods
-
+    
     /**
      * <p>odsExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
-    public static JasperOdsExporterBuilder odsExporter(Writer outputWriter) {
+    public static JasperOdsExporterBuilder odsExporter(final Writer outputWriter)
+    {
         return new JasperOdsExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>odsExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
-    public static JasperOdsExporterBuilder odsExporter(OutputStream outputStream) {
+    public static JasperOdsExporterBuilder odsExporter(final OutputStream outputStream)
+    {
         return new JasperOdsExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>odsExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
-    public static JasperOdsExporterBuilder odsExporter(File outputFile) {
+    public static JasperOdsExporterBuilder odsExporter(final File outputFile)
+    {
         return new JasperOdsExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>odsExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
-    public static JasperOdsExporterBuilder odsExporter(String outputFileName) {
+    public static JasperOdsExporterBuilder odsExporter(final String outputFileName)
+    {
         return new JasperOdsExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // odt
-
+    
     /**
      * <p>odtExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
-    public static JasperOdtExporterBuilder odtExporter(Writer outputWriter) {
+    public static JasperOdtExporterBuilder odtExporter(final Writer outputWriter)
+    {
         return new JasperOdtExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>odtExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
-    public static JasperOdtExporterBuilder odtExporter(OutputStream outputStream) {
+    public static JasperOdtExporterBuilder odtExporter(final OutputStream outputStream)
+    {
         return new JasperOdtExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>odtExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
-    public static JasperOdtExporterBuilder odtExporter(File outputFile) {
+    public static JasperOdtExporterBuilder odtExporter(final File outputFile)
+    {
         return new JasperOdtExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>odtExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
-    public static JasperOdtExporterBuilder odtExporter(String outputFileName) {
+    public static JasperOdtExporterBuilder odtExporter(final String outputFileName)
+    {
         return new JasperOdtExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // pdf
-
+    
     /**
      * <p>pdfExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
-    public static JasperPdfExporterBuilder pdfExporter(Writer outputWriter) {
+    public static JasperPdfExporterBuilder pdfExporter(final Writer outputWriter)
+    {
         return new JasperPdfExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>pdfExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
-    public static JasperPdfExporterBuilder pdfExporter(OutputStream outputStream) {
+    public static JasperPdfExporterBuilder pdfExporter(final OutputStream outputStream)
+    {
         return new JasperPdfExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>pdfExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
-    public static JasperPdfExporterBuilder pdfExporter(File outputFile) {
+    public static JasperPdfExporterBuilder pdfExporter(final File outputFile)
+    {
         return new JasperPdfExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>pdfExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
-    public static JasperPdfExporterBuilder pdfExporter(String outputFileName) {
+    public static JasperPdfExporterBuilder pdfExporter(final String outputFileName)
+    {
         return new JasperPdfExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // rtf
-
+    
     /**
      * <p>rtfExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
-    public static JasperRtfExporterBuilder rtfExporter(Writer outputWriter) {
+    public static JasperRtfExporterBuilder rtfExporter(final Writer outputWriter)
+    {
         return new JasperRtfExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>rtfExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
-    public static JasperRtfExporterBuilder rtfExporter(OutputStream outputStream) {
+    public static JasperRtfExporterBuilder rtfExporter(final OutputStream outputStream)
+    {
         return new JasperRtfExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>rtfExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
-    public static JasperRtfExporterBuilder rtfExporter(File outputFile) {
+    public static JasperRtfExporterBuilder rtfExporter(final File outputFile)
+    {
         return new JasperRtfExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>rtfExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
-    public static JasperRtfExporterBuilder rtfExporter(String outputFileName) {
+    public static JasperRtfExporterBuilder rtfExporter(final String outputFileName)
+    {
         return new JasperRtfExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // text
-
+    
     /**
      * <p>textExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
-    public static JasperTextExporterBuilder textExporter(Writer outputWriter) {
+    public static JasperTextExporterBuilder textExporter(final Writer outputWriter)
+    {
         return new JasperTextExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>textExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
-    public static JasperTextExporterBuilder textExporter(OutputStream outputStream) {
+    public static JasperTextExporterBuilder textExporter(final OutputStream outputStream)
+    {
         return new JasperTextExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>textExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
-    public static JasperTextExporterBuilder textExporter(File outputFile) {
+    public static JasperTextExporterBuilder textExporter(final File outputFile)
+    {
         return new JasperTextExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>textExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
-    public static JasperTextExporterBuilder textExporter(String outputFileName) {
+    public static JasperTextExporterBuilder textExporter(final String outputFileName)
+    {
         return new JasperTextExporterBuilder().setOutputFileName(outputFileName);
     }
-
-    // xls
-
-    /**
-     * <p>xlsExporter.</p>
-     *
-     * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     */
-    public static JasperXlsExporterBuilder xlsExporter(Writer outputWriter) {
-        return new JasperXlsExporterBuilder().setOutputWriter(outputWriter);
-    }
-
-    /**
-     * <p>xlsExporter.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     */
-    public static JasperXlsExporterBuilder xlsExporter(OutputStream outputStream) {
-        return new JasperXlsExporterBuilder().setOutputStream(outputStream);
-    }
-
-    /**
-     * <p>xlsExporter.</p>
-     *
-     * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     */
-    public static JasperXlsExporterBuilder xlsExporter(File outputFile) {
-        return new JasperXlsExporterBuilder().setOutputFile(outputFile);
-    }
-
-    /**
-     * <p>xlsExporter.</p>
-     *
-     * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsExporterBuilder} object.
-     */
-    public static JasperXlsExporterBuilder xlsExporter(String outputFileName) {
-        return new JasperXlsExporterBuilder().setOutputFileName(outputFileName);
-    }
-
+    
     // xlsx
-
+    
     /**
      * <p>xlsxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
-    public static JasperXlsxExporterBuilder xlsxExporter(Writer outputWriter) {
+    public static JasperXlsxExporterBuilder xlsxExporter(final Writer outputWriter)
+    {
         return new JasperXlsxExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>xlsxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
-    public static JasperXlsxExporterBuilder xlsxExporter(OutputStream outputStream) {
+    public static JasperXlsxExporterBuilder xlsxExporter(final OutputStream outputStream)
+    {
         return new JasperXlsxExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>xlsxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
-    public static JasperXlsxExporterBuilder xlsxExporter(File outputFile) {
+    public static JasperXlsxExporterBuilder xlsxExporter(final File outputFile)
+    {
         return new JasperXlsxExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>xlsxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
-    public static JasperXlsxExporterBuilder xlsxExporter(String outputFileName) {
+    public static JasperXlsxExporterBuilder xlsxExporter(final String outputFileName)
+    {
         return new JasperXlsxExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // xml
-
+    
     /**
      * <p>xmlExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
-    public static JasperXmlExporterBuilder xmlExporter(Writer outputWriter) {
+    public static JasperXmlExporterBuilder xmlExporter(final Writer outputWriter)
+    {
         return new JasperXmlExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>xmlExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
-    public static JasperXmlExporterBuilder xmlExporter(OutputStream outputStream) {
+    public static JasperXmlExporterBuilder xmlExporter(final OutputStream outputStream)
+    {
         return new JasperXmlExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>xmlExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
-    public static JasperXmlExporterBuilder xmlExporter(File outputFile) {
+    public static JasperXmlExporterBuilder xmlExporter(final File outputFile)
+    {
         return new JasperXmlExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>xmlExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
-    public static JasperXmlExporterBuilder xmlExporter(String outputFileName) {
+    public static JasperXmlExporterBuilder xmlExporter(final String outputFileName)
+    {
         return new JasperXmlExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // pptx
-
+    
     /**
      * <p>pptxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
-    public static JasperPptxExporterBuilder pptxExporter(Writer outputWriter) {
+    public static JasperPptxExporterBuilder pptxExporter(final Writer outputWriter)
+    {
         return new JasperPptxExporterBuilder().setOutputWriter(outputWriter);
     }
-
+    
     /**
      * <p>pptxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
-    public static JasperPptxExporterBuilder pptxExporter(OutputStream outputStream) {
+    public static JasperPptxExporterBuilder pptxExporter(final OutputStream outputStream)
+    {
         return new JasperPptxExporterBuilder().setOutputStream(outputStream);
     }
-
+    
     /**
      * <p>pptxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
-    public static JasperPptxExporterBuilder pptxExporter(File outputFile) {
+    public static JasperPptxExporterBuilder pptxExporter(final File outputFile)
+    {
         return new JasperPptxExporterBuilder().setOutputFile(outputFile);
     }
-
+    
     /**
      * <p>pptxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
-    public static JasperPptxExporterBuilder pptxExporter(String outputFileName) {
+    public static JasperPptxExporterBuilder pptxExporter(final String outputFileName)
+    {
         return new JasperPptxExporterBuilder().setOutputFileName(outputFileName);
     }
-
+    
     // image
-
+    
     /**
      * <p>imageExporter.</p>
      *
@@ -544,10 +547,11 @@ public static JasperPptxExporterBuilder pptxExporter(String outputFileName) {
      * @param imageType    a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
-    public static JasperImageExporterBuilder imageExporter(OutputStream outputStream, ImageType imageType) {
+    public static JasperImageExporterBuilder imageExporter(final OutputStream outputStream, final ImageType imageType)
+    {
         return new JasperImageExporterBuilder().setOutputStream(outputStream).setImageType(imageType);
     }
-
+    
     /**
      * <p>imageExporter.</p>
      *
@@ -555,10 +559,11 @@ public static JasperImageExporterBuilder imageExporter(OutputStream outputStream
      * @param imageType  a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
-    public static JasperImageExporterBuilder imageExporter(File outputFile, ImageType imageType) {
+    public static JasperImageExporterBuilder imageExporter(final File outputFile, final ImageType imageType)
+    {
         return new JasperImageExporterBuilder().setOutputFile(outputFile).setImageType(imageType);
     }
-
+    
     /**
      * <p>imageExporter.</p>
      *
@@ -566,7 +571,8 @@ public static JasperImageExporterBuilder imageExporter(File outputFile, ImageTyp
      * @param imageType      a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
      * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
-    public static JasperImageExporterBuilder imageExporter(String outputFileName, ImageType imageType) {
+    public static JasperImageExporterBuilder imageExporter(final String outputFileName, final ImageType imageType)
+    {
         return new JasperImageExporterBuilder().setOutputFileName(outputFileName).setImageType(imageType);
     }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java
index 1113403..75cdfdf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java
@@ -17,6 +17,8 @@
  */
 package net.sf.dynamicreports.jasper.transformation;
 
+import java.io.File;
+
 import net.sf.dynamicreports.design.transformation.StyleResolver;
 import net.sf.dynamicreports.jasper.definition.export.JasperICsvExporter;
 import net.sf.dynamicreports.jasper.definition.export.JasperIDocxExporter;
@@ -29,7 +31,6 @@
 import net.sf.dynamicreports.jasper.definition.export.JasperIPptxExporter;
 import net.sf.dynamicreports.jasper.definition.export.JasperIRtfExporter;
 import net.sf.dynamicreports.jasper.definition.export.JasperITextExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIXlsExporter;
 import net.sf.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
 import net.sf.dynamicreports.jasper.definition.export.JasperIXmlExporter;
 import net.sf.dynamicreports.jasper.exception.JasperDesignException;
@@ -43,7 +44,6 @@
 import net.sf.jasperreports.engine.export.JRPdfExporter;
 import net.sf.jasperreports.engine.export.JRRtfExporter;
 import net.sf.jasperreports.engine.export.JRTextExporter;
-import net.sf.jasperreports.engine.export.JRXlsExporter;
 import net.sf.jasperreports.engine.export.JRXmlExporter;
 import net.sf.jasperreports.engine.export.oasis.JROdsExporter;
 import net.sf.jasperreports.engine.export.oasis.JROdtExporter;
@@ -76,668 +76,873 @@
 import net.sf.jasperreports.export.SimpleTextExporterConfiguration;
 import net.sf.jasperreports.export.SimpleTextReportConfiguration;
 import net.sf.jasperreports.export.SimpleWriterExporterOutput;
-import net.sf.jasperreports.export.SimpleXlsExporterConfiguration;
-import net.sf.jasperreports.export.SimpleXlsReportConfiguration;
 import net.sf.jasperreports.export.SimpleXlsxExporterConfiguration;
 import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
 import net.sf.jasperreports.export.SimpleXmlExporterOutput;
 import net.sf.jasperreports.web.util.WebHtmlResourceHandler;
 
-import java.io.File;
 
 /**
  * <p>ExporterTransform class.</p>
  *
  * @author Ricardo Mariaca
- * 
  */
-public class ExporterTransform {
-    private JasperIExporter jasperExporter;
-
+public class ExporterTransform
+{
+    private final JasperIExporter jasperExporter;
+    
     /**
      * <p>Constructor for ExporterTransform.</p>
      *
      * @param jasperExporter a {@link net.sf.dynamicreports.jasper.definition.export.JasperIExporter} object.
      */
-    public ExporterTransform(JasperIExporter jasperExporter) {
+    public ExporterTransform(final JasperIExporter jasperExporter)
+    {
         this.jasperExporter = jasperExporter;
     }
-
+    
     /**
      * <p>transform.</p>
      *
      * @return a {@link net.sf.jasperreports.export.Exporter} object.
      * @throws net.sf.dynamicreports.report.exception.DRException if any.
      */
-    public Exporter<?, ?, ?, ?> transform() throws DRException {
-        Exporter<?, ?, ?, ?> jrExporter;
-
-        if (jasperExporter instanceof JasperICsvExporter) {
-            jrExporter = csv((JasperICsvExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIDocxExporter) {
-            jrExporter = docx((JasperIDocxExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIXlsExporter) {
-            jrExporter = xls((JasperIXlsExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIXlsxExporter) {
-            jrExporter = xlsx((JasperIXlsxExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIHtmlExporter) {
-            jrExporter = html((JasperIHtmlExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIOdsExporter) {
-            jrExporter = ods((JasperIOdsExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIOdtExporter) {
-            jrExporter = odt((JasperIOdtExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIPdfExporter) {
-            jrExporter = pdf((JasperIPdfExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIRtfExporter) {
-            jrExporter = rtf((JasperIRtfExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperITextExporter) {
-            jrExporter = text((JasperITextExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIXmlExporter) {
-            jrExporter = xml((JasperIXmlExporter) jasperExporter);
-        } else if (jasperExporter instanceof JasperIPptxExporter) {
-            jrExporter = pptx((JasperIPptxExporter) jasperExporter);
-        } else {
-            throw new JasperDesignException("Exporter " + jasperExporter.getClass().getName() + " not supported");
-        }
-
+    public Exporter<?, ?, ?, ?> transform() throws DRException
+    {
+        final Exporter<?, ?, ?, ?> jrExporter;
+        
+        if(this.jasperExporter instanceof JasperICsvExporter)
+        {
+            jrExporter = this.csv((JasperICsvExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIDocxExporter)
+        {
+            jrExporter = this.docx((JasperIDocxExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIXlsxExporter)
+        {
+            jrExporter = this.xlsx((JasperIXlsxExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIHtmlExporter)
+        {
+            jrExporter = this.html((JasperIHtmlExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIOdsExporter)
+        {
+            jrExporter = this.ods((JasperIOdsExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIOdtExporter)
+        {
+            jrExporter = this.odt((JasperIOdtExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIPdfExporter)
+        {
+            jrExporter = this.pdf((JasperIPdfExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIRtfExporter)
+        {
+            jrExporter = this.rtf((JasperIRtfExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperITextExporter)
+        {
+            jrExporter = this.text((JasperITextExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIXmlExporter)
+        {
+            jrExporter = this.xml((JasperIXmlExporter)this.jasperExporter);
+        }
+        else if(this.jasperExporter instanceof JasperIPptxExporter)
+        {
+            jrExporter = this.pptx((JasperIPptxExporter)this.jasperExporter);
+        }
+        else
+        {
+            throw new JasperDesignException("Exporter " + this.jasperExporter.getClass().getName() + " not supported");
+        }
+        
         return jrExporter;
     }
-
-    private SimpleWriterExporterOutput simpleWriterExporterOutput(JasperIExporter jasperExporter) {
-        if (jasperExporter.getOutputWriter() != null) {
+    
+    private SimpleWriterExporterOutput simpleWriterExporterOutput(final JasperIExporter jasperExporter)
+    {
+        if(jasperExporter.getOutputWriter() != null)
+        {
             return new SimpleWriterExporterOutput(jasperExporter.getOutputWriter());
         }
-        if (jasperExporter.getOutputStream() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleWriterExporterOutput(jasperExporter.getOutputStream(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputStream() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleWriterExporterOutput(
+                    jasperExporter.getOutputStream(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleWriterExporterOutput(jasperExporter.getOutputStream());
             }
         }
-        if (jasperExporter.getOutputFile() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleWriterExporterOutput(jasperExporter.getOutputFile(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputFile() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleWriterExporterOutput(
+                    jasperExporter.getOutputFile(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleWriterExporterOutput(jasperExporter.getOutputFile());
             }
         }
-        if (jasperExporter.getOutputFileName() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleWriterExporterOutput(jasperExporter.getOutputFileName(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputFileName() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleWriterExporterOutput(
+                    jasperExporter.getOutputFileName(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleWriterExporterOutput(jasperExporter.getOutputFileName());
             }
         }
         return null;
     }
-
-    private SimpleOutputStreamExporterOutput simpleOutputStreamExporterOutput(JasperIExporter jasperExporter) {
-        if (jasperExporter.getOutputStream() != null) {
+    
+    private SimpleOutputStreamExporterOutput simpleOutputStreamExporterOutput(final JasperIExporter jasperExporter)
+    {
+        if(jasperExporter.getOutputStream() != null)
+        {
             return new SimpleOutputStreamExporterOutput(jasperExporter.getOutputStream());
         }
-        if (jasperExporter.getOutputFile() != null) {
+        if(jasperExporter.getOutputFile() != null)
+        {
             return new SimpleOutputStreamExporterOutput(jasperExporter.getOutputFile());
         }
-        if (jasperExporter.getOutputFileName() != null) {
+        if(jasperExporter.getOutputFileName() != null)
+        {
             return new SimpleOutputStreamExporterOutput(jasperExporter.getOutputFileName());
         }
         return null;
     }
-
-    private SimpleHtmlExporterOutput simpleHtmlExporterOutput(JasperIExporter jasperExporter) {
-        if (jasperExporter.getOutputWriter() != null) {
+    
+    private SimpleHtmlExporterOutput simpleHtmlExporterOutput(final JasperIExporter jasperExporter)
+    {
+        if(jasperExporter.getOutputWriter() != null)
+        {
             return new SimpleHtmlExporterOutput(jasperExporter.getOutputWriter());
         }
-        if (jasperExporter.getOutputStream() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleHtmlExporterOutput(jasperExporter.getOutputStream(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputStream() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleHtmlExporterOutput(
+                    jasperExporter.getOutputStream(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleHtmlExporterOutput(jasperExporter.getOutputStream());
             }
         }
-        if (jasperExporter.getOutputFile() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleHtmlExporterOutput(jasperExporter.getOutputFile(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputFile() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleHtmlExporterOutput(
+                    jasperExporter.getOutputFile(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleHtmlExporterOutput(jasperExporter.getOutputFile());
             }
         }
-        if (jasperExporter.getOutputFileName() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleHtmlExporterOutput(jasperExporter.getOutputFileName(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputFileName() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleHtmlExporterOutput(
+                    jasperExporter.getOutputFileName(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleHtmlExporterOutput(jasperExporter.getOutputFileName());
             }
         }
         return null;
     }
-
-    private SimpleXmlExporterOutput simpleXmlExporterOutput(JasperIXmlExporter jasperExporter) {
-        if (jasperExporter.getOutputWriter() != null) {
+    
+    private SimpleXmlExporterOutput simpleXmlExporterOutput(final JasperIXmlExporter jasperExporter)
+    {
+        if(jasperExporter.getOutputWriter() != null)
+        {
             return new SimpleXmlExporterOutput(jasperExporter.getOutputWriter());
         }
-        if (jasperExporter.getOutputStream() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleXmlExporterOutput(jasperExporter.getOutputStream(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputStream() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleXmlExporterOutput(
+                    jasperExporter.getOutputStream(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleXmlExporterOutput(jasperExporter.getOutputStream());
             }
         }
-        if (jasperExporter.getOutputFile() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleXmlExporterOutput(jasperExporter.getOutputFile(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputFile() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleXmlExporterOutput(
+                    jasperExporter.getOutputFile(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleXmlExporterOutput(jasperExporter.getOutputFile());
             }
         }
-        if (jasperExporter.getOutputFileName() != null) {
-            if (jasperExporter.getCharacterEncoding() != null) {
-                return new SimpleXmlExporterOutput(jasperExporter.getOutputFileName(), jasperExporter.getCharacterEncoding());
-            } else {
+        if(jasperExporter.getOutputFileName() != null)
+        {
+            if(jasperExporter.getCharacterEncoding() != null)
+            {
+                return new SimpleXmlExporterOutput(
+                    jasperExporter.getOutputFileName(),
+                    jasperExporter.getCharacterEncoding());
+            }
+            else
+            {
                 return new SimpleXmlExporterOutput(jasperExporter.getOutputFileName());
             }
         }
         return null;
     }
-
-    private void reportExportConfiguration(SimpleReportExportConfiguration reportExportConfiguration, JasperIExporter jasperExporter) {
-        if (jasperExporter.getPageIndex() != null) {
+    
+    private void reportExportConfiguration(
+        final SimpleReportExportConfiguration reportExportConfiguration,
+        final JasperIExporter jasperExporter)
+    {
+        if(jasperExporter.getPageIndex() != null)
+        {
             reportExportConfiguration.setPageIndex(jasperExporter.getPageIndex());
         }
-        if (jasperExporter.getStartPageIndex() != null) {
+        if(jasperExporter.getStartPageIndex() != null)
+        {
             reportExportConfiguration.setStartPageIndex(jasperExporter.getStartPageIndex());
         }
-        if (jasperExporter.getEndPageIndex() != null) {
+        if(jasperExporter.getEndPageIndex() != null)
+        {
             reportExportConfiguration.setEndPageIndex(jasperExporter.getEndPageIndex());
         }
-        if (jasperExporter.getOffsetX() != null) {
+        if(jasperExporter.getOffsetX() != null)
+        {
             reportExportConfiguration.setOffsetX(jasperExporter.getOffsetX());
         }
-        if (jasperExporter.getOffsetY() != null) {
+        if(jasperExporter.getOffsetY() != null)
+        {
             reportExportConfiguration.setOffsetY(jasperExporter.getOffsetY());
         }
     }
-
-    private JRXmlExporter xml(JasperIXmlExporter jasperExporter) {
-        SimpleXmlExporterOutput exporterOutput = simpleXmlExporterOutput(jasperExporter);
-        if (jasperExporter.getEmbeddingImages() != null) {
+    
+    private JRXmlExporter xml(final JasperIXmlExporter jasperExporter)
+    {
+        final SimpleXmlExporterOutput exporterOutput = this.simpleXmlExporterOutput(jasperExporter);
+        if(jasperExporter.getEmbeddingImages() != null)
+        {
             exporterOutput.setEmbeddingImages(jasperExporter.getEmbeddingImages());
         }
-        SimpleReportExportConfiguration reportExportConfiguration = new SimpleReportExportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        SimpleExporterConfiguration exporterConfiguration = new SimpleExporterConfiguration();
-
-        JRXmlExporter jrExporter = new JRXmlExporter();
+        final SimpleReportExportConfiguration reportExportConfiguration = new SimpleReportExportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        final SimpleExporterConfiguration exporterConfiguration = new SimpleExporterConfiguration();
+        
+        final JRXmlExporter jrExporter = new JRXmlExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private JRPptxExporter pptx(JasperIPptxExporter jasperExporter) {
-        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
-        SimplePptxReportConfiguration reportExportConfiguration = new SimplePptxReportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getIgnoreHyperLink() != null) {
+    
+    private JRPptxExporter pptx(final JasperIPptxExporter jasperExporter)
+    {
+        final SimpleOutputStreamExporterOutput exporterOutput = this.simpleOutputStreamExporterOutput(jasperExporter);
+        final SimplePptxReportConfiguration reportExportConfiguration = new SimplePptxReportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getIgnoreHyperLink() != null)
+        {
             reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
         }
-        SimplePptxExporterConfiguration exporterConfiguration = new SimplePptxExporterConfiguration();
-
-        JRPptxExporter jrExporter = new JRPptxExporter();
+        final SimplePptxExporterConfiguration exporterConfiguration = new SimplePptxExporterConfiguration();
+        
+        final JRPptxExporter jrExporter = new JRPptxExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private JRTextExporter text(JasperITextExporter jasperExporter) {
-        SimpleWriterExporterOutput exporterOutput = simpleWriterExporterOutput(jasperExporter);
-        SimpleTextReportConfiguration reportExportConfiguration = new SimpleTextReportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getCharacterWidth() != null) {
+    
+    private JRTextExporter text(final JasperITextExporter jasperExporter)
+    {
+        final SimpleWriterExporterOutput exporterOutput = this.simpleWriterExporterOutput(jasperExporter);
+        final SimpleTextReportConfiguration reportExportConfiguration = new SimpleTextReportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getCharacterWidth() != null)
+        {
             reportExportConfiguration.setCharWidth(jasperExporter.getCharacterWidth());
-        } else {
-            DRFont font = Defaults.getDefaults().getFont();
-            reportExportConfiguration.setCharWidth((float) StyleResolver.getFontWidth(font));
         }
-        if (jasperExporter.getCharacterHeight() != null) {
+        else
+        {
+            final DRFont font = Defaults.getDefaults().getFont();
+            reportExportConfiguration.setCharWidth((float)StyleResolver.getFontWidth(font));
+        }
+        if(jasperExporter.getCharacterHeight() != null)
+        {
             reportExportConfiguration.setCharHeight(jasperExporter.getCharacterHeight());
-        } else {
-            DRFont font = Defaults.getDefaults().getFont();
-            reportExportConfiguration.setCharHeight((float) StyleResolver.getFontHeight(font));
         }
-        if (jasperExporter.getPageWidthInChars() != null) {
+        else
+        {
+            final DRFont font = Defaults.getDefaults().getFont();
+            reportExportConfiguration.setCharHeight((float)StyleResolver.getFontHeight(font));
+        }
+        if(jasperExporter.getPageWidthInChars() != null)
+        {
             reportExportConfiguration.setPageWidthInChars(jasperExporter.getPageWidthInChars());
         }
-        if (jasperExporter.getPageHeightInChars() != null) {
+        if(jasperExporter.getPageHeightInChars() != null)
+        {
             reportExportConfiguration.setPageHeightInChars(jasperExporter.getPageHeightInChars());
         }
-        SimpleTextExporterConfiguration exporterConfiguration = new SimpleTextExporterConfiguration();
-        if (jasperExporter.getPageSeparator() != null) {
+        final SimpleTextExporterConfiguration exporterConfiguration = new SimpleTextExporterConfiguration();
+        if(jasperExporter.getPageSeparator() != null)
+        {
             exporterConfiguration.setPageSeparator(jasperExporter.getPageSeparator());
         }
-        if (jasperExporter.getLineSeparator() != null) {
+        if(jasperExporter.getLineSeparator() != null)
+        {
             exporterConfiguration.setLineSeparator(jasperExporter.getLineSeparator());
         }
-        if (jasperExporter.getTrimLineRight() != null) {
+        if(jasperExporter.getTrimLineRight() != null)
+        {
             exporterConfiguration.setTrimLineRight(jasperExporter.getTrimLineRight());
         }
-
-        JRTextExporter jrExporter = new JRTextExporter();
+        
+        final JRTextExporter jrExporter = new JRTextExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private JRRtfExporter rtf(JasperIRtfExporter jasperExporter) {
-        SimpleWriterExporterOutput exporterOutput = simpleWriterExporterOutput(jasperExporter);
-        SimpleRtfReportConfiguration reportExportConfiguration = new SimpleRtfReportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getIgnoreHyperLink() != null) {
+    
+    private JRRtfExporter rtf(final JasperIRtfExporter jasperExporter)
+    {
+        final SimpleWriterExporterOutput exporterOutput = this.simpleWriterExporterOutput(jasperExporter);
+        final SimpleRtfReportConfiguration reportExportConfiguration = new SimpleRtfReportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getIgnoreHyperLink() != null)
+        {
             reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
         }
-        SimpleRtfExporterConfiguration exporterConfiguration = new SimpleRtfExporterConfiguration();
-
-        JRRtfExporter jrExporter = new JRRtfExporter();
+        final SimpleRtfExporterConfiguration exporterConfiguration = new SimpleRtfExporterConfiguration();
+        
+        final JRRtfExporter jrExporter = new JRRtfExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private JRPdfExporter pdf(JasperIPdfExporter jasperExporter) {
-        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
-        SimplePdfReportConfiguration reportExportConfiguration = new SimplePdfReportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getForceSvgShapes() != null) {
+    
+    private JRPdfExporter pdf(final JasperIPdfExporter jasperExporter)
+    {
+        final SimpleOutputStreamExporterOutput exporterOutput = this.simpleOutputStreamExporterOutput(jasperExporter);
+        final SimplePdfReportConfiguration reportExportConfiguration = new SimplePdfReportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getForceSvgShapes() != null)
+        {
             reportExportConfiguration.setForceSvgShapes(jasperExporter.getForceSvgShapes());
         }
-        if (jasperExporter.getCollapseMissingBookmarkLevels() != null) {
+        if(jasperExporter.getCollapseMissingBookmarkLevels() != null)
+        {
             reportExportConfiguration.setCollapseMissingBookmarkLevels(jasperExporter.getCollapseMissingBookmarkLevels());
         }
-        if (jasperExporter.getSizePageToContent() != null) {
+        if(jasperExporter.getSizePageToContent() != null)
+        {
             reportExportConfiguration.setSizePageToContent(jasperExporter.getSizePageToContent());
         }
-        if (jasperExporter.getIgnoreHyperLink() != null) {
+        if(jasperExporter.getIgnoreHyperLink() != null)
+        {
             reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
         }
-        if (jasperExporter.getForceLineBreakPolicy() != null) {
+        if(jasperExporter.getForceLineBreakPolicy() != null)
+        {
             reportExportConfiguration.setForceLineBreakPolicy(jasperExporter.getForceLineBreakPolicy());
         }
-        SimplePdfExporterConfiguration exporterConfiguration = new SimplePdfExporterConfiguration();
-        if (jasperExporter.getCreatingBatchModeBookmarks() != null) {
+        final SimplePdfExporterConfiguration exporterConfiguration = new SimplePdfExporterConfiguration();
+        if(jasperExporter.getCreatingBatchModeBookmarks() != null)
+        {
             exporterConfiguration.setCreatingBatchModeBookmarks(jasperExporter.getCreatingBatchModeBookmarks());
         }
-        if (jasperExporter.getCompressed() != null) {
+        if(jasperExporter.getCompressed() != null)
+        {
             exporterConfiguration.setCompressed(jasperExporter.getCompressed());
         }
-        if (jasperExporter.getEncrypted() != null) {
+        if(jasperExporter.getEncrypted() != null)
+        {
             exporterConfiguration.setEncrypted(jasperExporter.getEncrypted());
         }
-        if (jasperExporter.getBitKey128() != null) {
+        if(jasperExporter.getBitKey128() != null)
+        {
             exporterConfiguration.set128BitKey(jasperExporter.getBitKey128());
         }
-        if (jasperExporter.getUserPassword() != null) {
+        if(jasperExporter.getUserPassword() != null)
+        {
             exporterConfiguration.setUserPassword(jasperExporter.getUserPassword());
         }
-        if (jasperExporter.getOwnerPassword() != null) {
+        if(jasperExporter.getOwnerPassword() != null)
+        {
             exporterConfiguration.setOwnerPassword(jasperExporter.getOwnerPassword());
         }
-        if (jasperExporter.getPermissions() != null && !jasperExporter.getPermissions().isEmpty()) {
+        if(jasperExporter.getPermissions() != null && !jasperExporter.getPermissions().isEmpty())
+        {
             exporterConfiguration.setPermissions(ConstantTransform.pdfPermission(jasperExporter.getPermissions()));
         }
-        if (jasperExporter.getPdfVersion() != null) {
+        if(jasperExporter.getPdfVersion() != null)
+        {
             exporterConfiguration.setPdfVersion(ConstantTransform.pdfVersion(jasperExporter.getPdfVersion()));
         }
-        if (jasperExporter.getMetadataTitle() != null) {
+        if(jasperExporter.getMetadataTitle() != null)
+        {
             exporterConfiguration.setMetadataTitle(jasperExporter.getMetadataTitle());
         }
-        if (jasperExporter.getMetadataAuthor() != null) {
+        if(jasperExporter.getMetadataAuthor() != null)
+        {
             exporterConfiguration.setMetadataAuthor(jasperExporter.getMetadataAuthor());
         }
-        if (jasperExporter.getMetadataSubject() != null) {
+        if(jasperExporter.getMetadataSubject() != null)
+        {
             exporterConfiguration.setMetadataSubject(jasperExporter.getMetadataSubject());
         }
-        if (jasperExporter.getMetadataKeyWords() != null) {
+        if(jasperExporter.getMetadataKeyWords() != null)
+        {
             exporterConfiguration.setMetadataKeywords(jasperExporter.getMetadataKeyWords());
         }
-        if (jasperExporter.getMetadataCreator() != null) {
+        if(jasperExporter.getMetadataCreator() != null)
+        {
             exporterConfiguration.setMetadataCreator(jasperExporter.getMetadataCreator());
         }
-        if (jasperExporter.getPdfJavaScript() != null) {
+        if(jasperExporter.getPdfJavaScript() != null)
+        {
             exporterConfiguration.setPdfJavaScript(jasperExporter.getPdfJavaScript());
         }
-        if (jasperExporter.getTagged() != null) {
+        if(jasperExporter.getTagged() != null)
+        {
             exporterConfiguration.setTagged(jasperExporter.getTagged());
         }
-        if (jasperExporter.getTagLanguage() != null) {
+        if(jasperExporter.getTagLanguage() != null)
+        {
             exporterConfiguration.setTagLanguage(jasperExporter.getTagLanguage());
         }
-        if (jasperExporter.getPrintScaling() != null) {
+        if(jasperExporter.getPrintScaling() != null)
+        {
             exporterConfiguration.setPrintScaling(ConstantTransform.pdfPrintScaling(jasperExporter.getPrintScaling()));
         }
-        if (jasperExporter.getPdfaConformance() != null) {
+        if(jasperExporter.getPdfaConformance() != null)
+        {
             exporterConfiguration.setPdfaConformance(ConstantTransform.pdfaConformance(jasperExporter.getPdfaConformance()));
         }
-        if (jasperExporter.getIccProfilePath() != null) {
+        if(jasperExporter.getIccProfilePath() != null)
+        {
             exporterConfiguration.setIccProfilePath(jasperExporter.getIccProfilePath());
         }
-        if (jasperExporter.getAllowedPermissionsHint() != null) {
+        if(jasperExporter.getAllowedPermissionsHint() != null)
+        {
             exporterConfiguration.setAllowedPermissionsHint(jasperExporter.getAllowedPermissionsHint());
         }
-        if (jasperExporter.getDeniedPermissionsHint() != null) {
+        if(jasperExporter.getDeniedPermissionsHint() != null)
+        {
             exporterConfiguration.setDeniedPermissionsHint(jasperExporter.getDeniedPermissionsHint());
         }
-        if (jasperExporter.getDisplayMetadataTitle() != null) {
+        if(jasperExporter.getDisplayMetadataTitle() != null)
+        {
             exporterConfiguration.setDisplayMetadataTitle(jasperExporter.getDisplayMetadataTitle());
         }
-
-        JRPdfExporter jrExporter = new JRPdfExporter();
+        
+        final JRPdfExporter jrExporter = new JRPdfExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private JROdtExporter odt(JasperIOdtExporter jasperExporter) {
-        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
-        SimpleOdtReportConfiguration reportExportConfiguration = new SimpleOdtReportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getFlexibleRowHeight() != null) {
+    
+    private JROdtExporter odt(final JasperIOdtExporter jasperExporter)
+    {
+        final SimpleOutputStreamExporterOutput exporterOutput = this.simpleOutputStreamExporterOutput(jasperExporter);
+        final SimpleOdtReportConfiguration reportExportConfiguration = new SimpleOdtReportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getFlexibleRowHeight() != null)
+        {
             reportExportConfiguration.setFlexibleRowHeight(jasperExporter.getFlexibleRowHeight());
         }
-        if (jasperExporter.getIgnoreHyperLink() != null) {
+        if(jasperExporter.getIgnoreHyperLink() != null)
+        {
             reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
         }
-        SimpleOdtExporterConfiguration exporterConfiguration = new SimpleOdtExporterConfiguration();
-
-        JROdtExporter jrExporter = new JROdtExporter();
+        final SimpleOdtExporterConfiguration exporterConfiguration = new SimpleOdtExporterConfiguration();
+        
+        final JROdtExporter jrExporter = new JROdtExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private JROdsExporter ods(JasperIOdsExporter jasperExporter) {
-        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
-        SimpleOdsReportConfiguration reportExportConfiguration = new SimpleOdsReportConfiguration();
-        reportExcelExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getFlexibleRowHeight() != null) {
+    
+    private JROdsExporter ods(final JasperIOdsExporter jasperExporter)
+    {
+        final SimpleOutputStreamExporterOutput exporterOutput = this.simpleOutputStreamExporterOutput(jasperExporter);
+        final SimpleOdsReportConfiguration reportExportConfiguration = new SimpleOdsReportConfiguration();
+        this.reportExcelExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getFlexibleRowHeight() != null)
+        {
             reportExportConfiguration.setFlexibleRowHeight(jasperExporter.getFlexibleRowHeight());
         }
-        SimpleOdsExporterConfiguration exporterConfiguration = new SimpleOdsExporterConfiguration();
-        reportExcelExporterConfiguration(exporterConfiguration, jasperExporter);
-
-        JROdsExporter jrExporter = new JROdsExporter();
+        final SimpleOdsExporterConfiguration exporterConfiguration = new SimpleOdsExporterConfiguration();
+        this.reportExcelExporterConfiguration(exporterConfiguration, jasperExporter);
+        
+        final JROdsExporter jrExporter = new JROdsExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private HtmlExporter html(JasperIHtmlExporter jasperExporter) {
-        SimpleHtmlExporterOutput exporterOutput = simpleHtmlExporterOutput(jasperExporter);
-        Boolean outputImagesToDir = jasperExporter.getOutputImagesToDir();
-        String imagesUri = jasperExporter.getImagesURI();
+    
+    private HtmlExporter html(final JasperIHtmlExporter jasperExporter)
+    {
+        final SimpleHtmlExporterOutput exporterOutput = this.simpleHtmlExporterOutput(jasperExporter);
+        final Boolean outputImagesToDir = jasperExporter.getOutputImagesToDir();
+        final String imagesUri = jasperExporter.getImagesURI();
         HtmlResourceHandler imageHandler = null;
-        if (outputImagesToDir == null || outputImagesToDir) {
+        if(outputImagesToDir == null || outputImagesToDir)
+        {
             File imagesDir = null;
-            String imagesDirName = jasperExporter.getImagesDirName();
-            if (imagesDirName != null) {
+            final String imagesDirName = jasperExporter.getImagesDirName();
+            if(imagesDirName != null)
+            {
                 imagesDir = new File(imagesDirName);
             }
-            if (imagesDir != null) {
-                imageHandler = new FileHtmlResourceHandler(imagesDir, imagesUri == null ? imagesDir.getName() + "/{0}" : imagesUri + "{0}");
+            if(imagesDir != null)
+            {
+                imageHandler = new FileHtmlResourceHandler(
+                    imagesDir,
+                    imagesUri == null ? imagesDir.getName() + "/{0}" : imagesUri + "{0}");
             }
         }
-        if (imageHandler == null && imagesUri != null) {
+        if(imageHandler == null && imagesUri != null)
+        {
             imageHandler = new WebHtmlResourceHandler(imagesUri + "{0}");
         }
-        if (imageHandler != null) {
+        if(imageHandler != null)
+        {
             exporterOutput.setImageHandler(imageHandler);
         }
-        SimpleHtmlReportConfiguration reportExportConfiguration = new SimpleHtmlReportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getRemoveEmptySpaceBetweenRows() != null) {
+        final SimpleHtmlReportConfiguration reportExportConfiguration = new SimpleHtmlReportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getRemoveEmptySpaceBetweenRows() != null)
+        {
             reportExportConfiguration.setRemoveEmptySpaceBetweenRows(jasperExporter.getRemoveEmptySpaceBetweenRows());
         }
-        if (jasperExporter.getWhitePageBackground() != null) {
+        if(jasperExporter.getWhitePageBackground() != null)
+        {
             reportExportConfiguration.setWhitePageBackground(jasperExporter.getWhitePageBackground());
         }
-        if (jasperExporter.getWrapBreakWord() != null) {
+        if(jasperExporter.getWrapBreakWord() != null)
+        {
             reportExportConfiguration.setWrapBreakWord(jasperExporter.getWrapBreakWord());
         }
-        if (jasperExporter.getSizeUnit() != null) {
+        if(jasperExporter.getSizeUnit() != null)
+        {
             reportExportConfiguration.setSizeUnit(ConstantTransform.sizeUnit(jasperExporter.getSizeUnit()));
         }
-        if (jasperExporter.getIgnorePageMargins() != null) {
+        if(jasperExporter.getIgnorePageMargins() != null)
+        {
             reportExportConfiguration.setIgnorePageMargins(jasperExporter.getIgnorePageMargins());
         }
-        if (jasperExporter.getBorderCollapse() != null) {
+        if(jasperExporter.getBorderCollapse() != null)
+        {
             reportExportConfiguration.setBorderCollapse(jasperExporter.getBorderCollapse());
         }
-        if (jasperExporter.getAccessibleHtml() != null) {
+        if(jasperExporter.getAccessibleHtml() != null)
+        {
             reportExportConfiguration.setAccessibleHtml(jasperExporter.getAccessibleHtml());
         }
-        if (jasperExporter.getZoomRatio() != null) {
+        if(jasperExporter.getZoomRatio() != null)
+        {
             reportExportConfiguration.setZoomRatio(jasperExporter.getZoomRatio());
         }
-        if (jasperExporter.getIgnoreHyperLink() != null) {
+        if(jasperExporter.getIgnoreHyperLink() != null)
+        {
             reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
         }
-        SimpleHtmlExporterConfiguration exporterConfiguration = new SimpleHtmlExporterConfiguration();
-        if (jasperExporter.getHtmlHeader() != null) {
+        final SimpleHtmlExporterConfiguration exporterConfiguration = new SimpleHtmlExporterConfiguration();
+        if(jasperExporter.getHtmlHeader() != null)
+        {
             exporterConfiguration.setHtmlHeader(jasperExporter.getHtmlHeader());
         }
-        if (jasperExporter.getBetweenPagesHtml() != null) {
+        if(jasperExporter.getBetweenPagesHtml() != null)
+        {
             exporterConfiguration.setBetweenPagesHtml(jasperExporter.getBetweenPagesHtml());
         }
-        if (jasperExporter.getHtmlFooter() != null) {
+        if(jasperExporter.getHtmlFooter() != null)
+        {
             exporterConfiguration.setHtmlFooter(jasperExporter.getHtmlFooter());
         }
-        if (jasperExporter.getFlushOutput() != null) {
+        if(jasperExporter.getFlushOutput() != null)
+        {
             exporterConfiguration.setFlushOutput(jasperExporter.getFlushOutput());
         }
-
-        HtmlExporter jrExporter = new HtmlExporter();
+        
+        final HtmlExporter jrExporter = new HtmlExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private void reportExcelExportConfiguration(AbstractXlsReportConfiguration reportExportConfiguration, JasperIExcelExporter jasperExporter) {
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getOnePagePerSheet() != null) {
+    
+    private void reportExcelExportConfiguration(
+        final AbstractXlsReportConfiguration reportExportConfiguration,
+        final JasperIExcelExporter jasperExporter)
+    {
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getOnePagePerSheet() != null)
+        {
             reportExportConfiguration.setOnePagePerSheet(jasperExporter.getOnePagePerSheet());
         }
-        if (jasperExporter.getRemoveEmptySpaceBetweenRows() != null) {
+        if(jasperExporter.getRemoveEmptySpaceBetweenRows() != null)
+        {
             reportExportConfiguration.setRemoveEmptySpaceBetweenRows(jasperExporter.getRemoveEmptySpaceBetweenRows());
         }
-        if (jasperExporter.getRemoveEmptySpaceBetweenColumns() != null) {
+        if(jasperExporter.getRemoveEmptySpaceBetweenColumns() != null)
+        {
             reportExportConfiguration.setRemoveEmptySpaceBetweenColumns(jasperExporter.getRemoveEmptySpaceBetweenColumns());
         }
-        if (jasperExporter.getWhitePageBackground() != null) {
+        if(jasperExporter.getWhitePageBackground() != null)
+        {
             reportExportConfiguration.setWhitePageBackground(jasperExporter.getWhitePageBackground());
         }
-        if (jasperExporter.getDetectCellType() != null) {
+        if(jasperExporter.getDetectCellType() != null)
+        {
             reportExportConfiguration.setDetectCellType(jasperExporter.getDetectCellType());
         }
-        if (jasperExporter.getSheetNames() != null && !jasperExporter.getSheetNames().isEmpty()) {
-            String[] sheetNames = jasperExporter.getSheetNames().toArray(new String[jasperExporter.getSheetNames().size()]);
+        if(jasperExporter.getSheetNames() != null && !jasperExporter.getSheetNames().isEmpty())
+        {
+            final String[] sheetNames =
+                jasperExporter.getSheetNames().toArray(new String[jasperExporter.getSheetNames().size()]);
             reportExportConfiguration.setSheetNames(sheetNames);
         }
-        if (jasperExporter.getFontSizeFixEnabled() != null) {
+        if(jasperExporter.getFontSizeFixEnabled() != null)
+        {
             reportExportConfiguration.setFontSizeFixEnabled(jasperExporter.getFontSizeFixEnabled());
         }
-        if (jasperExporter.getImageBorderFixEnabled() != null) {
+        if(jasperExporter.getImageBorderFixEnabled() != null)
+        {
             reportExportConfiguration.setImageBorderFixEnabled(jasperExporter.getImageBorderFixEnabled());
         }
-        if (jasperExporter.getMaxRowsPerSheet() != null) {
+        if(jasperExporter.getMaxRowsPerSheet() != null)
+        {
             reportExportConfiguration.setMaxRowsPerSheet(jasperExporter.getMaxRowsPerSheet());
         }
-        if (jasperExporter.getIgnoreGraphics() != null) {
+        if(jasperExporter.getIgnoreGraphics() != null)
+        {
             reportExportConfiguration.setIgnoreGraphics(jasperExporter.getIgnoreGraphics());
         }
-        if (jasperExporter.getCollapseRowSpan() != null) {
+        if(jasperExporter.getCollapseRowSpan() != null)
+        {
             reportExportConfiguration.setCollapseRowSpan(jasperExporter.getCollapseRowSpan());
         }
-        if (jasperExporter.getIgnoreCellBorder() != null) {
+        if(jasperExporter.getIgnoreCellBorder() != null)
+        {
             reportExportConfiguration.setIgnoreCellBorder(jasperExporter.getIgnoreCellBorder());
         }
-        if (jasperExporter.getIgnoreCellBackground() != null) {
+        if(jasperExporter.getIgnoreCellBackground() != null)
+        {
             reportExportConfiguration.setIgnoreCellBackground(jasperExporter.getIgnoreCellBackground());
         }
-        if (jasperExporter.getPassword() != null) {
+        if(jasperExporter.getPassword() != null)
+        {
             reportExportConfiguration.setPassword(jasperExporter.getPassword());
         }
-        if (jasperExporter.getIgnorePageMargins() != null) {
+        if(jasperExporter.getIgnorePageMargins() != null)
+        {
             reportExportConfiguration.setIgnorePageMargins(jasperExporter.getIgnorePageMargins());
         }
-        if (jasperExporter.getWrapText() != null) {
+        if(jasperExporter.getWrapText() != null)
+        {
             reportExportConfiguration.setWrapText(jasperExporter.getWrapText());
         }
-        if (jasperExporter.getCellLocked() != null) {
+        if(jasperExporter.getCellLocked() != null)
+        {
             reportExportConfiguration.setCellLocked(jasperExporter.getCellLocked());
         }
-        if (jasperExporter.getCellHidden() != null) {
+        if(jasperExporter.getCellHidden() != null)
+        {
             reportExportConfiguration.setCellHidden(jasperExporter.getCellHidden());
         }
-        if (jasperExporter.getSheetHeaderLeft() != null) {
+        if(jasperExporter.getSheetHeaderLeft() != null)
+        {
             reportExportConfiguration.setSheetHeaderLeft(jasperExporter.getSheetHeaderLeft());
         }
-        if (jasperExporter.getSheetHeaderCenter() != null) {
+        if(jasperExporter.getSheetHeaderCenter() != null)
+        {
             reportExportConfiguration.setSheetHeaderCenter(jasperExporter.getSheetHeaderCenter());
         }
-        if (jasperExporter.getSheetHeaderRight() != null) {
+        if(jasperExporter.getSheetHeaderRight() != null)
+        {
             reportExportConfiguration.setSheetHeaderRight(jasperExporter.getSheetHeaderRight());
         }
-        if (jasperExporter.getSheetFooterLeft() != null) {
+        if(jasperExporter.getSheetFooterLeft() != null)
+        {
             reportExportConfiguration.setSheetFooterLeft(jasperExporter.getSheetFooterLeft());
         }
-        if (jasperExporter.getSheetFooterCenter() != null) {
+        if(jasperExporter.getSheetFooterCenter() != null)
+        {
             reportExportConfiguration.setSheetFooterCenter(jasperExporter.getSheetFooterCenter());
         }
-        if (jasperExporter.getSheetFooterRight() != null) {
+        if(jasperExporter.getSheetFooterRight() != null)
+        {
             reportExportConfiguration.setSheetFooterRight(jasperExporter.getSheetFooterRight());
         }
-        if (jasperExporter.getFormatPatternsMap() != null) {
+        if(jasperExporter.getFormatPatternsMap() != null)
+        {
             reportExportConfiguration.setFormatPatternsMap(jasperExporter.getFormatPatternsMap());
         }
-        if (jasperExporter.getIgnoreHyperLink() != null) {
+        if(jasperExporter.getIgnoreHyperLink() != null)
+        {
             reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
         }
-        if (jasperExporter.getIgnoreAnchors() != null) {
+        if(jasperExporter.getIgnoreAnchors() != null)
+        {
             reportExportConfiguration.setIgnoreAnchors(jasperExporter.getIgnoreAnchors());
         }
-        if (jasperExporter.getFitWidth() != null) {
+        if(jasperExporter.getFitWidth() != null)
+        {
             reportExportConfiguration.setFitWidth(jasperExporter.getFitWidth());
         }
-        if (jasperExporter.getFitHeight() != null) {
+        if(jasperExporter.getFitHeight() != null)
+        {
             reportExportConfiguration.setFitHeight(jasperExporter.getFitHeight());
         }
-        if (jasperExporter.getPageScale() != null) {
+        if(jasperExporter.getPageScale() != null)
+        {
             reportExportConfiguration.setPageScale(jasperExporter.getPageScale());
         }
-        if (jasperExporter.getSheetDirection() != null) {
+        if(jasperExporter.getSheetDirection() != null)
+        {
             reportExportConfiguration.setSheetDirection(ConstantTransform.runDirection(jasperExporter.getSheetDirection()));
         }
-        if (jasperExporter.getColumnWidthRatio() != null) {
+        if(jasperExporter.getColumnWidthRatio() != null)
+        {
             reportExportConfiguration.setColumnWidthRatio(jasperExporter.getColumnWidthRatio());
         }
-        if (jasperExporter.getUseTimeZone() != null) {
+        if(jasperExporter.getUseTimeZone() != null)
+        {
             reportExportConfiguration.setUseTimeZone(jasperExporter.getUseTimeZone());
         }
-        if (jasperExporter.getFirstPageNumber() != null) {
+        if(jasperExporter.getFirstPageNumber() != null)
+        {
             reportExportConfiguration.setFirstPageNumber(jasperExporter.getFirstPageNumber());
         }
-        if (jasperExporter.getShowGridLines() != null) {
+        if(jasperExporter.getShowGridLines() != null)
+        {
             reportExportConfiguration.setShowGridLines(jasperExporter.getShowGridLines());
         }
-        if (jasperExporter.getImageAnchorType() != null) {
+        if(jasperExporter.getImageAnchorType() != null)
+        {
             reportExportConfiguration.setImageAnchorType(ConstantTransform.imageAnchorType(jasperExporter.getImageAnchorType()));
         }
     }
-
-    private void reportExcelExporterConfiguration(AbstractXlsExporterConfiguration exporterConfiguration, JasperIExcelExporter jasperExporter) {
-        if (jasperExporter.getCreateCustomPalette() != null) {
+    
+    private void reportExcelExporterConfiguration(
+        final AbstractXlsExporterConfiguration exporterConfiguration,
+        final JasperIExcelExporter jasperExporter)
+    {
+        if(jasperExporter.getCreateCustomPalette() != null)
+        {
             exporterConfiguration.setCreateCustomPalette(jasperExporter.getCreateCustomPalette());
         }
-        if (jasperExporter.getWorkbookTemplate() != null) {
+        if(jasperExporter.getWorkbookTemplate() != null)
+        {
             exporterConfiguration.setWorkbookTemplate(jasperExporter.getWorkbookTemplate());
         }
-        if (jasperExporter.getKeepWorkbookTemplateSheets() != null) {
+        if(jasperExporter.getKeepWorkbookTemplateSheets() != null)
+        {
             exporterConfiguration.setKeepWorkbookTemplateSheets(jasperExporter.getKeepWorkbookTemplateSheets());
         }
     }
-
-    private JRXlsxExporter xlsx(JasperIXlsxExporter jasperExporter) {
-        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
-        SimpleXlsxReportConfiguration reportExportConfiguration = new SimpleXlsxReportConfiguration();
-        reportExcelExportConfiguration(reportExportConfiguration, jasperExporter);
-        SimpleXlsxExporterConfiguration exporterConfiguration = new SimpleXlsxExporterConfiguration();
-        reportExcelExporterConfiguration(exporterConfiguration, jasperExporter);
-        if (jasperExporter.getMacroTemplate() != null) {
+    
+    private JRXlsxExporter xlsx(final JasperIXlsxExporter jasperExporter)
+    {
+        final SimpleOutputStreamExporterOutput exporterOutput = this.simpleOutputStreamExporterOutput(jasperExporter);
+        final SimpleXlsxReportConfiguration reportExportConfiguration = new SimpleXlsxReportConfiguration();
+        this.reportExcelExportConfiguration(reportExportConfiguration, jasperExporter);
+        final SimpleXlsxExporterConfiguration exporterConfiguration = new SimpleXlsxExporterConfiguration();
+        this.reportExcelExporterConfiguration(exporterConfiguration, jasperExporter);
+        if(jasperExporter.getMacroTemplate() != null)
+        {
             exporterConfiguration.setMacroTemplate(jasperExporter.getMacroTemplate());
         }
-
-        JRXlsxExporter jrExporter = new JRXlsxExporter();
+        
+        final JRXlsxExporter jrExporter = new JRXlsxExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private JRXlsExporter xls(JasperIXlsExporter jasperExporter) {
-        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
-        SimpleXlsReportConfiguration reportExportConfiguration = new SimpleXlsReportConfiguration();
-        reportExcelExportConfiguration(reportExportConfiguration, jasperExporter);
-        SimpleXlsExporterConfiguration exporterConfiguration = new SimpleXlsExporterConfiguration();
-        reportExcelExporterConfiguration(exporterConfiguration, jasperExporter);
-
-        JRXlsExporter jrExporter = new JRXlsExporter();
-        jrExporter.setExporterOutput(exporterOutput);
-        jrExporter.setConfiguration(reportExportConfiguration);
-        jrExporter.setConfiguration(exporterConfiguration);
-        return jrExporter;
-    }
-
-    private JRDocxExporter docx(JasperIDocxExporter jasperExporter) {
-        SimpleOutputStreamExporterOutput exporterOutput = simpleOutputStreamExporterOutput(jasperExporter);
-        SimpleDocxReportConfiguration reportExportConfiguration = new SimpleDocxReportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        if (jasperExporter.getFramesAsNestedTables() != null) {
+    
+    private JRDocxExporter docx(final JasperIDocxExporter jasperExporter)
+    {
+        final SimpleOutputStreamExporterOutput exporterOutput = this.simpleOutputStreamExporterOutput(jasperExporter);
+        final SimpleDocxReportConfiguration reportExportConfiguration = new SimpleDocxReportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        if(jasperExporter.getFramesAsNestedTables() != null)
+        {
             reportExportConfiguration.setFramesAsNestedTables(jasperExporter.getFramesAsNestedTables());
         }
-        if (jasperExporter.getFlexibleRowHeight() != null) {
+        if(jasperExporter.getFlexibleRowHeight() != null)
+        {
             reportExportConfiguration.setFlexibleRowHeight(jasperExporter.getFlexibleRowHeight());
         }
-        if (jasperExporter.getIgnoreHyperLink() != null) {
+        if(jasperExporter.getIgnoreHyperLink() != null)
+        {
             reportExportConfiguration.setIgnoreHyperlink(jasperExporter.getIgnoreHyperLink());
         }
-        SimpleDocxExporterConfiguration exporterConfiguration = new SimpleDocxExporterConfiguration();
-
-        JRDocxExporter jrExporter = new JRDocxExporter();
+        final SimpleDocxExporterConfiguration exporterConfiguration = new SimpleDocxExporterConfiguration();
+        
+        final JRDocxExporter jrExporter = new JRDocxExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
         return jrExporter;
     }
-
-    private JRCsvExporter csv(JasperICsvExporter jasperExporter) {
-        SimpleWriterExporterOutput exporterOutput = simpleWriterExporterOutput(jasperExporter);
-        SimpleCsvReportConfiguration reportExportConfiguration = new SimpleCsvReportConfiguration();
-        reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        SimpleCsvExporterConfiguration exporterConfiguration = new SimpleCsvExporterConfiguration();
-        if (jasperExporter.getFieldDelimiter() != null) {
+    
+    private JRCsvExporter csv(final JasperICsvExporter jasperExporter)
+    {
+        final SimpleWriterExporterOutput exporterOutput = this.simpleWriterExporterOutput(jasperExporter);
+        final SimpleCsvReportConfiguration reportExportConfiguration = new SimpleCsvReportConfiguration();
+        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
+        final SimpleCsvExporterConfiguration exporterConfiguration = new SimpleCsvExporterConfiguration();
+        if(jasperExporter.getFieldDelimiter() != null)
+        {
             exporterConfiguration.setFieldDelimiter(jasperExporter.getFieldDelimiter());
         }
-        if (jasperExporter.getRecordDelimiter() != null) {
+        if(jasperExporter.getRecordDelimiter() != null)
+        {
             exporterConfiguration.setRecordDelimiter(jasperExporter.getRecordDelimiter());
         }
-
-        JRCsvExporter jrExporter = new JRCsvExporter();
+        
+        final JRCsvExporter jrExporter = new JRCsvExporter();
         jrExporter.setExporterOutput(exporterOutput);
         jrExporter.setConfiguration(reportExportConfiguration);
         jrExporter.setConfiguration(exporterConfiguration);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java
index 0ad8519..93192b3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java
@@ -21,35 +21,15 @@
  * <p>BooleanComponentType class.</p>
  *
  * @author Ricardo Mariaca
- * 
  */
-public enum BooleanComponentType {
-    /**
-     * Shows a text value (true/false)
-     */
-    TEXT_TRUE_FALSE, /**
-     * Shows a text value (yes/no)
-     */
-    TEXT_YES_NO, /**
-     * Shows an image
-     */
-    IMAGE_STYLE_1, /**
-     * Shows an image
-     */
-    IMAGE_STYLE_2, /**
-     * Shows an image
-     */
-    IMAGE_STYLE_3, /**
-     * Shows an image
-     */
-    IMAGE_STYLE_4, /**
-     * Shows a ball image
-     */
-    IMAGE_BALL, /**
-     * Shows a check box image
-     */
-    IMAGE_CHECKBOX_1, /**
-     * Shows a check box image
-     */
-    IMAGE_CHECKBOX_2
+public enum BooleanComponentType
+{
+	/**
+	 * Shows a text value (true/false)
+	 */
+	TEXT_TRUE_FALSE,
+	/**
+	 * Shows a text value (yes/no)
+	 */
+	TEXT_YES_NO
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/jasper/base/JasperCustomValuesTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/jasper/base/JasperCustomValuesTest.java
new file mode 100644
index 0000000..d859c52
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/jasper/base/JasperCustomValuesTest.java
@@ -0,0 +1,67 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.jasper.base;
+
+import static net.sf.dynamicreports.jasper.base.JasperScriptletManager.USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY;
+
+import java.util.Properties;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link JasperCustomValues}.
+ */
+public class JasperCustomValuesTest {
+
+  private JasperScriptlet scriptlet = new JasperScriptlet();
+  
+  @Test
+  public void shouldUseDefaultScriptletManager() {
+    JasperCustomValues cut = createClassUnderTest(false);
+    Assertions.assertTrue(cut.getScriptletManager() instanceof DefaultJasperScriptletManager);
+  }
+  
+  @Test
+  public void shouldUseThreadSafeScriptleManagerIfPropertySet() {
+    JasperCustomValues cut = createClassUnderTest(true);
+    Assertions.assertTrue(cut.getScriptletManager() instanceof ThreadSafeJasperScriptletManager);
+  }
+
+  @Test
+  public void shouldSetScriptletWithDefaultManager() {
+    JasperCustomValues cut = createClassUnderTest(false);
+    cut.setJasperScriptlet(scriptlet);
+    Assertions.assertEquals(scriptlet, cut.getJasperScriptlet());
+  }
+  
+  @Test
+  public void shouldSetScriptletWithThreadSafeManager() {
+    JasperCustomValues cut = createClassUnderTest(true);
+    cut.setJasperScriptlet(scriptlet);
+    Assertions.assertEquals(scriptlet, cut.getJasperScriptlet());    
+  }
+  
+  private JasperCustomValues createClassUnderTest(boolean useThreadSafeManager) {
+    Properties properties = new Properties();
+    if (useThreadSafeManager) {
+      properties.setProperty(USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY, "true");
+    }
+    return new JasperCustomValues(properties);
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/ReportUtilsTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/ReportUtilsTest.java
new file mode 100644
index 0000000..a7aa047
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/ReportUtilsTest.java
@@ -0,0 +1,81 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sf.dynamicreports.report;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ReportUtils}.
+ */
+public class ReportUtilsTest {
+
+  private static final String BASE_NAME = "any name";
+  private static final int NUMBER_OF_THREADS = 20;
+  private static final int NUMBER_OF_NAMES = 1000;
+
+  @BeforeEach
+  public void setUp() {
+    ReportUtils.setCounter(1);
+  }
+
+  @Test
+  public void shouldGenerateUniqueNamesConcurrently() throws Exception {
+    final ExecutorService executor = Executors.newFixedThreadPool(NUMBER_OF_THREADS);
+    try {
+      final List<Future<String>> futureNames = this.submitTasks(executor);
+      this.assertUniqueNames(futureNames);
+    } finally {
+      executor.shutdown();
+    }
+  }
+
+  @Test
+  public void shouldResetCounter() {
+    ReportUtils.setCounter(Integer.MAX_VALUE);
+    final String name = ReportUtils.generateUniqueName(BASE_NAME);
+    Assertions.assertTrue(name.endsWith("0_"));
+  }
+
+  private List<Future<String>> submitTasks(final ExecutorService executor) {
+    final Callable<String> task = () -> ReportUtils.generateUniqueName(BASE_NAME);
+    final List<Future<String>> futureNames = new ArrayList<>();
+    IntStream.range(0, NUMBER_OF_NAMES).forEach(i -> futureNames.add(executor.submit(task)));
+    return futureNames;
+  }
+
+  private void assertUniqueNames(final List<Future<String>> futureNames) throws Exception {
+    final Set<String> generatedNames = new HashSet<>();
+    for (final Future<String> futureName : futureNames) {
+      generatedNames.add(futureName.get());
+    }
+    Assertions.assertEquals(NUMBER_OF_NAMES, generatedNames.size());
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/builder/style/StyleBuildersTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/builder/style/StyleBuildersTest.java
new file mode 100644
index 0000000..ea51fac
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/builder/style/StyleBuildersTest.java
@@ -0,0 +1,107 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sf.dynamicreports.report.builder.style;
+
+import static net.sf.dynamicreports.report.constant.FontName.ARIAL;
+import static net.sf.dynamicreports.report.constant.FontName.COURIER_NEW;
+import static net.sf.dynamicreports.report.constant.FontName.TIMES_NEW_ROMAN;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Integration tests for {@link StyleBuilders}.
+ */
+public class StyleBuildersTest {
+
+  private StyleBuilders cut = new StyleBuilders();
+
+  @Test
+  public void shouldCreateFontBuilderWithArial() {
+    FontBuilder fontBuilder = cut.fontArial();
+    Assertions.assertEquals(ARIAL, fontBuilder.getFont().getFontName());
+    Assertions.assertFalse(fontBuilder.getFont().getBold());
+    Assertions.assertFalse(fontBuilder.getFont().getItalic());
+  }
+
+  @Test
+  public void shouldCreateFontBuilderWithArialBold() {
+    FontBuilder fontBuilder = cut.fontArialBold();
+    Assertions.assertEquals(ARIAL, fontBuilder.getFont().getFontName());
+    Assertions.assertTrue(fontBuilder.getFont().getBold());
+    Assertions.assertFalse(fontBuilder.getFont().getItalic());
+  }
+
+  @Test
+  public void shouldCreateFontBuilderWithArialBoldItalic() {
+    FontBuilder fontBuilder = cut.fontArialBold().italic();
+    Assertions.assertEquals(ARIAL, fontBuilder.getFont().getFontName());
+    Assertions.assertTrue(fontBuilder.getFont().getBold());
+    Assertions.assertTrue(fontBuilder.getFont().getItalic());
+  }
+
+  @Test
+  public void shouldCreateFontBuilderWithTimesNewRoman() {
+    FontBuilder fontBuilder = cut.fontTimesNewRoman();
+    Assertions.assertEquals(TIMES_NEW_ROMAN, fontBuilder.getFont().getFontName());
+    Assertions.assertFalse(fontBuilder.getFont().getBold());
+    Assertions.assertFalse(fontBuilder.getFont().getItalic());
+  }
+
+  @Test
+  public void shouldCreateFontBuilderWithTimesNewRomanBold() {
+    FontBuilder fontBuilder = cut.fontTimesNewRomanBold();
+    Assertions.assertEquals(TIMES_NEW_ROMAN, fontBuilder.getFont().getFontName());
+    Assertions.assertTrue(fontBuilder.getFont().getBold());
+    Assertions.assertFalse(fontBuilder.getFont().getItalic());
+  }
+
+  @Test
+  public void shouldCreateFontBuilderWithTimesNewRomanBoldItalic() {
+    FontBuilder fontBuilder = cut.fontTimesNewRomanBold().italic();
+    Assertions.assertEquals(TIMES_NEW_ROMAN, fontBuilder.getFont().getFontName());
+    Assertions.assertTrue(fontBuilder.getFont().getBold());
+    Assertions.assertTrue(fontBuilder.getFont().getItalic());
+  }
+
+  @Test
+  public void shouldCreateFontBuilderWithCourierNew() {
+    FontBuilder fontBuilder = cut.fontCourierNew();
+    Assertions.assertEquals(COURIER_NEW, fontBuilder.getFont().getFontName());
+    Assertions.assertFalse(fontBuilder.getFont().getBold());
+    Assertions.assertFalse(fontBuilder.getFont().getItalic());
+  }
+
+  @Test
+  public void shouldCreateFontBuilderWithCourierNewBold() {
+    FontBuilder fontBuilder = cut.fontCourierNewBold();
+    Assertions.assertEquals(COURIER_NEW, fontBuilder.getFont().getFontName());
+    Assertions.assertTrue(fontBuilder.getFont().getBold());
+    Assertions.assertFalse(fontBuilder.getFont().getItalic());
+  }
+
+  @Test
+  public void shouldCreateFontBuilderWithCourierNewBoldItalic() {
+    FontBuilder fontBuilder = cut.fontCourierNewBold().italic();
+    Assertions.assertEquals(COURIER_NEW, fontBuilder.getFont().getFontName());
+    Assertions.assertTrue(fontBuilder.getFont().getBold());
+    Assertions.assertTrue(fontBuilder.getFont().getItalic());
+  }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/ConditionsTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/ConditionsTest.java
new file mode 100644
index 0000000..b149f03
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/ConditionsTest.java
@@ -0,0 +1,248 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.base;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cnd;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+
+import java.sql.Connection;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import net.sf.dynamicreports.report.definition.DRIValue;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ConditionsTest
+{
+	
+	@Test
+	void test()
+	{
+		// equal
+		final FieldBuilder<Integer> value = field("name", Integer.class);
+		// conditionTrue("equal", cnd.equal(value, 5, 10, 20));
+		// conditionFalse("equal", cnd.equal(value, 5, 20));
+		
+		// unequal
+		// conditionFalse("unequal", cnd.unEqual(value, 5, 10, 20));
+		// conditionTrue("unequal", cnd.unEqual(value, 5, 20));
+		
+		// smaller
+        this.conditionFalse("smaller", cnd.smaller(value, 5));
+        this.conditionFalse("smaller", cnd.smaller(value, 10));
+        this.conditionTrue("smaller", cnd.smaller(value, 15));
+		
+		// smallerOrEquals
+        this.conditionFalse("smallerOrEquals", cnd.smallerOrEquals(value, 5));
+        this.conditionTrue("smallerOrEquals", cnd.smallerOrEquals(value, 10));
+        this.conditionTrue("smallerOrEquals", cnd.smallerOrEquals(value, 15));
+		
+		// greater
+        this.conditionTrue("greater", cnd.greater(value, 5));
+        this.conditionFalse("greater", cnd.greater(value, 10));
+        this.conditionFalse("greater", cnd.greater(value, 15));
+		
+		// greaterOrEquals
+        this.conditionTrue("greaterOrEquals", cnd.greaterOrEquals(value, 5));
+        this.conditionTrue("greaterOrEquals", cnd.greaterOrEquals(value, 10));
+        this.conditionFalse("greaterOrEquals", cnd.greaterOrEquals(value, 15));
+		
+		// between
+        this.conditionTrue("between", cnd.between(value, 5, 15));
+        this.conditionTrue("between", cnd.between(value, 5, 10));
+        this.conditionTrue("between", cnd.between(value, 10, 20));
+        this.conditionFalse("between", cnd.between(value, 5, 9));
+        this.conditionFalse("between", cnd.between(value, 11, 20));
+		
+		// notBetween
+        this.conditionFalse("notBetween", cnd.notBetween(value, 5, 15));
+        this.conditionFalse("notBetween", cnd.notBetween(value, 5, 10));
+        this.conditionFalse("notBetween", cnd.notBetween(value, 10, 20));
+        this.conditionTrue("notBetween", cnd.notBetween(value, 5, 9));
+        this.conditionTrue("notBetween", cnd.notBetween(value, 11, 20));
+		
+		// equal object
+		final FieldBuilder<Object> value2 = field("name", Object.class);
+        this.conditionTrue("equal", cnd.equal(value2, Type.A, Type.C, Type.F), Type.C);
+        this.conditionFalse("equal", cnd.equal(value2, Type.B, Type.C), Type.E);
+		
+		// unequal object
+        this.conditionFalse("unequal", cnd.unEqual(value2, Type.A, Type.C, Type.F), Type.C);
+        this.conditionTrue("unequal", cnd.unEqual(value2, Type.B, Type.C), Type.E);
+	}
+	
+	private void conditionTrue(final String name, final DRISimpleExpression<Boolean> condition)
+	{
+		Assertions.assertTrue(condition.evaluate(new TestReportParameters(10)), name + " condition");
+	}
+	
+	private void conditionFalse(final String name, final DRISimpleExpression<Boolean> condition)
+	{
+		Assertions.assertFalse(condition.evaluate(new TestReportParameters(10)), name + " condition");
+	}
+	
+	private void conditionTrue(final String name, final DRISimpleExpression<Boolean> condition, final Object actualValue)
+	{
+		Assertions.assertTrue(condition.evaluate(new TestReportParameters(actualValue)), name + " condition");
+	}
+	
+	private void conditionFalse(final String name, final DRISimpleExpression<Boolean> condition, final Object actualValue)
+	{
+		Assertions.assertFalse(condition.evaluate(new TestReportParameters(actualValue)), name + " condition");
+	}
+	
+	private enum Type
+	{
+		A, B, C, D, E, F
+	}
+	
+	
+	private static class TestReportParameters implements ReportParameters
+	{
+		private final Object value;
+		
+		public TestReportParameters(final Object value)
+		{
+			this.value = value;
+		}
+		
+		@Override
+		public Integer getColumnNumber()
+		{
+			return null;
+		}
+		
+		@Override
+		public Integer getColumnRowNumber()
+		{
+			return null;
+		}
+		
+		@Override
+		public Connection getConnection()
+		{
+			return null;
+		}
+		
+		@Override
+		public Integer getGroupCount(final String groupName)
+		{
+			return null;
+		}
+		
+		@Override
+		public Locale getLocale()
+		{
+			return null;
+		}
+		
+		@Override
+		public String getMessage(final String key)
+		{
+			return null;
+		}
+		
+		@Override
+		public String getMessage(final String key, final Object[] arguments)
+		{
+			return null;
+		}
+		
+		@Override
+		public Integer getPageNumber()
+		{
+			return null;
+		}
+		
+		@Override
+		public Integer getPageRowNumber()
+		{
+			return null;
+		}
+		
+		@Override
+		public Integer getReportRowNumber()
+		{
+			return null;
+		}
+		
+		@Override
+		public Integer getCrosstabRowNumber()
+		{
+			return null;
+		}
+		
+		@Override
+		public DRIScriptlet getScriptlet(final String name)
+		{
+			return null;
+		}
+		
+		@Override
+		public <T> T getValue(final String name)
+		{
+			return null;
+		}
+		
+		@Override
+		@SuppressWarnings("unchecked")
+		public <T> T getValue(final DRIValue<T> value)
+		{
+			return (T)this.value;
+		}
+		
+		@Override
+		public ReportParameters getMasterParameters()
+		{
+			return null;
+		}
+		
+		@Override
+		public Integer getSubreportWidth()
+		{
+			return null;
+		}
+		
+		@Override
+		public <T> T getFieldValue(final String name)
+		{
+			return null;
+		}
+		
+		@Override
+		public <T> T getVariableValue(final String name)
+		{
+			return null;
+		}
+		
+		@Override
+		public <T> T getParameterValue(final String name)
+		{
+			return null;
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DataTypeTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DataTypeTest.java
new file mode 100644
index 0000000..419d0ed
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DataTypeTest.java
@@ -0,0 +1,161 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.base;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.report.builder.datatype.BigDecimalType;
+import net.sf.dynamicreports.report.builder.datatype.StringType;
+import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import net.sf.dynamicreports.report.exception.DRException;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class DataTypeTest
+{
+	@Test
+	void detectTypeTest()
+	{
+		try
+		{
+            this.detectTypeTest(type.bigDecimalType(), BigDecimal.class);
+            this.detectTypeTest(type.bigIntegerType(), BigInteger.class);
+            this.detectTypeTest(type.byteType(), Byte.class);
+            this.detectTypeTest(type.doubleType(), Double.class);
+            this.detectTypeTest(type.floatType(), Float.class);
+            this.detectTypeTest(type.integerType(), Integer.class);
+            this.detectTypeTest(type.longType(), Long.class);
+            this.detectTypeTest(type.shortType(), Short.class);
+            this.detectTypeTest(type.dateType(), Date.class);
+            this.detectTypeTest(type.dateYearToMonthType(), "DateYearToMonth");
+            this.detectTypeTest(type.dateYearToHourType(), "DateYearToHour");
+            this.detectTypeTest(type.dateYearToMinuteType(), "DateYearToMinute");
+            this.detectTypeTest(type.dateYearToSecondType(), "DateYearToSecond");
+            this.detectTypeTest(type.dateYearToFractionType(), "DateYearToFraction");
+            this.detectTypeTest(type.dateYearType(), "DateYear");
+            this.detectTypeTest(type.dateMonthType(), "DateMonth");
+            this.detectTypeTest(type.dateDayType(), "DateDay");
+            this.detectTypeTest(type.timeHourToMinuteType(), "TimeHourToMinute");
+            this.detectTypeTest(type.timeHourToSecondType(), "TimeHourToSecond");
+            this.detectTypeTest(type.timeHourToFractionType(), "TimeHourToFraction");
+            this.detectTypeTest(type.percentageType(), "Percentage");
+            this.detectTypeTest(type.booleanType(), Boolean.class);
+            this.detectTypeTest(type.characterType(), Character.class);
+            this.detectTypeTest(type.stringType(), String.class);
+            this.detectTypeTest(type.stringType(), "Text");
+            this.detectTypeTest(type.listType(), List.class);
+			
+			@SuppressWarnings("unused")
+            final BigDecimalType bigDecimalType = type.detectType(BigDecimal.class);
+			@SuppressWarnings("unused")
+            final StringType stringType = type.detectType(String.class);
+		}
+		catch(final DRException e)
+		{
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	public <U, T extends U> void detectTypeTest(final DRIDataType<U, T> dataType, final Class<T> valueClass) throws DRException
+	{
+        this.detectTypeTest(dataType, valueClass.getSimpleName());
+		Assertions.assertEquals(dataType.getClass(), type.detectType(valueClass.getName()).getClass());
+		Assertions.assertEquals(dataType.getClass(), type.detectType(valueClass).getClass());
+	}
+	
+	public <U, T extends U> void detectTypeTest(final DRIDataType<U, T> dataType, final String... dataTypes) throws DRException
+	{
+		for(final String stringDataType : dataTypes)
+		{
+			Assertions.assertEquals(dataType.getClass(), type.detectType(stringDataType).getClass());
+			Assertions.assertEquals(dataType.getClass(), type.detectType(stringDataType.toLowerCase()).getClass());
+			Assertions.assertEquals(dataType.getClass(), type.detectType(stringDataType.toUpperCase()).getClass());
+		}
+	}
+	
+	@Test
+	void valueConversionTest()
+	{
+        this.valueConversionTest("BigDecimal", type.bigDecimalType(), 1000, "1,000.00");
+        this.valueConversionTest("BigInteger", type.bigIntegerType(), 1000, "1,000");
+        this.valueConversionTest("Byte", type.byteType(), 100, "100");
+        this.valueConversionTest("Double", type.doubleType(), 1000.1, "1,000.1");
+        this.valueConversionTest("Float", type.floatType(), 1000.1, "1,000.1");
+        this.valueConversionTest("Integer", type.integerType(), 1000, "1,000");
+        this.valueConversionTest("Long", type.longType(), 1000, "1,000");
+        this.valueConversionTest("Short", type.shortType(), 1000, "1,000");
+		
+		final Calendar c = Calendar.getInstance();
+		c.set(2010, 0, 2, 15, 5, 20);
+		c.set(Calendar.MILLISECOND, 100);
+		final Date date = c.getTime();
+        this.valueConversionTest("Date", type.dateType(), date, "01/02/2010");
+        this.valueConversionTest("DateYearToMonth", type.dateYearToMonthType(), date, "01/2010");
+        this.valueConversionTest("DateYearToHour", type.dateYearToHourType(), date, "01/02/2010 3 PM");
+        this.valueConversionTest("DateYearToMinute", type.dateYearToMinuteType(), date, "01/02/2010 3:05 PM");
+        this.valueConversionTest("DateYearToSecond", type.dateYearToSecondType(), date, "01/02/2010 3:05:20 PM");
+        this.valueConversionTest("DateYearToFraction", type.dateYearToFractionType(), date, "01/02/2010 3:05:20,100 PM");
+        this.valueConversionTest("DateYear", type.dateYearType(), date, "2010");
+        this.valueConversionTest("DateMonth", type.dateMonthType(), date, "January");
+        this.valueConversionTest("DateDay", type.dateDayType(), date, "02");
+        this.valueConversionTest("TimeHourToMinute", type.timeHourToMinuteType(), date, "3:05 PM");
+        this.valueConversionTest("TimeHourToSecond", type.timeHourToSecondType(), date, "3:05:20 PM");
+        this.valueConversionTest("TimeHourToFraction", type.timeHourToFractionType(), date, "3:05:20,100 PM");
+        
+        this.valueConversionTest("Percentage", type.percentageType(), 0.89156, "89.16%");
+        this.valueConversionTest("Boolean", type.booleanType(), true, "true");
+        this.valueConversionTest("Character", type.characterType(), 'a', "a");
+        this.valueConversionTest("String", type.stringType(), "text", "text");
+	}
+	
+	private <U, T extends U> void valueConversionTest(
+		final String name,
+		final DRIDataType<U, T> dataType,
+		final U value,
+		final String stringValue)
+	{
+		Assertions.assertEquals(stringValue, dataType.valueToString(value, Locale.ENGLISH));
+		
+		try
+		{
+			final String stringResult = dataType.valueToString(value, Locale.ENGLISH);
+			final U stringToValue = dataType.stringToValue(stringValue, Locale.ENGLISH);
+			Assertions.assertTrue(
+				stringToValue.getClass().equals(dataType.getValueClass()));
+			Assertions.assertEquals(
+				stringResult,
+				dataType.valueToString(stringToValue, Locale.ENGLISH));
+		}
+		catch(final DRException e)
+		{
+			Assertions.fail(e.getMessage());
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DefaultsTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DefaultsTest.java
new file mode 100644
index 0000000..a67386f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DefaultsTest.java
@@ -0,0 +1,124 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.base;
+
+import java.io.InputStream;
+
+import javax.xml.transform.stream.StreamSource;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+import net.sf.dynamicreports.report.base.datatype.DRDataType;
+import net.sf.dynamicreports.report.base.style.DRFont;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.defaults.Default;
+import net.sf.dynamicreports.report.defaults.DefaultBinder;
+import net.sf.dynamicreports.report.defaults.xml.XmlDynamicReports;
+
+
+/**
+ * Defaults tests.
+ *
+ * @author Ricardo Mariaca
+ */
+class DefaultsTest
+{
+	private Default load()
+	{
+		final InputStream is = DefaultsTest.class.getResourceAsStream("dynamicreports-defaults.xml");
+		try
+		{
+			final Unmarshaller unmarshaller =
+				JAXBContext.newInstance(XmlDynamicReports.class).createUnmarshaller();
+			final JAXBElement<XmlDynamicReports> root =
+				unmarshaller.unmarshal(new StreamSource(is), XmlDynamicReports.class);
+			return DefaultBinder.bind(root.getValue());
+		}
+		catch(final JAXBException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+		return null;
+	}
+	
+	@Test
+	void test()
+	{
+		DefaultBinder.bind(null);
+		final Default defaults = this.load();
+		
+		final DRFont font = defaults.getFont();
+		Assertions.assertEquals("Arimo", font.getFontName());
+		Assertions.assertEquals(15, font.getFontSize());
+		Assertions.assertEquals("Arimo", font.getPdfFontName());
+		Assertions.assertEquals("Identity-H", font.getPdfEncoding());
+		Assertions.assertTrue(font.getPdfEmbedded());
+		
+		this.testDataType("BigDecimal", defaults.getBigDecimalType(), "#,###.00#",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("BigInteger", defaults.getBigIntegerType(), "#,###", HorizontalTextAlignment.LEFT);
+		this.testDataType("Byte", defaults.getByteType(), "#,###", HorizontalTextAlignment.LEFT);
+		this.testDataType("Double", defaults.getDoubleType(), "#,###.#", HorizontalTextAlignment.LEFT);
+		this.testDataType("Float", defaults.getFloatType(), "#,###.#", HorizontalTextAlignment.LEFT);
+		this.testDataType("Integer", defaults.getIntegerType(), "#,###", HorizontalTextAlignment.LEFT);
+		this.testDataType("Long", defaults.getLongType(), "#,###", HorizontalTextAlignment.LEFT);
+		this.testDataType("Short", defaults.getShortType(), "#,###", HorizontalTextAlignment.LEFT);
+		this.testDataType("Date", defaults.getDateType(), "MM.dd.yyyy", HorizontalTextAlignment.LEFT);
+		this.testDataType("DateYearToMonth", defaults.getDateYearToMonthType(), "MM.yyyy",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("DateYearToHour", defaults.getDateYearToHourType(), "MM.dd.yyyy h a",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("DateYearToMinute", defaults.getDateYearToMinuteType(), "MM.dd.yyyy h:mm a",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("DateYearToSecond", defaults.getDateYearToSecondType(), "MM.dd.yyyy h:mm:ss a",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("DateYearToFraction", defaults.getDateYearToFractionType(),
+			"MM.dd.yyyy h:mm:ss,SSS a", HorizontalTextAlignment.LEFT);
+		this.testDataType("DateYear", defaults.getDateYearType(), "yy", HorizontalTextAlignment.LEFT);
+		this.testDataType("DateMonth", defaults.getDateMonthType(), "MM", HorizontalTextAlignment.LEFT);
+		this.testDataType("DateDay", defaults.getDateDayType(), "d", HorizontalTextAlignment.LEFT);
+		this.testDataType("TimeHourToMinute", defaults.getTimeHourToMinuteType(), "hh:mm a",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("TimeHourToSecond", defaults.getTimeHourToSecondType(), "hh:mm:ss a",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("TimeHourToFraction", defaults.getTimeHourToFractionType(), "hh:mm:ss,SSS a",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("Percentage", defaults.getPercentageType(), "#,###.00%",
+			HorizontalTextAlignment.LEFT);
+		this.testDataType("Boolean", defaults.getBooleanType(), null, HorizontalTextAlignment.RIGHT);
+		this.testDataType("Character", defaults.getCharacterType(), null, HorizontalTextAlignment.RIGHT);
+		this.testDataType("String", defaults.getStringType(), null, HorizontalTextAlignment.RIGHT);
+	}
+	
+	private void testDataType(
+		final String name, final DRDataType<?, ?> dataType, final String pattern,
+		final HorizontalTextAlignment horizontalTextAlignment)
+	{
+		Assertions.assertEquals(pattern, dataType.getPattern(), name + " pattern");
+		Assertions.assertEquals(
+			horizontalTextAlignment,
+			dataType.getHorizontalTextAlignment(),
+			name + " horizontal alignment");
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/bugs/Bug_2997586_Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/bugs/Bug_2997586_Test.java
new file mode 100644
index 0000000..6cbfde8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/bugs/Bug_2997586_Test.java
@@ -0,0 +1,55 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.bugs;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
+
+
+/**
+ * @author Ricardo Mariaca
+ * <p>
+ * The height in setDimension(Integer width, Integer height) of the DimensionComponentBuilder class is set with the
+ * width.
+ */
+class Bug_2997586_Test
+{
+	
+	@Test
+	void test()
+	{
+		final Integer width = 150;
+		final Integer height = 200;
+		
+		TextFieldBuilder<String> textField = cmp.text("").setDimension(width, height);
+		Assertions.assertEquals(width, textField.getComponent().getWidth());
+		Assertions.assertEquals(height, textField.getComponent().getHeight());
+		
+		textField = cmp.text("").setFixedDimension(width, height);
+		Assertions.assertEquals(width, textField.getComponent().getWidth());
+		Assertions.assertEquals(height, textField.getComponent().getHeight());
+		
+		textField = cmp.text("").setMinDimension(width, height);
+		Assertions.assertEquals(width, textField.getComponent().getWidth());
+		Assertions.assertEquals(height, textField.getComponent().getHeight());
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/AbstractBandTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/AbstractBandTest.java
new file mode 100644
index 0000000..735c80c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/AbstractBandTest.java
@@ -0,0 +1,128 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.DRDesignReport;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.exception.DRException;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public abstract class AbstractBandTest
+{
+	
+	@Test
+	public void test()
+	{
+		final ReportBuilder<?> rb = new DesignReportBuilder();
+        this.configureReport(rb);
+		try
+		{
+			final DRDesignReport report = new DRDesignReport(rb.getReport());
+            this.titleBandTest(report.getTitleBand());
+            this.pageHeaderBandTest(report.getPageHeaderBand());
+            this.pageFooterBandTest(report.getPageFooterBand());
+            this.columnHeaderBandTest(report.getColumnHeaderBand());
+            this.columnFooterBandTest(report.getColumnFooterBand());
+			for(final DRDesignBand designBand : report.getDetailBands())
+			{
+                this.detailBandTest(designBand);
+			}
+            this.lastPageFooterBandTest(report.getLastPageFooterBand());
+            this.summaryBandTest(report.getSummaryBand());
+            this.noDataBandTest(report.getNoDataBand());
+            this.backgroundBandTest(report.getBackgroundBand());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	protected void titleBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void pageHeaderBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void pageFooterBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void columnHeaderBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void columnFooterBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void detailBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void lastPageFooterBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void summaryBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void noDataBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void backgroundBandTest(final DRDesignBand band)
+	{
+		Assertions.assertNull(band);
+	}
+	
+	protected void componentPositionTest(final DRDesignComponent component, final int x, final int y, final int width, final int height)
+	{
+		Assertions.assertNotNull(component.getWidth());
+		Assertions.assertEquals(Integer.valueOf(width), component.getWidth());
+		Assertions.assertNotNull(component.getHeight());
+		Assertions.assertEquals(Integer.valueOf(height), component.getHeight());
+		Assertions.assertNotNull(component.getX());
+		Assertions.assertEquals(Integer.valueOf(x), component.getX());
+		Assertions.assertNotNull(component.getY());
+		Assertions.assertEquals(Integer.valueOf(y), component.getY());
+	}
+	
+	public abstract void configureReport(ReportBuilder<?> rb);
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsExporter.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignReportBuilder.java
similarity index 61%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsExporter.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignReportBuilder.java
index cb8c5b8..6ea3b42 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignReportBuilder.java
@@ -15,17 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package net.sf.dynamicreports.test.design;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIXlsExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.definition.DRITemplateDesign;
 
 /**
- * <p>JasperXlsExporter class.</p>
- *
  * @author Ricardo Mariaca
- * 
  */
-public class JasperXlsExporter extends AbstractJasperExcelExporter implements JasperIXlsExporter {
-    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+public class DesignReportBuilder extends ReportBuilder<DesignReportBuilder> {
+    private static final long serialVersionUID = 1L;
+
+    public DesignReportBuilder() {
+        getObject().setTemplateDesign(new DesignTestTemplateDesign());
+    }
+
+    public DesignReportBuilder(DRITemplateDesign<?> templateDesign) {
+        getObject().setTemplateDesign(templateDesign);
+    }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsExporter.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignTestTemplateDesign.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsExporter.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignTestTemplateDesign.java
index e31e53b..4d3699e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignTestTemplateDesign.java
@@ -15,13 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package net.sf.dynamicreports.test.design;
+
+import net.sf.dynamicreports.report.base.AbstractTemplateDesign;
 
 /**
- * <p>JasperIXlsExporter interface.</p>
- *
  * @author Ricardo Mariaca
- * 
  */
-public interface JasperIXlsExporter extends JasperIExcelExporter {
+public class DesignTestTemplateDesign extends AbstractTemplateDesign<Object> {
+    private static final long serialVersionUID = 1L;
+
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition1Test.java
new file mode 100644
index 0000000..f14fe10
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition1Test.java
@@ -0,0 +1,67 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.position;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.test.design.AbstractBandTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnPosition1Test extends AbstractBandTest {
+
+    @Override
+    public void configureReport(ReportBuilder<?> rb) {
+        rb.columns(col.column("Column1", "field1", Integer.class), col.column("Column2", "field2", Integer.class));
+    }
+
+    @Override
+    protected void columnHeaderBandTest(DRDesignBand band) {
+        testBand(band);
+    }
+
+    @Override
+    protected void detailBandTest(DRDesignBand band) {
+        testBand(band);
+    }
+
+    protected void testBand(DRDesignBand band) {
+        DRDesignComponent component = band.getBandComponent();
+        Assertions.assertTrue(component instanceof DRDesignList);
+        DRDesignList list = (DRDesignList) component;
+        Assertions.assertEquals(ListType.HORIZONTAL, list.getType());
+        Assertions.assertEquals(2, list.getComponents().size());
+        componentPositionTest(list, 0, 0, 575, 16);
+        Assertions.assertTrue(list.getComponents().get(0) instanceof DRDesignTextField);
+        Assertions.assertTrue(list.getComponents().get(1) instanceof DRDesignTextField);
+
+        // column1
+        componentPositionTest(list.getComponents().get(0), 0, 0, 287, 16);
+
+        // column2
+        componentPositionTest(list.getComponents().get(1), 287, 0, 288, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition2Test.java
new file mode 100644
index 0000000..79aa028
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition2Test.java
@@ -0,0 +1,93 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.position;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.ListType;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnPosition2Test extends ColumnPosition1Test {
+
+    @Override
+    public void configureReport(ReportBuilder<?> rb) {
+        TextColumnBuilder<Integer> column1, column2, column3, column4, column5;
+
+        rb.columns(column1 = col.column("Column1", "field1", Integer.class), column2 = col.column("Column2", "field2", Integer.class), column3 = col.column("Column3", "field3", Integer.class),
+                   column4 = col.column("Column4", "field4", Integer.class).setWidth(50), column5 = col.column("Column5", "field5", Integer.class))
+          .columnGrid(column1, grid.horizontalColumnGridList().add(column2, column3).newRow().add(column4, column5));
+    }
+
+    @Override
+    protected void testBand(DRDesignBand band) {
+        DRDesignComponent component = band.getBandComponent();
+        Assertions.assertTrue(component instanceof DRDesignList);
+        DRDesignList list1 = (DRDesignList) component;
+        Assertions.assertEquals(ListType.HORIZONTAL, list1.getType());
+        Assertions.assertEquals(2, list1.getComponents().size());
+        componentPositionTest(list1, 0, 0, 575, 32);
+        Assertions.assertTrue(list1.getComponents().get(0) instanceof DRDesignTextField);
+        Assertions.assertTrue(list1.getComponents().get(1) instanceof DRDesignList);
+
+        DRDesignList list2 = (DRDesignList) list1.getComponents().get(1);
+        Assertions.assertEquals(ListType.VERTICAL, list2.getType());
+        Assertions.assertEquals(2, list2.getComponents().size());
+        componentPositionTest(list2, 191, 0, 384, 32);
+        Assertions.assertTrue(list2.getComponents().get(0) instanceof DRDesignList);
+        Assertions.assertTrue(list2.getComponents().get(1) instanceof DRDesignList);
+
+        DRDesignList list3 = (DRDesignList) list2.getComponents().get(0);
+        Assertions.assertEquals(ListType.HORIZONTAL, list3.getType());
+        Assertions.assertEquals(2, list3.getComponents().size());
+        componentPositionTest(list3, 191, 0, 384, 16);
+        Assertions.assertTrue(list3.getComponents().get(0) instanceof DRDesignTextField);
+        Assertions.assertTrue(list3.getComponents().get(1) instanceof DRDesignTextField);
+
+        DRDesignList list4 = (DRDesignList) list2.getComponents().get(1);
+        Assertions.assertEquals(ListType.HORIZONTAL, list4.getType());
+        Assertions.assertEquals(2, list4.getComponents().size());
+        componentPositionTest(list4, 191, 16, 384, 16);
+        Assertions.assertTrue(list4.getComponents().get(0) instanceof DRDesignTextField);
+        Assertions.assertTrue(list4.getComponents().get(1) instanceof DRDesignTextField);
+
+        // column1
+        componentPositionTest(list1.getComponents().get(0), 0, 0, 191, 32);
+
+        // column2
+        componentPositionTest(list3.getComponents().get(0), 0, 0, 192, 16);
+
+        // column3
+        componentPositionTest(list3.getComponents().get(1), 192, 0, 192, 16);
+
+        // column4
+        componentPositionTest(list4.getComponents().get(0), 0, 0, 128, 16);
+
+        // column5
+        componentPositionTest(list4.getComponents().get(1), 128, 0, 256, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/HorizontalListPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/HorizontalListPositionTest.java
new file mode 100644
index 0000000..90d671a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/HorizontalListPositionTest.java
@@ -0,0 +1,68 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.position;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.test.design.AbstractBandTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class HorizontalListPositionTest extends AbstractBandTest {
+
+    @Override
+    public void configureReport(ReportBuilder<?> rb) {
+        rb.setPageFormat(PageType.A2)
+          .title(cmp.horizontalList(cmp.hListCell(cmp.text("").setHeight(23)), cmp.hListCell(cmp.text("")), cmp.hListCell(cmp.text("")).widthFixed(),
+                                    cmp.hListCell(cmp.text("")).widthFixed().heightFixedOnTop(), cmp.hListCell(cmp.text("")).heightFixedOnTop(),
+                                    cmp.hListCell(cmp.text("")).widthFixed().heightFixedOnMiddle(), cmp.hListCell(cmp.text("")).heightFixedOnMiddle(),
+                                    cmp.hListCell(cmp.text("")).widthFixed().heightFixedOnBottom(), cmp.hListCell(cmp.text("")).heightFixedOnBottom()));
+    }
+
+    @Override
+    protected void titleBandTest(DRDesignBand band) {
+        DRDesignComponent component = band.getBandComponent();
+        Assertions.assertTrue(component instanceof DRDesignList);
+        DRDesignList list = (DRDesignList) component;
+        Assertions.assertEquals(ListType.HORIZONTAL, list.getType());
+        Assertions.assertEquals(9, list.getComponents().size());
+        componentPositionTest(list, 0, 0, 1170, 23);
+        for (int i = 0; i < 9; i++) {
+            Assertions.assertTrue(list.getComponents().get(i) instanceof DRDesignTextField);
+        }
+
+        componentPositionTest(list.getComponents().get(0), 0, 0, 154, 23);
+        componentPositionTest(list.getComponents().get(1), 154, 0, 154, 23);
+        componentPositionTest(list.getComponents().get(2), 308, 0, 100, 23);
+        componentPositionTest(list.getComponents().get(3), 408, 0, 100, 16);
+        componentPositionTest(list.getComponents().get(4), 508, 0, 154, 16);
+        componentPositionTest(list.getComponents().get(5), 662, 3, 100, 16);
+        componentPositionTest(list.getComponents().get(6), 762, 3, 154, 16);
+        componentPositionTest(list.getComponents().get(7), 916, 7, 100, 16);
+        componentPositionTest(list.getComponents().get(8), 1016, 7, 154, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/SubtotalPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/SubtotalPositionTest.java
new file mode 100644
index 0000000..12f9c90
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/SubtotalPositionTest.java
@@ -0,0 +1,123 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.position;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.test.design.AbstractBandTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubtotalPositionTest extends AbstractBandTest {
+
+    @Override
+    public void configureReport(ReportBuilder<?> rb) {
+        TextColumnBuilder<Integer> column3;
+
+        rb.setShowColumnTitle(false)
+          .columns(col.column("Column1", "field1", Integer.class), col.column("Column2", "field2", Integer.class), column3 = col.column("Column3", "field3", Integer.class))
+          .subtotalsAtTitle(sbt.sum(column3))
+          .subtotalsAtPageHeader(sbt.sum(column3))
+          .subtotalsAtPageFooter(sbt.sum(column3))
+          .subtotalsAtColumnHeader(sbt.sum(column3))
+          .subtotalsAtColumnFooter(sbt.sum(column3))
+          .subtotalsAtLastPageFooter(sbt.sum(column3))
+          .subtotalsAtSummary(sbt.sum(column3), sbt.aggregate(column3, Calculation.AVERAGE));
+    }
+
+    @Override
+    protected void titleBandTest(DRDesignBand band) {
+        testBand(band);
+    }
+
+    @Override
+    protected void pageHeaderBandTest(DRDesignBand band) {
+        testBand(band);
+    }
+
+    @Override
+    protected void pageFooterBandTest(DRDesignBand band) {
+        testBand(band);
+    }
+
+    @Override
+    protected void columnHeaderBandTest(DRDesignBand band) {
+        testBand(band);
+    }
+
+    @Override
+    protected void columnFooterBandTest(DRDesignBand band) {
+        testBand(band);
+    }
+
+    @Override
+    protected void detailBandTest(DRDesignBand band) {
+        Assertions.assertNotNull(band);
+    }
+
+    @Override
+    protected void lastPageFooterBandTest(DRDesignBand band) {
+        testBand(band);
+    }
+
+    @Override
+    protected void summaryBandTest(DRDesignBand band) {
+        DRDesignComponent component = band.getBandComponent();
+        Assertions.assertTrue(component instanceof DRDesignList);
+        DRDesignList list = (DRDesignList) component;
+        Assertions.assertEquals(ListType.HORIZONTAL, list.getType());
+        Assertions.assertEquals(1, list.getComponents().size());
+        componentPositionTest(list, 0, 0, 575, 32);
+        Assertions.assertTrue(list.getComponents().get(0) instanceof DRDesignList);
+
+        list = (DRDesignList) list.getComponents().get(0);
+        Assertions.assertEquals(ListType.VERTICAL, list.getType());
+        Assertions.assertEquals(2, list.getComponents().size());
+        componentPositionTest(list, 383, 0, 192, 32);
+        Assertions.assertTrue(list.getComponents().get(0) instanceof DRDesignTextField);
+        Assertions.assertTrue(list.getComponents().get(1) instanceof DRDesignTextField);
+
+        // column3
+        componentPositionTest(list.getComponents().get(0), 383, 0, 192, 16);
+        componentPositionTest(list.getComponents().get(1), 383, 16, 192, 16);
+    }
+
+    protected void testBand(DRDesignBand band) {
+        DRDesignComponent component = band.getBandComponent();
+        Assertions.assertTrue(component instanceof DRDesignList);
+        DRDesignList list = (DRDesignList) component;
+        Assertions.assertEquals(ListType.HORIZONTAL, list.getType());
+        Assertions.assertEquals(1, list.getComponents().size());
+        componentPositionTest(list, 0, 0, 575, 16);
+        Assertions.assertTrue(list.getComponents().get(0) instanceof DRDesignTextField);
+
+        // column3
+        componentPositionTest(list.getComponents().get(0), 383, 0, 192, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/VerticalListPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/VerticalListPositionTest.java
new file mode 100644
index 0000000..5671dd2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/VerticalListPositionTest.java
@@ -0,0 +1,71 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.position;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.design.base.DRDesignBand;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.test.design.AbstractBandTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class VerticalListPositionTest extends AbstractBandTest {
+
+    @Override
+    public void configureReport(ReportBuilder<?> rb) {
+        rb.title(cmp.horizontalList(cmp.verticalList(cmp.vListCell(cmp.text("")), cmp.vListCell(cmp.text("")).heightFixed(), cmp.vListCell(cmp.text("")).widthFixedOnLeft().heightFixed(),
+                                                     cmp.vListCell(cmp.text("")).widthFixedOnLeft(), cmp.vListCell(cmp.text("")).widthFixedOnCenter().heightFixed(),
+                                                     cmp.vListCell(cmp.text("")).widthFixedOnCenter(), cmp.vListCell(cmp.text("")).widthFixedOnRight().heightFixed(),
+                                                     cmp.vListCell(cmp.text("")).widthFixedOnRight()), cmp.filler().setHeight(200)));
+    }
+
+    @Override
+    protected void titleBandTest(DRDesignBand band) {
+        DRDesignComponent component = band.getBandComponent();
+        Assertions.assertTrue(component instanceof DRDesignList);
+        DRDesignList list = (DRDesignList) component;
+        Assertions.assertEquals(ListType.HORIZONTAL, list.getType());
+        Assertions.assertEquals(1, list.getComponents().size());
+        componentPositionTest(list, 0, 0, 575, 200);
+        Assertions.assertTrue(list.getComponents().get(0) instanceof DRDesignList);
+
+        list = (DRDesignList) list.getComponents().get(0);
+        Assertions.assertEquals(ListType.VERTICAL, list.getType());
+        Assertions.assertEquals(8, list.getComponents().size());
+        componentPositionTest(list, 0, 0, 575, 200);
+        for (int i = 0; i < 8; i++) {
+            Assertions.assertTrue(list.getComponents().get(i) instanceof DRDesignTextField);
+        }
+
+        componentPositionTest(list.getComponents().get(0), 0, 0, 575, 34);
+        componentPositionTest(list.getComponents().get(1), 0, 34, 575, 16);
+        componentPositionTest(list.getComponents().get(2), 0, 50, 100, 16);
+        componentPositionTest(list.getComponents().get(3), 0, 66, 100, 34);
+        componentPositionTest(list.getComponents().get(4), 237, 100, 100, 16);
+        componentPositionTest(list.getComponents().get(5), 237, 116, 100, 34);
+        componentPositionTest(list.getComponents().get(6), 475, 150, 100, 16);
+        componentPositionTest(list.getComponents().get(7), 475, 166, 100, 34);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/BandBackgroundTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/BandBackgroundTest.java
new file mode 100644
index 0000000..27e476f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/BandBackgroundTest.java
@@ -0,0 +1,171 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+
+import java.util.ArrayList;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.base.DRDesignReport;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignRectangle;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.design.DesignReportBuilder;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class BandBackgroundTest
+{
+	
+	@Test
+	void styleTest()
+	{
+		final ReportBuilder<?> rb = new DesignReportBuilder();
+		final TextColumnBuilder<String> column1;
+		final TextColumnBuilder<Integer> column2;
+		final ColumnGroupBuilder group1;
+		
+		final ReportTemplateBuilder template = template().setTitleBackgroundComponent(cmp.roundRectangle(1))
+			.setPageHeaderBackgroundComponent(cmp.roundRectangle(2))
+			.setPageFooterBackgroundComponent(cmp.roundRectangle(3))
+			.setColumnHeaderBackgroundComponent(cmp.roundRectangle(4))
+			.setColumnFooterBackgroundComponent(cmp.roundRectangle(5))
+			.setGroupHeaderBackgroundComponent(cmp.roundRectangle(6))
+			.setGroupFooterBackgroundComponent(cmp.roundRectangle(7))
+			.setDetailHeaderBackgroundComponent(cmp.roundRectangle(8))
+			.setDetailBackgroundComponent(cmp.roundRectangle(9))
+			.setDetailFooterBackgroundComponent(cmp.roundRectangle(10))
+			.setLastPageFooterBackgroundComponent(cmp.roundRectangle(11))
+			.setSummaryBackgroundComponent(cmp.roundRectangle(12))
+			.setBackgroundBackgroundComponent(cmp.roundRectangle(13));
+		
+		rb.setTemplate(template)
+			.setPageColumnsPerPage(2)
+			.columns(
+				column1 = col.column("Column1", "field1", String.class),
+				column2 = col.column("Column2", "field2", Integer.class))
+			.groupBy(group1 = grp.group(column1).setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE))
+			.subtotalsAtGroupHeader(group1, sbt.sum(column2))
+			.subtotalsAtGroupFooter(group1, sbt.sum(column2))
+			.title(cmp.verticalGap(10))
+			.pageHeader(cmp.verticalGap(10))
+			.pageFooter(cmp.verticalGap(10))
+			.columnHeader(cmp.verticalGap(10))
+			.columnFooter(cmp.verticalGap(10))
+			.groupHeader(group1, cmp.verticalGap(10))
+			.groupFooter(group1, cmp.verticalGap(10))
+			.detailHeader(cmp.verticalGap(10))
+			.detail(cmp.verticalGap(10))
+			.detailFooter(cmp.verticalGap(10))
+			.lastPageFooter(cmp.verticalGap(10))
+			.summary(cmp.verticalGap(10))
+			.background(cmp.verticalGap(10));
+        
+        this.testBackgroundComponents(rb, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
+		
+		rb.setTitleBackgroundComponent(cmp.roundRectangle(14))
+			.setPageHeaderBackgroundComponent(cmp.roundRectangle(15))
+			.setPageFooterBackgroundComponent(cmp.roundRectangle(16))
+			.setColumnHeaderBackgroundComponent(cmp.roundRectangle(17))
+			.setColumnFooterBackgroundComponent(cmp.roundRectangle(18))
+			.setGroupHeaderBackgroundComponent(group1, cmp.roundRectangle(19))
+			.setGroupFooterBackgroundComponent(group1, cmp.roundRectangle(20))
+			.setDetailHeaderBackgroundComponent(cmp.roundRectangle(21))
+			.setDetailBackgroundComponent(cmp.roundRectangle(22))
+			.setDetailFooterBackgroundComponent(cmp.roundRectangle(23))
+			.setLastPageFooterBackgroundComponent(cmp.roundRectangle(24))
+			.setSummaryBackgroundComponent(cmp.roundRectangle(25))
+			.setBackgroundBackgroundComponent(cmp.roundRectangle(26));
+        
+        this.testBackgroundComponents(rb, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26);
+	}
+	
+	private void testBackgroundComponents(final ReportBuilder<?> rb, final Integer... radius)
+	{
+		try
+		{
+			final DRDesignReport report = new DRDesignReport(rb.getReport());
+			
+			DRDesignRectangle rectangle =
+				(DRDesignRectangle)((DRDesignList)report.getTitleBand().getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[0], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getPageHeaderBand()
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[1], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getPageFooterBand()
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[2], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getColumnHeaderBand()
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[3], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getColumnFooterBand()
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[4], rectangle.getRadius());
+			final DRDesignGroup group = new ArrayList<>(report.getGroups()).get(0);
+			rectangle = (DRDesignRectangle)((DRDesignList)group.getHeaderBands()
+				.get(0)
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[5], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)group.getFooterBands()
+				.get(0)
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[6], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getDetailBands()
+				.get(0)
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[7], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getDetailBands()
+				.get(1)
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[8], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getDetailBands()
+				.get(2)
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[9], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getLastPageFooterBand()
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[10], rectangle.getRadius());
+			rectangle =
+				(DRDesignRectangle)((DRDesignList)report.getSummaryBand().getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[11], rectangle.getRadius());
+			rectangle = (DRDesignRectangle)((DRDesignList)report.getBackgroundBand()
+				.getBandComponent()).getBackgroundComponent();
+			Assertions.assertEquals(radius[12], rectangle.getRadius());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ExceptionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ExceptionTest.java
new file mode 100644
index 0000000..5a8849f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ExceptionTest.java
@@ -0,0 +1,114 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.report;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.design.base.DRDesignReport;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.design.DesignReportBuilder;
+import org.junit.jupiter.api.Test;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.variable;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ExceptionTest {
+
+    @Test
+    public void testComponentFixedWidth() {
+        ReportBuilder<?> rb1 = new DesignReportBuilder();
+        rb1.title(cmp.text("").setFixedWidth(600));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("component fixed width exception");
+        } catch (DRException e) {
+        }
+
+        ReportBuilder<?> rb2 = new DesignReportBuilder();
+        rb2.title(cmp.horizontalList(cmp.text("").setFixedWidth(600)));
+        try {
+            new DRDesignReport(rb2.getReport());
+            Assertions.fail("component fixed width exception");
+        } catch (DRException e) {
+        }
+
+        ReportBuilder<?> rb3 = new DesignReportBuilder();
+        rb3.title(cmp.horizontalFlowList(cmp.text("").setFixedWidth(600)));
+        try {
+            new DRDesignReport(rb3.getReport());
+            Assertions.fail("component fixed width exception");
+        } catch (DRException e) {
+        }
+    }
+
+    @Test
+    public void testComponentMinimumWidth() {
+        ReportBuilder<?> rb1 = new DesignReportBuilder();
+        rb1.title(cmp.text("").setMinWidth(600));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("component minimum width exception");
+        } catch (DRException e) {
+        }
+
+        ReportBuilder<?> rb2 = new DesignReportBuilder();
+        rb2.title(cmp.horizontalList(cmp.text("").setMinWidth(600)));
+        try {
+            new DRDesignReport(rb2.getReport());
+            Assertions.fail("component fixed width exception");
+        } catch (DRException e) {
+        }
+
+        ReportBuilder<?> rb3 = new DesignReportBuilder();
+        rb3.title(cmp.horizontalFlowList(cmp.text("").setMinWidth(600)));
+        try {
+            new DRDesignReport(rb3.getReport());
+            Assertions.fail("component fixed width exception");
+        } catch (DRException e) {
+        }
+    }
+
+    @Test
+    public void testVariable() {
+        TextColumnBuilder<Object> column = col.column("fieldName", Object.class);
+        ColumnGroupBuilder group = grp.group(column);
+        ReportBuilder<?> rb1 =
+            new DesignReportBuilder().columns(column).groupBy(group).variables(variable("fieldName", Object.class, Calculation.SUM).setResetGroup(group).setResetType(Evaluation.REPORT));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("variable exception");
+        } catch (DRException e) {
+        }
+
+        ReportBuilder<?> rb2 = new DesignReportBuilder().columns(column).groupBy(group).variables(variable("fieldName", Object.class, Calculation.SUM).setResetType(Evaluation.GROUP));
+        try {
+            new DRDesignReport(rb2.getReport());
+            Assertions.fail("variable exception");
+        } catch (DRException e) {
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ReportTemplateTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ReportTemplateTest.java
new file mode 100644
index 0000000..8e1c024
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ReportTemplateTest.java
@@ -0,0 +1,357 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.design.base.DRDesignGroup;
+import net.sf.dynamicreports.design.base.DRDesignReport;
+import net.sf.dynamicreports.design.base.component.DRDesignComponent;
+import net.sf.dynamicreports.design.base.component.DRDesignImage;
+import net.sf.dynamicreports.design.base.component.DRDesignList;
+import net.sf.dynamicreports.design.base.component.DRDesignTextField;
+import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import net.sf.dynamicreports.design.definition.component.DRIDesignList;
+import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.constant.Language;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.design.DesignReportBuilder;
+
+
+class ReportTemplateTest
+{
+	
+	private void configureReport(final ReportBuilder<?> rb)
+	{
+		final TextColumnBuilder<Integer> column1;
+		
+		rb.columns(column1 = col.column("Column1", "field1", Integer.class), col.booleanColumn("Column2", "field2"))
+			.groupBy(grp.group(column1).header(cmp.horizontalList(cmp.hListCell(cmp.text("")).widthFixed())))
+			.title(cmp.horizontalList(
+				cmp.hListCell(cmp.image("")).widthFixed().heightFixedOnTop(),
+				cmp.hListCell(ctab.crosstab()
+						.rowGroups(ctab.rowGroup("f1", String.class))
+						.columnGroups(
+							ctab.columnGroup("f2", String.class),
+							ctab.columnGroup("f3", String.class))
+						.measures(ctab.measure("f4", "f4", Integer.class, Calculation.SUM)))
+					.widthFixed()
+					.heightFixedOnTop()))
+			.setTemplate(template().setLocale(Locale.ENGLISH)
+				.setShowColumnTitle(false)
+				.setIgnorePagination(true)
+				.setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL)
+				.setWhenResourceMissingType(WhenResourceMissingType.KEY)
+				.setTitleOnANewPage(true)
+				.setSummaryOnANewPage(true)
+				.setSummaryWithPageHeaderAndFooter(true)
+				.setFloatColumnFooter(true)
+				.setPrintOrder(Orientation.HORIZONTAL)
+				.setColumnDirection(RunDirection.RIGHT_TO_LEFT)
+				.setLanguage(Language.GROOVY)
+				
+				.setHighlightDetailOddRows(true)
+				.setDetailOddRowStyle(stl.simpleStyle().setBackgroundColor(Color.BLUE))
+				.setHighlightDetailEvenRows(true)
+				.setDetailEvenRowStyle(stl.simpleStyle().setBackgroundColor(Color.CYAN))
+				.setDefaultFont(stl.font().setFontSize(12))
+				.setTextStyle(stl.style().bold())
+				
+				.setPageFormat(PageType.A3, PageOrientation.LANDSCAPE)
+				.setPageMargin(margin(3))
+				.setPageColumnsPerPage(3)
+				.setPageColumnSpace(20)
+				
+				.setColumnPrintRepeatedDetailValues(false)
+				.setColumnWidth(250)
+				
+				.setGroupHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE)
+				.setGroupHideColumn(false)
+				.setGroupShowColumnHeaderAndFooter(true)
+				.setGroupPadding(20)
+				.setGroupStartInNewPage(true)
+				.setGroupStartInNewColumn(true)
+				.setGroupReprintHeaderOnEachPage(true)
+				.setGroupHeaderWithSubtotal(true)
+				
+				.setTextFieldWidth(150)
+				
+				.setImageWidth(110)
+				.setImageHeight(120)
+				
+				.setListgap(10)
+				
+				.setCrosstabWidth(90)
+				.setCrosstabHeight(101)
+				.setCrosstabHighlightOddRows(true)
+				.setCrosstabOddRowStyle(stl.simpleStyle().setBackgroundColor(Color.ORANGE))
+				.setCrosstabHighlightEvenRows(true)
+				.setCrosstabEvenRowStyle(stl.simpleStyle().setBackgroundColor(Color.MAGENTA))
+				.setCrosstabGroupStyle(stl.style().setBackgroundColor(Color.RED))
+				.setCrosstabGroupTotalStyle(stl.style().setBackgroundColor(Color.ORANGE))
+				.setCrosstabGrandTotalStyle(stl.style().setBackgroundColor(Color.BLUE))
+				.setCrosstabCellStyle(stl.style().setBackgroundColor(Color.CYAN))
+				.setCrosstabMeasureTitleStyle(stl.style().setBackgroundColor(Color.YELLOW))
+				
+				.setBooleanColumnStyle(stl.style(stl.pen1Point()))
+				
+				.setDetailSplitType(SplitType.IMMEDIATE));
+	}
+	
+	@Test
+	void test()
+	{
+		@SuppressWarnings("rawtypes")
+		final ReportBuilder rb = new DesignReportBuilder();
+		this.configureReport(rb);
+		try
+		{
+			final DRDesignReport report = new DRDesignReport(rb.getReport());
+			Assertions.assertEquals(Locale.ENGLISH, report.getLocale());
+			Assertions.assertNull(report.getColumnHeaderBand());
+			Assertions.assertTrue(report.isIgnorePagination());
+			Assertions.assertEquals(
+				WhenNoDataType.ALL_SECTIONS_NO_DETAIL,
+				report.getWhenNoDataType());
+			Assertions.assertEquals(
+				WhenResourceMissingType.KEY,
+				report.getWhenResourceMissingType());
+			Assertions.assertTrue(report.isTitleOnANewPage());
+			Assertions.assertTrue(report.isSummaryOnANewPage());
+			Assertions.assertTrue(report.isSummaryWithPageHeaderAndFooter());
+			Assertions.assertTrue(report.isFloatColumnFooter());
+			Assertions.assertEquals(Orientation.HORIZONTAL, report.getPrintOrder());
+			Assertions.assertEquals(RunDirection.RIGHT_TO_LEFT, report.getColumnDirection());
+			Assertions.assertEquals(Language.GROOVY, report.getLanguage());
+			
+			final DRDesignTextField columnTextField1 =
+				(DRDesignTextField)((DRDesignList)report.getDetailBands().get(0).getBandComponent()).getComponents()
+					.get(0);
+			DRIDesignStyle style = columnTextField1.getStyle();
+			Assertions.assertEquals(
+				Color.BLUE,
+				style.getConditionalStyles().get(0).getBackgroundColor());
+			Assertions.assertEquals(
+				Color.CYAN,
+				style.getConditionalStyles().get(1).getBackgroundColor());
+			Assertions.assertEquals(
+				12,
+				style.getParentStyle().getFont().getFontSize());
+			Assertions.assertTrue(style.getParentStyle().getFont().getBold());
+			
+			Assertions.assertEquals(1190, report.getPage().getWidth());
+			Assertions.assertEquals(842, report.getPage().getHeight());
+			Assertions.assertEquals(PageOrientation.LANDSCAPE, report.getPage().getOrientation());
+			Assertions.assertEquals(3, report.getPage().getMargin().getLeft());
+			Assertions.assertEquals(3, report.getPage().getColumnsPerPage());
+			Assertions.assertEquals(20, report.getPage().getColumnSpace());
+			
+			Assertions.assertFalse(columnTextField1.isPrintRepeatedValues());
+			Assertions.assertEquals(180, columnTextField1.getWidth());
+			
+			final DRDesignTextField columnTextField2 =
+				(DRDesignTextField)((DRDesignList)report.getDetailBands().get(0).getBandComponent()).getComponents()
+					.get(1);
+			style = columnTextField2.getStyle();
+			Assertions.assertEquals(
+				Color.BLUE,
+				style.getConditionalStyles().get(0).getBackgroundColor());
+			Assertions.assertEquals(
+				Color.CYAN,
+				style.getConditionalStyles().get(1).getBackgroundColor());
+			Assertions.assertEquals(
+				Float.valueOf(1),
+				style.getParentStyle().getBorder().getTopPen().getLineWidth());
+			Assertions.assertEquals(181, columnTextField2.getWidth());
+			
+			final DRDesignGroup group = (DRDesignGroup)report.getGroups().toArray()[0];
+			final DRDesignComponent textField = group.getHeaderBands().get(1).getBandComponent();
+			Assertions.assertEquals(
+				2,
+				((DRDesignList)group.getHeaderBands().get(0).getBandComponent()).getComponents().size());
+			Assertions.assertEquals("groupHeader.textField1", textField.getUniqueName());
+			Assertions.assertEquals(20, columnTextField1.getX());
+			Assertions.assertTrue(group.isStartInNewPage());
+			Assertions.assertTrue(group.isStartInNewColumn());
+			Assertions.assertTrue(group.isReprintHeaderOnEachPage());
+			Assertions.assertTrue(group.isHeaderWithSubtotal());
+			
+			Assertions.assertEquals(150, textField.getWidth());
+			
+			final DRDesignList titleList = (DRDesignList)report.getTitleBand().getBandComponent();
+			Assertions.assertEquals(10, titleList.getGap());
+			
+			final DRDesignComponent image = titleList.getComponents().get(0);
+			Assertions.assertEquals(110, image.getWidth());
+			Assertions.assertEquals(120, image.getHeight());
+			
+			final DRDesignCrosstab crosstab = (DRDesignCrosstab)titleList.getComponents().get(1);
+			Assertions.assertEquals(Integer.valueOf(90), crosstab.getWidth());
+			Assertions.assertEquals(Integer.valueOf(101), crosstab.getHeight());
+			style = crosstab.getCells().get(0).getContent().getComponent().getStyle();
+			Assertions.assertEquals(
+				new Color(63, 241, 191),
+				style.getConditionalStyles().get(0).getBackgroundColor());
+			Assertions.assertEquals(
+				new Color(63, 191, 255),
+				style.getConditionalStyles().get(1).getBackgroundColor());
+			Assertions.assertEquals(Color.CYAN, style.getParentStyle().getBackgroundColor());
+			style = crosstab.getColumnGroups().get(0).getHeader().getComponent().getStyle();
+			Assertions.assertEquals(Color.RED, style.getBackgroundColor());
+			style = ((DRIDesignList)crosstab.getColumnGroups().get(0).getTotalHeader().getComponent()).getComponents()
+				.get(0)
+				.getStyle();
+			Assertions.assertEquals(Color.BLUE, style.getBackgroundColor());
+			style = ((DRIDesignList)crosstab.getColumnGroups().get(1).getHeader().getComponent()).getComponents()
+				.get(0)
+				.getStyle();
+			Assertions.assertEquals(Color.RED, style.getBackgroundColor());
+			style = ((DRIDesignList)crosstab.getColumnGroups().get(1).getTotalHeader().getComponent()).getComponents()
+				.get(0)
+				.getStyle();
+			Assertions.assertEquals(Color.ORANGE, style.getBackgroundColor());
+			style = ((DRIDesignList)crosstab.getRowGroups().get(0).getHeader().getComponent()).getComponents()
+				.get(0)
+				.getStyle();
+			Assertions.assertEquals(Color.RED, style.getBackgroundColor());
+			style = crosstab.getRowGroups().get(0).getTotalHeader().getComponent().getStyle();
+			Assertions.assertEquals(Color.BLUE, style.getBackgroundColor());
+			
+			style = crosstab.getColumnGroups().get(0).getHeader().getStyle();
+			Assertions.assertEquals(Color.RED, style.getBackgroundColor());
+			style = crosstab.getColumnGroups().get(0).getTotalHeader().getStyle();
+			Assertions.assertEquals(Color.BLUE, style.getBackgroundColor());
+			style = crosstab.getColumnGroups().get(1).getHeader().getStyle();
+			Assertions.assertEquals(Color.RED, style.getBackgroundColor());
+			style = crosstab.getColumnGroups().get(1).getTotalHeader().getStyle();
+			Assertions.assertEquals(Color.ORANGE, style.getBackgroundColor());
+			style = crosstab.getRowGroups().get(0).getHeader().getStyle();
+			Assertions.assertEquals(Color.RED, style.getBackgroundColor());
+			style = crosstab.getRowGroups().get(0).getTotalHeader().getStyle();
+			Assertions.assertEquals(Color.BLUE, style.getBackgroundColor());
+			
+			style = ((DRIDesignList)crosstab.getColumnGroups().get(0).getTotalHeader().getComponent()).getComponents()
+				.get(1)
+				.getStyle();
+			Assertions.assertEquals(Color.YELLOW, style.getBackgroundColor());
+			style = ((DRIDesignList)crosstab.getColumnGroups().get(1).getHeader().getComponent()).getComponents()
+				.get(1)
+				.getStyle();
+			Assertions.assertEquals(Color.YELLOW, style.getBackgroundColor());
+			style = ((DRIDesignList)crosstab.getColumnGroups().get(1).getTotalHeader().getComponent()).getComponents()
+				.get(1)
+				.getStyle();
+			Assertions.assertEquals(Color.YELLOW, style.getBackgroundColor());
+			
+			Assertions.assertEquals(
+				SplitType.IMMEDIATE,
+				report.getDetailBands().get(0).getSplitType());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	@Test
+	void styleTest()
+	{
+		final ReportBuilder<?> rb = new DesignReportBuilder();
+		final TextColumnBuilder<Integer> column1;
+		
+		rb.columns(column1 = col.column("Column1", "field1", Integer.class))
+			.groupBy(grp.group(column1).setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE).setHideColumn(false))
+			.subtotalsAtSummary(sbt.sum(column1))
+			.title(cmp.image(""), cmp.image(""))
+			.setTemplate(template().setColumnStyle(stl.style().setFontSize(1))
+				.setColumnTitleStyle(stl.style().setFontSize(2))
+				.setGroupStyle(stl.style().setFontSize(3))
+				.setGroupTitleStyle(stl.style().setFontSize(4))
+				.setSubtotalStyle(stl.style().setFontSize(5))
+				.setImageStyle(stl.style().setBorder(stl.pen1Point())));
+		try
+		{
+			final DRDesignReport report = new DRDesignReport(rb.getReport());
+			
+			DRDesignTextField textField =
+				(DRDesignTextField)((DRDesignList)report.getDetailBands().get(0).getBandComponent()).getComponents()
+					.get(0);
+			Assertions.assertEquals(Integer.valueOf(1), textField.getStyle().getFont().getFontSize());
+			
+			textField =
+				(DRDesignTextField)((DRDesignList)report.getColumnHeaderBand().getBandComponent()).getComponents()
+					.get(1);
+			Assertions.assertEquals(
+				Integer.valueOf(2),
+				textField.getStyle().getFont().getFontSize());
+			
+			final DRDesignList groupHeaderComponent =
+				(DRDesignList)new ArrayList<>(report.getGroups()).get(0).getHeaderBands().get(0).getBandComponent();
+			textField = (DRDesignTextField)groupHeaderComponent.getComponents().get(1);
+			Assertions.assertEquals(Integer.valueOf(3), textField.getStyle().getFont().getFontSize());
+			
+			textField = (DRDesignTextField)groupHeaderComponent.getComponents().get(0);
+			Assertions.assertEquals(
+				4,
+				textField.getStyle().getFont().getFontSize());
+			
+			textField =
+				(DRDesignTextField)((DRDesignList)report.getSummaryBand().getBandComponent()).getComponents().get(0);
+			Assertions.assertEquals(
+				5,
+				textField.getStyle().getFont().getFontSize());
+			
+			final DRDesignImage image =
+				(DRDesignImage)((DRDesignList)report.getTitleBand().getBandComponent()).getComponents().get(0);
+			Assertions.assertEquals(
+				Float.valueOf(1),
+				image.getStyle().getBorder().getTopPen().getLineWidth());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/TemplateDesignTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/TemplateDesignTest.java
new file mode 100644
index 0000000..d2aaba2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/TemplateDesignTest.java
@@ -0,0 +1,290 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.design.report;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.design.base.DRDesignReport;
+import net.sf.dynamicreports.report.base.AbstractTemplateDesign;
+import net.sf.dynamicreports.report.base.DRMargin;
+import net.sf.dynamicreports.report.builder.MarginBuilder;
+import net.sf.dynamicreports.report.builder.ReportBuilder;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.definition.DRIMargin;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.design.DesignReportBuilder;
+import org.junit.jupiter.api.Test;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesignTest {
+
+    @Test
+    public void testComponentFixedWidth() {
+        ReportBuilder<?> rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.setPageFormat(100, 100, PageOrientation.LANDSCAPE);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page width");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.setPageFormat(50, 200, PageOrientation.LANDSCAPE);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page height");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.setPageFormat(200, 100, PageOrientation.PORTRAIT);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page orientation");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        MarginBuilder margin = margin();
+        margin.setLeft(10).setRight(6).setTop(7).setBottom(8);
+        rb1.setPageMargin(margin);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page left margin");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        margin = margin();
+        margin.setLeft(5).setRight(10).setTop(7).setBottom(8);
+        rb1.setPageMargin(margin);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page right margin");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        margin = margin();
+        margin.setLeft(5).setRight(6).setTop(10).setBottom(8);
+        rb1.setPageMargin(margin);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page top margin");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        margin = margin();
+        margin.setLeft(5).setRight(6).setTop(7).setBottom(10);
+        rb1.setPageMargin(margin);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page bottom margin");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.setPageColumnsPerPage(5);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page columnsPerPage margin");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.setPageColumnSpace(5);
+        try {
+            new DRDesignReport(rb1.getReport());
+        } catch (DRException e) {
+            Assertions.fail("template design failed - page columnSpace margin");
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.title(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - title band");
+        } catch (DRException e) {
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.pageHeader(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - page header band");
+        } catch (DRException e) {
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.pageFooter(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - page footer band");
+        } catch (DRException e) {
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.columnHeader(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - column header band");
+        } catch (DRException e) {
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.columnFooter(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - column footer band");
+        } catch (DRException e) {
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.pageFooter(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - page footer band");
+        } catch (DRException e) {
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.summary(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - summary band");
+        } catch (DRException e) {
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.noData(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - no data band");
+        } catch (DRException e) {
+        }
+
+        rb1 = new DesignReportBuilder(new TestTemplateDesign());
+        rb1.background(cmp.text(""));
+        try {
+            new DRDesignReport(rb1.getReport());
+            Assertions.fail("template design failed - background band");
+        } catch (DRException e) {
+        }
+    }
+
+    public class TestTemplateDesign extends AbstractTemplateDesign<Object> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Integer getPageWidth() {
+            return 200;
+        }
+
+        @Override
+        public Integer getPageHeight() {
+            return 100;
+        }
+
+        @Override
+        public PageOrientation getPageOrientation() {
+            return PageOrientation.LANDSCAPE;
+        }
+
+        @Override
+        public DRIMargin getPageMargin() {
+            DRMargin margin = new DRMargin();
+            margin.setLeft(5);
+            margin.setRight(6);
+            margin.setTop(7);
+            margin.setBottom(8);
+            return margin;
+        }
+
+        @Override
+        public Integer getPageColumnsPerPage() {
+            return 2;
+        }
+
+        @Override
+        public Integer getPageColumnSpace() {
+            return 20;
+        }
+
+        @Override
+        public Integer getPageColumnWidth() {
+            return 100;
+        }
+
+        @Override
+        public int getTitleComponentsCount() {
+            return 1;
+        }
+
+        @Override
+        public int getPageHeaderComponentsCount() {
+            return 1;
+        }
+
+        @Override
+        public int getPageFooterComponentsCount() {
+            return 1;
+        }
+
+        @Override
+        public int getColumnHeaderComponentsCount() {
+            return 1;
+        }
+
+        @Override
+        public int getColumnFooterComponentsCount() {
+            return 1;
+        }
+
+        @Override
+        public int getLastPageFooterComponentsCount() {
+            return 1;
+        }
+
+        @Override
+        public int getSummaryComponentsCount() {
+            return 1;
+        }
+
+        @Override
+        public int getNoDataComponentsCount() {
+            return 1;
+        }
+
+        @Override
+        public int getBackgroundComponentsCount() {
+            return 1;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java
new file mode 100644
index 0000000..e6d540e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper;
+
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public abstract class AbstractJasperCrosstabPositionTest extends AbstractJasperPositionTest {
+    private String crosstabBand;
+
+    public void setCrosstabBand(String crosstabBand) {
+        this.crosstabBand = crosstabBand;
+    }
+
+    protected void crosstabWhenNoDataElementPositionTest(String name, int index, int x, int y, int width, int height) {
+        elementPositionTest(getPrefix(1) + "whennodatacell." + name, index, x, y, width, height);
+    }
+
+    protected void crosstabHeaderElementPositionTest(String name, int index, int x, int y, int width, int height) {
+        elementPositionTest(getPrefix(1) + "headercell." + name, index, x, y, width, height);
+    }
+
+    // group header
+    protected void crosstabGroupHeaderPositionTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, int x, int y, int width, int height) {
+        elementPositionTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(group), index, x, y, width, height);
+    }
+
+    // group total header
+    protected void crosstabGroupTotalHeaderPositionTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, int x, int y, int width, int height) {
+        elementPositionTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTotalHeaderName(group), index, x, y, width, height);
+    }
+
+    // group title header
+    protected void crosstabGroupTitleHeaderPositionTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure, int index, int x, int y, int width, int height) {
+        elementPositionTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTitleHeaderName(group, measure), index, x, y, width, height);
+    }
+
+    // group title total header
+    protected void crosstabGroupTitleTotalHeaderPositionTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure, int index, int x, int y, int width, int height) {
+        elementPositionTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTitleTotalHeaderName(group, measure), index, x, y, width, height);
+    }
+
+    // cell
+    protected void crosstabCellPositionTest(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup, int index, int x, int y, int width,
+                                            int height) {
+        elementPositionTest(getPrefix(1) + JasperTestUtils.getCrosstabCellName(measure, rowGroup, columnGroup), index, x, y, width, height);
+    }
+
+    private String getPrefix(int index) {
+        return crosstabBand + ".crosstab" + index + ".";
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java
new file mode 100644
index 0000000..16d3fce
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java
@@ -0,0 +1,135 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper;
+
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+import java.awt.Color;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public abstract class AbstractJasperCrosstabStyleTest extends AbstractJasperStyleTest {
+    private String crosstabBand;
+
+    public void setCrosstabBand(String crosstabBand) {
+        this.crosstabBand = crosstabBand;
+    }
+
+    // header
+    protected void crosstabHeaderElementStyleTest(String name, int index, Color foreColor, Color backColor, String fontName, Float fontSize, Boolean bold, Boolean italic) {
+        styleTest(getPrefix(1) + "headercell." + name, index, foreColor, backColor, fontName, fontSize, bold, italic);
+    }
+
+    protected void crosstabHeaderElementBorderTest(String name, int index, Color topColor, LineStyleEnum topLineStyle, float top, Color bottomColor, LineStyleEnum bottomLineStyle, float bottom,
+                                                   Color leftColor, LineStyleEnum leftLineStyle, float left, Color rightColor, LineStyleEnum rightLineStyle, float right) {
+        borderTest(getPrefix(1) + "headercell." + name, index, topColor, topLineStyle, top, bottomColor, bottomLineStyle, bottom, leftColor, leftLineStyle, left, rightColor, rightLineStyle, right);
+    }
+
+    protected void crosstabHeaderElementPaddingTest(String name, int index, Integer top, Integer bottom, Integer left, Integer right) {
+        paddingTest(getPrefix(1) + "headercell." + name, index, top, bottom, left, right);
+    }
+
+    protected void crosstabHeaderElementHorizontalAlignmentTest(String name, int index, HorizontalTextAlignEnum horizontalAlignment) {
+        horizontalAlignmentTest(getPrefix(1) + "headercell." + name, index, horizontalAlignment);
+    }
+
+    // group header
+    protected void crosstabGroupHeaderStyleTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, Color foreColor, Color backColor, String fontName, Float fontSize, Boolean bold,
+                                                Boolean italic) {
+        styleTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(group), index, foreColor, backColor, fontName, fontSize, bold, italic);
+    }
+
+    protected void crosstabGroupHeaderBorderTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, Color topColor, LineStyleEnum topLineStyle, float top, Color bottomColor,
+                                                 LineStyleEnum bottomLineStyle, float bottom, Color leftColor, LineStyleEnum leftLineStyle, float left, Color rightColor, LineStyleEnum rightLineStyle,
+                                                 float right) {
+        borderTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(group), index, topColor, topLineStyle, top, bottomColor, bottomLineStyle, bottom, leftColor, leftLineStyle, left,
+                   rightColor, rightLineStyle, right);
+    }
+
+    protected void crosstabGroupHeaderPaddingTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, Integer top, Integer bottom, Integer left, Integer right) {
+        paddingTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(group), index, top, bottom, left, right);
+    }
+
+    protected void crosstabGroupHeaderHorizontalAlignmentTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, HorizontalTextAlignEnum horizontalAlignment) {
+        horizontalAlignmentTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(group), index, horizontalAlignment);
+    }
+
+    protected void crosstabGroupTitleHeaderStyleTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure, int index, Color foreColor, Color backColor, String fontName,
+                                                     Float fontSize, Boolean bold, Boolean italic) {
+        styleTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTitleHeaderName(group, measure), index, foreColor, backColor, fontName, fontSize, bold, italic);
+    }
+
+    // group total header
+    protected void crosstabGroupTotalHeaderStyleTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, Color foreColor, Color backColor, String fontName, Float fontSize, Boolean bold,
+                                                     Boolean italic) {
+        styleTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTotalHeaderName(group), index, foreColor, backColor, fontName, fontSize, bold, italic);
+    }
+
+    protected void crosstabGroupTotalHeaderBorderTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, Color topColor, LineStyleEnum topLineStyle, float top, Color bottomColor,
+                                                      LineStyleEnum bottomLineStyle, float bottom, Color leftColor, LineStyleEnum leftLineStyle, float left, Color rightColor,
+                                                      LineStyleEnum rightLineStyle, float right) {
+        borderTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTotalHeaderName(group), index, topColor, topLineStyle, top, bottomColor, bottomLineStyle, bottom, leftColor, leftLineStyle, left,
+                   rightColor, rightLineStyle, right);
+    }
+
+    protected void crosstabGroupTotalHeaderPaddingTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, Integer top, Integer bottom, Integer left, Integer right) {
+        paddingTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTotalHeaderName(group), index, top, bottom, left, right);
+    }
+
+    protected void crosstabGroupTotalHeaderHorizontalAlignmentTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int index, HorizontalTextAlignEnum horizontalAlignment) {
+        horizontalAlignmentTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTotalHeaderName(group), index, horizontalAlignment);
+    }
+
+    protected void crosstabGroupTitleTotalHeaderStyleTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure, int index, Color foreColor, Color backColor, String fontName,
+                                                          Float fontSize, Boolean bold, Boolean italic) {
+        styleTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTitleTotalHeaderName(group, measure), index, foreColor, backColor, fontName, fontSize, bold, italic);
+    }
+
+    // cell
+    protected void crosstabCellStyleTest(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup, int index, Color foreColor, Color backColor,
+                                         String fontName, Float fontSize, Boolean bold, Boolean italic) {
+        styleTest(getPrefix(1) + JasperTestUtils.getCrosstabCellName(measure, rowGroup, columnGroup), index, foreColor, backColor, fontName, fontSize, bold, italic);
+    }
+
+    protected void crosstabCellBorderTest(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup, int index, Color topColor,
+                                          LineStyleEnum topLineStyle, float top, Color bottomColor, LineStyleEnum bottomLineStyle, float bottom, Color leftColor, LineStyleEnum leftLineStyle,
+                                          float left, Color rightColor, LineStyleEnum rightLineStyle, float right) {
+        borderTest(getPrefix(1) + JasperTestUtils.getCrosstabCellName(measure, rowGroup, columnGroup), index, topColor, topLineStyle, top, bottomColor, bottomLineStyle, bottom, leftColor,
+                   leftLineStyle, left, rightColor, rightLineStyle, right);
+    }
+
+    protected void crosstabCellPaddingTest(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup, int index, Integer top, Integer bottom,
+                                           Integer left, Integer right) {
+        paddingTest(getPrefix(1) + JasperTestUtils.getCrosstabCellName(measure, rowGroup, columnGroup), index, top, bottom, left, right);
+    }
+
+    protected void crosstabCellHorizontalAlignmentTest(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup, int index,
+                                                       HorizontalTextAlignEnum horizontalAlignment) {
+        horizontalAlignmentTest(getPrefix(1) + JasperTestUtils.getCrosstabCellName(measure, rowGroup, columnGroup), index, horizontalAlignment);
+    }
+
+    private String getPrefix(int index) {
+        return crosstabBand + ".crosstab" + index + ".";
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java
new file mode 100644
index 0000000..70c1777
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java
@@ -0,0 +1,104 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper;
+
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public abstract class AbstractJasperCrosstabValueTest extends AbstractJasperValueTest {
+    private String crosstabBand;
+
+    public void setCrosstabBand(String crosstabBand) {
+        this.crosstabBand = crosstabBand;
+    }
+
+    protected void crosstabHeaderElementCountTest(String name, int expectedNumberOfElements) {
+        elementCountTest(getPrefix(1) + "headercell." + name, expectedNumberOfElements);
+    }
+
+    protected void crosstabHeaderElementValueTest(String name, String... values) {
+        elementValueTest(getPrefix(1) + "headercell." + name, values);
+    }
+
+    // group header
+    protected void crosstabGroupHeaderCountTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int expectedNumberOfElements) {
+        elementCountTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(group), expectedNumberOfElements);
+    }
+
+    protected void crosstabGroupHeaderValueTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, String... values) {
+        elementValueTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(group), values);
+    }
+
+    protected void crosstabGroupHeaderFullValueTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, String... values) {
+        elementFullValueTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(group), values);
+    }
+
+    // group total header
+    protected void crosstabGroupTotalHeaderCountTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, int expectedNumberOfElements) {
+        elementCountTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTotalHeaderName(group), expectedNumberOfElements);
+    }
+
+    protected void crosstabGroupTotalHeaderValueTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, String... values) {
+        elementValueTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTotalHeaderName(group), values);
+    }
+
+    protected void crosstabGroupTotalHeaderFullValueTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, String... values) {
+        elementFullValueTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTotalHeaderName(group), values);
+    }
+
+    // group title header
+    protected void crosstabGroupTitleHeaderCountTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure, int expectedNumberOfElements) {
+        elementCountTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTitleHeaderName(group, measure), expectedNumberOfElements);
+    }
+
+    protected void crosstabGroupTitleHeaderValueTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure, String... values) {
+        elementValueTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTitleHeaderName(group, measure), values);
+    }
+
+    // group title total header
+    protected void crosstabGroupTitleTotalHeaderCountTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure, int expectedNumberOfElements) {
+        elementCountTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTitleTotalHeaderName(group, measure), expectedNumberOfElements);
+    }
+
+    protected void crosstabGroupTitleTotalHeaderValueTest(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure, String... values) {
+        elementValueTest(getPrefix(1) + JasperTestUtils.getCrosstabGroupTitleTotalHeaderName(group, measure), values);
+    }
+
+    // cell
+    protected void crosstabCellCountTest(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup, int expectedNumberOfElements) {
+        elementCountTest(getPrefix(1) + JasperTestUtils.getCrosstabCellName(measure, rowGroup, columnGroup), expectedNumberOfElements);
+    }
+
+    protected void crosstabCellValueTest(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup, String... values) {
+        elementValueTest(getPrefix(1) + JasperTestUtils.getCrosstabCellName(measure, rowGroup, columnGroup), values);
+    }
+
+    protected void crosstabCellFullValueTest(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup, String... values) {
+        elementFullValueTest(getPrefix(1) + JasperTestUtils.getCrosstabCellName(measure, rowGroup, columnGroup), values);
+    }
+
+    protected String getPrefix(int index) {
+        return crosstabBand + ".crosstab" + index + ".";
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperPositionTest.java
new file mode 100644
index 0000000..99cb799
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperPositionTest.java
@@ -0,0 +1,150 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.SubtotalBuilder;
+import net.sf.jasperreports.engine.JRPrintElement;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public abstract class AbstractJasperPositionTest extends AbstractJasperTest
+{
+	
+	protected void elementPositionTest(
+		final String name,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		final JRPrintElement element = this.getElementAt(name, index);
+		Assertions.assertEquals(width, element.getWidth());
+		Assertions.assertEquals(height, element.getHeight());
+		Assertions.assertEquals(x, element.getX());
+		Assertions.assertEquals(y, element.getY());
+	}
+	
+	// column detail
+	protected void columnDetailPositionTest(
+		final ColumnBuilder<?, ?> column,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		this.elementPositionTest(JasperTestUtils.getColumnDetailName(column), index, x, y, width, height);
+	}
+	
+	// column title
+	protected void columnTitlePositionTest(
+		final ColumnBuilder<?, ?> column,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		this.elementPositionTest(JasperTestUtils.getColumnTitleName(column), index, x, y, width, height);
+	}
+	
+	// subtotal label
+	protected void subtotalLabelPositionTest(
+		final SubtotalBuilder<?, ?> subtotal,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		this.elementPositionTest(JasperTestUtils.getSubtotalLabelName(subtotal, 1), index, x, y, width, height);
+	}
+	
+	protected void subtotalLabelIndexPositionTest(
+		final SubtotalBuilder<?, ?> subtotal,
+		final int subtotalIndex,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		this.elementPositionTest(
+			JasperTestUtils.getSubtotalLabelName(subtotal, subtotalIndex),
+			index,
+			x,
+			y,
+			width,
+			height);
+	}
+	
+	// subtotal
+	protected void subtotalPositionTest(
+		final SubtotalBuilder<?, ?> subtotal,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		this.elementPositionTest(JasperTestUtils.getSubtotalName(subtotal, 1), index, x, y, width, height);
+	}
+	
+	protected void subtotalIndexPositionTest(
+		final SubtotalBuilder<?, ?> subtotal,
+		final int subtotalIndex,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		this.elementPositionTest(JasperTestUtils.getSubtotalName(subtotal, subtotalIndex), index, x, y, width, height);
+	}
+	
+	// group header title
+	protected void groupHeaderTitlePositionTest(
+		final GroupBuilder<?> group,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		this.elementPositionTest(JasperTestUtils.getHeaderTitleGroupName(group), index, x, y, width, height);
+	}
+	
+	// group header
+	protected void groupHeaderPositionTest(
+		final GroupBuilder<?> group,
+		final int index,
+		final int x,
+		final int y,
+		final int width,
+		final int height)
+	{
+		this.elementPositionTest(JasperTestUtils.getHeaderGroupName(group), index, x, y, width, height);
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperStyleTest.java
new file mode 100644
index 0000000..38b497d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperStyleTest.java
@@ -0,0 +1,329 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper;
+
+import java.awt.Color;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.SubtotalBuilder;
+import net.sf.jasperreports.engine.JRImageAlignment;
+import net.sf.jasperreports.engine.JRStyle;
+import net.sf.jasperreports.engine.JRTextAlignment;
+import net.sf.jasperreports.engine.base.JRBoxPen;
+import net.sf.jasperreports.engine.type.HorizontalImageAlignEnum;
+import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+import net.sf.jasperreports.engine.type.VerticalImageAlignEnum;
+import net.sf.jasperreports.engine.type.VerticalTextAlignEnum;
+
+
+/**
+ * Base class for jasper style tests.
+ */
+public abstract class AbstractJasperStyleTest extends AbstractJasperTest
+{
+	
+	protected static final String TEST_FONT_NAME = "Arimo";
+	
+	protected void styleTest(
+		final String name, final int index, final Color foreColor, final Color backColor,
+		final String fontName, final Float fontSize, final Boolean bold, final Boolean italic)
+	{
+		final JRStyle style = this.getElementAt(name, index).getStyle();
+		this.styleTest(style, foreColor, backColor, fontName, fontSize, bold, italic);
+	}
+	
+	protected void styleTest(
+		final JRStyle style, final Color foreColor, final Color backColor, final String fontName,
+		final Float fontSize, final Boolean bold, final Boolean italic)
+	{
+		Assertions.assertNotNull(style);
+		Assertions.assertEquals(foreColor, style.getForecolor());
+		Assertions.assertEquals(backColor, style.getBackcolor());
+		Assertions.assertEquals(fontName, style.getFontName());
+		Assertions.assertEquals(fontSize, style.getFontsize());
+		Assertions.assertEquals(bold, style.isBold());
+		Assertions.assertEquals(italic, style.isItalic());
+	}
+	
+	protected void borderTest(
+		final String name, final int index, final Color topColor, final LineStyleEnum topLineStyle,
+		final float top, final Color bottomColor, final LineStyleEnum bottomLineStyle, final float bottom, final Color leftColor,
+		final LineStyleEnum leftLineStyle, final float left, final Color rightColor, final LineStyleEnum rightLineStyle,
+		final float right)
+	{
+		final JRStyle style = this.getElementAt(name, index).getStyle();
+		
+		JRBoxPen pen = style.getLineBox().getTopPen();
+		Assertions.assertEquals(top, pen.getLineWidth().floatValue(), 0);
+		Assertions.assertEquals(topColor, pen.getLineColor());
+		Assertions.assertEquals(topLineStyle, pen.getLineStyleValue());
+		
+		pen = style.getLineBox().getBottomPen();
+		Assertions.assertEquals(bottom, pen.getLineWidth().floatValue(), 0);
+		Assertions.assertEquals(bottomColor, pen.getLineColor());
+		Assertions.assertEquals(bottomLineStyle, pen.getLineStyleValue());
+		
+		pen = style.getLineBox().getLeftPen();
+		Assertions.assertEquals(left, pen.getLineWidth().floatValue(), 0);
+		Assertions.assertEquals(leftColor, pen.getLineColor());
+		Assertions.assertEquals(leftLineStyle, pen.getLineStyleValue());
+		
+		pen = style.getLineBox().getRightPen();
+		Assertions.assertEquals(right, pen.getLineWidth().floatValue(), 0);
+		Assertions.assertEquals(rightColor, pen.getLineColor());
+		Assertions.assertEquals(rightLineStyle, pen.getLineStyleValue());
+	}
+	
+	protected void paddingTest(
+		final String name, final int index, final Integer top, final Integer bottom, final Integer left,
+		final Integer right)
+	{
+		final JRStyle style = this.getElementAt(name, index).getStyle();
+		Assertions.assertEquals(top, style.getLineBox().getTopPadding());
+		Assertions.assertEquals(bottom, style.getLineBox().getBottomPadding());
+		Assertions.assertEquals(left, style.getLineBox().getLeftPadding());
+		Assertions.assertEquals(right, style.getLineBox().getRightPadding());
+	}
+	
+	protected void horizontalAlignmentTest(
+		final String name, final int index,
+		final HorizontalImageAlignEnum horizontalAlignment)
+	{
+		final JRImageAlignment element = (JRImageAlignment)this.getElementAt(name, index);
+		if(horizontalAlignment == null)
+		{
+			Assertions.assertEquals(
+				HorizontalImageAlignEnum.LEFT,
+				element.getHorizontalImageAlign());
+		}
+		Assertions.assertEquals(
+			horizontalAlignment,
+			element.getHorizontalImageAlign());
+	}
+	
+	protected void horizontalAlignmentTest(
+		final String name, final int index,
+		final HorizontalTextAlignEnum horizontalAlignment)
+	{
+		final JRTextAlignment element = (JRTextAlignment)this.getElementAt(name, index);
+		if(horizontalAlignment == null)
+		{
+			Assertions.assertEquals(
+				HorizontalTextAlignEnum.LEFT,
+				element.getHorizontalTextAlign());
+		}
+		Assertions.assertEquals(
+			horizontalAlignment,
+			element.getHorizontalTextAlign());
+	}
+	
+	protected void verticalAlignmentTest(
+		final String name, final int index,
+		final VerticalImageAlignEnum verticalAlignment)
+	{
+		final JRImageAlignment element = (JRImageAlignment)this.getElementAt(name, index);
+		if(verticalAlignment == null)
+		{
+			Assertions.assertEquals(
+				VerticalTextAlignEnum.TOP,
+				element.getVerticalImageAlign());
+		}
+		Assertions.assertEquals(verticalAlignment, element.getVerticalImageAlign());
+	}
+	
+	protected void verticalAlignmentTest(
+		final String name, final int index,
+		final VerticalTextAlignEnum verticalAlignment)
+	{
+		final JRTextAlignment element = (JRTextAlignment)this.getElementAt(name, index);
+		if(verticalAlignment == null)
+		{
+			Assertions.assertEquals(
+				VerticalTextAlignEnum.TOP,
+				element.getVerticalTextAlign());
+		}
+		Assertions.assertEquals(verticalAlignment, element.getVerticalTextAlign());
+	}
+	
+	// column detail
+	protected void columnDetailStyleTest(
+		final ColumnBuilder<?, ?> column, final int index, final Color foreColor,
+		final Color backColor, final String fontName, final Float fontSize, final Boolean bold, final Boolean italic)
+	{
+		this.styleTest(JasperTestUtils.getColumnDetailName(column), index, foreColor, backColor, fontName,
+			fontSize, bold, italic);
+	}
+	
+	protected void columnDetailPaddingTest(
+		final ColumnBuilder<?, ?> column, final int index, final Integer top,
+		final Integer bottom, final Integer left, final Integer right)
+	{
+		this.paddingTest(JasperTestUtils.getColumnDetailName(column), index, top, bottom, left, right);
+	}
+	
+	protected void columnDetailAlignmentTest(
+		final ColumnBuilder<?, ?> column, final int index,
+		final HorizontalImageAlignEnum horizontalAlignment)
+	{
+		this.horizontalAlignmentTest(JasperTestUtils.getColumnDetailName(column), index,
+			horizontalAlignment);
+	}
+	
+	protected void columnDetailAlignmentTest(
+		final ColumnBuilder<?, ?> column, final int index,
+		final VerticalImageAlignEnum verticalAlignment)
+	{
+		this.verticalAlignmentTest(JasperTestUtils.getColumnDetailName(column), index, verticalAlignment);
+	}
+	
+	protected void columnDetailAlignmentTest(
+		final ColumnBuilder<?, ?> column, final int index,
+		final HorizontalTextAlignEnum horizontalAlignment)
+	{
+		this.horizontalAlignmentTest(JasperTestUtils.getColumnDetailName(column), index,
+			horizontalAlignment);
+	}
+	
+	protected void columnDetailAlignmentTest(
+		final ColumnBuilder<?, ?> column, final int index,
+		final VerticalTextAlignEnum verticalAlignment)
+	{
+		this.verticalAlignmentTest(JasperTestUtils.getColumnDetailName(column), index, verticalAlignment);
+	}
+	
+	protected void columnDetailBorderTest(
+		final ColumnBuilder<?, ?> column, final int index, final Color topColor,
+		final LineStyleEnum topLineStyle, final float top, final Color bottomColor, final LineStyleEnum bottomLineStyle,
+		final float bottom, final Color leftColor, final LineStyleEnum leftLineStyle, final float left, final Color rightColor,
+		final LineStyleEnum rightLineStyle, final float right)
+	{
+		this.borderTest(JasperTestUtils.getColumnDetailName(column), index, topColor, topLineStyle, top,
+			bottomColor, bottomLineStyle, bottom, leftColor, leftLineStyle, left, rightColor,
+			rightLineStyle, right);
+	}
+	
+	// column title
+	protected void columnTitleBorderTest(
+		final ColumnBuilder<?, ?> column, final int index, final Color topColor,
+		final LineStyleEnum topLineStyle, final float top, final Color bottomColor, final LineStyleEnum bottomLineStyle,
+		final float bottom, final Color leftColor, final LineStyleEnum leftLineStyle, final float left, final Color rightColor,
+		final LineStyleEnum rightLineStyle, final float right)
+	{
+		this.borderTest(JasperTestUtils.getColumnTitleName(column), index, topColor, topLineStyle, top,
+			bottomColor, bottomLineStyle, bottom, leftColor, leftLineStyle, left, rightColor,
+			rightLineStyle, right);
+	}
+	
+	protected void columnTitlePaddingTest(
+		final ColumnBuilder<?, ?> column, final int index, final Integer top,
+		final Integer bottom, final Integer left, final Integer right)
+	{
+		this.paddingTest(JasperTestUtils.getColumnTitleName(column), index, top, bottom, left, right);
+	}
+	
+	protected void columnTitleStyleTest(
+		final ColumnBuilder<?, ?> column, final int index, final Color foreColor,
+		final Color backColor, final String fontName, final Float fontSize, final Boolean bold, final Boolean italic)
+	{
+		this.styleTest(JasperTestUtils.getColumnTitleName(column), index, foreColor, backColor, fontName,
+			fontSize, bold, italic);
+	}
+	
+	protected void columnTitleAlignmentTest(
+		final ColumnBuilder<?, ?> column, final int index,
+		final HorizontalTextAlignEnum horizontalAlignment)
+	{
+		this.horizontalAlignmentTest(JasperTestUtils.getColumnTitleName(column), index, horizontalAlignment);
+	}
+	
+	// subtotal label
+	protected void subtotalLabelBorderTest(
+		final SubtotalBuilder<?, ?> subtotal, final int index, final Color topColor,
+		final LineStyleEnum topLineStyle, final float top, final Color bottomColor, final LineStyleEnum bottomLineStyle,
+		final float bottom, final Color leftColor, final LineStyleEnum leftLineStyle, final float left, final Color rightColor,
+		final LineStyleEnum rightLineStyle, final float right)
+	{
+		this.borderTest(JasperTestUtils.getSubtotalLabelName(subtotal, 1), index, topColor, topLineStyle,
+			top, bottomColor, bottomLineStyle, bottom, leftColor, leftLineStyle, left, rightColor,
+			rightLineStyle, right);
+	}
+	
+	protected void subtotalLabelStyleTest(
+		final SubtotalBuilder<?, ?> subtotal, final int index, final Color foreColor,
+		final Color backColor, final String fontName, final Float fontSize, final Boolean bold, final Boolean italic)
+	{
+		this.styleTest(JasperTestUtils.getSubtotalLabelName(subtotal, 1), index, foreColor, backColor,
+			fontName, fontSize, bold, italic);
+	}
+	
+	// subtotal
+	protected void subtotalBorderTest(
+		final SubtotalBuilder<?, ?> subtotal, final int index, final Color topColor,
+		final LineStyleEnum topLineStyle, final float top, final Color bottomColor, final LineStyleEnum bottomLineStyle,
+		final float bottom, final Color leftColor, final LineStyleEnum leftLineStyle, final float left, final Color rightColor,
+		final LineStyleEnum rightLineStyle, final float right)
+	{
+		this.borderTest(JasperTestUtils.getSubtotalName(subtotal, 1), index, topColor, topLineStyle, top,
+			bottomColor, bottomLineStyle, bottom, leftColor, leftLineStyle, left, rightColor,
+			rightLineStyle, right);
+	}
+	
+	protected void subtotalPaddingTest(
+		final SubtotalBuilder<?, ?> subtotal, final int index, final Integer top,
+		final Integer bottom, final Integer left, final Integer right)
+	{
+		this.paddingTest(JasperTestUtils.getSubtotalName(subtotal, 1), index, top, bottom, left, right);
+	}
+	
+	protected void subtotalStyleTest(
+		final SubtotalBuilder<?, ?> subtotal, final int index, final Color foreColor,
+		final Color backColor, final String fontName, final Float fontSize, final Boolean bold, final Boolean italic)
+	{
+		this.styleTest(JasperTestUtils.getSubtotalName(subtotal, 1), index, foreColor, backColor, fontName,
+			fontSize, bold, italic);
+	}
+	
+	// group header title
+	protected void groupHeaderTitleStyleTest(
+		final GroupBuilder<?> group, final int index, final Color foreColor,
+		final Color backColor, final String fontName, final Float fontSize, final Boolean bold, final Boolean italic)
+	{
+		this.styleTest(JasperTestUtils.getHeaderTitleGroupName(group), index, foreColor, backColor, fontName,
+			fontSize, bold, italic);
+	}
+	
+	// group header
+	protected void groupHeaderStyleTest(
+		final GroupBuilder<?> group, final int index, final Color foreColor,
+		final Color backColor, final String fontName, final Float fontSize, final Boolean bold, final Boolean italic)
+	{
+		this.styleTest(JasperTestUtils.getHeaderGroupName(group), index, foreColor, backColor, fontName,
+			fontSize, bold, italic);
+	}
+	
+	protected void groupHeaderAlignmentTest(
+		final GroupBuilder<?> group, final int index,
+		final HorizontalTextAlignEnum horizontalAlignment)
+	{
+		this.horizontalAlignmentTest(JasperTestUtils.getHeaderGroupName(group), index, horizontalAlignment);
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperTest.java
new file mode 100644
index 0000000..082e59a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperTest.java
@@ -0,0 +1,253 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRPrintElement;
+import net.sf.jasperreports.engine.JRPrintFrame;
+import net.sf.jasperreports.engine.JRPrintPage;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.util.JRLoader;
+import net.sf.jasperreports.engine.util.JRSaver;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public abstract class AbstractJasperTest
+{
+	private JasperReportBuilder reportBuilder;
+	private JasperReport jasperReport;
+	private JasperPrint jasperPrint;
+	
+	@BeforeEach
+	public void init()
+	{
+		try
+		{
+			this.reportBuilder = DynamicReports.report();
+			this.configureReport(this.reportBuilder);
+			if(this.serializableTest())
+			{
+				this.reportBuilder = this.serializableReportTest(this.reportBuilder);
+				this.serializableParametersTest(this.reportBuilder.getJasperParameters());
+			}
+			final JRDataSource dataSource = this.createDataSource();
+			if(dataSource != null)
+			{
+				this.reportBuilder.setDataSource(dataSource);
+			}
+			this.build();
+			if(this.serializableJrPrintTest())
+			{
+				this.jasperPrint = this.serializableTest(this.jasperPrint);
+			}
+		}
+		catch(final Exception e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	protected void build() throws DRException
+	{
+		this.jasperReport = this.reportBuilder.toJasperReport();
+		this.jasperPrint = this.reportBuilder.toJasperPrint();
+	}
+	
+	@Test
+	public void test()
+	{
+	}
+	
+	protected boolean serializableTest()
+	{
+		return true;
+	}
+	
+	protected boolean serializableJrPrintTest()
+	{
+		return true;
+	}
+	
+	private JasperReportBuilder serializableReportTest(final JasperReportBuilder report)
+		throws IOException, ClassNotFoundException
+	{
+		final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		final ObjectOutputStream oos = new ObjectOutputStream(bos);
+		oos.writeObject(report);
+		oos.flush();
+		oos.close();
+		
+		final InputStream stream = new ByteArrayInputStream(bos.toByteArray());
+		final ObjectInputStream ois = new ObjectInputStream(stream);
+		return (JasperReportBuilder)ois.readObject();
+	}
+	
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> serializableParametersTest(final Map<String, Object> parameters)
+		throws IOException, ClassNotFoundException
+	{
+		final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		final ObjectOutputStream oos = new ObjectOutputStream(bos);
+		oos.writeObject(parameters);
+		oos.flush();
+		oos.close();
+		
+		final InputStream stream = new ByteArrayInputStream(bos.toByteArray());
+		final ObjectInputStream ois = new ObjectInputStream(stream);
+		return (Map<String, Object>)ois.readObject();
+	}
+	
+	private JasperPrint serializableTest(final JasperPrint jasperPrint) throws IOException, JRException
+	{
+		final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		JRSaver.saveObject(jasperPrint, bos);
+		bos.flush();
+		bos.close();
+		
+		final InputStream stream = new ByteArrayInputStream(bos.toByteArray());
+		return (JasperPrint)JRLoader.loadObject(stream);
+	}
+	
+	public JasperReportBuilder getReportBuilder()
+	{
+		return this.reportBuilder;
+	}
+	
+	public JasperReport getJasperReport()
+	{
+		return this.jasperReport;
+	}
+	
+	public JasperPrint getJasperPrint()
+	{
+		return this.jasperPrint;
+	}
+	
+	protected void numberOfPagesTest(final int expectedNumberOfPages)
+	{
+		Assertions.assertEquals(expectedNumberOfPages, this.getNumberOfPages());
+	}
+	
+	private int getNumberOfPages()
+	{
+		return this.jasperPrint.getPages().size();
+	}
+	
+	protected JRPrintElement getElementAt(final String key, final int index)
+	{
+		final List<JRPrintElement> elements = this.findElement(key);
+		if(elements.size() - 1 < index)
+		{
+			Assertions.fail("Element " + key + " at index " + index + " not found");
+			return null;
+		}
+		return elements.get(index);
+	}
+	
+	protected List<JRPrintElement> findElement(final String key)
+	{
+		final List<JRPrintElement> elements = new ArrayList<>();
+		for(
+			final Iterator<?> iterator = this.jasperPrint.getPages().iterator(); iterator.hasNext(); )
+		{
+			final JRPrintPage page = (JRPrintPage)iterator.next();
+			for(
+				final Iterator<?> iterator2 = page.getElements().iterator(); iterator2.hasNext(); )
+			{
+				final JRPrintElement element = (JRPrintElement)iterator2.next();
+				this.findElement(key, elements, element);
+			}
+		}
+		return elements;
+	}
+	
+	protected void findElement(final String key, final List<JRPrintElement> elements, final JRPrintElement element)
+	{
+		if(key.equals(element.getKey()))
+		{
+			elements.add(element);
+		}
+		if(element instanceof JRPrintFrame)
+		{
+			for(
+				final Iterator<?> iterator = ((JRPrintFrame)element).getElements().iterator(); iterator.hasNext(); )
+			{
+				final JRPrintElement element2 = (JRPrintElement)iterator.next();
+				this.findElement(key, elements, element2);
+			}
+		}
+	}
+	
+	protected void containsElement(final String key, final int pageIndex)
+	{
+		final List<JRPrintElement> elements = new ArrayList<>();
+		final JRPrintPage page = this.getJasperPrint().getPages().get(pageIndex);
+		for(
+			final Iterator<?> iterator = page.getElements().iterator(); iterator.hasNext(); )
+		{
+			final JRPrintElement element = (JRPrintElement)iterator.next();
+			this.findElement(key, elements, element);
+		}
+		if(elements.isEmpty())
+		{
+			Assertions.fail("Element " + key + " at page index " + pageIndex + " not found");
+		}
+	}
+	
+	protected Date toDate(final int year, final int month, final int day)
+	{
+		final Calendar c = Calendar.getInstance();
+		c.clear();
+		c.set(Calendar.YEAR, year);
+		c.set(Calendar.MONTH, month - 1);
+		c.set(Calendar.DAY_OF_MONTH, day);
+		return c.getTime();
+	}
+	
+	protected JRDataSource createDataSource()
+	{
+		return null;
+	}
+	
+	protected abstract void configureReport(JasperReportBuilder rb) throws DRException;
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperValueTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperValueTest.java
new file mode 100644
index 0000000..579756c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperValueTest.java
@@ -0,0 +1,252 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.BaseSubtotalBuilder;
+import net.sf.jasperreports.engine.DefaultJasperReportsContext;
+import net.sf.jasperreports.engine.JRPrintElement;
+import net.sf.jasperreports.engine.JRPrintText;
+import net.sf.jasperreports.engine.util.JRStyledTextUtil;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public abstract class AbstractJasperValueTest extends AbstractJasperTest
+{
+	
+	protected void elementCountTest(final String name, final int expectedNumberOfElements)
+	{
+		Assertions.assertEquals(expectedNumberOfElements, this.findElement(name).size());
+	}
+	
+	protected void elementValueTest(final String name, final int index, final String value)
+	{
+		Assertions.assertEquals(value, this.getElementValue(name, index));
+	}
+	
+	protected void elementFullValueTest(final String name, final int index, final String value)
+	{
+		Assertions.assertEquals(value, this.getElementFullValue(name, index));
+	}
+	
+	protected void elementValueTest(final String name, final String... values)
+	{
+		final List<JRPrintElement> elements = this.findElement(name);
+		Assertions.assertTrue(values.length <= elements.size());
+		for(int i = 0; i < values.length; i++)
+		{
+			final JRPrintText textElement = (JRPrintText)elements.get(i);
+			final String value =
+				JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(textElement);
+			Assertions.assertEquals(values[i], value);
+		}
+	}
+	
+	protected void elementFullValueTest(final String name, final String... values)
+	{
+		final List<JRPrintElement> elements = this.findElement(name);
+		Assertions.assertTrue(values.length <= elements.size());
+		for(int i = 0; i < values.length; i++)
+		{
+			final String value = ((JRPrintText)elements.get(i)).getFullText();
+			Assertions.assertEquals(values[i], value);
+		}
+	}
+	
+	private String getElementValue(final String key, final int index)
+	{
+		final JRPrintText textElement = (JRPrintText)this.getElementAt(key, index);
+		final String value =
+			JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(textElement);
+		return value;
+	}
+	
+	private String getElementFullValue(final String key, final int index)
+	{
+		return ((JRPrintText)this.getElementAt(key, index)).getFullText();
+	}
+	
+	// column detail
+	protected void columnDetailCountTest(final ColumnBuilder<?, ?> column, final int expectedNumberOfElements)
+	{
+		this.elementCountTest(JasperTestUtils.getColumnDetailName(column), expectedNumberOfElements);
+	}
+	
+	protected void columnDetailValueTest(final ColumnBuilder<?, ?> column, final int index, final String value)
+	{
+		this.elementValueTest(JasperTestUtils.getColumnDetailName(column), index, value);
+	}
+	
+	protected void columnDetailFullValueTest(final ColumnBuilder<?, ?> column, final int index, final String value)
+	{
+		this.elementFullValueTest(JasperTestUtils.getColumnDetailName(column), index, value);
+	}
+	
+	protected void columnDetailValueTest(final ColumnBuilder<?, ?> column, final String... values)
+	{
+		this.elementValueTest(JasperTestUtils.getColumnDetailName(column), values);
+	}
+	
+	protected void columnDetailAtPageIndexTest(final ColumnBuilder<?, ?> column, final int pageIndex)
+	{
+		this.containsElement(JasperTestUtils.getColumnDetailName(column), pageIndex);
+	}
+	
+	// column title
+	protected void columnTitleCountTest(final ColumnBuilder<?, ?> column, final int expectedNumberOfElements)
+	{
+		this.elementCountTest(JasperTestUtils.getColumnTitleName(column), expectedNumberOfElements);
+	}
+	
+	protected void columnTitleValueTest(final ColumnBuilder<?, ?> column, final int index, final String value)
+	{
+		this.elementValueTest(JasperTestUtils.getColumnTitleName(column), index, value);
+	}
+	
+	protected void columnTitleFullValueTest(final ColumnBuilder<?, ?> column, final int index, final String value)
+	{
+		this.elementFullValueTest(JasperTestUtils.getColumnTitleName(column), index, value);
+	}
+	
+	protected void columnTitleValueTest(final ColumnBuilder<?, ?> column, final String... values)
+	{
+		this.elementValueTest(JasperTestUtils.getColumnTitleName(column), values);
+	}
+	
+	// subtotal label
+	protected void subtotalLabelCountTest(final BaseSubtotalBuilder<?, ?> subtotal, final int expectedNumberOfElements)
+	{
+		this.elementCountTest(JasperTestUtils.getSubtotalLabelName(subtotal, 1), expectedNumberOfElements);
+	}
+	
+	protected void subtotalLabelValueTest(final BaseSubtotalBuilder<?, ?> subtotal, final int index,
+        final String value)
+	{
+		this.elementValueTest(JasperTestUtils.getSubtotalLabelName(subtotal, 1), index, value);
+	}
+	
+	protected void subtotalLabelValueTest(final BaseSubtotalBuilder<?, ?> subtotal, final String... values)
+	{
+		this.elementValueTest(JasperTestUtils.getSubtotalLabelName(subtotal, 1), values);
+	}
+	
+	protected void subtotalLabelIndexCountTest(
+		final BaseSubtotalBuilder<?, ?> subtotal,
+		final int subtotalIndex,
+		final int expectedNumberOfElements)
+	{
+		this.elementCountTest(JasperTestUtils.getSubtotalLabelName(subtotal, subtotalIndex), expectedNumberOfElements);
+	}
+	
+	protected void subtotalLabelIndexValueTest(
+		final BaseSubtotalBuilder<?, ?> subtotal,
+		final int subtotalIndex,
+		final int index,
+		final String value)
+	{
+		this.elementValueTest(JasperTestUtils.getSubtotalLabelName(subtotal, subtotalIndex), index, value);
+	}
+	
+	protected void subtotalLabelIndexValueTest(
+		final BaseSubtotalBuilder<?, ?> subtotal,
+		final int subtotalIndex,
+		final String... values)
+	{
+		this.elementValueTest(JasperTestUtils.getSubtotalLabelName(subtotal, subtotalIndex), values);
+	}
+	
+	// subtotal
+	protected void subtotalCountTest(final BaseSubtotalBuilder<?, ?> subtotal, final int expectedNumberOfElements)
+	{
+		this.elementCountTest(JasperTestUtils.getSubtotalName(subtotal, 1), expectedNumberOfElements);
+	}
+	
+	protected void subtotalValueTest(final BaseSubtotalBuilder<?, ?> subtotal, final int index, final String value)
+	{
+		this.elementValueTest(JasperTestUtils.getSubtotalName(subtotal, 1), index, value);
+	}
+	
+	protected void subtotalValueTest(final BaseSubtotalBuilder<?, ?> subtotal, final String... values)
+	{
+		this.elementValueTest(JasperTestUtils.getSubtotalName(subtotal, 1), values);
+	}
+	
+	protected void subtotalIndexCountTest(
+		final BaseSubtotalBuilder<?, ?> subtotal,
+		final int subtotalIndex,
+		final int expectedNumberOfElements)
+	{
+		this.elementCountTest(JasperTestUtils.getSubtotalName(subtotal, subtotalIndex), expectedNumberOfElements);
+	}
+	
+	protected void subtotalIndexValueTest(
+		final BaseSubtotalBuilder<?, ?> subtotal,
+		final int subtotalIndex,
+		final int index,
+		final String value)
+	{
+		this.elementValueTest(JasperTestUtils.getSubtotalName(subtotal, subtotalIndex), index, value);
+	}
+	
+	protected void subtotalIndexValueTest(
+		final BaseSubtotalBuilder<?, ?> subtotal,
+		final int subtotalIndex,
+		final String... values)
+	{
+		this.elementValueTest(JasperTestUtils.getSubtotalName(subtotal, subtotalIndex), values);
+	}
+	
+	// group header title
+	protected void groupHeaderTitleCountTest(final GroupBuilder<?> group, final int expectedNumberOfElements)
+	{
+		this.elementCountTest(JasperTestUtils.getHeaderTitleGroupName(group), expectedNumberOfElements);
+	}
+	
+	protected void groupHeaderTitleValueTest(final GroupBuilder<?> group, final int index, final String value)
+	{
+		this.elementValueTest(JasperTestUtils.getHeaderTitleGroupName(group), index, value);
+	}
+	
+	protected void groupHeaderTitleValueTest(final GroupBuilder<?> group, final String... values)
+	{
+		this.elementValueTest(JasperTestUtils.getHeaderTitleGroupName(group), values);
+	}
+	
+	// group header
+	protected void groupHeaderCountTest(final GroupBuilder<?> group, final int expectedNumberOfElements)
+	{
+		this.elementCountTest(JasperTestUtils.getHeaderGroupName(group), expectedNumberOfElements);
+	}
+	
+	protected void groupHeaderValueTest(final GroupBuilder<?> group, final int index, final String value)
+	{
+		this.elementValueTest(JasperTestUtils.getHeaderGroupName(group), index, value);
+	}
+	
+	protected void groupHeaderValueTest(final GroupBuilder<?> group, final String... values)
+	{
+		this.elementValueTest(JasperTestUtils.getHeaderGroupName(group), values);
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/JasperTestUtils.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/JasperTestUtils.java
new file mode 100644
index 0000000..fa1066d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/JasperTestUtils.java
@@ -0,0 +1,137 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.report.base.DRSubtotal;
+import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.group.GroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.BaseSubtotalBuilder;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class JasperTestUtils {
+
+    // column detail
+    public static String getColumnDetailName(ColumnBuilder<?, ?> column) {
+        return "detail.column_" + column.build().getName() + "1";
+    }
+
+    // column title
+    public static String getColumnTitleName(ColumnBuilder<?, ?> column) {
+        return "columnHeader.column_" + column.build().getName() + ".title1";
+    }
+
+    // subtotal
+    private static String getSubtotalName(BaseSubtotalBuilder<?, ?> subtotal) {
+        String band = null;
+        DRSubtotal<?> subtl = subtotal.getSubtotal();
+        switch (subtl.getPosition()) {
+            case TITLE:
+                band = "title";
+                break;
+            case PAGE_HEADER:
+                band = "pageHeader";
+                break;
+            case PAGE_FOOTER:
+                band = "pageFooter";
+                break;
+            case COLUMN_HEADER:
+                band = "columnHeader";
+                break;
+            case COLUMN_FOOTER:
+                band = "columnFooter";
+                break;
+            case GROUP_HEADER:
+            case FIRST_GROUP_HEADER:
+            case LAST_GROUP_HEADER:
+                band = "subtotalGroupHeader";
+                break;
+            case GROUP_FOOTER:
+            case FIRST_GROUP_FOOTER:
+            case LAST_GROUP_FOOTER:
+                band = "subtotalGroupFooter";
+                break;
+            case LAST_PAGE_FOOTER:
+                band = "lastPageFooter";
+                break;
+            case SUMMARY:
+                band = "summary";
+                break;
+            default:
+                Assertions.fail("Subtotal position " + subtl.getPosition().name() + " not found");
+                return null;
+        }
+        return band + ".column_" + subtl.getShowInColumn().getName() + ".subtotal";
+    }
+
+    public static String getSubtotalLabelName(BaseSubtotalBuilder<?, ?> subtotal, int subtotalIndex) {
+        return getSubtotalName(subtotal) + ".label" + subtotalIndex;
+    }
+
+    public static String getSubtotalName(BaseSubtotalBuilder<?, ?> subtotal, int subtotalIndex) {
+        return getSubtotalName(subtotal) + subtotalIndex;
+    }
+
+    // group header title
+    public static String getHeaderTitleGroupName(GroupBuilder<?> group) {
+        return "groupHeaderTitleAndValue.group_" + group.getGroup().getName() + ".title1";
+    }
+
+    // group header
+    public static String getHeaderGroupName(GroupBuilder<?> group) {
+        return "groupHeaderTitleAndValue.group_" + group.getGroup().getName() + "1";
+    }
+
+    // crosstab group header
+    public static String getCrosstabGroupHeaderName(AbstractCrosstabGroupBuilder<?, ?, ?> group) {
+        return "group_" + group.build().getName() + ".header1";
+    }
+
+    // crosstab group total header
+    public static String getCrosstabGroupTotalHeaderName(AbstractCrosstabGroupBuilder<?, ?, ?> group) {
+        return "group_" + group.build().getName() + ".totalheader1";
+    }
+
+    // crosstab group title header
+    public static String getCrosstabGroupTitleHeaderName(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure) {
+        return "group_" + group.build().getName() + ".titleheader." + measure.build().getName() + "1";
+    }
+
+    // crosstab group title total header
+    public static String getCrosstabGroupTitleTotalHeaderName(AbstractCrosstabGroupBuilder<?, ?, ?> group, CrosstabMeasureBuilder<?> measure) {
+        return "group_" + group.build().getName() + ".titletotalheader." + measure.build().getName() + "1";
+    }
+
+    // crosstab cell
+    public static String getCrosstabCellName(CrosstabMeasureBuilder<?> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup) {
+        String name = "cell_measure[" + measure.build().getName() + "]";
+        if (rowGroup != null) {
+            name += "_rowgroup[" + rowGroup.build().getName() + "]";
+        }
+        if (columnGroup != null) {
+            name += "_columngroup[" + columnGroup.build().getName() + "]";
+        }
+        return name + "1";
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn1Test.java
new file mode 100644
index 0000000..07f85fc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn1Test.java
@@ -0,0 +1,81 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRPrintImage;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BooleanColumn1Test extends AbstractJasperValueTest implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.setLocale(Locale.ENGLISH)
+			.columns(col.booleanColumn("field1").setComponentType(BooleanComponentType.TEXT_TRUE_FALSE),
+				col.booleanColumn("field1").setComponentType(BooleanComponentType.TEXT_YES_NO),
+				col.booleanColumn("field1")
+					.setComponentType(BooleanComponentType.TEXT_TRUE_FALSE)
+					.setEmptyWhenNullValue(true));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.elementCountTest("detail.column_field11", 3);
+        this.elementValueTest("detail.column_field11", "True", "False", "False");
+        
+        this.elementCountTest("detail.column_field12", 3);
+        this.elementValueTest("detail.column_field12", "Yes", "No", "No");
+        
+        this.elementCountTest("detail.column_field13", 3);
+        this.elementValueTest("detail.column_field13", "True", "False", "");
+        
+		Assertions.assertNull((((JRPrintImage)this.getElementAt("detail.column_field111", 2)).getRenderer()));
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add(true);
+		dataSource.add(false);
+		dataSource.add();
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn2Test.java
new file mode 100644
index 0000000..915d137
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn2Test.java
@@ -0,0 +1,80 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRPrintImage;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BooleanColumn2Test extends AbstractJasperValueTest implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.setLocale(Locale.ENGLISH)
+			.setTemplate(template().setBooleanEmptyWhenNullValue(true))
+			.columns(
+				col.booleanColumn("field1").setComponentType(BooleanComponentType.TEXT_TRUE_FALSE),
+				col.booleanColumn("field1")
+					.setComponentType(BooleanComponentType.TEXT_TRUE_FALSE)
+					.setEmptyWhenNullValue(false));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.elementCountTest("detail.column_field11", 3);
+        this.elementValueTest("detail.column_field11", "True", "False", "");
+        
+        this.elementCountTest("detail.column_field12", 3);
+        this.elementValueTest("detail.column_field12", "True", "False", "False");
+        
+		Assertions.assertNull((((JRPrintImage)this.getElementAt("detail.column_field13", 2)).getRenderer()));
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add(true);
+		dataSource.add(false);
+		dataSource.add();
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java
new file mode 100644
index 0000000..47b948d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BooleanColumnPosition1Test extends AbstractJasperPositionTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.columns(col.booleanColumn("field1").setComponentType(BooleanComponentType.TEXT_TRUE_FALSE),
+			col.booleanColumn("field1")
+				.setStyle(stl.style().setPadding(0)), col.column("field2", String.class).setFixedWidth(20));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        this.elementPositionTest("detail.column_field11", 0, 0, 0, 277, 38);
+        this.elementPositionTest("detail.column_field12", 0, 277, 0, 278, 38);
+        
+        this.elementPositionTest("detail.column_field11", 1, 0, 0, 277, 16);
+        this.elementPositionTest("detail.column_field12", 1, 277, 0, 278, 16);
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1", "field2");
+		dataSource.add(true, "11111");
+		dataSource.add(false, "");
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java
new file mode 100644
index 0000000..0d929e5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BooleanColumnPosition2Test extends AbstractJasperPositionTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.columns(col.booleanColumn("field1").setComponentType(BooleanComponentType.TEXT_TRUE_FALSE),
+			col.booleanColumn("field1"),
+			col.column("field2", String.class).setFixedWidth(20).setRows(3));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        this.elementPositionTest("detail.column_field11", 0, 0, 0, 277, 49);
+        this.elementPositionTest("detail.column_field12", 0, 277, 0, 278, 49);
+        
+        this.elementPositionTest("detail.column_field11", 1, 0, 0, 277, 39);
+        this.elementPositionTest("detail.column_field12", 1, 277, 0, 278, 39);
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1", "field2");
+		dataSource.add(true, "1111111");
+		dataSource.add(false, "");
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java
new file mode 100644
index 0000000..08219f3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.BooleanComponentType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BooleanColumnPosition3Test extends AbstractJasperPositionTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.columns(
+			col.booleanColumn("C1", "field1").setComponentType(BooleanComponentType.TEXT_TRUE_FALSE).setFixedWidth(100),
+			col.booleanColumn("C2", "field1").setFixedWidth(110).setFixedHeight(40));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.elementPositionTest("columnHeader.list1", 0, 10, 10, 210, 16);
+        this.elementPositionTest("columnHeader.column_field1.title1", 0, 0, 0, 100, 16);
+        this.elementPositionTest("columnHeader.column_field1.title2", 0, 100, 0, 110, 16);
+        
+        this.elementPositionTest("detail.list1", 0, 10, 26, 210, 40);
+        this.elementPositionTest("detail.column_field11", 0, 0, 0, 100, 40);
+        this.elementPositionTest("detail.column_field12", 0, 100, 0, 110, 40);
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add(true);
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java
new file mode 100644
index 0000000..7d69b3b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java
@@ -0,0 +1,67 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BooleanColumnPosition4Test extends AbstractJasperPositionTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.setColumnStyle(stl.style().setPadding(2))
+			.columns(
+				col.booleanColumn("1", "field1"),
+				col.booleanColumn("1", "field1"));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 16);
+        this.elementPositionTest("columnHeader.column_field1.title1", 0, 0, 0, 287, 16);
+        this.elementPositionTest("columnHeader.column_field1.title2", 0, 287, 0, 288, 16);
+        
+        this.elementPositionTest("detail.list1", 0, 10, 26, 575, 18);
+        this.elementPositionTest("detail.column_field11", 0, 0, 0, 287, 18);
+        this.elementPositionTest("detail.column_field12", 0, 287, 0, 288, 18);
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add(true);
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java
new file mode 100644
index 0000000..3ee9962
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java
@@ -0,0 +1,68 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BooleanColumnPosition5Test extends AbstractJasperPositionTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.setColumnStyle(stl.style().setPadding(2))
+			.highlightDetailEvenRows()
+			.columns(
+				col.booleanColumn("1", "field1"),
+				col.booleanColumn("1", "field1"));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 16);
+        this.elementPositionTest("columnHeader.column_field1.title1", 0, 0, 0, 287, 16);
+        this.elementPositionTest("columnHeader.column_field1.title2", 0, 287, 0, 288, 16);
+        
+        this.elementPositionTest("detail.list1", 0, 10, 26, 575, 18);
+        this.elementPositionTest("detail.column_field11", 0, 0, 0, 287, 18);
+        this.elementPositionTest("detail.column_field12", 0, 287, 0, 288, 18);
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add(true);
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column1Test.java
new file mode 100644
index 0000000..ec5b05d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column1Test.java
@@ -0,0 +1,137 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Column1Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<Date> column3;
+    private TextColumnBuilder<Double> column4;
+    private TextColumnBuilder<BigDecimal> column5;
+    private TextColumnBuilder<Double> column6;
+    private TextColumnBuilder<Object> column7;
+
+    private Date date = new Date();
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH)
+          .addField("field1", Integer.class)
+          .columns(column2 = col.column("Column2\nColumn2", "field2", String.class), column3 = col.column("Column3", "field3", Date.class).setPattern("dd.MM.yyyy"),
+                   column4 = col.column("Column4", "field4", Double.class).setPattern("#,###.00"),
+                   column5 = col.column("Column5", "field5", BigDecimal.class).setValueFormatter(new ColumnValueFormatter()),
+                   column6 = col.column("Column6", "field6", Double.class).setPattern(new PatternExpression()), column7 = col.column("Column7", field("field7", Date.class).build()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+        // column2
+        columnDetailCountTest(column2, 110);
+        columnDetailValueTest(column2, 50, "test");
+        columnTitleCountTest(column2, 3);
+        columnTitleValueTest(column2, "Column2\nColumn2", "Column2\nColumn2", "Column2\nColumn2");
+        // column3
+        columnDetailCountTest(column3, 110);
+        columnDetailValueTest(column3, 50, new SimpleDateFormat("dd.MM.yyyy").format(date));
+        columnTitleCountTest(column3, 3);
+        columnTitleValueTest(column3, "Column3", "Column3", "Column3");
+        // column4
+        columnDetailCountTest(column4, 110);
+        columnDetailValueTest(column4, 50, "1.00");
+        columnTitleCountTest(column4, 3);
+        columnTitleValueTest(column4, "Column4", "Column4", "Column4");
+        // column5
+        columnDetailCountTest(column5, 110);
+        columnDetailValueTest(column5, 50, "value = 10");
+        columnTitleCountTest(column5, 3);
+        columnTitleValueTest(column5, "Column5", "Column5", "Column5");
+        // column6
+        columnDetailCountTest(column6, 110);
+        columnDetailValueTest(column6, 0, "1.00");
+        columnDetailValueTest(column6, 1, "1.000");
+        columnDetailValueTest(column6, 2, "1.0000");
+        columnDetailValueTest(column6, 3, "1.0");
+        columnDetailValueTest(column6, 50, "1.0");
+        columnTitleCountTest(column6, 3);
+        columnTitleValueTest(column6, "Column6", "Column6", "Column6");
+        // column7
+        columnDetailCountTest(column7, 110);
+        columnDetailValueTest(column7, 50, new SimpleDateFormat("MM/dd/yyyy").format(date));
+        columnTitleCountTest(column7, 3);
+        columnTitleValueTest(column7, "Column7", "Column7", "Column7");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5", "field6", "field7");
+        for (int i = 0; i < 110; i++) {
+            dataSource.add(1, "test", date, 1d, new BigDecimal(10), 1d, date);
+        }
+        return dataSource;
+    }
+
+    private class ColumnValueFormatter extends AbstractValueFormatter<String, BigDecimal> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String format(BigDecimal value, ReportParameters reportParameters) {
+            return "value = " + value;
+        }
+    }
+
+    private class PatternExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            String pattern = "#,###.0";
+            Integer reportRowNumber = reportParameters.getReportRowNumber();
+            if (reportRowNumber < 4) {
+                for (int i = 0; i < reportRowNumber; i++) {
+                    pattern += "0";
+                }
+            }
+            return pattern;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column2Test.java
new file mode 100644
index 0000000..e14673b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column2Test.java
@@ -0,0 +1,99 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Column2Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<Integer> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<Integer> column3;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageColumnsPerPage(2)
+          .fields(field("field1", Integer.class))
+          .columns(column1 = col.reportRowNumberColumn("Column1").setWidth(50), column2 = col.pageRowNumberColumn("Column2").setWidth(50), column3 = col.columnRowNumberColumn("Column3").setWidth(50));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        List<String> rows = new ArrayList<String>();
+        for (int i = 0; i < 110; i++) {
+            rows.add(String.valueOf(i + 1));
+        }
+        List<String> pageRows = new ArrayList<String>();
+        for (int i = 0; i < 100; i++) {
+            pageRows.add(String.valueOf(i + 1));
+        }
+        for (int i = 0; i < 10; i++) {
+            pageRows.add(String.valueOf(i + 1));
+        }
+        List<String> columnRows = new ArrayList<String>();
+        for (int i = 0; i < 50; i++) {
+            columnRows.add(String.valueOf(i + 1));
+        }
+        for (int i = 0; i < 50; i++) {
+            columnRows.add(String.valueOf(i + 1));
+        }
+        for (int i = 0; i < 10; i++) {
+            columnRows.add(String.valueOf(i + 1));
+        }
+
+        numberOfPagesTest(2);
+        // column1
+        columnDetailCountTest(column1, 110);
+        columnDetailValueTest(column1, rows.toArray(new String[] {}));
+        columnTitleCountTest(column1, 3);
+        columnTitleValueTest(column1, "Column1", "Column1", "Column1");
+        // column2
+        columnDetailCountTest(column2, 110);
+        columnDetailValueTest(column2, pageRows.toArray(new String[] {}));
+        columnTitleCountTest(column2, 3);
+        columnTitleValueTest(column2, "Column2", "Column2", "Column2");
+        // column3
+        columnDetailCountTest(column3, 110);
+        columnDetailValueTest(column3, columnRows.toArray(new String[] {}));
+        columnTitleCountTest(column3, 3);
+        columnTitleValueTest(column3, "Column3", "Column3", "Column3");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 110; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column3Test.java
new file mode 100644
index 0000000..6302297
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column3Test.java
@@ -0,0 +1,126 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.datatype.DoubleType;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Column3Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Date> column2;
+    private TextColumnBuilder<Date> column3;
+    private TextColumnBuilder<Double> column4;
+    private TextColumnBuilder<BigDecimal> column5;
+    private TextColumnBuilder<Double> column6;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH)
+          .columnGrid(ListType.HORIZONTAL_FLOW)
+          .columns(column1 = col.column("Column1", "field1", type.stringType()), column2 = col.column("Column2", "field2", type.dateType()),
+                   column3 = col.column("Column3", "field3", type.dateYearToMinuteType()), column4 = col.column("Column4", "field4", type.doubleType()),
+                   column5 = col.column("Column5", "field5", type.bigDecimalType()), column6 = col.column("Column6", "field6", new CustomType()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // column2
+        columnDetailCountTest(column1, 10);
+        columnDetailValueTest(column1, 1, "test");
+        columnTitleCountTest(column1, 1);
+        columnTitleValueTest(column1, "Column1");
+        // column2
+        columnDetailCountTest(column2, 10);
+        columnDetailValueTest(column2, 1, new SimpleDateFormat(type.dateType().getPattern()).format(new Date()));
+        columnTitleCountTest(column2, 1);
+        columnTitleValueTest(column2, "Column2");
+        // column3
+        columnDetailCountTest(column3, 10);
+        columnDetailValueTest(column3, 1, new SimpleDateFormat(type.dateYearToMinuteType().getPattern()).format(new Date()));
+        columnTitleCountTest(column3, 1);
+        columnTitleValueTest(column3, "Column3");
+        // column4
+        columnDetailCountTest(column4, 10);
+        columnDetailValueTest(column4, 1, "1,000.1");
+        columnTitleCountTest(column4, 1);
+        columnTitleValueTest(column4, "Column4");
+        // column5
+        columnDetailCountTest(column5, 10);
+        columnDetailValueTest(column5, 1, "10.00");
+        columnTitleCountTest(column5, 1);
+        columnTitleValueTest(column5, "Column5");
+        // column6
+        columnDetailCountTest(column6, 10);
+        columnDetailValueTest(column6, 1, "value = 1.0");
+        columnTitleCountTest(column6, 1);
+        columnTitleValueTest(column6, "Column6");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5", "field6");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("test", new Date(), new Date(), 1000.1d, new BigDecimal(10), 1d);
+        }
+        return dataSource;
+    }
+
+    private class CustomType extends DoubleType {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public DRIValueFormatter<String, Double> getValueFormatter() {
+            return new ColumnValueFormatter();
+        }
+
+    }
+
+    private class ColumnValueFormatter extends AbstractValueFormatter<String, Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String format(Double value, ReportParameters reportParameters) {
+            return "value = " + value;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column4Test.java
new file mode 100644
index 0000000..162c7a7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column4Test.java
@@ -0,0 +1,74 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Column4Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", type.stringType()).setPrintRepeatedDetailValues(false).setPrintInFirstWholeBand(true),
+                   column2 = col.column("Column2", "field2", type.integerType()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+        // column1
+        columnDetailCountTest(column1, 3);
+        columnDetailValueTest(column1, "test1", "test2", "test2");
+        columnTitleCountTest(column1, 2);
+        columnTitleValueTest(column1, "Column1", "Column1");
+        // column2
+        columnDetailCountTest(column2, 60);
+        columnDetailValueTest(column2, 0, "0");
+        columnTitleCountTest(column2, 2);
+        columnTitleValueTest(column2, "Column2", "Column2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 30; i++) {
+            dataSource.add("test1", i);
+        }
+        for (int i = 0; i < 30; i++) {
+            dataSource.add("test2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnGridTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnGridTest.java
new file mode 100644
index 0000000..b9b2fc2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnGridTest.java
@@ -0,0 +1,80 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnGridTest extends AbstractJasperPositionTest {
+    private TextColumnBuilder<Integer> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<Integer> column3;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<Integer> subtotal3;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columnGrid(ListType.VERTICAL)
+          .columns(column1 = col.column("Column1", "field1", Integer.class), column2 = col.column("Column2", "field2", Integer.class), column3 = col.column("Column3", "field3", Integer.class))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column1), subtotal2 = sbt.sum(column2), subtotal3 = sbt.sum(column3));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnTitlePositionTest(column1, 0, 10, 10, 575, 16);
+        columnDetailPositionTest(column1, 0, 10, 58, 575, 16);
+        columnDetailPositionTest(column1, 1, 10, 106, 575, 16);
+        // column2
+        columnTitlePositionTest(column2, 0, 10, 26, 575, 16);
+        columnDetailPositionTest(column2, 0, 10, 74, 575, 16);
+        columnDetailPositionTest(column2, 1, 10, 122, 575, 16);
+        // column3
+        columnTitlePositionTest(column3, 0, 10, 42, 575, 16);
+        columnDetailPositionTest(column3, 0, 10, 90, 575, 16);
+        columnDetailPositionTest(column3, 1, 10, 138, 575, 16);
+        // subtotal
+        subtotalPositionTest(subtotal1, 0, 10, 154, 575, 16);
+        subtotalPositionTest(subtotal2, 0, 10, 170, 575, 16);
+        subtotalPositionTest(subtotal3, 0, 10, 186, 575, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add(1, 2, 3);
+        dataSource.add(1, 2, 3);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition1Test.java
new file mode 100644
index 0000000..7044b2d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition1Test.java
@@ -0,0 +1,79 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnPosition1Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<Integer> column3;
+    private TextColumnBuilder<Integer> column4;
+    private TextColumnBuilder<Integer> column5;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.addField("field1", type.integerType())
+          .columns(column2 = col.column("Very long Column2 title", "field2", String.class).setFixedWidth(70), column3 = col.column("Column3", "field3", Integer.class),
+                   column4 = col.column("Column4", "field4", Integer.class), column5 = col.column("Column5", "field5", Integer.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 26);
+        elementPositionTest("detail.list1", 0, 10, 36, 575, 16);
+        elementPositionTest("detail.list1", 1, 10, 52, 575, 26);
+
+        // column2
+        columnTitlePositionTest(column2, 0, 0, 0, 70, 26);
+        columnDetailPositionTest(column2, 0, 0, 0, 70, 16);
+        columnDetailPositionTest(column2, 1, 0, 0, 70, 26);
+        // column3
+        columnTitlePositionTest(column3, 0, 70, 0, 168, 26);
+        columnDetailPositionTest(column3, 0, 70, 0, 168, 16);
+        columnDetailPositionTest(column3, 1, 70, 0, 168, 26);
+        // column4
+        columnTitlePositionTest(column4, 0, 238, 0, 168, 26);
+        columnDetailPositionTest(column4, 0, 238, 0, 168, 16);
+        columnDetailPositionTest(column4, 1, 238, 0, 168, 26);
+        // column5
+        columnTitlePositionTest(column5, 0, 406, 0, 169, 26);
+        columnDetailPositionTest(column5, 0, 406, 0, 169, 16);
+        columnDetailPositionTest(column5, 1, 406, 0, 169, 26);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+        dataSource.add(1, "2", 3, 4, 5);
+        dataSource.add(1, "very very very long value 2", 3, 4, 5);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition2Test.java
new file mode 100644
index 0000000..cc02f59
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition2Test.java
@@ -0,0 +1,95 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnPosition2Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<Integer> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<Integer> column3;
+    private TextColumnBuilder<Integer> column4;
+    private TextColumnBuilder<Integer> column5;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", Integer.class), column2 = col.column("Very very very very very very long Column2 title", "field2", String.class),
+                   column3 = col.column("Column3", "field3", Integer.class), column4 = col.column("Column4", "field4", Integer.class).setWidth(50),
+                   column5 = col.column("Column5", "field5", Integer.class)).columnGrid(column1, grid.horizontalColumnGridList().add(column2, column3).newRow().add(column4, column5));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 42);
+        // elementPositionTest("columnHeader.list2", 0, 191, 0, 384, 42);
+        elementPositionTest("columnHeader.list3", 0, 191, 0, 384, 26);
+        elementPositionTest("columnHeader.list4", 0, 191, 26, 384, 16);
+
+        elementPositionTest("detail.list1", 0, 10, 52, 575, 32);
+        // elementPositionTest("detail.list2", 0, 191, 0, 384, 32);
+        elementPositionTest("detail.list3", 0, 191, 0, 384, 16);
+        elementPositionTest("detail.list4", 0, 191, 16, 384, 16);
+
+        elementPositionTest("detail.list1", 1, 10, 84, 575, 42);
+        // elementPositionTest("detail.list2", 1, 191, 0, 384, 42);
+        elementPositionTest("detail.list3", 1, 191, 0, 384, 26);
+        elementPositionTest("detail.list4", 1, 191, 26, 384, 16);
+
+        // column1
+        columnTitlePositionTest(column1, 0, 0, 0, 191, 42);
+        columnDetailPositionTest(column1, 0, 0, 0, 191, 32);
+        columnDetailPositionTest(column1, 1, 0, 0, 191, 42);
+        // column2
+        columnTitlePositionTest(column2, 0, 0, 0, 192, 26);
+        columnDetailPositionTest(column2, 0, 0, 0, 192, 16);
+        columnDetailPositionTest(column2, 1, 0, 0, 192, 26);
+        // column3
+        columnTitlePositionTest(column3, 0, 192, 0, 192, 26);
+        columnDetailPositionTest(column3, 0, 192, 0, 192, 16);
+        columnDetailPositionTest(column3, 1, 192, 0, 192, 26);
+        // column4
+        columnTitlePositionTest(column4, 0, 0, 0, 128, 16);
+        columnDetailPositionTest(column4, 0, 0, 0, 128, 16);
+        columnDetailPositionTest(column4, 1, 0, 0, 128, 16);
+        // column5
+        columnTitlePositionTest(column5, 0, 128, 0, 256, 16);
+        columnDetailPositionTest(column5, 0, 128, 0, 256, 16);
+        columnDetailPositionTest(column5, 1, 128, 0, 256, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+        dataSource.add(1, "2", 3, 4, 5);
+        dataSource.add(1, "very very very very very very very long value 2", 3, 4, 5);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java
new file mode 100644
index 0000000..082d12e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnTitleGroup1Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<String> column4;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("Column1", "field1", String.class);
+        column2 = col.column("Column2", "field2", String.class);
+        column3 = col.column("Column3", "field3", String.class);
+        column4 = col.column("Column4", "field4", String.class);
+
+        rb.columnGrid(column1, grid.titleGroup("Group1", column2, grid.titleGroup("Group2", column3, column4))).columns(column1, column2, column3, column4);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementValueTest("columnHeader.columngroup.title1", 0, "Group1");
+        elementValueTest("columnHeader.columngroup.title2", 0, "Group2");
+        // column1
+        columnTitleValueTest(column1, 0, "Column1");
+        columnDetailValueTest(column1, 0, "text");
+        // column2
+        columnTitleValueTest(column2, 0, "Column2");
+        columnDetailValueTest(column2, 0, "text");
+        // column3
+        columnTitleValueTest(column3, 0, "Column3");
+        columnDetailValueTest(column3, 0, "text");
+        // column4
+        columnTitleValueTest(column4, 0, "Column4");
+        columnDetailValueTest(column4, 0, "text");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("text", "text", "text", "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java
new file mode 100644
index 0000000..5951ad2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java
@@ -0,0 +1,74 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.constant.JasperProperty;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnTitleGroup2Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<String> column3;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("Column1", "field1", String.class);
+        column2 = col.column("Column2", "field2", String.class).setFixedWidth(25);
+        column3 = col.column("Column3", "field3", String.class).setFixedWidth(25);
+
+        ColumnTitleGroupBuilder titleGroup = grid.titleGroup("test test test", column2, column3).setTitleStretchWithOverflow(false).addTitleProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true");
+        rb.columnGrid(column1, titleGroup).columns(column1, column2, column3);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementValueTest("columnHeader.columngroup.title1", 0, "test test ");
+        elementFullValueTest("columnHeader.columngroup.title1", 0, "test test test");
+        // column1
+        columnTitleValueTest(column1, 0, "Column1");
+        columnDetailValueTest(column1, 0, "text");
+        // column2
+        columnTitleValueTest(column2, 0, "Column2");
+        columnDetailValueTest(column2, 0, "text");
+        // column3
+        columnTitleValueTest(column3, 0, "Column3");
+        columnDetailValueTest(column3, 0, "text");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("text", "text", "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java
new file mode 100644
index 0000000..bef9331
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java
@@ -0,0 +1,77 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.constant.JasperProperty;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * @author Ricardo Mariaca, Jan Moxter
+ */
+public class ColumnTitleGroup3Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<String> column3;
+
+    @Override
+    protected void configureReport(final JasperReportBuilder rb) {
+        column1 = col.column("Column1", "field1", String.class);
+        column2 = col.column("Column2", "field2", String.class).setFixedWidth(25);
+        column3 = col.column("Column3", "field3", String.class).setFixedWidth(25);
+
+        final ColumnTitleGroupBuilder titleGroup = grid.titleGroup("test test test", column2, column3)
+                        .setTitleTextAdjust(TextAdjust.CUT_TEXT)
+                        .addTitleProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true");
+        rb.columnGrid(column1, titleGroup).columns(column1, column2, column3);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementValueTest("columnHeader.columngroup.title1", 0, "test test ");
+        elementFullValueTest("columnHeader.columngroup.title1", 0, "test test test");
+        // column1
+        columnTitleValueTest(column1, 0, "Column1");
+        columnDetailValueTest(column1, 0, "text");
+        // column2
+        columnTitleValueTest(column2, 0, "Column2");
+        columnDetailValueTest(column2, 0, "text");
+        // column3
+        columnTitleValueTest(column3, 0, "Column3");
+        columnDetailValueTest(column3, 0, "text");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        final DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("text", "text", "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java
new file mode 100644
index 0000000..637a945
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java
@@ -0,0 +1,86 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnTitleGroupPosition1Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<Integer> column3;
+    private TextColumnBuilder<String> column4;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("Column1", "field1", String.class);
+        column2 = col.column("Column2", "field2", String.class);
+        column3 = col.column("Column3", "field3", Integer.class);
+        column4 = col.column("Column4", "field4", String.class);
+
+        rb.columnGrid(column1, grid.titleGroup("Group1", column2, grid.titleGroup("group2", column3, column4)))
+          .columns(column1, column2, column3, column4)
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column3));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 48);
+        elementPositionTest("columnHeader.list3", 0, 143, 16, 432, 32);
+        elementPositionTest("columnHeader.list5", 0, 144, 16, 288, 16);
+        elementPositionTest("columnHeader.columngroup.title1", 0, 143, 0, 432, 16);
+        elementPositionTest("columnHeader.columngroup.title2", 0, 144, 0, 288, 16);
+        // column1
+        columnTitlePositionTest(column1, 0, 0, 0, 143, 48);
+        columnDetailPositionTest(column1, 0, 0, 0, 143, 26);
+        // column2
+        columnTitlePositionTest(column2, 0, 0, 0, 144, 32);
+        columnDetailPositionTest(column2, 0, 143, 0, 144, 26);
+        // column3
+        columnTitlePositionTest(column3, 0, 0, 0, 144, 16);
+        columnDetailPositionTest(column3, 0, 287, 0, 144, 26);
+        // column4
+        columnTitlePositionTest(column4, 0, 144, 0, 144, 16);
+        columnDetailPositionTest(column4, 0, 431, 0, 144, 26);
+        // subtotal
+        subtotalPositionTest(subtotal1, 0, 287, 0, 144, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("text", "text text text text text text text text", 1, "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java
new file mode 100644
index 0000000..52f6341
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java
@@ -0,0 +1,77 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnTitleGroupPosition2Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<String> column3;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("Column1", "field1", String.class);
+        column2 = col.column("Column2", "field2", Integer.class);
+        column3 = col.column("Column3", "field3", String.class).setFixedWidth(50);
+
+        rb.columnGrid(column1, grid.titleGroup("Group1", column2, column3)).columns(column1, column2, column3).subtotalsAtSummary(subtotal1 = sbt.sum(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 32);
+        elementPositionTest("columnHeader.list3", 0, 230, 16, 345, 16);
+        elementPositionTest("columnHeader.columngroup.title1", 0, 230, 0, 345, 16);
+        // column1
+        columnTitlePositionTest(column1, 0, 0, 0, 230, 32);
+        columnDetailPositionTest(column1, 0, 0, 0, 230, 16);
+        // column2
+        columnTitlePositionTest(column2, 0, 0, 0, 295, 16);
+        columnDetailPositionTest(column2, 0, 230, 0, 295, 16);
+        // column3
+        columnTitlePositionTest(column3, 0, 295, 0, 50, 16);
+        columnDetailPositionTest(column3, 0, 525, 0, 50, 16);
+        // subtotal
+        subtotalPositionTest(subtotal1, 0, 230, 0, 295, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("text", 1, "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java
new file mode 100644
index 0000000..eadf186
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java
@@ -0,0 +1,77 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnTitleGroupPosition3Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<String> column3;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("Col1", "field1", String.class);
+        column2 = col.column("Col2", "field2", Integer.class).setFixedWidth(40);
+        column3 = col.column("Col3", "field3", String.class).setFixedWidth(40);
+
+        rb.columnGrid(column1, grid.titleGroup("Group1", column2, column3)).columns(column1, column2, column3).subtotalsAtSummary(subtotal1 = sbt.sum(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 32);
+        elementPositionTest("columnHeader.list3", 0, 495, 16, 80, 16);
+        elementPositionTest("columnHeader.columngroup.title1", 0, 495, 0, 80, 16);
+        // column1
+        columnTitlePositionTest(column1, 0, 0, 0, 495, 32);
+        columnDetailPositionTest(column1, 0, 0, 0, 495, 16);
+        // column2
+        columnTitlePositionTest(column2, 0, 0, 0, 40, 16);
+        columnDetailPositionTest(column2, 0, 495, 0, 40, 16);
+        // column3
+        columnTitlePositionTest(column3, 0, 40, 0, 40, 16);
+        columnDetailPositionTest(column3, 0, 535, 0, 40, 16);
+        // subtotal
+        subtotalPositionTest(subtotal1, 0, 495, 0, 40, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("text", 1, "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java
new file mode 100644
index 0000000..d261cd0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java
@@ -0,0 +1,91 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnTitleGroupPosition4Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<String> column4;
+    private TextColumnBuilder<String> column5;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("Col1", "field1", String.class);
+        column2 = col.column("Col2", "field2", Integer.class);
+        column3 = col.column("Col3", "field3", String.class);
+        column4 = col.column("Col4", "field4", String.class);
+        column5 = col.column("Col5", "field5", String.class);
+
+        rb.columnGrid(column1, grid.titleGroup("Group1", column2, column3).setTitleFixedWidth(400), grid.titleGroup("Group2", column4, column5).setTitleFixedWidth(80))
+          .columns(column1, column2, column3, column4, column5)
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 32);
+        elementPositionTest("columnHeader.list3", 0, 95, 16, 400, 16);
+        elementPositionTest("columnHeader.list5", 0, 495, 16, 80, 16);
+        elementPositionTest("columnHeader.columngroup.title1", 0, 95, 0, 400, 16);
+        elementPositionTest("columnHeader.columngroup.title2", 0, 495, 0, 80, 16);
+        // column1
+        columnTitlePositionTest(column1, 0, 0, 0, 95, 32);
+        columnDetailPositionTest(column1, 0, 0, 0, 95, 16);
+        // column2
+        columnTitlePositionTest(column2, 0, 0, 0, 200, 16);
+        columnDetailPositionTest(column2, 0, 95, 0, 200, 16);
+        // column3
+        columnTitlePositionTest(column3, 0, 200, 0, 200, 16);
+        columnDetailPositionTest(column3, 0, 295, 0, 200, 16);
+        // column4
+        columnTitlePositionTest(column4, 0, 0, 0, 40, 16);
+        columnDetailPositionTest(column4, 0, 495, 0, 40, 16);
+        // column5
+        columnTitlePositionTest(column5, 0, 40, 0, 40, 16);
+        columnDetailPositionTest(column5, 0, 535, 0, 40, 16);
+        // subtotal
+        subtotalPositionTest(subtotal1, 0, 95, 0, 200, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+        dataSource.add("text", 1, "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java
new file mode 100644
index 0000000..e8812ad
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java
@@ -0,0 +1,88 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnTitleGroupPosition5Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<String> column4;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("Col1", "field1", String.class);
+        column2 = col.column("Col2", "field2", Integer.class);
+        column3 = col.column("Col3", "field3", String.class).setFixedWidth(50);
+        column4 = col.column("Col4", "field4", String.class);
+
+        ColumnTitleGroupBuilder titleGroup2 = grid.titleGroup("Group 2", column3, column4).setTitleFixedWidth(150);
+        ColumnTitleGroupBuilder titleGroup1 = grid.titleGroup("Group 1", column2, titleGroup2).setTitleFixedWidth(300);
+
+        rb.columnGrid(column1, titleGroup1).columns(column1, column2, column3, column4).subtotalsAtSummary(subtotal1 = sbt.sum(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 48);
+        elementPositionTest("columnHeader.list3", 0, 275, 16, 300, 32);
+        elementPositionTest("columnHeader.list5", 0, 150, 16, 150, 16);
+        elementPositionTest("columnHeader.columngroup.title1", 0, 275, 0, 300, 16);
+        elementPositionTest("columnHeader.columngroup.title2", 0, 150, 0, 150, 16);
+        // column1
+        columnTitlePositionTest(column1, 0, 0, 0, 275, 48);
+        columnDetailPositionTest(column1, 0, 0, 0, 275, 16);
+        // column2
+        columnTitlePositionTest(column2, 0, 0, 0, 150, 32);
+        columnDetailPositionTest(column2, 0, 275, 0, 150, 16);
+        // column3
+        columnTitlePositionTest(column3, 0, 0, 0, 50, 16);
+        columnDetailPositionTest(column3, 0, 425, 0, 50, 16);
+        // column4
+        columnTitlePositionTest(column4, 0, 50, 0, 100, 16);
+        columnDetailPositionTest(column4, 0, 475, 0, 100, 16);
+        // subtotal
+        subtotalPositionTest(subtotal1, 0, 275, 0, 150, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("text", 1, "text", "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java
new file mode 100644
index 0000000..925aa5e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnTitleGroupPosition6Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<String> column4;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("field1", String.class);
+        column2 = col.column("field2", Integer.class);
+        column3 = col.column("field3", String.class).setFixedWidth(50);
+        column4 = col.column("field4", String.class);
+
+        rb.columnGrid(column1, grid.titleGroup("Group 1", column2), grid.titleGroup("Group 2", column3, column4)).columns(column1, column2, column3, column4);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 16);
+        elementPositionTest("columnHeader.columngroup.title1", 0, 164, 0, 164, 16);
+        elementPositionTest("columnHeader.columngroup.title2", 0, 328, 0, 247, 16);
+        // column1
+        columnDetailPositionTest(column1, 0, 0, 0, 164, 16);
+        // column2
+        columnDetailPositionTest(column2, 0, 164, 0, 164, 16);
+        // column3
+        columnDetailPositionTest(column3, 0, 328, 0, 50, 16);
+        // column4
+        columnDetailPositionTest(column4, 0, 378, 0, 197, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("text", 1, "text", "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java
new file mode 100644
index 0000000..7c001fd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java
@@ -0,0 +1,97 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.ComponentColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ComponentColumnPositionTest extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private ComponentColumnBuilder column3;
+    private CustomSubtotalBuilder<String> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", type.stringType()), col.componentColumn(cmp.filler().setFixedWidth(5)), col.componentColumn(cmp.filler()).setFixedWidth(5),
+                   column3 = col.componentColumn("Column3", cmp.verticalList(cmp.horizontalList(cmp.text("aa"), cmp.text("cc")), cmp.text("aa"))))
+          .subtotalsAtSummary(subtotal1 = sbt.customValue(exp.text("subtotal"), column3));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 16);
+        elementPositionTest("detail.list1", 0, 10, 26, 575, 32);
+        elementPositionTest("detail.list1", 1, 10, 58, 575, 32);
+
+        // column1
+        columnTitlePositionTest(column1, 0, 0, 0, 188, 16);
+        columnDetailPositionTest(column1, 0, 0, 0, 188, 32);
+        columnDetailPositionTest(column1, 1, 0, 0, 188, 32);
+
+        // column3
+        columnTitlePositionTest(column3, 0, 198, 0, 377, 16);
+        // columnDetailPositionTest(column3, 0, 198, 0, 377, 32);
+        // columnDetailPositionTest(column3, 1, 198, 0, 377, 32);
+
+        elementPositionTest("detail.list2", 0, 198, 0, 377, 16);
+        elementPositionTest("detail.list2", 1, 198, 0, 377, 16);
+
+        elementPositionTest("detail.textField1", 0, 0, 0, 188, 16);
+        elementPositionTest("detail.textField1", 1, 0, 0, 188, 16);
+
+        elementPositionTest("detail.textField2", 0, 188, 0, 189, 16);
+        elementPositionTest("detail.textField2", 1, 188, 0, 189, 16);
+
+        elementPositionTest("detail.textField3", 0, 198, 16, 377, 16);
+        elementPositionTest("detail.textField3", 1, 198, 16, 377, 16);
+
+        // summary
+        elementPositionTest("summary.list1", 0, 10, 90, 575, 16);
+        subtotalPositionTest(subtotal1, 0, 198, 0, 377, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("test");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/EmptyColumnTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/EmptyColumnTest.java
new file mode 100644
index 0000000..709d868
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/EmptyColumnTest.java
@@ -0,0 +1,101 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class EmptyColumnTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<String> column4;
+    private TextColumnBuilder<String> column5;
+    private TextColumnBuilder<String> column6;
+    private TextColumnBuilder<String> column7;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", String.class), column2 = col.emptyColumn(), column3 = col.column("Column3", "field3", String.class),
+                   column4 = col.emptyColumn(false, true), column5 = col.emptyColumn(true, false), column6 = col.emptyColumn(true, true), column7 = col.column("Column7", "field7", String.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnDetailCountTest(column1, 1);
+        columnDetailValueTest(column1, "test1");
+        columnTitleCountTest(column1, 1);
+        columnTitleValueTest(column1, "Column1");
+
+        // column2
+        columnDetailCountTest(column2, 0);
+        columnTitleCountTest(column2, 0);
+
+        // column3
+        columnDetailCountTest(column3, 1);
+        columnDetailValueTest(column3, "test3");
+        columnTitleCountTest(column3, 1);
+        columnTitleValueTest(column3, "Column3");
+
+        // column4
+        columnDetailCountTest(column4, 1);
+        columnDetailValueTest(column4, "");
+        columnTitleCountTest(column4, 0);
+
+        // column5
+        columnDetailCountTest(column5, 0);
+        columnTitleCountTest(column5, 1);
+        columnTitleValueTest(column5, "");
+
+        // column6
+        columnDetailCountTest(column6, 1);
+        columnDetailValueTest(column6, "");
+        columnTitleCountTest(column6, 1);
+        columnTitleValueTest(column6, "");
+
+        // column7
+        columnDetailCountTest(column7, 1);
+        columnDetailValueTest(column7, "test7");
+        columnTitleCountTest(column7, 1);
+        columnTitleValueTest(column7, "Column7");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5", "field6", "field7");
+        dataSource.add("test1", "test2", "test3", "test4", "test5", "test6", "test7");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ExpressionColumnTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ExpressionColumnTest.java
new file mode 100644
index 0000000..863deb4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ExpressionColumnTest.java
@@ -0,0 +1,137 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ExpressionColumnTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private FieldBuilder<Double> field1;
+    private TextColumnBuilder<Double> column2;
+    private TextColumnBuilder<Double> expression1;
+    private TextColumnBuilder<BigDecimal> calcExpression1;
+    private TextColumnBuilder<BigDecimal> calcExpression2;
+    private TextColumnBuilder<BigDecimal> calcExpression3;
+    private TextColumnBuilder<BigDecimal> calcExpression4;
+    private TextColumnBuilder<BigDecimal> calcExpression5;
+    private TextColumnBuilder<BigDecimal> calcExpression6;
+    private TextColumnBuilder<BigDecimal> calcExpression7;
+    private TextColumnBuilder<BigDecimal> calcExpression8;
+    private TextColumnBuilder<Double> expression2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH)
+          .fields(field1 = field("field1", Double.class))
+          .columns(column2 = col.column("Column2", "field2", Double.class).setValueFormatter(new ColumnValueFormatter()), expression1 = col.column("Expression", new ValueExpression1()),
+                   calcExpression1 = expression1.multiply(column2), calcExpression2 = calcExpression1.multiply(5), calcExpression3 = calcExpression2.subtract(calcExpression1),
+                   calcExpression4 = calcExpression3.subtract(5), calcExpression5 = calcExpression4.add(calcExpression1), calcExpression6 = calcExpression5.add(5),
+                   calcExpression7 = calcExpression6.divide(2, expression1), calcExpression8 = calcExpression7.divide(2, 3), expression2 = col.column("Expression", new ValueExpression2()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // column2
+        columnDetailCountTest(column2, 3);
+        columnDetailValueTest(column2, "value = 4.0", "value = 5.0", "value = 6.0");
+        // expression
+        columnDetailCountTest(expression1, 3);
+        columnDetailValueTest(expression1, "5.0", "7.0", "9.0");
+        columnDetailCountTest(expression2, 3);
+        columnDetailValueTest(expression2, "11.67", "15.33", "19.0");
+        // calcExpression
+        columnDetailCountTest(calcExpression1, 3);
+        columnDetailValueTest(calcExpression1, "20.00", "35.00", "54.00");
+        columnDetailCountTest(calcExpression2, 3);
+        columnDetailValueTest(calcExpression2, "100.00", "175.00", "270.00");
+        columnDetailCountTest(calcExpression3, 3);
+        columnDetailValueTest(calcExpression3, "80.00", "140.00", "216.00");
+        columnDetailCountTest(calcExpression4, 3);
+        columnDetailValueTest(calcExpression4, "75.00", "135.00", "211.00");
+        columnDetailCountTest(calcExpression5, 3);
+        columnDetailValueTest(calcExpression5, "95.00", "170.00", "265.00");
+        columnDetailCountTest(calcExpression6, 3);
+        columnDetailValueTest(calcExpression6, "100.00", "175.00", "270.00");
+        columnDetailCountTest(calcExpression7, 3);
+        columnDetailValueTest(calcExpression7, "20.00", "25.00", "30.00");
+        columnDetailCountTest(calcExpression8, 3);
+        columnDetailValueTest(calcExpression8, "6.67", "8.33", "10.00");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        dataSource.add(1d, 4d);
+        dataSource.add(2d, 5d);
+        dataSource.add(3d, 6d);
+        return dataSource;
+    }
+
+    private class ValueExpression1 extends AbstractSimpleExpression<Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Double evaluate(ReportParameters reportParameters) {
+            double f1 = reportParameters.getValue(field1);
+            double f2 = reportParameters.getValue(column2);
+            return f1 + f2;
+        }
+    }
+
+    private class ValueExpression2 extends AbstractSimpleExpression<Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Double evaluate(ReportParameters reportParameters) {
+            double f1 = reportParameters.getValue(expression1);
+            double f2 = reportParameters.getValue(calcExpression8).doubleValue();
+            return f1 + f2;
+        }
+    }
+
+    private class ColumnValueFormatter extends AbstractValueFormatter<String, Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String format(Double value, ReportParameters reportParameters) {
+            return "value = " + value;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/PercentageColumnTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/PercentageColumnTest.java
new file mode 100644
index 0000000..cafd389
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/PercentageColumnTest.java
@@ -0,0 +1,90 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.column;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.builder.column.PercentageColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PercentageColumnTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private PercentageColumnBuilder percentage1;
+    private PercentageColumnBuilder percentage2;
+    private PercentageColumnBuilder percentage3;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<Integer> column2;
+
+        rb.setLocale(Locale.ENGLISH)
+          .fields(field("field1", Integer.class))
+          .columns(column2 = col.column("field2", Integer.class), percentage1 = col.percentageColumn("field1", Integer.class), percentage2 = col.percentageColumn(column2),
+                   percentage3 = col.percentageColumn("field3", Integer.class).setValueFormatter(new ColumnValueFormatter()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // percentage1
+        columnDetailCountTest(percentage1, 3);
+        columnDetailValueTest(percentage1, "16.67%", "33.33%", "50.00%");
+        // percentage2
+        columnDetailCountTest(percentage2, 3);
+        columnDetailValueTest(percentage2, "26.67%", "33.33%", "40.00%");
+        // percentage3
+        columnDetailCountTest(percentage3, 3);
+        columnDetailValueTest(percentage3, "value = 29.17%", "value = 33.33%", "value = 37.50%");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add(1, 4, 7);
+        dataSource.add(2, 5, 8);
+        dataSource.add(3, 6, 9);
+        return dataSource;
+    }
+
+    private class ColumnValueFormatter extends AbstractValueFormatter<String, Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String format(Double value, ReportParameters reportParameters) {
+            return "value = " + new DecimalFormat("#,##0.00%", new DecimalFormatSymbols(Locale.ENGLISH)).format(value);
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/BreakTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/BreakTest.java
new file mode 100644
index 0000000..315a2be
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/BreakTest.java
@@ -0,0 +1,82 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BreakTest extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageColumnsPerPage(2)
+          .columns(col.componentColumn("Column1",
+                                       cmp.verticalList(cmp.text("value"), cmp.pageBreak().setPrintWhenExpression(new Expression1()), cmp.columnBreak().setPrintWhenExpression(new Expression2()))))
+          .title(cmp.text("text1"), cmp.pageBreak(), cmp.text("text1"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 575, 16);
+        elementPositionTest("title.textField2", 0, 10, 10, 575, 16);
+        elementPositionTest("detail.textField1", 0, 10, 42, 287, 16);
+        elementPositionTest("detail.textField1", 1, 10, 26, 287, 16);
+        elementPositionTest("detail.textField1", 2, 297, 26, 287, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(3);
+    }
+
+    public class Expression1 extends AbstractSimpleExpression<Boolean> {
+        private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+        @Override
+        public Boolean evaluate(ReportParameters reportParameters) {
+            return reportParameters.getReportRowNumber() == 1;
+        }
+    }
+
+    public class Expression2 extends AbstractSimpleExpression<Boolean> {
+        private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+
+        @Override
+        public Boolean evaluate(ReportParameters reportParameters) {
+            return reportParameters.getReportRowNumber() == 2;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component1Test.java
new file mode 100644
index 0000000..4a2c6d6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component1Test.java
@@ -0,0 +1,97 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Component1Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH)
+          .columns(col.column("Column1", "field1", Integer.class))
+          .pageFooter(cmp.pageXofY(), cmp.pageXslashY(), cmp.currentDate().setPattern("dd.MM.yyyy"), cmp.totalPages(), cmp.pageNumber(), cmp.totalPages().setFormatExpression("total pages {0}"),
+                      cmp.pageNumber().setFormatExpression("page number {0}"), cmp.currentDate().setFormatExpression("current date {0}"),
+                      cmp.currentDate().setFormatExpression("current date {0}").setPattern("dd.MM.yyyy"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+        elementCountTest("pageFooter.textField1", 3);
+        elementValueTest("pageFooter.textField1", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField2", 3);
+        elementValueTest("pageFooter.textField2", " of 3", " of 3", " of 3");
+
+        elementCountTest("pageFooter.textField3", 3);
+        elementValueTest("pageFooter.textField3", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField4", 3);
+        elementValueTest("pageFooter.textField4", "/3", "/3", "/3");
+
+        elementCountTest("pageFooter.textField5", 3);
+        String date = new SimpleDateFormat("dd.MM.yyyy").format(new Date());
+        elementValueTest("pageFooter.textField5", date, date, date);
+
+        elementCountTest("pageFooter.textField6", 3);
+        elementValueTest("pageFooter.textField6", "3", "3", "3");
+
+        elementCountTest("pageFooter.textField7", 3);
+        elementValueTest("pageFooter.textField7", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField8", 3);
+        elementValueTest("pageFooter.textField8", "total pages 3", "total pages 3", "total pages 3");
+
+        elementCountTest("pageFooter.textField9", 3);
+        elementValueTest("pageFooter.textField9", "page number 1", "page number 2", "page number 3");
+
+        elementCountTest("pageFooter.textField10", 3);
+        date = type.dateType().valueToString(new Date(), Locale.ENGLISH);
+        elementValueTest("pageFooter.textField10", "current date " + date, "current date " + date, "current date " + date);
+
+        elementCountTest("pageFooter.textField11", 3);
+        date = new SimpleDateFormat("dd.MM.yyyy").format(new Date());
+        elementValueTest("pageFooter.textField11", "current date " + date, "current date " + date, "current date " + date);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 100; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component2Test.java
new file mode 100644
index 0000000..85594b1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component2Test.java
@@ -0,0 +1,99 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.LineDirection;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRPrintLine;
+import net.sf.jasperreports.engine.JRPrintRectangle;
+import net.sf.jasperreports.engine.type.LineDirectionEnum;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Component2Test extends AbstractJasperPositionTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.title(cmp.horizontalList(cmp.line(), cmp.filler().setFixedWidth(10), cmp.line()),
+			cmp.horizontalList(
+				cmp.line().setFixedDimension(1, 50),
+				cmp.line().setDirection(LineDirection.TOP_DOWN),
+				cmp.line().setDirection(LineDirection.BOTTOM_UP)),
+			cmp.ellipse(),
+			cmp.rectangle(),
+			cmp.roundRectangle(),
+			cmp.roundRectangle(20),
+			cmp.verticalGap(30),
+			cmp.horizontalList(cmp.text(""), cmp.horizontalGap(10), cmp.text("")),
+			cmp.centerHorizontal(cmp.text("").setFixedWidth(50)),
+			cmp.centerHorizontal(cmp.text("").setFixedWidth(50)).setFixedWidth(250),
+			cmp.horizontalList(cmp.centerVertical(cmp.text("").setFixedRows(1)), cmp.text("").setFixedRows(3)),
+			cmp.centerVertical(cmp.text("").setFixedRows(1)).setFixedHeight(50));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.elementPositionTest("title.line1", 0, 0, 0, 282, 1);
+        this.elementPositionTest("title.line2", 0, 292, 0, 283, 1);
+        this.elementPositionTest("title.line3", 0, 0, 0, 1, 50);
+        this.elementPositionTest("title.line4", 0, 1, 0, 287, 50);
+        this.elementPositionTest("title.line5", 0, 288, 0, 287, 50);
+		
+		JRPrintLine line = (JRPrintLine)this.getElementAt("title.line4", 0);
+		Assertions.assertEquals(LineDirectionEnum.TOP_DOWN, line.getDirectionValue());
+		line = (JRPrintLine)this.getElementAt("title.line5", 0);
+		Assertions.assertEquals(LineDirectionEnum.BOTTOM_UP, line.getDirectionValue());
+        
+        this.elementPositionTest("title.ellipse1", 0, 10, 61, 575, 100);
+        this.elementPositionTest("title.rectangle1", 0, 10, 161, 575, 100);
+        this.elementPositionTest("title.rectangle2", 0, 10, 261, 575, 100);
+        this.elementPositionTest("title.rectangle3", 0, 10, 361, 575, 100);
+		
+		JRPrintRectangle rectangle = (JRPrintRectangle)this.getElementAt("title.rectangle1", 0);
+		Assertions.assertEquals(0, rectangle.getRadius());
+		rectangle = (JRPrintRectangle)this.getElementAt("title.rectangle2", 0);
+		Assertions.assertEquals(10, rectangle.getRadius());
+		rectangle = (JRPrintRectangle)this.getElementAt("title.rectangle3", 0);
+		Assertions.assertEquals(20, rectangle.getRadius());
+        
+        this.elementPositionTest("title.list4", 0, 10, 491, 575, 16);
+        this.elementPositionTest("title.textField1", 0, 0, 0, 282, 16);
+        this.elementPositionTest("title.textField2", 0, 292, 0, 283, 16);
+        
+        this.elementPositionTest("title.textField3", 0, 262, 0, 50, 16);
+        this.elementPositionTest("title.textField4", 0, 100, 0, 50, 16);
+        
+        this.elementPositionTest("title.textField5", 0, 0, 11, 287, 16);
+        this.elementPositionTest("title.textField6", 0, 287, 0, 288, 39);
+        this.elementPositionTest("title.textField7", 0, 10, 595, 575, 16);
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component3Test.java
new file mode 100644
index 0000000..bb43f31
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component3Test.java
@@ -0,0 +1,86 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
+import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
+import net.sf.dynamicreports.report.constant.ComponentPositionType;
+import net.sf.dynamicreports.report.constant.StretchType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRElement;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+import net.sf.jasperreports.engine.type.PositionTypeEnum;
+import net.sf.jasperreports.engine.type.StretchTypeEnum;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Component3Test extends AbstractJasperTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final CustomGroupBuilder group = grp.group("group1", exp.text(""));
+		
+		final TextFieldBuilder<String> textField = cmp.text("")
+			.setPositionType(ComponentPositionType.FIX_RELATIVE_TO_TOP)
+			.setStretchType(StretchType.NO_STRETCH)
+			.setPrintInFirstWholeBand(true)
+			.setPrintWhenDetailOverflows(true)
+			.setPrintWhenGroupChanges(group);
+		rb.title(textField)
+			.columns(col.column("column1", type.stringType()).setPrintWhenDetailOverflows(true))
+			.groupBy(group);
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+		
+		JRElement textField = this.getJasperReport().getTitle().getElementByKey("title.textField1");
+		Assertions.assertEquals(PositionTypeEnum.FIX_RELATIVE_TO_TOP, textField.getPositionTypeValue());
+		Assertions.assertEquals(StretchTypeEnum.NO_STRETCH, textField.getStretchTypeValue());
+		Assertions.assertTrue(textField.isPrintInFirstWholeBand());
+		Assertions.assertTrue(textField.isPrintWhenDetailOverflows());
+		Assertions.assertEquals("group1", textField.getPrintWhenGroupChanges().getName());
+		
+		textField = this.getJasperReport().getDetailSection().getBands()[0].getElementByKey("detail.column_column11");
+		Assertions.assertTrue(textField.isPrintWhenDetailOverflows());
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		return new JREmptyDataSource(1);
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ComponentStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ComponentStyleTest.java
new file mode 100644
index 0000000..bd28655
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ComponentStyleTest.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRPen;
+import net.sf.jasperreports.engine.JRPrintEllipse;
+import net.sf.jasperreports.engine.JRPrintLine;
+import net.sf.jasperreports.engine.JRPrintRectangle;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+import java.awt.Color;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ComponentStyleTest extends AbstractJasperStyleTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        StyleBuilder style = stl.style().setLinePen(stl.penDotted());
+        rb.title(cmp.line().setStyle(style), cmp.filler().setFixedHeight(10), cmp.line().setPen(stl.pen2Point()), cmp.ellipse().setStyle(style), cmp.ellipse().setPen(stl.pen2Point()),
+                 cmp.rectangle().setStyle(style), cmp.rectangle().setPen(stl.pen2Point()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        JRPrintLine line = (JRPrintLine) getElementAt("title.line1", 0);
+        penTest(line.getStyle().getLinePen(), 1f, null, LineStyleEnum.DOTTED);
+
+        line = (JRPrintLine) getElementAt("title.line2", 0);
+        penTest(line.getLinePen(), 2f, Color.BLACK, LineStyleEnum.SOLID);
+
+        JRPrintEllipse ellipse = (JRPrintEllipse) getElementAt("title.ellipse1", 0);
+        penTest(ellipse.getStyle().getLinePen(), 1f, null, LineStyleEnum.DOTTED);
+        ellipse = (JRPrintEllipse) getElementAt("title.ellipse2", 0);
+        penTest(ellipse.getLinePen(), 2f, Color.BLACK, LineStyleEnum.SOLID);
+
+        JRPrintRectangle rectangle = (JRPrintRectangle) getElementAt("title.rectangle1", 0);
+        penTest(rectangle.getStyle().getLinePen(), 1f, null, LineStyleEnum.DOTTED);
+        rectangle = (JRPrintRectangle) getElementAt("title.rectangle2", 0);
+        penTest(rectangle.getLinePen(), 2f, Color.BLACK, LineStyleEnum.SOLID);
+
+    }
+
+    private void penTest(JRPen pen, Float width, Color color, LineStyleEnum style) {
+        Assertions.assertEquals(width, pen.getLineWidth());
+        Assertions.assertEquals(color, pen.getLineColor());
+        Assertions.assertEquals(style, pen.getLineStyleValue());
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image1Test.java
new file mode 100644
index 0000000..4080cfe
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image1Test.java
@@ -0,0 +1,105 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.Serializable;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.ImageScale;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperTest;
+import net.sf.jasperreports.engine.DefaultJasperReportsContext;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRPrintImage;
+import net.sf.jasperreports.engine.type.ImageTypeEnum;
+import net.sf.jasperreports.engine.type.ScaleImageEnum;
+import net.sf.jasperreports.engine.util.JRImageLoader;
+import net.sf.jasperreports.renderers.SimpleDataRenderer;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Image1Test extends AbstractJasperTest
+{
+	private Image image;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL)
+			.setImageStyle(stl.style().setImageScale(ImageScale.CLIP))
+			.title(cmp.image(this.image = new TestImage()), cmp.image(Image1Test.class.getResource("noimage")));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+		
+		try
+		{
+			final byte[] imageData = JRImageLoader.getInstance(DefaultJasperReportsContext.getInstance())
+				.loadBytesFromAwtImage(this.image, ImageTypeEnum.JPEG);
+			final JRPrintImage jrImage = (JRPrintImage)this.getElementAt("title.image1", 0);
+			Assertions.assertTrue(Arrays.equals(
+				imageData,
+				((SimpleDataRenderer)jrImage.getRenderer()).getData(DefaultJasperReportsContext.getInstance())));
+			Assertions.assertEquals(ScaleImageEnum.CLIP, jrImage.getScaleImageValue());
+		}
+		catch(final JRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	@Override
+	protected boolean serializableTest()
+	{
+		return false;
+	}
+	
+	private class TestImage extends BufferedImage implements Serializable
+	{
+		private static final long serialVersionUID = 1L;
+		
+		public TestImage()
+		{
+			super(100, 100, BufferedImage.TYPE_INT_RGB);
+			final Graphics2D g2d = this.createGraphics();
+			g2d.setColor(Color.BLUE);
+			g2d.setComposite(AlphaComposite.Src);
+			g2d.fill(new Rectangle2D.Float(5, 5, 90, 90));
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image2Test.java
new file mode 100644
index 0000000..06a34a2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image2Test.java
@@ -0,0 +1,89 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.component.ImageBuilder;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.test.jasper.AbstractJasperTest;
+import net.sf.jasperreports.engine.DefaultJasperReportsContext;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRPrintImage;
+import net.sf.jasperreports.engine.type.HorizontalImageAlignEnum;
+import net.sf.jasperreports.renderers.SimpleDataRenderer;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class Image2Test extends AbstractJasperTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final ImageBuilder image = cmp.image(Image2Test.class.getResourceAsStream("dynamicreports.png"))
+			.setHorizontalImageAlignment(HorizontalImageAlignment.CENTER);
+		rb.pageHeader(image).detail(cmp.filler().setFixedHeight(20));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(2);
+		
+		try
+		{
+			JRPrintImage jrImage = (JRPrintImage)this.getElementAt("pageHeader.image1", 0);
+			final byte[] imageData1 =
+				((SimpleDataRenderer)jrImage.getRenderer()).getData(DefaultJasperReportsContext.getInstance());
+			jrImage = (JRPrintImage)this.getElementAt("pageHeader.image1", 1);
+			final byte[] imageData2 =
+				((SimpleDataRenderer)jrImage.getRenderer()).getData(DefaultJasperReportsContext.getInstance());
+			Assertions.assertTrue(Arrays.equals(imageData1, imageData2));
+			Assertions.assertEquals(HorizontalImageAlignEnum.CENTER, jrImage.getHorizontalImageAlign());
+		}
+		catch(final JRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	@Override
+	protected boolean serializableTest()
+	{
+		return false;
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		return new JREmptyDataSource(50);
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List1Test.java
new file mode 100644
index 0000000..317d849
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List1Test.java
@@ -0,0 +1,195 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class List1Test extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        StyleBuilder style = stl.style().setPadding(10);
+
+        rb.setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL)
+          .setTextStyle(stl.style().setPadding(1))
+          .title(cmp.horizontalList()
+                    .setBaseStyle(style)
+                    .setBaseGap(2)
+                    .setGap(5)
+                    .add(cmp.verticalList()
+                            .setStyle(style)
+                            .add(cmp.vListCell(cmp.text("").setWidth(50)).heightFixed())
+                            .add(10, cmp.vListCell(cmp.text("").setWidth(50)).heightFixed(), cmp.vListCell(cmp.text("").setWidth(50)).heightFixed())
+                            .add(cmp.vListCell(cmp.text("").setWidth(50)).heightFixed())
+                            .add(cmp.filler())
+                            .add(cmp.vListCell(cmp.text("").setWidth(50)).heightFixed()))
+                    .add(cmp.hListCell(cmp.verticalList()
+                                          .setStyle(stl.style().setPadding(stl.padding().setLeft(2).setRight(4).setTop(6).setBottom(8)))
+                                          .setGap(5)
+                                          .add(cmp.vListCell(cmp.text("").setWidth(10)).widthFixedOnCenter().heightFixed())
+                                          .add(cmp.text(""), cmp.horizontalList().setStyle(style).add(cmp.text(""), cmp.text("")).add(5, cmp.text("").setWidth(50)), cmp.text(""))
+                                          .add(cmp.vListCell(cmp.horizontalList(cmp.text(""), cmp.text("")).setStyle(style)).widthFixedOnCenter().heightFixed())).widthFixed().heightFixedOnMiddle())
+                    .add(cmp.verticalList()
+                            .setStyle(style)
+                            .add(cmp.text(""))
+                            .add(cmp.vListCell(cmp.text("").setHeight(30).setWidth(50)), cmp.vListCell(cmp.text("").setWidth(50)).heightFixed(),
+                                 cmp.vListCell(cmp.text("").setWidth(50)).widthFixedOnLeft().heightFixed(), cmp.vListCell(cmp.text("").setWidth(50)).widthFixedOnLeft(),
+                                 cmp.vListCell(cmp.text("").setWidth(50)).widthFixedOnCenter().heightFixed(), cmp.vListCell(cmp.text("").setWidth(50)).widthFixedOnCenter(),
+                                 cmp.vListCell(cmp.text("").setWidth(50)).widthFixedOnRight().heightFixed(), cmp.vListCell(cmp.text("").setWidth(50)).widthFixedOnRight()))
+                    .add(cmp.text("").setWidth(20).setHeight(200))
+
+                    .newRow(10)
+                    .add(cmp.text(""))
+
+                    .newRow()
+                    .add(cmp.hListCell(cmp.text("")).widthFixed().heightFixedOnMiddle())
+                    .add(cmp.filler())
+                    .add(cmp.filler())
+                    .add(cmp.hListCell(cmp.text("")).widthFixed().heightFixedOnMiddle())
+
+                    .newRow()
+                    .add(cmp.text("").setWidth(50).setHeight(50))
+                    .add(cmp.text("").setWidth(50))
+                    .add(cmp.hListCell(cmp.text("").setWidth(50)).widthFixed())
+                    .add(cmp.hListCell(cmp.text("").setWidth(50)).widthFixed().heightFixedOnTop())
+                    .add(cmp.hListCell(cmp.text("").setWidth(50)).heightFixedOnTop())
+                    .add(cmp.hListCell(cmp.verticalList(cmp.text("").setWidth(50), cmp.text("").setWidth(50)).setStyle(style)).widthFixed().heightFixedOnMiddle())
+                    .add(cmp.hListCell(cmp.text("").setWidth(50)).heightFixedOnMiddle())
+                    .add(cmp.hListCell(cmp.text("").setWidth(50)).widthFixed().heightFixedOnBottom())
+                    .add(cmp.hListCell(cmp.text("").setWidth(50)).heightFixedOnBottom())
+
+                    .newFlowRow()
+                    .setGap(5)
+                    .setStyle(style)
+                    .add(cmp.text(""), cmp.text(""), cmp.text(""), cmp.text(""), cmp.text(""), cmp.text("").setWidth(500), cmp.text(""), cmp.text(""))
+                    .newRow()
+                    .add(cmp.text(""), cmp.text(""), cmp.text(""))
+                    .add(cmp.hListCell(cmp.text("")).widthFixed())
+                    .add(cmp.hListCell(cmp.text("")).widthExpand())
+                    .add(cmp.text(""), cmp.text(""), cmp.text(""))
+                    .newRow()
+                    .add(cmp.text(""))
+                    .add(cmp.verticalList().add(cmp.vListCell(cmp.text("")).widthFixedOnCenter(), cmp.vListCell(cmp.text("")).widthFixedOnCenter()))
+                    .add(cmp.text("")));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementPositionTest("title.list1", 0, 10, 10, 575, 426);
+
+        elementPositionTest("title.list2", 0, 0, 0, 555, 200);
+        elementPositionTest("title.list3", 0, 0, 0, 86, 200);
+        elementPositionTest("title.textField1", 0, 0, 0, 66, 14);
+        elementPositionTest("title.textField2", 0, 0, 24, 66, 14);
+        elementPositionTest("title.textField3", 0, 0, 48, 66, 14);
+        elementPositionTest("title.textField4", 0, 0, 62, 66, 14);
+        elementPositionTest("title.textField5", 0, 0, 166, 66, 14);
+
+        elementPositionTest("title.list4", 0, 91, 28, 281, 144);
+        elementPositionTest("title.textField6", 0, 132, 0, 10, 14);
+        elementPositionTest("title.textField7", 0, 0, 19, 275, 14);
+
+        elementPositionTest("title.list5", 0, 0, 38, 275, 34);
+        elementPositionTest("title.textField8", 0, 0, 0, 100, 14);
+        elementPositionTest("title.textField9", 0, 100, 0, 100, 14);
+        elementPositionTest("title.textField10", 0, 205, 0, 50, 14);
+
+        elementPositionTest("title.textField11", 0, 0, 77, 275, 14);
+
+        elementPositionTest("title.list6", 0, 27, 96, 220, 34);
+        elementPositionTest("title.textField12", 0, 0, 0, 100, 14);
+        elementPositionTest("title.textField13", 0, 100, 0, 100, 14);
+
+        elementPositionTest("title.list7", 0, 377, 0, 148, 200);
+        elementPositionTest("title.textField14", 0, 0, 0, 128, 20);
+        elementPositionTest("title.textField15", 0, 0, 20, 128, 43);
+        elementPositionTest("title.textField16", 0, 0, 63, 128, 14);
+        elementPositionTest("title.textField17", 0, 0, 77, 50, 14);
+        elementPositionTest("title.textField18", 0, 0, 91, 50, 20);
+        elementPositionTest("title.textField19", 0, 39, 111, 50, 14);
+        elementPositionTest("title.textField20", 0, 39, 125, 50, 20);
+        elementPositionTest("title.textField21", 0, 78, 145, 50, 14);
+        elementPositionTest("title.textField22", 0, 78, 159, 50, 21);
+
+        elementPositionTest("title.textField23", 0, 530, 0, 25, 200);
+        elementPositionTest("title.textField24", 0, 0, 214, 555, 14);
+
+        elementPositionTest("title.list8", 0, 0, 230, 555, 14);
+        elementPositionTest("title.textField25", 0, 0, 0, 100, 14);
+        elementPositionTest("title.textField26", 0, 455, 0, 100, 14);
+
+        elementPositionTest("title.list9", 0, 0, 246, 555, 50);
+        elementPositionTest("title.textField27", 0, 0, 0, 67, 50);
+        elementPositionTest("title.textField28", 0, 67, 0, 67, 50);
+        elementPositionTest("title.textField29", 0, 134, 0, 50, 50);
+        elementPositionTest("title.textField30", 0, 184, 0, 50, 14);
+        elementPositionTest("title.textField31", 0, 234, 0, 67, 14);
+
+        elementPositionTest("title.list10", 0, 301, 1, 70, 48);
+        elementPositionTest("title.textField32", 0, 0, 0, 50, 14);
+        elementPositionTest("title.textField33", 0, 0, 14, 50, 14);
+
+        elementPositionTest("title.textField34", 0, 371, 18, 67, 14);
+        elementPositionTest("title.textField35", 0, 438, 36, 50, 14);
+        elementPositionTest("title.textField36", 0, 488, 36, 67, 14);
+
+        elementPositionTest("title.list11", 0, 0, 298, 555, 62);
+        // elementPositionTest("title.list12", 0, 0, 0, 535, 42);
+        elementPositionTest("title.list13", 0, 0, 0, 535, 14);
+        elementPositionTest("title.textField37", 0, 0, 0, 103, 14);
+        elementPositionTest("title.textField38", 0, 108, 0, 103, 14);
+        elementPositionTest("title.textField39", 0, 216, 0, 103, 14);
+        elementPositionTest("title.textField40", 0, 324, 0, 103, 14);
+        elementPositionTest("title.textField41", 0, 432, 0, 103, 14);
+
+        elementPositionTest("title.textField42", 0, 0, 14, 535, 14);
+
+        elementPositionTest("title.list14", 0, 0, 28, 535, 14);
+        elementPositionTest("title.textField43", 0, 0, 0, 265, 14);
+        elementPositionTest("title.textField44", 0, 270, 0, 265, 14);
+
+        elementPositionTest("title.list15", 0, 0, 362, 555, 14);
+        elementPositionTest("title.textField45", 0, 0, 0, 59, 14);
+        elementPositionTest("title.textField46", 0, 59, 0, 59, 14);
+        elementPositionTest("title.textField47", 0, 118, 0, 59, 14);
+        elementPositionTest("title.textField48", 0, 177, 0, 100, 14);
+        elementPositionTest("title.textField49", 0, 277, 0, 100, 14);
+        elementPositionTest("title.textField50", 0, 377, 0, 59, 14);
+        elementPositionTest("title.textField51", 0, 436, 0, 59, 14);
+        elementPositionTest("title.textField52", 0, 495, 0, 60, 14);
+
+        elementPositionTest("title.list16", 0, 0, 378, 555, 28);
+        elementPositionTest("title.textField53", 0, 0, 0, 227, 28);
+        // elementPositionTest("title.list17", 0, 227, 0, 100, 28);
+        elementPositionTest("title.textField54", 0, 227, 0, 100, 14);
+        elementPositionTest("title.textField55", 0, 227, 14, 100, 14);
+        elementPositionTest("title.textField56", 0, 327, 0, 228, 28);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List2Test.java
new file mode 100644
index 0000000..088008f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List2Test.java
@@ -0,0 +1,75 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.component.VerticalListBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class List2Test extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        VerticalListBuilder list1 = cmp.verticalList();
+        list1.add(cmp.text(""));
+
+        VerticalListBuilder list2 = cmp.verticalList();
+        list2.add(cmp.text(""));
+        list2.add(cmp.filler().setFixedWidth(500));
+
+        VerticalListBuilder list3 = cmp.verticalList();
+        list3.add(cmp.text(""));
+
+        VerticalListBuilder list4 = cmp.verticalList();
+        list4.add(cmp.text(""));
+        list4.add(cmp.filler().setFixedWidth(50));
+
+        VerticalListBuilder list5 = cmp.verticalList();
+        list5.add(cmp.text(""));
+
+        VerticalListBuilder list6 = cmp.verticalList();
+        list6.add(cmp.text(""));
+        list6.add(cmp.filler().setFixedWidth(200));
+        list6.add(cmp.text(""));
+        list6.add(cmp.filler().setFixedWidth(500));
+
+        rb.title(cmp.horizontalList(list1, list2), cmp.horizontalList(list3, list4), cmp.horizontalList(list5, list6));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.textField1", 0, 0, 0, 75, 16);
+        elementPositionTest("title.textField2", 0, 75, 0, 500, 16);
+
+        elementPositionTest("title.textField3", 0, 0, 0, 287, 16);
+        elementPositionTest("title.textField4", 0, 287, 0, 288, 16);
+
+        elementPositionTest("title.textField5", 0, 0, 0, 75, 32);
+        elementPositionTest("title.textField6", 0, 75, 0, 500, 16);
+        elementPositionTest("title.textField7", 0, 75, 16, 500, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List3Test.java
new file mode 100644
index 0000000..cc0cf7f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List3Test.java
@@ -0,0 +1,128 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.component.HorizontalListBuilder;
+import net.sf.dynamicreports.report.builder.component.VerticalListBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class List3Test extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        VerticalListBuilder list1 = cmp.verticalList();
+        list1.add(cmp.text(""));
+        list1.add(cmp.text(""));
+        list1.setFixedWidth(50);
+
+        HorizontalListBuilder list2 = cmp.horizontalList();
+        list2.add(cmp.text(""));
+        list2.add(cmp.text(""));
+        list2.setFixedWidth(150);
+
+        VerticalListBuilder list3 = cmp.verticalList();
+        list3.add(cmp.text(""));
+        list3.add(cmp.text(""));
+        list3.setFixedWidth(200);
+
+        HorizontalListBuilder list4 = cmp.horizontalList();
+        list4.add(cmp.text(""));
+        list4.add(cmp.text(""));
+        list4.setFixedWidth(500);
+
+        VerticalListBuilder list5 = cmp.verticalList();
+        list5.add(cmp.text(""));
+        list5.add(cmp.text(""));
+        list5.setFixedHeight(50);
+
+        HorizontalListBuilder list6 = cmp.horizontalList();
+        list6.add(cmp.text(""));
+        list6.add(cmp.text(""));
+        list6.setFixedHeight(40);
+
+        HorizontalListBuilder list7 = cmp.horizontalList();
+        list7.add(cmp.text("").setFixedWidth(30));
+        list7.add(cmp.text(""));
+        list7.setFixedWidth(150);
+
+        VerticalListBuilder list8 = cmp.verticalList();
+        list8.add(cmp.text("").setFixedHeight(20));
+        list8.add(cmp.text(""));
+        list8.setFixedHeight(50);
+
+        VerticalListBuilder list9 = cmp.verticalList();
+        list9.add(cmp.text(""));
+        list9.add(cmp.text(""));
+        list9.setFixedDimension(250, 40);
+
+        HorizontalListBuilder list10 = cmp.horizontalList();
+        list10.add(cmp.text(""));
+        list10.add(cmp.text(""));
+        list10.setFixedDimension(250, 40);
+
+        rb.title(list1, list2, list3, list4, list5, list6, list7, list8, list9, list10);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 50, 16);
+        elementPositionTest("title.textField2", 0, 10, 26, 50, 16);
+
+        elementPositionTest("title.list3", 0, 10, 42, 150, 16);
+        elementPositionTest("title.textField3", 0, 0, 0, 75, 16);
+        elementPositionTest("title.textField4", 0, 75, 0, 75, 16);
+
+        elementPositionTest("title.textField5", 0, 10, 58, 200, 16);
+        elementPositionTest("title.textField6", 0, 10, 74, 200, 16);
+
+        elementPositionTest("title.list5", 0, 10, 90, 500, 16);
+        elementPositionTest("title.textField7", 0, 0, 0, 250, 16);
+        elementPositionTest("title.textField8", 0, 250, 0, 250, 16);
+
+        elementPositionTest("title.textField9", 0, 10, 106, 575, 25);
+        elementPositionTest("title.textField10", 0, 10, 131, 575, 25);
+
+        elementPositionTest("title.list7", 0, 10, 156, 575, 40);
+        elementPositionTest("title.textField11", 0, 0, 0, 287, 40);
+        elementPositionTest("title.textField12", 0, 287, 0, 288, 40);
+
+        elementPositionTest("title.list8", 0, 10, 196, 150, 16);
+        elementPositionTest("title.textField13", 0, 0, 0, 30, 16);
+        elementPositionTest("title.textField14", 0, 30, 0, 120, 16);
+
+        elementPositionTest("title.textField15", 0, 10, 212, 575, 20);
+        elementPositionTest("title.textField16", 0, 10, 232, 575, 30);
+
+        elementPositionTest("title.textField17", 0, 10, 262, 250, 20);
+        elementPositionTest("title.textField18", 0, 10, 282, 250, 20);
+
+        elementPositionTest("title.list11", 0, 10, 302, 250, 40);
+        elementPositionTest("title.textField19", 0, 0, 0, 125, 40);
+        elementPositionTest("title.textField20", 0, 125, 0, 125, 40);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java
new file mode 100644
index 0000000..d4bd711
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java
@@ -0,0 +1,102 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.RectangleBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRPrintElement;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ListBackgroundComponentTest extends AbstractJasperPositionTest
+{
+	private TextColumnBuilder<String> column;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final RectangleBuilder background = cmp.rectangle();
+		final ReportTemplateBuilder template = template().setDetailBackgroundComponent(background);
+		
+		rb.setTemplate(template)
+			.setTitleBackgroundComponent(background)
+			.setSummaryBackgroundComponent(background)
+			.title(cmp.text("title").setFixedHeight(300))
+			.columns(this.column = col.column("field1", String.class))
+			.summary(cmp.text("text\ntext"),
+				cmp.horizontalList(cmp.text("text"),
+					cmp.horizontalList(cmp.text("text"), cmp.text("text")).setBackgroundComponent(background),
+					cmp.text("text")),
+				cmp.verticalList(cmp.text("text"), cmp.text("text"))
+					.setStyle(stl.style(5))
+					.setBackgroundComponent(background));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.elementPositionTest("title.list1", 0, 10, 10, 575, 300);
+        this.elementPositionTest("title.list1.background", 0, 0, 0, 575, 300);
+        
+        this.columnDetailPositionTest(this.column, 0, 0, 0, 575, 16);
+        this.elementPositionTest("detail.list1", 0, 10, 310, 575, 16);
+        this.elementPositionTest("detail.list1.background", 0, 0, 0, 575, 16);
+        this.columnDetailPositionTest(this.column, 1, 0, 0, 575, 16);
+        this.elementPositionTest("detail.list1", 1, 10, 326, 575, 16);
+        this.elementPositionTest("detail.list1.background", 1, 0, 0, 575, 16);
+        
+        this.elementPositionTest("summary.list1", 0, 10, 342, 575, 84);
+        this.elementPositionTest("summary.list1.background", 0, 0, 0, 575, 84);
+        this.elementPositionTest("summary.list2", 0, 0, 26, 575, 16);
+		final List<JRPrintElement> elements = this.findElement("summary.list2.background");
+		Assertions.assertTrue(elements.isEmpty());
+        this.elementPositionTest("summary.list3", 0, 143, 0, 288, 16);
+        this.elementPositionTest("summary.list3.background", 0, 0, 0, 288, 16);
+        this.elementPositionTest("summary.list4", 0, 0, 42, 575, 42);
+        this.elementPositionTest("summary.list4.background", 0, 0, 0, 565, 32);
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add("value1");
+		dataSource.add("value2");
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java
new file mode 100644
index 0000000..936e552
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java
@@ -0,0 +1,57 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ListComponentGroupTypeTest extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageFormat(PageType.A8)
+          .setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL)
+          .title(cmp.text("title").setFixedHeight(130))
+          .summary(cmp.text("text1"), cmp.text("text2"), cmp.horizontalList(cmp.verticalList(cmp.text("text3"), cmp.text("text4")), cmp.text("text5")), cmp.text("text6"))
+          .setSummarySplitType(SplitType.IMMEDIATE);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        elementPositionTest("summary.list2", 0, 10, 10, 128, 32);
+
+        elementPositionTest("summary.textField1", 0, 10, 140, 128, 16);
+        elementPositionTest("summary.textField2", 0, 10, 156, 128, 16);
+        elementPositionTest("summary.textField3", 0, 0, 0, 64, 16);
+        elementPositionTest("summary.textField4", 0, 0, 16, 64, 16);
+        elementPositionTest("summary.textField5", 0, 64, 0, 64, 32);
+        elementPositionTest("summary.textField6", 0, 10, 42, 128, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents1Test.java
new file mode 100644
index 0000000..63e2a4d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents1Test.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ListFixedComponents1Test extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.title(cmp.horizontalList(cmp.text("").setFixedWidth(50), cmp.text("").setFixedWidth(100)));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.list1", 0, 10, 10, 150, 16);
+
+        elementPositionTest("title.textField1", 0, 0, 0, 50, 16);
+        elementPositionTest("title.textField2", 0, 50, 0, 100, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents2Test.java
new file mode 100644
index 0000000..7bda1ad
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents2Test.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ListFixedComponents2Test extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.title(cmp.horizontalList(cmp.text("")).setFixedWidth(300).setBaseStyle(stl.style().setPadding(5)));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.list1", 0, 10, 10, 300, 26);
+
+        elementPositionTest("title.textField1", 0, 0, 0, 290, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListGapTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListGapTest.java
new file mode 100644
index 0000000..8a0a05e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListGapTest.java
@@ -0,0 +1,48 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ListGapTest extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageFormat(PageType.A5).setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL).title(cmp.horizontalList(cmp.text("a"), cmp.text("a")).setGap(250));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.list1", 0, 10, 10, 401, 16);
+
+        elementPositionTest("title.textField1", 0, 0, 0, 75, 16);
+        elementPositionTest("title.textField2", 0, 325, 0, 76, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList1Test.java
new file mode 100644
index 0000000..7232c9e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList1Test.java
@@ -0,0 +1,67 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.MultiPageListBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class MultiPageList1Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<Integer> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        MultiPageListBuilder multiPageList = cmp.multiPageList();
+        for (int i = 0; i < 150; i++) {
+            multiPageList.add(cmp.text("text" + i));
+        }
+        rb.title(multiPageList).columns(column1 = col.column("Column1", "field1", Integer.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+
+        for (int i = 0; i < 150; i++) {
+            elementValueTest("title.textField1", i, "text" + i);
+        }
+
+        columnTitleValueTest(column1, "Column1");
+        columnDetailValueTest(column1, "0", "1");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList2Test.java
new file mode 100644
index 0000000..481d774
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList2Test.java
@@ -0,0 +1,78 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.MultiPageListBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class MultiPageList2Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<Integer> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        MultiPageListBuilder multiPageList1 = cmp.multiPageList();
+        for (int i = 0; i < 3; i++) {
+            MultiPageListBuilder multiPageList2 = cmp.multiPageList();
+            multiPageList1.add(multiPageList2);
+            for (int j = 0; j < 50; j++) {
+                multiPageList2.add(cmp.text("text"));
+            }
+        }
+        rb.title(multiPageList1).columns(column1 = col.column("Column1", "field1", Integer.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+
+        for (int i = 0; i < 51; i++) {
+            elementPositionTest("title.textField1", i, 10, 10 + i * 16, 575, 16);
+        }
+        for (int i = 0; i < 51; i++) {
+            elementPositionTest("title.textField1", 51 + i, 10, 10 + i * 16, 575, 16);
+        }
+        for (int i = 0; i < 48; i++) {
+            elementPositionTest("title.textField1", 102 + i, 10, 10 + i * 16, 575, 16);
+        }
+
+        columnTitlePositionTest(column1, 0, 10, 778, 575, 16);
+        columnDetailPositionTest(column1, 0, 10, 794, 575, 16);
+        columnDetailPositionTest(column1, 1, 10, 810, 575, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList3Test.java
new file mode 100644
index 0000000..3e23fcd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList3Test.java
@@ -0,0 +1,79 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.MultiPageListBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class MultiPageList3Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<Integer> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        column1 = col.column("Column1", "field1", type.integerType());
+
+        MultiPageListBuilder multiPageList = cmp.multiPageList();
+        multiPageList.add(cmp.subreport(createSubreport(80)));
+        multiPageList.newPage();
+        multiPageList.add(cmp.subreport(createSubreport(80)));
+        multiPageList.newPage();
+        multiPageList.add(cmp.subreport(createSubreport(10)));
+        multiPageList.newPage();
+        multiPageList.add(cmp.subreport(createSubreport(10)));
+        rb.title(multiPageList);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(4);
+
+        columnDetailAtPageIndexTest(column1, 0);
+        columnDetailAtPageIndexTest(column1, 1);
+        columnDetailAtPageIndexTest(column1, 2);
+        columnDetailAtPageIndexTest(column1, 3);
+    }
+
+    private JasperReportBuilder createSubreport(int numberOfRecords) {
+        JasperReportBuilder report = report();
+        report.title(cmp.verticalGap(6)).setPageColumnsPerPage(2).columns(column1).setDataSource(createSubreportDataSource(numberOfRecords));
+
+        return report;
+    }
+
+    protected JRDataSource createSubreportDataSource(int numberOfRecords) {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < numberOfRecords; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList4Test.java
new file mode 100644
index 0000000..db61e6c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList4Test.java
@@ -0,0 +1,100 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.MultiPageListBuilder;
+import net.sf.dynamicreports.report.constant.SplitType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRPrintElement;
+import net.sf.jasperreports.engine.JRPrintText;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class MultiPageList4Test extends AbstractJasperValueTest
+{
+	private TextColumnBuilder<String> column1;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+        this.column1 = col.column("Column1", "field1", type.stringType());
+		
+		final MultiPageListBuilder multiPageList = cmp.multiPageList();
+		multiPageList.setSplitType(SplitType.PREVENT);
+		multiPageList.add(cmp.subreport(this.createSubreport()));
+		multiPageList.add(cmp.verticalGap(730));
+		multiPageList.add(cmp.subreport(this.createSubreport()));
+		rb.title(multiPageList);
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(2);
+		
+		int count = 0;
+		for(final JRPrintElement element : this.getJasperPrint().getPages().get(0).getElements())
+		{
+			if(element instanceof JRPrintText)
+			{
+				count++;
+			}
+		}
+		Assertions.assertEquals(3, count);
+		count = 0;
+		for(final JRPrintElement element : this.getJasperPrint().getPages().get(1).getElements())
+		{
+			if(element instanceof JRPrintText)
+			{
+				count++;
+			}
+		}
+		Assertions.assertEquals(3, count);
+	}
+	
+	private JasperReportBuilder createSubreport()
+	{
+		final JasperReportBuilder report = report();
+		report.columns(this.column1).setDataSource(this.createSubreportDataSource());
+		
+		return report;
+	}
+	
+	protected JRDataSource createSubreportDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add("text");
+		dataSource.add("text");
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber1Test.java
new file mode 100644
index 0000000..2917fb9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber1Test.java
@@ -0,0 +1,59 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PageNumber1Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL).pageFooter(cmp.pageNumber(), cmp.totalPages(), cmp.pageXslashY(), cmp.pageXofY());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementCountTest("pageFooter.textField1", 1);
+        elementValueTest("pageFooter.textField1", "1");
+
+        elementCountTest("pageFooter.textField2", 1);
+        elementValueTest("pageFooter.textField2", "1");
+
+        elementCountTest("pageFooter.textField3", 1);
+        elementValueTest("pageFooter.textField3", "1");
+
+        elementCountTest("pageFooter.textField4", 1);
+        elementValueTest("pageFooter.textField4", "/1");
+
+        elementCountTest("pageFooter.textField5", 1);
+        elementValueTest("pageFooter.textField5", "1");
+
+        elementCountTest("pageFooter.textField6", 1);
+        elementValueTest("pageFooter.textField6", " of 1");
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber2Test.java
new file mode 100644
index 0000000..f2d75e4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber2Test.java
@@ -0,0 +1,74 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PageNumber2Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(col.column("Column1", "field1", Integer.class))
+          .summaryOnANewPage()
+          .summaryWithPageHeaderAndFooter()
+          .summary(cmp.text("summary"))
+          .pageFooter(cmp.pageNumber(), cmp.totalPages(), cmp.pageXslashY(), cmp.pageXofY());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+        elementCountTest("pageFooter.textField1", 2);
+        elementValueTest("pageFooter.textField1", "1", "2");
+
+        elementCountTest("pageFooter.textField2", 2);
+        elementValueTest("pageFooter.textField2", "2", "2");
+
+        elementCountTest("pageFooter.textField3", 2);
+        elementValueTest("pageFooter.textField3", "1", "2");
+
+        elementCountTest("pageFooter.textField4", 2);
+        elementValueTest("pageFooter.textField4", "/2", "/2");
+
+        elementCountTest("pageFooter.textField5", 2);
+        elementValueTest("pageFooter.textField5", "1", "2");
+
+        elementCountTest("pageFooter.textField6", 2);
+        elementValueTest("pageFooter.textField6", " of 2", " of 2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber3Test.java
new file mode 100644
index 0000000..cd0b979
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber3Test.java
@@ -0,0 +1,138 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PageNumber3Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder subreport = cmp.subreport(titleSubreport()).setDataSource(new SubreportDataSourceExpression());
+
+        rb.detail(subreport)
+          .pageFooter(cmp.pageNumber(), cmp.totalPages(), cmp.pageXslashY(), cmp.pageXofY(), cmp.pageXofY().setFormatExpression("Page {0} of {1}"),
+                      cmp.pageXofY().setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.pageXofY().setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT),
+                      cmp.pageXofY().setHorizontalTextAlignment(HorizontalTextAlignment.JUSTIFIED), cmp.pageXofY().setHorizontalTextAlignment(HorizontalTextAlignment.CENTER));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+        elementCountTest("pageFooter.textField1", 3);
+        elementValueTest("pageFooter.textField1", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField2", 3);
+        elementValueTest("pageFooter.textField2", "3", "3", "3");
+
+        elementCountTest("pageFooter.textField3", 3);
+        elementValueTest("pageFooter.textField3", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField4", 3);
+        elementValueTest("pageFooter.textField4", "/3", "/3", "/3");
+
+        elementCountTest("pageFooter.textField5", 3);
+        elementValueTest("pageFooter.textField5", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField6", 3);
+        elementValueTest("pageFooter.textField6", " of 3", " of 3", " of 3");
+
+        elementCountTest("pageFooter.textField7", 3);
+        elementValueTest("pageFooter.textField7", "Page 1", "Page 2", "Page 3");
+
+        elementCountTest("pageFooter.textField8", 3);
+        elementValueTest("pageFooter.textField8", " of 3", " of 3", " of 3");
+
+        elementCountTest("pageFooter.textField9", 3);
+        elementValueTest("pageFooter.textField9", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField10", 3);
+        elementValueTest("pageFooter.textField10", " of 3", " of 3", " of 3");
+
+        elementCountTest("pageFooter.textField11", 3);
+        elementValueTest("pageFooter.textField11", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField12", 3);
+        elementValueTest("pageFooter.textField12", " of 3", " of 3", " of 3");
+
+        elementCountTest("pageFooter.textField13", 3);
+        elementValueTest("pageFooter.textField13", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField14", 3);
+        elementValueTest("pageFooter.textField14", " of 3", " of 3", " of 3");
+
+        elementCountTest("pageFooter.textField15", 3);
+        elementValueTest("pageFooter.textField15", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField16", 3);
+        elementValueTest("pageFooter.textField16", " of 3", " of 3", " of 3");
+    }
+
+    private JasperReportBuilder titleSubreport() {
+        JasperReportBuilder report = report();
+        report.columns(col.column("Column1", "field1", type.integerType())).setDataSource(titleSubreportDataSource());
+        return report;
+    }
+
+    private JRDataSource titleSubreportDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 50; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(2);
+    }
+
+    private class SubreportDataSourceExpression extends AbstractSimpleExpression<JRDataSource> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JRDataSource evaluate(ReportParameters reportParameters) {
+            DRDataSource dataSource = new DRDataSource("field1");
+            for (int i = 0; i < 50; i++) {
+                dataSource.add(i);
+            }
+            return dataSource;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber4Test.java
new file mode 100644
index 0000000..728cb04
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber4Test.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PageNumber4Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH)
+          .columns(col.column("Column1", "field1", Integer.class))
+          .groupBy(grp.group("field2", String.class))
+          .pageFooter(cmp.pageXofY(), cmp.pageXslashY(), cmp.totalPages(), cmp.pageNumber());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+        elementCountTest("pageFooter.textField1", 3);
+        elementValueTest("pageFooter.textField1", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField2", 3);
+        elementValueTest("pageFooter.textField2", " of 3", " of 3", " of 3");
+
+        elementCountTest("pageFooter.textField3", 3);
+        elementValueTest("pageFooter.textField3", "1", "2", "3");
+
+        elementCountTest("pageFooter.textField4", 3);
+        elementValueTest("pageFooter.textField4", "/3", "/3", "/3");
+
+        elementCountTest("pageFooter.textField5", 3);
+        elementValueTest("pageFooter.textField5", "3", "3", "3");
+
+        elementCountTest("pageFooter.textField6", 3);
+        elementValueTest("pageFooter.textField6", "1", "2", "3");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 100; i++) {
+            dataSource.add(i, "text" + (i < 50 ? "1" : "2"));
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber5Test.java
new file mode 100644
index 0000000..bab4438
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber5Test.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PageNumber5Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH)
+          .columns(col.column("Column1", "field1", Integer.class))
+          .groupBy(grp.group("field2", String.class).setResetPageNumber(true))
+          .pageFooter(cmp.pageXofY(), cmp.pageXslashY(), cmp.totalPages(), cmp.pageNumber());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+        elementCountTest("pageFooter.textField1", 3);
+        elementValueTest("pageFooter.textField1", "1", "2", "1");
+
+        elementCountTest("pageFooter.textField2", 3);
+        elementValueTest("pageFooter.textField2", " of 2", " of 2", " of 1");
+
+        elementCountTest("pageFooter.textField3", 3);
+        elementValueTest("pageFooter.textField3", "1", "2", "1");
+
+        elementCountTest("pageFooter.textField4", 3);
+        elementValueTest("pageFooter.textField4", "/2", "/2", "/1");
+
+        elementCountTest("pageFooter.textField5", 3);
+        elementValueTest("pageFooter.textField5", "2", "2", "1");
+
+        elementCountTest("pageFooter.textField6", 3);
+        elementValueTest("pageFooter.textField6", "1", "2", "1");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 90; i++) {
+            dataSource.add(i, "text" + (i < 50 ? "1" : "2"));
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber6Test.java
new file mode 100644
index 0000000..aaeb86d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber6Test.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.report.exception.DRException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PageNumber6Test {
+
+    @Test
+    public void test() {
+        try {
+            report().summary(cmp.pageXofY().setFormatExpression("{1} {0}")).toJasperPrint();
+            Assertions.fail("Wrong page number");
+        } catch (DRException e) {
+        }
+
+        try {
+            report().summary(cmp.pageXofY().setFormatExpression("{1} {1}")).toJasperPrint();
+            Assertions.fail("Wrong page number");
+        } catch (DRException e) {
+        }
+
+        try {
+            report().summary(cmp.pageXofY().setFormatExpression("{0} {0}")).toJasperPrint();
+            Assertions.fail("Wrong page number");
+        } catch (DRException e) {
+        }
+
+        try {
+            report().summary(cmp.pageXofY().setFormatExpression("{0}")).toJasperPrint();
+            Assertions.fail("Wrong page number");
+        } catch (DRException e) {
+        }
+
+        try {
+            report().summary(cmp.pageXofY().setFormatExpression("{1}")).toJasperPrint();
+            Assertions.fail("Wrong page number");
+        } catch (DRException e) {
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumberPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumberPositionTest.java
new file mode 100644
index 0000000..85a1446
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumberPositionTest.java
@@ -0,0 +1,95 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.component.PageXofYBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PageNumberPositionTest extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        StyleBuilder style = stl.style().setHorizontalTextAlignment(HorizontalTextAlignment.LEFT);
+        PageXofYBuilder pageXofYLeft = cmp.pageXofY().setStyle(stl.style(style));
+        PageXofYBuilder pageXofYRight = cmp.pageXofY().setStyle(stl.style(style).setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT));
+
+        rb.setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL)
+          .pageFooter(cmp.pageXofY(), cmp.pageXofY().setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.pageXofY().setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT),
+                      cmp.pageXofY().setHorizontalTextAlignment(HorizontalTextAlignment.JUSTIFIED), cmp.pageXofY().setHorizontalTextAlignment(HorizontalTextAlignment.CENTER),
+                      cmp.horizontalList(pageXofYLeft, pageXofYRight, pageXofYLeft, pageXofYRight), cmp.pageXofY().setPageXFixedWidth(20), cmp.pageXofY().setPageYFixedWidth(25),
+                      cmp.pageXslashY().setPageXFixedWidth(30), cmp.pageXslashY().setPageYFixedWidth(35), cmp.pageXofY().setPageXFixedWidth(18).setPageYFixedWidth(22));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementPositionTest("pageFooter.textField1", 0, 0, 0, 287, 16);
+        elementPositionTest("pageFooter.textField2", 0, 287, 0, 288, 16);
+
+        elementPositionTest("pageFooter.textField3", 0, 0, 0, 40, 16);
+        elementPositionTest("pageFooter.textField4", 0, 40, 0, 535, 16);
+
+        elementPositionTest("pageFooter.textField5", 0, 0, 0, 517, 16);
+        elementPositionTest("pageFooter.textField6", 0, 517, 0, 58, 16);
+
+        elementPositionTest("pageFooter.textField7", 0, 0, 0, 287, 16);
+        elementPositionTest("pageFooter.textField8", 0, 287, 0, 288, 16);
+
+        elementPositionTest("pageFooter.textField9", 0, 0, 0, 287, 16);
+        elementPositionTest("pageFooter.textField10", 0, 287, 0, 288, 16);
+
+        elementPositionTest("pageFooter.textField11", 0, 0, 0, 36, 12);
+        elementPositionTest("pageFooter.textField12", 0, 36, 0, 107, 12);
+
+        elementPositionTest("pageFooter.textField13", 0, 0, 0, 90, 12);
+        elementPositionTest("pageFooter.textField14", 0, 90, 0, 54, 12);
+
+        elementPositionTest("pageFooter.textField15", 0, 0, 0, 36, 12);
+        elementPositionTest("pageFooter.textField16", 0, 36, 0, 108, 12);
+
+        elementPositionTest("pageFooter.textField17", 0, 0, 0, 90, 12);
+        elementPositionTest("pageFooter.textField18", 0, 90, 0, 54, 12);
+
+        elementPositionTest("pageFooter.textField19", 0, 0, 0, 20, 16);
+        elementPositionTest("pageFooter.textField20", 0, 20, 0, 555, 16);
+
+        elementPositionTest("pageFooter.textField21", 0, 0, 0, 550, 16);
+        elementPositionTest("pageFooter.textField22", 0, 550, 0, 25, 16);
+
+        elementPositionTest("pageFooter.textField23", 0, 0, 0, 30, 16);
+        elementPositionTest("pageFooter.textField24", 0, 30, 0, 545, 16);
+
+        elementPositionTest("pageFooter.textField25", 0, 0, 0, 540, 16);
+        elementPositionTest("pageFooter.textField26", 0, 540, 0, 35, 16);
+
+        elementPositionTest("pageFooter.textField27", 0, 0, 0, 18, 16);
+        elementPositionTest("pageFooter.textField28", 0, 18, 0, 22, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField1Test.java
new file mode 100644
index 0000000..9389952
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField1Test.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TextField1Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<Integer> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<Integer> column3;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", Integer.class), column2 = col.column("Column2", "field2", Integer.class).setColumns(20),
+                   column3 = col.column("Column3", "field3", Integer.class).setRows(2))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column2))
+          .title(cmp.horizontalList(cmp.hListCell(cmp.text("").setColumns(10).setRows(5)).widthFixed()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 94, 62);
+
+        columnTitlePositionTest(column1, 0, 0, 0, 149, 16);
+        columnDetailPositionTest(column1, 0, 0, 0, 149, 27);
+
+        columnTitlePositionTest(column2, 0, 149, 0, 276, 16);
+        columnDetailPositionTest(column2, 0, 149, 0, 276, 27);
+
+        columnTitlePositionTest(column3, 0, 425, 0, 150, 16);
+        columnDetailPositionTest(column3, 0, 425, 0, 150, 27);
+
+        subtotalPositionTest(subtotal1, 0, 149, 0, 276, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add(i, i, i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField2Test.java
new file mode 100644
index 0000000..a8af552
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField2Test.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TextField2Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("test test", "field1", String.class).setFixedWidth(25).setStretchWithOverflow(false).setTitleStretchWithOverflow(false))
+          .title(cmp.text("test test").setFixedWidth(25).setStretchWithOverflow(false), cmp.text("test test").setFixedWidth(25));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 25, 16);
+        elementPositionTest("title.textField2", 0, 10, 26, 25, 26);
+
+        columnTitlePositionTest(column1, 0, 10, 52, 25, 16);
+        columnDetailPositionTest(column1, 0, 10, 68, 25, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add("test test");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField3Test.java
new file mode 100644
index 0000000..dea43f2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField3Test.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.constant.JasperProperty;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TextField3Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("test test", "field1", String.class)
+                                .setFixedWidth(25)
+                                .setStretchWithOverflow(false)
+                                .addProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                .setTitleStretchWithOverflow(false)
+                                .addTitleProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true"))
+          .title(cmp.text("test test").setFixedWidth(25).setStretchWithOverflow(false).addProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true"), cmp.text("test test").setFixedWidth(25),
+                 cmp.text("test test").setFixedWidth(25).setStretchWithOverflow(false));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementValueTest("title.textField1", 0, "test ");
+        elementFullValueTest("title.textField1", 0, "test test");
+        elementValueTest("title.textField2", 0, "test test");
+        elementValueTest("title.textField3", 0, "test ");
+        elementFullValueTest("title.textField3", 0, "test ");
+
+        columnTitleValueTest(column1, 0, "test ");
+        columnTitleFullValueTest(column1, 0, "test test");
+
+        columnDetailValueTest(column1, 0, "test ");
+        columnDetailFullValueTest(column1, 0, "test test");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add("test test");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField4Test.java
new file mode 100644
index 0000000..646e730
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField4Test.java
@@ -0,0 +1,77 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.VariableBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static net.sf.dynamicreports.report.builder.DynamicReports.variable;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TextField4Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<Integer> column1 = col.column("Column1", "field1", type.integerType());
+        VariableBuilder<Integer> variable1 = variable("variable1", column1, Calculation.SUM);
+
+        rb.columns(column1).variables(variable1).title(cmp.text(new TextExpression()).setEvaluationTime(Evaluation.REPORT));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementValueTest("title.textField1", 0, "sum = 14");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add(5);
+        dataSource.add(9);
+        return dataSource;
+    }
+
+    private class TextExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            return "sum = " + reportParameters.getValue("variable1");
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField5Test.java
new file mode 100644
index 0000000..789391c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField5Test.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TextField5Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.detail(cmp.horizontalList(cmp.text(field("field1", type.stringType())).setPrintRepeatedValues(false).setPrintInFirstWholeBand(true), cmp.text(field("field2", type.integerType()))));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+        // textField1
+        elementCountTest("detail.textField1", 3);
+        elementValueTest("detail.textField1", "test1", "test2", "test2");
+        // textField2
+        elementCountTest("detail.textField2", 60);
+        elementValueTest("detail.textField2", 0, "0");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 30; i++) {
+            dataSource.add("test1", i);
+        }
+        for (int i = 0; i < 30; i++) {
+            dataSource.add("test2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField6Test.java
new file mode 100644
index 0000000..bd53b6f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField6Test.java
@@ -0,0 +1,65 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * @author Jan Moxter
+ */
+public class TextField6Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(final JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("test test", "field1", String.class)
+                        .setFixedWidth(25)
+                        .setTextAdjust(TextAdjust.CUT_TEXT)
+                        .setTitleTextAdjust(TextAdjust.CUT_TEXT))
+          .title(cmp.text("test test").setFixedWidth(25)
+                          .setTextAdjust(TextAdjust.CUT_TEXT), cmp.text("test test").setFixedWidth(25));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 25, 16);
+        elementPositionTest("title.textField2", 0, 10, 26, 25, 26);
+
+        columnTitlePositionTest(column1, 0, 10, 52, 25, 16);
+        columnDetailPositionTest(column1, 0, 10, 68, 25, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        final DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add("test test");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField7Test.java
new file mode 100644
index 0000000..125cb64
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField7Test.java
@@ -0,0 +1,80 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.constant.JasperProperty;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * @author Jan Moxter
+ */
+public class TextField7Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(final JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("test test", "field1", String.class)
+                                .setFixedWidth(25)
+                                .setTextAdjust(TextAdjust.CUT_TEXT)
+                                .addProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                .setTitleTextAdjust(TextAdjust.CUT_TEXT)
+                                .addTitleProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true"))
+          .title(cmp.text("test test")
+                          .setFixedWidth(25)
+                          .setTextAdjust(TextAdjust.CUT_TEXT)
+                          .addProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true"), cmp.text("test test")
+                          .setFixedWidth(25),
+                 cmp.text("test test")
+                         .setFixedWidth(25)
+                         .setTextAdjust(TextAdjust.CUT_TEXT));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementValueTest("title.textField1", 0, "test ");
+        elementFullValueTest("title.textField1", 0, "test test");
+        elementValueTest("title.textField2", 0, "test test");
+        elementValueTest("title.textField3", 0, "test ");
+        elementFullValueTest("title.textField3", 0, "test ");
+
+        columnTitleValueTest(column1, 0, "test ");
+        columnTitleFullValueTest(column1, 0, "test test");
+
+        columnDetailValueTest(column1, 0, "test ");
+        columnDetailFullValueTest(column1, 0, "test test");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        final DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add("test test");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/VerticalListTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/VerticalListTest.java
new file mode 100644
index 0000000..6772f81
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/VerticalListTest.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class VerticalListTest extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageFormat(PageType.A8)
+          .setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL)
+          .title(cmp.text("text"), cmp.text("text text text text text text text"),
+                 cmp.horizontalList(cmp.verticalList(cmp.text("text"), cmp.text("text text text text text text"), cmp.text("text")), cmp.text("text")), cmp.text("text"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // elementPositionTest("title.list1", 0, 10, 10, 128, 116);
+        elementPositionTest("title.list2", 0, 10, 52, 128, 58);
+        // elementPositionTest("title.list3", 0, 0, 0, 64, 58);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 128, 16);
+        elementPositionTest("title.textField2", 0, 10, 26, 128, 26);
+        elementPositionTest("title.textField3", 0, 0, 0, 64, 16);
+        elementPositionTest("title.textField4", 0, 0, 16, 64, 26);
+        elementPositionTest("title.textField5", 0, 0, 42, 64, 16);
+        elementPositionTest("title.textField6", 0, 64, 0, 64, 58);
+        elementPositionTest("title.textField7", 0, 10, 110, 128, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/XyListTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/XyListTest.java
new file mode 100644
index 0000000..2ee4162
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/XyListTest.java
@@ -0,0 +1,88 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.component;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.component.XyListBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class XyListTest extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        StyleBuilder style = stl.style(stl.pen1Point());
+
+        XyListBuilder list1 = cmp.xyList();
+        list1.add(10, 10, cmp.text(""));
+        list1.add(50, 15, cmp.text(""));
+
+        XyListBuilder list2 = cmp.xyList().setStyle(style);
+        list2.add(10, 10, cmp.text(""));
+        list2.add(50, 15, cmp.text(""));
+        list2.add(200, 5, cmp.horizontalList(cmp.text(""), cmp.text("")).setWidth(100));
+        list2.add(350, 5, cmp.verticalList(cmp.text(""), cmp.text("")).setWidth(150));
+
+        XyListBuilder list3 = cmp.xyList();
+        list3.add(10, 10, cmp.horizontalList(cmp.text("").setWidth(50), cmp.text("")).newRow().add(cmp.text("")));
+        list3.add(200, 10, cmp.xyList().add(5, 5, cmp.horizontalList(cmp.text(""), cmp.text(""))));
+
+        XyListBuilder list4 = cmp.xyList().setStyle(style).setFixedWidth(250);
+        list4.add(100, 10, cmp.xyList().setStyle(style).add(5, 5, cmp.verticalList(cmp.text(""), cmp.text(""))));
+
+        rb.title(list1, list2, list3, list4);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.textField1", 0, 20, 20, 100, 16);
+        elementPositionTest("title.textField2", 0, 60, 25, 100, 16);
+
+        elementPositionTest("title.list3", 0, 10, 41, 575, 37);
+        elementPositionTest("title.textField3", 0, 10, 10, 100, 16);
+        elementPositionTest("title.textField4", 0, 50, 15, 100, 16);
+        elementPositionTest("title.list4", 0, 200, 5, 100, 16);
+        elementPositionTest("title.textField5", 0, 0, 0, 50, 16);
+        elementPositionTest("title.textField6", 0, 50, 0, 50, 16);
+        elementPositionTest("title.textField7", 0, 350, 5, 150, 16);
+        elementPositionTest("title.textField8", 0, 350, 21, 150, 16);
+
+        elementPositionTest("title.list8", 0, 20, 88, 150, 16);
+        elementPositionTest("title.textField9", 0, 0, 0, 50, 16);
+        elementPositionTest("title.textField10", 0, 50, 0, 100, 16);
+        elementPositionTest("title.textField11", 0, 20, 104, 150, 16);
+        elementPositionTest("title.list9", 0, 215, 93, 200, 16);
+        elementPositionTest("title.textField12", 0, 0, 0, 100, 16);
+        elementPositionTest("title.textField13", 0, 100, 0, 100, 16);
+
+        elementPositionTest("title.list10", 0, 10, 120, 250, 47);
+        elementPositionTest("title.list11", 0, 100, 10, 105, 37);
+        elementPositionTest("title.textField14", 0, 5, 5, 100, 16);
+        elementPositionTest("title.textField15", 0, 5, 21, 100, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab1Test.java
new file mode 100644
index 0000000..9a7a1d4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab1Test.java
@@ -0,0 +1,191 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Crosstab1Test extends AbstractJasperCrosstabValueTest {
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Double> measure2;
+    private CrosstabMeasureBuilder<Double> measure3;
+    private CrosstabMeasureBuilder<Double> measure4;
+    private CrosstabMeasureBuilder<Integer> measure5;
+    private CrosstabMeasureBuilder<Double> measure6;
+    private CrosstabMeasureBuilder<Double> measure7;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+        TextColumnBuilder<Double> column4 = col.column("Column4", "field4", Double.class);
+        TextColumnBuilder<String> column5 = col.column("Column5", "field5", String.class);
+
+        measure1 = ctab.measure(column3, Calculation.SUM);
+        measure2 = ctab.measure(column3, Calculation.SUM);
+        measure2.setPercentageType(CrosstabPercentageType.GRAND_TOTAL);
+        measure3 = ctab.measure(column4, Calculation.SUM);
+        measure4 = ctab.measure(column4, Calculation.SUM);
+        measure4.setPercentageType(CrosstabPercentageType.GRAND_TOTAL);
+        measure5 = ctab.measure(column5, Calculation.COUNT);
+        measure6 = ctab.measure(column5, Calculation.COUNT);
+        measure6.setPercentageType(CrosstabPercentageType.GRAND_TOTAL);
+        measure7 = ctab.measure(column4, Calculation.AVERAGE);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .headerCell(cmp.text("Header"))
+                                       .rowGroups(rowGroup = ctab.rowGroup(column1).setTotalHeader("Total for rowgroup"))
+                                       .columnGroups(columnGroup = ctab.columnGroup(column2))
+                                       .measures(measure1, measure2, measure3, measure4, measure5, measure6, measure7);
+
+        rb.setLocale(Locale.ENGLISH).columns(column1, column2, column3, column4, column5).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        crosstabHeaderElementCountTest("textField1", 1);
+        crosstabHeaderElementValueTest("textField1", "Header");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "c", "d");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 3);
+        crosstabGroupHeaderValueTest(rowGroup, "a", "b", "c");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "Total for rowgroup");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 6);
+        crosstabCellValueTest(measure1, null, null, "358", "768", "1,193", "1,602", "1,193", "1,602");
+        crosstabCellCountTest(measure1, null, columnGroup, 3);
+        crosstabCellValueTest(measure1, null, columnGroup, "1,126", "2,795", "2,795");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "2,744", "3,972");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "6,716");
+
+        // measure2
+        crosstabCellCountTest(measure2, null, null, 6);
+        crosstabCellValueTest(measure2, null, null, "5.3", "11.4", "17.8", "23.9", "17.8", "23.9");
+        crosstabCellCountTest(measure2, null, columnGroup, 3);
+        crosstabCellValueTest(measure2, null, columnGroup, "16.8", "41.6", "41.6");
+        crosstabCellCountTest(measure2, rowGroup, null, 2);
+        crosstabCellValueTest(measure2, rowGroup, null, "40.9", "59.1");
+        crosstabCellCountTest(measure2, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure2, rowGroup, columnGroup, "100");
+
+        // measure3
+        crosstabCellCountTest(measure3, null, null, 6);
+        crosstabCellValueTest(measure3, null, null, "5", "9", "13", "17", "13", "17");
+        crosstabCellCountTest(measure3, null, columnGroup, 3);
+        crosstabCellValueTest(measure3, null, columnGroup, "14", "30", "30");
+        crosstabCellCountTest(measure3, rowGroup, null, 2);
+        crosstabCellValueTest(measure3, rowGroup, null, "31", "43");
+        crosstabCellCountTest(measure3, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure3, rowGroup, columnGroup, "74");
+
+        // measure4
+        crosstabCellCountTest(measure4, null, null, 6);
+        crosstabCellValueTest(measure4, null, null, "6.8", "12.2", "17.6", "23", "17.6", "23");
+        crosstabCellCountTest(measure4, null, columnGroup, 3);
+        crosstabCellValueTest(measure4, null, columnGroup, "18.9", "40.5", "40.5");
+        crosstabCellCountTest(measure4, rowGroup, null, 2);
+        crosstabCellValueTest(measure4, rowGroup, null, "41.9", "58.1");
+        crosstabCellCountTest(measure4, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure4, rowGroup, columnGroup, "100");
+
+        // measure5
+        crosstabCellCountTest(measure5, null, null, 6);
+        crosstabCellValueTest(measure5, null, null, "2", "2", "2", "2", "2", "2");
+        crosstabCellCountTest(measure5, null, columnGroup, 3);
+        crosstabCellValueTest(measure5, null, columnGroup, "4", "4", "4");
+        crosstabCellCountTest(measure5, rowGroup, null, 2);
+        crosstabCellValueTest(measure5, rowGroup, null, "6", "6");
+        crosstabCellCountTest(measure5, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure5, rowGroup, columnGroup, "12");
+
+        // measure6
+        crosstabCellCountTest(measure6, null, null, 6);
+        crosstabCellValueTest(measure6, null, null, "16", "16", "16", "16", "16", "16");
+        crosstabCellCountTest(measure6, null, columnGroup, 3);
+        crosstabCellValueTest(measure6, null, columnGroup, "33", "33", "33");
+        crosstabCellCountTest(measure6, rowGroup, null, 2);
+        crosstabCellValueTest(measure6, rowGroup, null, "50", "50");
+        crosstabCellCountTest(measure6, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure6, rowGroup, columnGroup, "100");
+
+        // measure7
+        crosstabCellCountTest(measure7, null, null, 6);
+        crosstabCellValueTest(measure7, null, null, "2.5", "4.5", "6.5", "8.5", "6.5", "8.5");
+        crosstabCellCountTest(measure7, null, columnGroup, 3);
+        crosstabCellValueTest(measure7, null, columnGroup, "3.5", "7.5", "7.5");
+        crosstabCellCountTest(measure7, rowGroup, null, 2);
+        crosstabCellValueTest(measure7, rowGroup, null, "5.2", "7.2");
+        crosstabCellCountTest(measure7, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure7, rowGroup, columnGroup, "6.2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+        dataSource.add("a", "c", 106, 2d, "1");
+        dataSource.add("a", "c", 252, 3d, "1");
+        dataSource.add("a", "d", 312, 4d, "1");
+        dataSource.add("a", "d", 456, 5d, "4");
+        dataSource.add("b", "c", 515, 6d, "5");
+        dataSource.add("b", "c", 678, 7d, "6");
+        dataSource.add("b", "d", 779, 8d, "7");
+        dataSource.add("b", "d", 823, 9d, "8");
+        dataSource.add("c", "c", 515, 6d, "5");
+        dataSource.add("c", "c", 678, 7d, "6");
+        dataSource.add("c", "d", 779, 8d, "7");
+        dataSource.add("c", "d", 823, 9d, "8");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab2Test.java
new file mode 100644
index 0000000..cfae9f1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab2Test.java
@@ -0,0 +1,153 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Crosstab2Test extends AbstractJasperCrosstabValueTest {
+    private CrosstabRowGroupBuilder<String> rowGroup1;
+    private CrosstabRowGroupBuilder<String> rowGroup2;
+    private CrosstabColumnGroupBuilder<String> columnGroup1;
+    private CrosstabColumnGroupBuilder<String> columnGroup2;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Integer> measure2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<String> column3 = col.column("Column3", "field3", String.class);
+        TextColumnBuilder<String> column4 = col.column("Column4", "field4", String.class);
+        TextColumnBuilder<Integer> column5 = col.column("Column5", "field5", Integer.class);
+
+        measure1 = ctab.measure("measure1", column5, Calculation.SUM);
+        measure2 = ctab.measure("measure2", column5, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .headerCell(cmp.text("Header"))
+                                       .setCellWidth(20)
+                                       .rowGroups(rowGroup1 = ctab.rowGroup(column1), rowGroup2 = ctab.rowGroup(column2))
+                                       .columnGroups(columnGroup1 = ctab.columnGroup(column3), columnGroup2 = ctab.columnGroup(column4))
+                                       .measures(measure1, measure2);
+
+        rb.setLocale(Locale.ENGLISH).setPageFormat(PageType.A3, PageOrientation.LANDSCAPE).columns(column1, column2, column3, column4, column5).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        crosstabHeaderElementCountTest("textField1", 1);
+        crosstabHeaderElementValueTest("textField1", "Header");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup1, 2);
+        crosstabGroupHeaderValueTest(columnGroup1, "g", "h");
+        crosstabGroupTotalHeaderCountTest(columnGroup1, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup1, "Total");
+        crosstabGroupHeaderCountTest(columnGroup2, 4);
+        crosstabGroupHeaderValueTest(columnGroup2, "i", "j", "k", "l");
+        crosstabGroupTotalHeaderCountTest(columnGroup2, 2);
+        crosstabGroupTotalHeaderValueTest(columnGroup2, "Total", "Total");
+
+        // column group title
+        crosstabGroupTitleHeaderCountTest(columnGroup1, measure1, 0);
+        crosstabGroupTitleTotalHeaderCountTest(columnGroup1, measure1, 1);
+        crosstabGroupTitleTotalHeaderValueTest(columnGroup1, measure1, "measure1");
+        crosstabGroupTitleHeaderCountTest(columnGroup2, measure1, 4);
+        crosstabGroupTitleHeaderValueTest(columnGroup2, measure1, "measure1", "measure1", "measure1", "measure1");
+        crosstabGroupTitleTotalHeaderCountTest(columnGroup2, measure1, 2);
+        crosstabGroupTitleTotalHeaderValueTest(columnGroup2, measure1, "measure1", "measure1");
+
+        crosstabGroupTitleHeaderCountTest(columnGroup1, measure2, 0);
+        crosstabGroupTitleTotalHeaderCountTest(columnGroup1, measure2, 1);
+        crosstabGroupTitleTotalHeaderValueTest(columnGroup1, measure2, "measure2");
+        crosstabGroupTitleHeaderCountTest(columnGroup2, measure2, 4);
+        crosstabGroupTitleHeaderValueTest(columnGroup2, measure2, "measure2", "measure2", "measure2", "measure2");
+        crosstabGroupTitleTotalHeaderCountTest(columnGroup2, measure2, 2);
+        crosstabGroupTitleTotalHeaderValueTest(columnGroup2, measure2, "measure2", "measure2");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup1, 2);
+        crosstabGroupHeaderValueTest(rowGroup1, "a", "b");
+        crosstabGroupTotalHeaderCountTest(rowGroup1, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup1, "Total");
+        crosstabGroupHeaderCountTest(rowGroup2, 4);
+        crosstabGroupHeaderValueTest(rowGroup2, "c", "d", "e", "f");
+        crosstabGroupTotalHeaderCountTest(rowGroup2, 2);
+        crosstabGroupTotalHeaderValueTest(rowGroup2, "Total", "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 16);
+        crosstabCellValueTest(measure1, null, null, "1", "2", "0", "0", "3", "4", "0", "0", "0", "0", "5", "6", "0", "0", "7", "8");
+        crosstabCellCountTest(measure1, null, columnGroup1, 4);
+        crosstabCellValueTest(measure1, null, columnGroup1, "3", "7", "11", "15");
+        crosstabCellCountTest(measure1, null, columnGroup2, 8);
+        crosstabCellValueTest(measure1, null, columnGroup2, "3", "0", "7", "0", "0", "11", "0", "15");
+        crosstabCellCountTest(measure1, rowGroup1, null, 4);
+        crosstabCellValueTest(measure1, rowGroup1, null, "4", "6", "12", "14");
+        crosstabCellCountTest(measure1, rowGroup2, null, 8);
+        crosstabCellValueTest(measure1, rowGroup2, null, "4", "6", "0", "0", "0", "0", "12", "14");
+        crosstabCellCountTest(measure1, rowGroup1, columnGroup1, 1);
+        crosstabCellValueTest(measure1, rowGroup1, columnGroup1, "36");
+        crosstabCellCountTest(measure1, rowGroup2, columnGroup2, 4);
+        crosstabCellValueTest(measure1, rowGroup2, columnGroup2, "10", "0", "0", "26");
+        crosstabCellCountTest(measure1, rowGroup1, columnGroup2, 2);
+        crosstabCellValueTest(measure1, rowGroup1, columnGroup2, "10", "26");
+        crosstabCellCountTest(measure1, rowGroup2, columnGroup1, 2);
+        crosstabCellValueTest(measure1, rowGroup2, columnGroup1, "10", "26");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+        dataSource.add("a", "c", "g", "i", 1);
+        dataSource.add("a", "c", "g", "j", 2);
+        dataSource.add("a", "d", "g", "i", 3);
+        dataSource.add("a", "d", "g", "j", 4);
+        dataSource.add("b", "e", "h", "k", 5);
+        dataSource.add("b", "e", "h", "l", 6);
+        dataSource.add("b", "f", "h", "k", 7);
+        dataSource.add("b", "f", "h", "l", 8);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab3Test.java
new file mode 100644
index 0000000..d5d8582
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab3Test.java
@@ -0,0 +1,122 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Crosstab3Test extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+        measure1.setValueFormatter(new ValueFormatter1());
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class).setHeaderValueFormatter(new ValueFormatter2()))
+                                       .columnGroups(columnGroup = ctab.columnGroup("field2", String.class).setHeaderValueFormatter(new ValueFormatter2()))
+                                       .measures(measure1);
+
+        rb.setLocale(Locale.ENGLISH).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "value = c", "value = d");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 2);
+        crosstabGroupHeaderValueTest(rowGroup, "value = a", "value = b");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 4);
+        crosstabCellValueTest(measure1, null, null, "value = 3", "value = 7", "value = 11", "value = 15");
+        crosstabCellCountTest(measure1, null, columnGroup, 2);
+        crosstabCellValueTest(measure1, null, columnGroup, "value = 10", "value = 26");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "value = 14", "value = 22");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "value = 36");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a", "c", 1);
+        dataSource.add("a", "c", 2);
+        dataSource.add("a", "d", 3);
+        dataSource.add("a", "d", 4);
+        dataSource.add("b", "c", 5);
+        dataSource.add("b", "c", 6);
+        dataSource.add("b", "d", 7);
+        dataSource.add("b", "d", 8);
+        return dataSource;
+    }
+
+    private class ValueFormatter1 extends AbstractValueFormatter<String, Integer> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String format(Integer value, ReportParameters reportParameters) {
+            return "value = " + value;
+        }
+    }
+
+    private class ValueFormatter2 extends AbstractValueFormatter<String, String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String format(String value, ReportParameters reportParameters) {
+            return "value = " + value;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab4Test.java
new file mode 100644
index 0000000..b52be32
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab4Test.java
@@ -0,0 +1,108 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.dynamicreports.test.jasper.JasperTestUtils;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Crosstab4Test extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .setDataPreSorted(true)
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class))
+                                       .columnGroups(columnGroup = ctab.columnGroup("field2", String.class))
+                                       .measures(measure1 = ctab.measure("field3", Integer.class, Calculation.SUM));
+
+        rb.setLocale(Locale.ENGLISH).summary(crosstab, crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "d", "c");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 3);
+        crosstabGroupHeaderValueTest(rowGroup, "c", "a", "b");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 6);
+        crosstabCellValueTest(measure1, null, null, "1", "1", "1", "1", "1", "1");
+        crosstabCellCountTest(measure1, null, columnGroup, 3);
+        crosstabCellValueTest(measure1, null, columnGroup, "2", "2", "2");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "3", "3");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "6");
+
+        // column group
+        elementCountTest(getPrefix(2) + JasperTestUtils.getCrosstabGroupHeaderName(columnGroup), 2);
+        elementCountTest(getPrefix(2) + JasperTestUtils.getCrosstabGroupTotalHeaderName(columnGroup), 1);
+
+        // row group
+        elementCountTest(getPrefix(2) + JasperTestUtils.getCrosstabGroupHeaderName(rowGroup), 3);
+        elementCountTest(getPrefix(2) + JasperTestUtils.getCrosstabGroupTotalHeaderName(rowGroup), 1);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("c", "d", 1);
+        dataSource.add("c", "c", 1);
+        dataSource.add("a", "d", 1);
+        dataSource.add("a", "c", 1);
+        dataSource.add("b", "d", 1);
+        dataSource.add("b", "c", 1);
+
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab5Test.java
new file mode 100644
index 0000000..251a1f1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab5Test.java
@@ -0,0 +1,207 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Crosstab5Test extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabVariableBuilder<Integer> variable1;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<?> measure2;
+    private CrosstabMeasureBuilder<BigDecimal> measure3;
+    private CrosstabMeasureBuilder<BigDecimal> measure4;
+    private CrosstabMeasureBuilder<BigDecimal> measure5;
+
+    @Override
+    protected void configureReport(final JasperReportBuilder rb) {
+        this.rowGroup = ctab.rowGroup("field1", String.class);
+        this.columnGroup = ctab.columnGroup("field2", String.class);
+
+        final FieldBuilder<Integer> field = field("field3", Integer.class);
+        this.variable1 = ctab.variable(field, Calculation.SUM);
+        this.measure1 = ctab.measure(field, Calculation.SUM);
+        this.measure2 = ctab.measure(field, Calculation.SUM);
+        this.measure2.setPercentageType(CrosstabPercentageType.GRAND_TOTAL);
+        this.measure3 = ctab.measure(new PercentageExpression1());
+        this.measure3.setDataType(type.doubleType());
+        final String expression = "$V{" + this.measure1.getName() + "}.doubleValue()/$V{" + this.measure1.getName() + "_" + this.rowGroup.getName() + "_" + this.columnGroup.getName() + "_ALL}.doubleValue() * 100";
+        this.measure4 = ctab.measure(exp.jasperSyntax(expression, Double.class));
+        this.measure4.setDataType(type.doubleType());
+        this.measure5 = ctab.measure(new PercentageExpression2());
+        this.measure5.setDataType(type.doubleType());
+
+        final CrosstabBuilder crosstab = ctab.crosstab().rowGroups(this.rowGroup).columnGroups(this.columnGroup).variables(
+            this.variable1).measures(this.measure1, this.measure2, this.measure3, this.measure4, this.measure5);
+
+        rb.setLocale(Locale.ENGLISH).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.setCrosstabBand("summary");
+
+        // column group
+        this.crosstabGroupHeaderCountTest(this.columnGroup, 2);
+        this.crosstabGroupHeaderValueTest(this.columnGroup, "c", "d");
+        this.crosstabGroupTotalHeaderCountTest(this.columnGroup, 1);
+        this.crosstabGroupTotalHeaderValueTest(this.columnGroup, "Total");
+
+        // row group
+        this.crosstabGroupHeaderCountTest(this.rowGroup, 2);
+        this.crosstabGroupHeaderValueTest(this.rowGroup, "a", "b");
+        this.crosstabGroupTotalHeaderCountTest(this.rowGroup, 1);
+        this.crosstabGroupTotalHeaderValueTest(this.rowGroup, "Total");
+
+        // measure1
+        this.crosstabCellCountTest(this.measure1, null, null, 4);
+        this.crosstabCellValueTest(this.measure1, null, null, "3", "7", "11", "15");
+        this.crosstabCellCountTest(this.measure1, null, this.columnGroup, 2);
+        this.crosstabCellValueTest(this.measure1, null, this.columnGroup, "10", "26");
+        this.crosstabCellCountTest(this.measure1, this.rowGroup, null, 2);
+        this.crosstabCellValueTest(this.measure1, this.rowGroup, null, "14", "22");
+        this.crosstabCellCountTest(this.measure1, this.rowGroup, this.columnGroup, 1);
+        this.crosstabCellValueTest(this.measure1, this.rowGroup, this.columnGroup, "36");
+
+        // measure2
+        this.crosstabCellCountTest(this.measure2, null, null, 4);
+        this.crosstabCellValueTest(this.measure2, null, null, "8.3", "19.4", "30.6", "41.7");
+        this.crosstabCellCountTest(this.measure2, null, this.columnGroup, 2);
+        this.crosstabCellValueTest(this.measure2, null, this.columnGroup, "27.8", "72.2");
+        this.crosstabCellCountTest(this.measure2, this.rowGroup, null, 2);
+        this.crosstabCellValueTest(this.measure2, this.rowGroup, null, "38.9", "61.1");
+        this.crosstabCellCountTest(this.measure2, this.rowGroup, this.columnGroup, 1);
+        this.crosstabCellValueTest(this.measure2, this.rowGroup, this.columnGroup, "100");
+
+        // measure3
+        this.crosstabCellCountTest(this.measure3, null, null, 4);
+        this.crosstabCellValueTest(this.measure3, null, null, "8.3", "19.4", "30.6", "41.7");
+        this.crosstabCellCountTest(this.measure3, null, this.columnGroup, 2);
+        this.crosstabCellValueTest(this.measure3, null, this.columnGroup, "27.8", "72.2");
+        this.crosstabCellCountTest(this.measure3, this.rowGroup, null, 2);
+        this.crosstabCellValueTest(this.measure3, this.rowGroup, null, "38.9", "61.1");
+        this.crosstabCellCountTest(this.measure3, this.rowGroup, this.columnGroup, 1);
+        this.crosstabCellValueTest(this.measure3, this.rowGroup, this.columnGroup, "100");
+
+        // measure4
+        this.crosstabCellCountTest(this.measure4, null, null, 4);
+        this.crosstabCellValueTest(this.measure4, null, null, "8.3", "19.4", "30.6", "41.7");
+        this.crosstabCellCountTest(this.measure4, null, this.columnGroup, 2);
+        this.crosstabCellValueTest(this.measure4, null, this.columnGroup, "27.8", "72.2");
+        this.crosstabCellCountTest(this.measure4, this.rowGroup, null, 2);
+        this.crosstabCellValueTest(this.measure4, this.rowGroup, null, "38.9", "61.1");
+        this.crosstabCellCountTest(this.measure4, this.rowGroup, this.columnGroup, 1);
+        this.crosstabCellValueTest(this.measure4, this.rowGroup, this.columnGroup, "100");
+
+        // measure5
+        this.crosstabCellCountTest(this.measure5, null, null, 4);
+        this.crosstabCellValueTest(this.measure5, null, null, "21.4", "31.8", "78.6", "68.2");
+        this.crosstabCellCountTest(this.measure5, null, this.columnGroup, 2);
+        this.crosstabCellValueTest(this.measure5, null, this.columnGroup, "27.8", "72.2");
+        this.crosstabCellCountTest(this.measure5, this.rowGroup, null, 2);
+        this.crosstabCellValueTest(this.measure5, this.rowGroup, null, "100", "100");
+        this.crosstabCellCountTest(this.measure5, this.rowGroup, this.columnGroup, 1);
+        this.crosstabCellValueTest(this.measure5, this.rowGroup, this.columnGroup, "100");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        final DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a", "c", 1);
+        dataSource.add("a", "c", 2);
+        dataSource.add("a", "d", 3);
+        dataSource.add("a", "d", 4);
+        dataSource.add("b", "c", 5);
+        dataSource.add("b", "c", 6);
+        dataSource.add("b", "d", 7);
+        dataSource.add("b", "d", 8);
+        return dataSource;
+    }
+
+    private class PercentageExpression1 extends AbstractComplexExpression<BigDecimal> {
+        private static final long serialVersionUID = 1L;
+
+        private PercentageExpression1() {
+            this.addExpression(exp.crosstabValue(Crosstab5Test.this.measure1));
+            this.addExpression(exp.crosstabValue(Crosstab5Test.this.measure1, Crosstab5Test.this.rowGroup,
+                Crosstab5Test.this.columnGroup));
+        }
+
+        @Override
+        public BigDecimal evaluate(final List<?> values, final ReportParameters reportParameters) {
+            final Integer value1 = (Integer) values.get(0);
+            final Integer value2 = (Integer) values.get(1);
+            return new BigDecimal(value1).divide(new BigDecimal(value2), 3, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
+        }
+    }
+
+    private class PercentageExpression2 extends AbstractComplexExpression<BigDecimal> {
+        private static final long serialVersionUID = 1L;
+
+        private PercentageExpression2() {
+            this.addExpression(exp.crosstabValue(Crosstab5Test.this.variable1));
+            this.addExpression(exp.crosstabValue(Crosstab5Test.this.measure1, Crosstab5Test.this.rowGroup));
+            this.addExpression(exp.jasperSyntax("$V{" + Crosstab5Test.this.measure1.getName() + "_" + Crosstab5Test.this.rowGroup.getName() + "_ALL}", Integer.class));
+        }
+
+        @Override
+        public BigDecimal evaluate(final List<?> values, final ReportParameters reportParameters) {
+            final Integer value1 = (Integer) values.get(0);
+            final Integer value2 = (Integer) values.get(1);
+            final Integer measure1Value = reportParameters.getValue(Crosstab5Test.this.measure1);
+            Assertions.assertEquals(value1, measure1Value);
+            Assertions.assertEquals(value2, values.get(2));
+            return new BigDecimal(value1).divide(new BigDecimal(value2), 3, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab6Test.java
new file mode 100644
index 0000000..9a04c00
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab6Test.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.constant.JasperProperty;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Crosstab6Test extends AbstractJasperCrosstabValueTest {
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+        measure1.addProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true");
+        measure1.setStretchWithOverflow(false);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .setCellWidth(18)
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class)
+                                                                 .addHeaderProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                                                 .addTotalHeaderProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                                                 .setHeaderStretchWithOverflow(false)
+                                                                 .setTotalHeaderStretchWithOverflow(false)
+                                                                 .setHeaderWidth(18))
+                                       .columnGroups(columnGroup = ctab.columnGroup("field2", String.class)
+                                                                       .addHeaderProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                                                       .addTotalHeaderProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                                                       .setHeaderStretchWithOverflow(false)
+                                                                       .setTotalHeaderStretchWithOverflow(false))
+                                       .measures(measure1);
+
+        rb.summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "c ", "d ");
+        crosstabGroupHeaderFullValueTest(columnGroup, "c test test", "d test test");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "To");
+        crosstabGroupTotalHeaderFullValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 2);
+        crosstabGroupHeaderValueTest(rowGroup, "a ", "b ");
+        crosstabGroupHeaderFullValueTest(rowGroup, "a test test", "b test test");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "To");
+        crosstabGroupTotalHeaderFullValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 4);
+        crosstabCellValueTest(measure1, null, null, "30", "70", "11", "15");
+        crosstabCellFullValueTest(measure1, null, null, "30", "70", "110", "150");
+        crosstabCellCountTest(measure1, null, columnGroup, 2);
+        crosstabCellValueTest(measure1, null, columnGroup, "10", "26");
+        crosstabCellFullValueTest(measure1, null, columnGroup, "100", "260");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "14", "22");
+        crosstabCellFullValueTest(measure1, rowGroup, null, "140", "220");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "36");
+        crosstabCellFullValueTest(measure1, rowGroup, columnGroup, "360");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a test test", "c test test", 10);
+        dataSource.add("a test test", "c test test", 20);
+        dataSource.add("a test test", "d test test", 30);
+        dataSource.add("a test test", "d test test", 40);
+        dataSource.add("b test test", "c test test", 50);
+        dataSource.add("b test test", "c test test", 60);
+        dataSource.add("b test test", "d test test", 70);
+        dataSource.add("b test test", "d test test", 80);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab7Test.java
new file mode 100644
index 0000000..66c9264
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab7Test.java
@@ -0,0 +1,118 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.constant.JasperProperty;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.TextAdjust;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * @author Jan Moxter
+ */
+public class Crosstab7Test extends AbstractJasperCrosstabValueTest {
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(final JasperReportBuilder rb) {
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+        measure1.addProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true");
+        measure1.setTextAdjust(TextAdjust.CUT_TEXT);
+
+        final CrosstabBuilder crosstab = ctab.crosstab()
+                                       .setCellWidth(18)
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class)
+                                                                 .addHeaderProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                                                 .addTotalHeaderProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                                                 .setHeaderTextAdjust(TextAdjust.CUT_TEXT)
+                                                                 .setTotalHeaderTextAdjust(TextAdjust.CUT_TEXT)
+                                                                 .setHeaderWidth(18))
+                                       .columnGroups(columnGroup = ctab.columnGroup("field2", String.class)
+                                                                       .addHeaderProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                                                       .addTotalHeaderProperty(JasperProperty.PRINT_KEEP_FULL_TEXT, "true")
+                                                                       .setHeaderTextAdjust(TextAdjust.CUT_TEXT)
+                                                                       .setTotalHeaderTextAdjust(TextAdjust.CUT_TEXT))
+                                       .measures(measure1);
+
+        rb.summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "c ", "d ");
+        crosstabGroupHeaderFullValueTest(columnGroup, "c test test", "d test test");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "To");
+        crosstabGroupTotalHeaderFullValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 2);
+        crosstabGroupHeaderValueTest(rowGroup, "a ", "b ");
+        crosstabGroupHeaderFullValueTest(rowGroup, "a test test", "b test test");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "To");
+        crosstabGroupTotalHeaderFullValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 4);
+        crosstabCellValueTest(measure1, null, null, "30", "70", "11", "15");
+        crosstabCellFullValueTest(measure1, null, null, "30", "70", "110", "150");
+        crosstabCellCountTest(measure1, null, columnGroup, 2);
+        crosstabCellValueTest(measure1, null, columnGroup, "10", "26");
+        crosstabCellFullValueTest(measure1, null, columnGroup, "100", "260");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "14", "22");
+        crosstabCellFullValueTest(measure1, rowGroup, null, "140", "220");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "36");
+        crosstabCellFullValueTest(measure1, rowGroup, columnGroup, "360");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        final DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a test test", "c test test", 10);
+        dataSource.add("a test test", "c test test", 20);
+        dataSource.add("a test test", "d test test", 30);
+        dataSource.add("a test test", "d test test", 40);
+        dataSource.add("b test test", "c test test", 50);
+        dataSource.add("b test test", "c test test", 60);
+        dataSource.add("b test test", "d test test", 70);
+        dataSource.add("b test test", "d test test", 80);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java
new file mode 100644
index 0000000..65b1e94
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java
@@ -0,0 +1,86 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition10Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup1;
+    private CrosstabColumnGroupBuilder<String> columnGroup1;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+
+        rowGroup1 = ctab.rowGroup(column1).setShowTotal(false);
+        measure1 = ctab.measure(column3, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab().rowGroups(rowGroup1).columnGroups(columnGroup1 = ctab.columnGroup(column2)).measures(measure1);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group 1
+        crosstabGroupHeaderPositionTest(columnGroup1, 0, 0, 0, 100, 26);
+        crosstabGroupHeaderPositionTest(columnGroup1, 1, 0, 0, 100, 26);
+        crosstabGroupTotalHeaderPositionTest(columnGroup1, 0, 0, 0, 100, 26);
+
+        // row group 1
+        crosstabGroupHeaderPositionTest(rowGroup1, 0, 0, 0, 100, 16);
+
+        // measures
+        crosstabCellPositionTest(measure1, null, null, 0, 0, 0, 100, 16);
+        crosstabCellPositionTest(measure1, null, null, 1, 0, 0, 100, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("text", "a", 1);
+        dataSource.add("text", "a\nb", 1);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java
new file mode 100644
index 0000000..2143370
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java
@@ -0,0 +1,121 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition1Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Double> measure2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+        TextColumnBuilder<Double> column4 = col.column("Column4", "field4", Double.class);
+
+        measure1 = ctab.measure(column3, Calculation.SUM);
+        measure2 = ctab.measure(column4, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .headerCell(cmp.text("Header"))
+                                       .setCellWidth(200)
+                                       .rowGroups(rowGroup = ctab.rowGroup(column1).setHeaderWidth(50))
+                                       .columnGroups(columnGroup = ctab.columnGroup(column2).setTotalHeaderWidth(210))
+                                       .measures(measure1, measure2);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).columns(column1, column2, column3, column4).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        crosstabHeaderElementPositionTest("textField1", 0, 0, 0, 50, 16);
+
+        // column group
+        crosstabGroupHeaderPositionTest(columnGroup, 0, 0, 0, 200, 16);
+        crosstabGroupHeaderPositionTest(columnGroup, 1, 0, 0, 200, 16);
+        crosstabGroupTotalHeaderPositionTest(columnGroup, 0, 0, 0, 210, 16);
+
+        // row group
+        crosstabGroupHeaderPositionTest(rowGroup, 0, 0, 0, 50, 16);
+        crosstabGroupHeaderPositionTest(rowGroup, 1, 0, 0, 50, 16);
+        crosstabGroupHeaderPositionTest(rowGroup, 2, 0, 0, 50, 16);
+        crosstabGroupTotalHeaderPositionTest(rowGroup, 0, 0, 0, 50, 16);
+
+        // measures
+        for (int i = 0; i < 6; i++) {
+            crosstabCellPositionTest(measure1, null, null, i, 0, 0, 100, 16);
+            crosstabCellPositionTest(measure2, null, null, i, 100, 0, 100, 16);
+        }
+        for (int i = 0; i < 3; i++) {
+            crosstabCellPositionTest(measure1, null, columnGroup, i, 0, 0, 105, 16);
+            crosstabCellPositionTest(measure2, null, columnGroup, i, 105, 0, 105, 16);
+        }
+        for (int i = 0; i < 2; i++) {
+            crosstabCellPositionTest(measure1, rowGroup, null, i, 0, 0, 100, 16);
+            crosstabCellPositionTest(measure2, rowGroup, null, i, 100, 0, 100, 16);
+        }
+        crosstabCellPositionTest(measure1, rowGroup, columnGroup, 0, 0, 0, 105, 16);
+        crosstabCellPositionTest(measure2, rowGroup, columnGroup, 0, 105, 0, 105, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("a", "c", 106, 2d);
+        dataSource.add("a", "c", 252, 3d);
+        dataSource.add("a", "d", 312, 4d);
+        dataSource.add("a", "d", 456, 5d);
+        dataSource.add("b", "c", 515, 6d);
+        dataSource.add("b", "c", 678, 7d);
+        dataSource.add("b", "d", 779, 8d);
+        dataSource.add("b", "d", 823, 9d);
+        dataSource.add("c", "c", 515, 6d);
+        dataSource.add("c", "c", 678, 7d);
+        dataSource.add("c", "d", 779, 8d);
+        dataSource.add("c", "d", 823, 9d);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java
new file mode 100644
index 0000000..14493fe
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition2Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Double> measure2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+        TextColumnBuilder<Double> column4 = col.column("Column4", "field4", Double.class);
+
+        measure1 = ctab.measure(column3, Calculation.SUM);
+        measure2 = ctab.measure(column4, Calculation.SUM);
+
+        CrosstabBuilder crosstab =
+            ctab.crosstab().headerCell(cmp.text("Header")).rowGroups(rowGroup = ctab.rowGroup(column1)).columnGroups(columnGroup = ctab.columnGroup(column2)).measures(measure1, measure2);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).columns(column1, column2, column3, column4).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        crosstabHeaderElementPositionTest("textField1", 0, 0, 0, 100, 16);
+
+        // column group
+        crosstabGroupHeaderPositionTest(columnGroup, 0, 0, 0, 150, 16);
+        crosstabGroupHeaderPositionTest(columnGroup, 1, 0, 0, 150, 16);
+        crosstabGroupTotalHeaderPositionTest(columnGroup, 0, 0, 0, 150, 16);
+
+        // row group
+        crosstabGroupHeaderPositionTest(rowGroup, 0, 0, 0, 100, 16);
+        crosstabGroupHeaderPositionTest(rowGroup, 1, 0, 0, 100, 16);
+        crosstabGroupHeaderPositionTest(rowGroup, 2, 0, 0, 100, 16);
+        crosstabGroupTotalHeaderPositionTest(rowGroup, 0, 0, 0, 100, 16);
+
+        // measures
+        for (int i = 0; i < 6; i++) {
+            crosstabCellPositionTest(measure1, null, null, i, 0, 0, 75, 16);
+            crosstabCellPositionTest(measure2, null, null, i, 75, 0, 75, 16);
+        }
+        for (int i = 0; i < 3; i++) {
+            crosstabCellPositionTest(measure1, null, columnGroup, i, 0, 0, 75, 16);
+            crosstabCellPositionTest(measure2, null, columnGroup, i, 75, 0, 75, 16);
+        }
+        for (int i = 0; i < 2; i++) {
+            crosstabCellPositionTest(measure1, rowGroup, null, i, 0, 0, 75, 16);
+            crosstabCellPositionTest(measure2, rowGroup, null, i, 75, 0, 75, 16);
+        }
+        crosstabCellPositionTest(measure1, rowGroup, columnGroup, 0, 0, 0, 75, 16);
+        crosstabCellPositionTest(measure2, rowGroup, columnGroup, 0, 75, 0, 75, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("a", "c", 106, 2d);
+        dataSource.add("a", "c", 252, 3d);
+        dataSource.add("a", "d", 312, 4d);
+        dataSource.add("a", "d", 456, 5d);
+        dataSource.add("b", "c", 515, 6d);
+        dataSource.add("b", "c", 678, 7d);
+        dataSource.add("b", "d", 779, 8d);
+        dataSource.add("b", "d", 823, 9d);
+        dataSource.add("c", "c", 515, 6d);
+        dataSource.add("c", "c", 678, 7d);
+        dataSource.add("c", "d", 779, 8d);
+        dataSource.add("c", "d", 823, 9d);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java
new file mode 100644
index 0000000..520c45b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java
@@ -0,0 +1,122 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition3Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Double> measure2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+        TextColumnBuilder<Double> column4 = col.column("Column4", "field4", Double.class);
+
+        measure1 = ctab.measure(column3, Calculation.SUM);
+        measure2 = ctab.measure(column4, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .headerCell(cmp.text("Header"), cmp.text("Header2"))
+                                       .setCellHeight(20)
+                                       .rowGroups(rowGroup = ctab.rowGroup(column1).setTotalHeaderHeight(30))
+                                       .columnGroups(columnGroup = ctab.columnGroup(column2).setHeaderHeight(40))
+                                       .measures(measure1, measure2);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).columns(column1, column2, column3, column4).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        crosstabHeaderElementPositionTest("textField1", 0, 0, 0, 100, 20);
+        crosstabHeaderElementPositionTest("textField2", 0, 0, 20, 100, 20);
+
+        // column group
+        crosstabGroupHeaderPositionTest(columnGroup, 0, 0, 0, 150, 40);
+        crosstabGroupHeaderPositionTest(columnGroup, 1, 0, 0, 150, 40);
+        crosstabGroupTotalHeaderPositionTest(columnGroup, 0, 0, 0, 150, 40);
+
+        // row group
+        crosstabGroupHeaderPositionTest(rowGroup, 0, 0, 0, 100, 20);
+        crosstabGroupHeaderPositionTest(rowGroup, 1, 0, 0, 100, 20);
+        crosstabGroupHeaderPositionTest(rowGroup, 2, 0, 0, 100, 20);
+        crosstabGroupTotalHeaderPositionTest(rowGroup, 0, 0, 0, 100, 30);
+
+        // measures
+        for (int i = 0; i < 6; i++) {
+            crosstabCellPositionTest(measure1, null, null, i, 0, 0, 75, 20);
+            crosstabCellPositionTest(measure2, null, null, i, 75, 0, 75, 20);
+        }
+        for (int i = 0; i < 3; i++) {
+            crosstabCellPositionTest(measure1, null, columnGroup, i, 0, 0, 75, 20);
+            crosstabCellPositionTest(measure2, null, columnGroup, i, 75, 0, 75, 20);
+        }
+        for (int i = 0; i < 2; i++) {
+            crosstabCellPositionTest(measure1, rowGroup, null, i, 0, 0, 75, 30);
+            crosstabCellPositionTest(measure2, rowGroup, null, i, 75, 0, 75, 30);
+        }
+        crosstabCellPositionTest(measure1, rowGroup, columnGroup, 0, 0, 0, 75, 30);
+        crosstabCellPositionTest(measure2, rowGroup, columnGroup, 0, 75, 0, 75, 30);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("a", "c", 106, 2d);
+        dataSource.add("a", "c", 252, 3d);
+        dataSource.add("a", "d", 312, 4d);
+        dataSource.add("a", "d", 456, 5d);
+        dataSource.add("b", "c", 515, 6d);
+        dataSource.add("b", "c", 678, 7d);
+        dataSource.add("b", "d", 779, 8d);
+        dataSource.add("b", "d", 823, 9d);
+        dataSource.add("c", "c", 515, 6d);
+        dataSource.add("c", "c", 678, 7d);
+        dataSource.add("c", "d", 779, 8d);
+        dataSource.add("c", "d", 823, 9d);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java
new file mode 100644
index 0000000..55e4f8a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java
@@ -0,0 +1,114 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition4Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Double> measure2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+        TextColumnBuilder<Double> column4 = col.column("Column4", "field4", Double.class);
+
+        measure1 = ctab.measure(column3, Calculation.SUM);
+        measure2 = ctab.measure(column4, Calculation.SUM);
+
+        CrosstabBuilder crosstab =
+            ctab.crosstab().setCellWidth(80).setCellHeight(30).rowGroups(rowGroup = ctab.rowGroup(column1)).columnGroups(columnGroup = ctab.columnGroup(column2)).measures(measure1, measure2);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).columns(column1, column2, column3, column4).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group
+        crosstabGroupHeaderPositionTest(columnGroup, 0, 0, 0, 80, 16);
+        crosstabGroupHeaderPositionTest(columnGroup, 1, 0, 0, 80, 16);
+        crosstabGroupTotalHeaderPositionTest(columnGroup, 0, 0, 0, 80, 16);
+
+        // row group
+        crosstabGroupHeaderPositionTest(rowGroup, 0, 0, 0, 100, 30);
+        crosstabGroupHeaderPositionTest(rowGroup, 1, 0, 0, 100, 30);
+        crosstabGroupHeaderPositionTest(rowGroup, 2, 0, 0, 100, 30);
+        crosstabGroupTotalHeaderPositionTest(rowGroup, 0, 0, 0, 100, 30);
+
+        // measures
+        for (int i = 0; i < 6; i++) {
+            crosstabCellPositionTest(measure1, null, null, i, 0, 0, 40, 30);
+            crosstabCellPositionTest(measure2, null, null, i, 40, 0, 40, 30);
+        }
+        for (int i = 0; i < 3; i++) {
+            crosstabCellPositionTest(measure1, null, columnGroup, i, 0, 0, 40, 30);
+            crosstabCellPositionTest(measure2, null, columnGroup, i, 40, 0, 40, 30);
+        }
+        for (int i = 0; i < 2; i++) {
+            crosstabCellPositionTest(measure1, rowGroup, null, i, 0, 0, 40, 30);
+            crosstabCellPositionTest(measure2, rowGroup, null, i, 40, 0, 40, 30);
+        }
+        crosstabCellPositionTest(measure1, rowGroup, columnGroup, 0, 0, 0, 40, 30);
+        crosstabCellPositionTest(measure2, rowGroup, columnGroup, 0, 40, 0, 40, 30);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("a", "c", 106, 2d);
+        dataSource.add("a", "c", 252, 3d);
+        dataSource.add("a", "d", 312, 4d);
+        dataSource.add("a", "d", 456, 5d);
+        dataSource.add("b", "c", 515, 6d);
+        dataSource.add("b", "c", 678, 7d);
+        dataSource.add("b", "d", 779, 8d);
+        dataSource.add("b", "d", 823, 9d);
+        dataSource.add("c", "c", 515, 6d);
+        dataSource.add("c", "c", 678, 7d);
+        dataSource.add("c", "d", 779, 8d);
+        dataSource.add("c", "d", 823, 9d);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java
new file mode 100644
index 0000000..95ee1d0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java
@@ -0,0 +1,127 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition5Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup1;
+    private CrosstabColumnGroupBuilder<String> columnGroup2;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Double> measure2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field1", String.class);
+        TextColumnBuilder<String> column3 = col.column("Column3", "field2", String.class);
+        TextColumnBuilder<Integer> column4 = col.column("Column4", "field3", Integer.class);
+        TextColumnBuilder<Double> column5 = col.column("Column5", "field4", Double.class);
+
+        measure1 = ctab.measure("measure1", column4, Calculation.SUM);
+        measure2 = ctab.measure("measure2", column5, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .headerCell(cmp.text("Header"))
+                                       .setCellWidth(100)
+                                       .rowGroups(rowGroup = ctab.rowGroup(column1).setHeaderWidth(50))
+                                       .columnGroups(columnGroup1 = ctab.columnGroup(column2), columnGroup2 = ctab.columnGroup(column3))
+                                       .measures(measure1, measure2);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        crosstabHeaderElementPositionTest("textField1", 0, 0, 0, 50, 48);
+
+        // column group 1
+        crosstabGroupHeaderPositionTest(columnGroup1, 0, 0, 0, 300, 16);
+        crosstabGroupTotalHeaderPositionTest(columnGroup1, 0, 0, 0, 100, 24);
+
+        crosstabGroupTitleTotalHeaderPositionTest(columnGroup1, measure1, 0, 0, 0, 50, 24);
+        crosstabGroupTitleTotalHeaderPositionTest(columnGroup1, measure2, 0, 50, 0, 50, 24);
+
+        // column group 2
+        crosstabGroupHeaderPositionTest(columnGroup2, 0, 0, 0, 100, 16);
+        crosstabGroupHeaderPositionTest(columnGroup2, 1, 0, 0, 100, 16);
+        crosstabGroupTotalHeaderPositionTest(columnGroup2, 0, 0, 0, 100, 16);
+
+        crosstabGroupTitleHeaderPositionTest(columnGroup2, measure1, 0, 0, 0, 50, 16);
+        crosstabGroupTitleHeaderPositionTest(columnGroup2, measure2, 0, 50, 0, 50, 16);
+        crosstabGroupTitleHeaderPositionTest(columnGroup2, measure1, 1, 0, 0, 50, 16);
+        crosstabGroupTitleHeaderPositionTest(columnGroup2, measure2, 1, 50, 0, 50, 16);
+        crosstabGroupTitleTotalHeaderPositionTest(columnGroup2, measure1, 0, 0, 0, 50, 16);
+        crosstabGroupTitleTotalHeaderPositionTest(columnGroup2, measure2, 0, 50, 0, 50, 16);
+
+        // row group
+        crosstabGroupHeaderPositionTest(rowGroup, 0, 0, 0, 50, 16);
+        crosstabGroupTotalHeaderPositionTest(rowGroup, 0, 0, 0, 50, 16);
+
+        // measures
+        for (int i = 0; i < 2; i++) {
+            crosstabCellPositionTest(measure1, null, null, i, 0, 0, 50, 16);
+            crosstabCellPositionTest(measure2, null, null, i, 50, 0, 50, 16);
+        }
+        crosstabCellPositionTest(measure1, null, columnGroup1, 0, 0, 0, 50, 16);
+        crosstabCellPositionTest(measure2, null, columnGroup1, 0, 50, 0, 50, 16);
+        crosstabCellPositionTest(measure1, null, columnGroup2, 0, 0, 0, 50, 16);
+        crosstabCellPositionTest(measure2, null, columnGroup2, 0, 50, 0, 50, 16);
+        crosstabCellPositionTest(measure1, rowGroup, null, 0, 0, 0, 50, 16);
+        crosstabCellPositionTest(measure2, rowGroup, null, 0, 50, 0, 50, 16);
+        crosstabCellPositionTest(measure1, rowGroup, columnGroup1, 0, 0, 0, 50, 16);
+        crosstabCellPositionTest(measure2, rowGroup, columnGroup1, 0, 50, 0, 50, 16);
+        crosstabCellPositionTest(measure1, rowGroup, columnGroup2, 0, 0, 0, 50, 16);
+        crosstabCellPositionTest(measure2, rowGroup, columnGroup2, 0, 50, 0, 50, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("a", "c", 1, 2d);
+        dataSource.add("a", "c", 2, 3d);
+        dataSource.add("a", "d", 3, 4d);
+        dataSource.add("a", "d", 4, 5d);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java
new file mode 100644
index 0000000..6a15039
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java
@@ -0,0 +1,96 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition6Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup1;
+    private CrosstabRowGroupBuilder<String> rowGroup2;
+    private CrosstabColumnGroupBuilder<String> columnGroup1;
+    private CrosstabColumnGroupBuilder<String> columnGroup2;
+    private CrosstabMeasureBuilder<Integer> measure;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field1", String.class);
+        TextColumnBuilder<String> column3 = col.column("Column3", "field2", String.class);
+        TextColumnBuilder<String> column4 = col.column("Column4", "field2", String.class);
+        TextColumnBuilder<Integer> column5 = col.column("Column5", "field3", Integer.class);
+
+        measure = ctab.measure("measure", column5, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .rowGroups(rowGroup1 = ctab.rowGroup(column1), rowGroup2 = ctab.rowGroup(column2).setShowTotal(false))
+                                       .columnGroups(columnGroup1 = ctab.columnGroup(column3), columnGroup2 = ctab.columnGroup(column4).setShowTotal(false))
+                                       .measures(measure);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group 1
+        crosstabGroupHeaderPositionTest(columnGroup1, 0, 0, 0, 100, 16);
+        crosstabGroupTotalHeaderPositionTest(columnGroup1, 0, 0, 0, 100, 24);
+
+        // column group 2
+        crosstabGroupHeaderPositionTest(columnGroup2, 0, 0, 0, 100, 16);
+
+        // row group 1
+        crosstabGroupHeaderPositionTest(rowGroup1, 0, 0, 0, 100, 16);
+        crosstabGroupTotalHeaderPositionTest(rowGroup1, 0, 0, 0, 200, 16);
+
+        // row group 2
+        crosstabGroupHeaderPositionTest(rowGroup2, 0, 0, 0, 100, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a", "c", 1);
+        dataSource.add("a", "c", 2);
+        dataSource.add("a", "d", 3);
+        dataSource.add("a", "d", 4);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java
new file mode 100644
index 0000000..297fb85
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java
@@ -0,0 +1,98 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition7Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup1;
+    private CrosstabRowGroupBuilder<String> rowGroup2;
+    private CrosstabColumnGroupBuilder<String> columnGroup1;
+    private CrosstabColumnGroupBuilder<String> columnGroup2;
+    private CrosstabMeasureBuilder<Integer> measure;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field1", String.class);
+        TextColumnBuilder<String> column3 = col.column("Column3", "field2", String.class);
+        TextColumnBuilder<String> column4 = col.column("Column4", "field2", String.class);
+        TextColumnBuilder<Integer> column5 = col.column("Column5", "field3", Integer.class);
+
+        measure = ctab.measure("measure", column5, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .rowGroups(rowGroup1 = ctab.rowGroup(column1), rowGroup2 = ctab.rowGroup(column2).setShowTotal(false))
+                                       .columnGroups(columnGroup1 = ctab.columnGroup(column3), columnGroup2 = ctab.columnGroup(column4).setShowTotal(false))
+                                       .measures(measure)
+                                       .setCellWidth(50)
+                                       .setCellHeight(20);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group 1
+        crosstabGroupHeaderPositionTest(columnGroup1, 0, 0, 0, 50, 16);
+        crosstabGroupTotalHeaderPositionTest(columnGroup1, 0, 0, 0, 50, 24);
+
+        // column group 2
+        crosstabGroupHeaderPositionTest(columnGroup2, 0, 0, 0, 50, 16);
+
+        // row group 1
+        crosstabGroupHeaderPositionTest(rowGroup1, 0, 0, 0, 100, 20);
+        crosstabGroupTotalHeaderPositionTest(rowGroup1, 0, 0, 0, 200, 20);
+
+        // row group 2
+        crosstabGroupHeaderPositionTest(rowGroup2, 0, 0, 0, 100, 20);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a", "c", 1);
+        dataSource.add("a", "c", 2);
+        dataSource.add("a", "d", 3);
+        dataSource.add("a", "d", 4);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java
new file mode 100644
index 0000000..1150312
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java
@@ -0,0 +1,94 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition8Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup1;
+    private CrosstabColumnGroupBuilder<String> columnGroup1;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Integer> measure2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+
+        rowGroup1 = ctab.rowGroup(column1).setHeaderWidth(22);
+        measure1 = ctab.measure("measure1", column3, Calculation.SUM);
+        measure2 = ctab.measure("measure2", column3, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab().setCellWidth(100).rowGroups(rowGroup1).columnGroups(columnGroup1 = ctab.columnGroup(column2)).measures(measure1, measure2);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group 1
+        crosstabGroupHeaderPositionTest(columnGroup1, 0, 0, 0, 100, 16);
+        crosstabGroupTotalHeaderPositionTest(columnGroup1, 0, 0, 0, 100, 16);
+
+        // row group 1
+        crosstabGroupHeaderPositionTest(rowGroup1, 0, 0, 0, 22, 26);
+        crosstabGroupTotalHeaderPositionTest(rowGroup1, 0, 0, 0, 22, 26);
+
+        // measures
+        crosstabCellPositionTest(measure1, null, null, 0, 0, 0, 50, 26);
+        crosstabCellPositionTest(measure1, rowGroup1, null, 0, 0, 0, 50, 26);
+        crosstabCellPositionTest(measure1, null, columnGroup1, 0, 0, 0, 50, 26);
+        crosstabCellPositionTest(measure1, rowGroup1, columnGroup1, 0, 0, 0, 50, 26);
+
+        crosstabCellPositionTest(measure2, null, null, 0, 50, 0, 50, 26);
+        crosstabCellPositionTest(measure2, rowGroup1, null, 0, 50, 0, 50, 26);
+        crosstabCellPositionTest(measure2, null, columnGroup1, 0, 50, 0, 50, 26);
+        crosstabCellPositionTest(measure2, rowGroup1, columnGroup1, 0, 50, 0, 50, 26);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("text text", "a", 1);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java
new file mode 100644
index 0000000..a97b270
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java
@@ -0,0 +1,85 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabPosition9Test extends AbstractJasperCrosstabPositionTest {
+    private CrosstabRowGroupBuilder<String> rowGroup1;
+    private CrosstabRowGroupBuilder<String> rowGroup2;
+    private CrosstabColumnGroupBuilder<String> columnGroup1;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+
+        rowGroup1 = ctab.rowGroup(column1).setShowTotal(false);
+        rowGroup2 = ctab.rowGroup(column1).setShowTotal(false).setHeaderWidth(25);
+        measure1 = ctab.measure("measure1", column3, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab().rowGroups(rowGroup1, rowGroup2).columnGroups(columnGroup1 = ctab.columnGroup(column2)).measures(measure1);
+
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group 1
+        crosstabGroupHeaderPositionTest(columnGroup1, 0, 0, 0, 100, 16);
+
+        // row group 1
+        crosstabGroupHeaderPositionTest(rowGroup1, 0, 0, 0, 100, 26);
+        crosstabGroupHeaderPositionTest(rowGroup2, 0, 0, 0, 25, 26);
+
+        // measures
+        crosstabCellPositionTest(measure1, null, null, 0, 0, 0, 100, 26);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("text text", "a", 1);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java
new file mode 100644
index 0000000..9a08f40
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java
@@ -0,0 +1,130 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
+
+/**
+ * Crosstab style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class CrosstabStyle1Test extends AbstractJasperCrosstabStyleTest {
+  private CrosstabRowGroupBuilder<String> rowGroup;
+  private CrosstabColumnGroupBuilder<String> columnGroup;
+  private CrosstabMeasureBuilder<Integer> measure1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    FieldBuilder<String> field1 = field("field1", String.class);
+    FieldBuilder<String> field2 = field("field2", String.class);
+
+    StyleBuilder titleStyle1 = stl.style().setFontSize(12).bold();
+    StyleBuilder titleStyle2 = stl.style(titleStyle1).setBackgroundColor(Color.LIGHT_GRAY);
+    StyleBuilder titleStyle3 = stl.style(titleStyle2).setBorder(stl.pen1Point())
+        .setHorizontalTextAlignment(HorizontalTextAlignment.CENTER);
+    StyleBuilder cellStyle = stl.style().bold();
+    final StyleBuilder rowGroupCellStyle = stl.style(cellStyle).setBackgroundColor(Color.BLUE);
+    final StyleBuilder columnGroupCellStyle = stl.style(cellStyle).setBackgroundColor(Color.ORANGE);
+    final StyleBuilder rowColumnGroupCellStyle = stl.style(cellStyle).setBackgroundColor(Color.RED);
+
+    rowGroup = ctab.rowGroup(field1).setHeaderStyle(titleStyle2).setTotalHeaderStyle(titleStyle3);
+    columnGroup =
+        ctab.columnGroup(field2).setHeaderStyle(titleStyle2).setTotalHeaderStyle(titleStyle3);
+
+    measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+    measure1.setStyle(cellStyle);
+    measure1.setStyle(rowGroupCellStyle, rowGroup);
+    measure1.setStyle(columnGroupCellStyle, columnGroup);
+    measure1.setStyle(rowColumnGroupCellStyle, rowGroup, columnGroup);
+
+    CrosstabBuilder crosstab = ctab.crosstab().headerCell(cmp.text("Header").setStyle(titleStyle1))
+        .rowGroups(rowGroup).columnGroups(columnGroup).measures(measure1);
+
+    rb.summary(crosstab);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    setCrosstabBand("summary");
+
+    crosstabHeaderElementStyleTest("textField1", 0, null, null, TEST_FONT_NAME, 12f, true, null);
+
+    crosstabGroupHeaderStyleTest(rowGroup, 0, null, Color.LIGHT_GRAY, TEST_FONT_NAME, 12f, true,
+        null);
+    crosstabGroupTotalHeaderStyleTest(rowGroup, 0, null, Color.LIGHT_GRAY, TEST_FONT_NAME, 12f,
+        true, null);
+    crosstabGroupTotalHeaderHorizontalAlignmentTest(rowGroup, 0, HorizontalTextAlignEnum.CENTER);
+
+    crosstabGroupHeaderStyleTest(columnGroup, 0, null, Color.LIGHT_GRAY, TEST_FONT_NAME, 12f, true,
+        null);
+    crosstabGroupTotalHeaderStyleTest(columnGroup, 0, null, Color.LIGHT_GRAY, TEST_FONT_NAME, 12f,
+        true, null);
+    crosstabGroupTotalHeaderHorizontalAlignmentTest(columnGroup, 0, HorizontalTextAlignEnum.CENTER);
+
+    for (int i = 0; i < 4; i++) {
+      crosstabCellStyleTest(measure1, null, null, i, null, null, TEST_FONT_NAME, 10f, true, null);
+    }
+    for (int i = 0; i < 2; i++) {
+      crosstabCellStyleTest(measure1, rowGroup, null, i, null, Color.BLUE, TEST_FONT_NAME, 10f,
+          true, null);
+      crosstabCellStyleTest(measure1, null, columnGroup, i, null, Color.ORANGE, TEST_FONT_NAME, 10f,
+          true, null);
+    }
+    crosstabCellStyleTest(measure1, rowGroup, columnGroup, 0, null, Color.RED, TEST_FONT_NAME, 10f,
+        true, null);
+
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("a", "c", 1);
+    dataSource.add("a", "c", 2);
+    dataSource.add("a", "d", 3);
+    dataSource.add("a", "d", 4);
+    dataSource.add("b", "c", 5);
+    dataSource.add("b", "c", 6);
+    dataSource.add("b", "d", 7);
+    dataSource.add("b", "d", 8);
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java
new file mode 100644
index 0000000..76303ca
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java
@@ -0,0 +1,133 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Crosstab style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class CrosstabStyle2Test extends AbstractJasperCrosstabStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private CrosstabRowGroupBuilder<String> rowGroup;
+  private CrosstabColumnGroupBuilder<String> columnGroup;
+  private CrosstabMeasureBuilder<Integer> measure1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    FieldBuilder<String> field1 = field("field1", String.class);
+    FieldBuilder<String> field2 = field("field2", String.class);
+
+    final StyleBuilder cellStyle =
+        stl.style().conditionalStyles(stl.conditionalStyle(new ConditionExpression(10, 15, 14, 36))
+            .setBackgroundColor(Color.ORANGE));
+
+    rowGroup = ctab.rowGroup(field1);
+    columnGroup = ctab.columnGroup(field2);
+
+    measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+    measure1.setStyle(cellStyle);
+
+    CrosstabBuilder crosstab =
+        ctab.crosstab().rowGroups(rowGroup).columnGroups(columnGroup).measures(measure1);
+
+    rb.summary(crosstab);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    setCrosstabBand("summary");
+
+    crosstabCellStyleTest(measure1, null, null, 0, null, null, TEST_FONT_NAME, 10f, null, null);
+    crosstabCellStyleTest(measure1, null, null, 1, null, null, TEST_FONT_NAME, 10f, null, null);
+    crosstabCellStyleTest(measure1, null, null, 2, null, null, TEST_FONT_NAME, 10f, null, null);
+    crosstabCellStyleTest(measure1, null, null, 3, null, Color.ORANGE, TEST_FONT_NAME, 10f, null,
+        null);
+
+    crosstabCellStyleTest(measure1, rowGroup, null, 0, null, Color.ORANGE, TEST_FONT_NAME, 10f,
+        null, null);
+    crosstabCellStyleTest(measure1, rowGroup, null, 1, null, null, TEST_FONT_NAME, 10f, null, null);
+
+    crosstabCellStyleTest(measure1, null, columnGroup, 0, null, Color.ORANGE, TEST_FONT_NAME, 10f,
+        null, null);
+    crosstabCellStyleTest(measure1, null, columnGroup, 1, null, null, TEST_FONT_NAME, 10f, null,
+        null);
+
+    crosstabCellStyleTest(measure1, rowGroup, columnGroup, 0, null, Color.ORANGE, TEST_FONT_NAME,
+        10f, null, null);
+
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("a", "c", 1);
+    dataSource.add("a", "c", 2);
+    dataSource.add("a", "d", 3);
+    dataSource.add("a", "d", 4);
+    dataSource.add("b", "c", 5);
+    dataSource.add("b", "c", 6);
+    dataSource.add("b", "d", 7);
+    dataSource.add("b", "d", 8);
+    return dataSource;
+  }
+
+  private class ConditionExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = 1L;
+
+    private List<Integer> values;
+
+    private ConditionExpression(Integer... values) {
+      this.values = Arrays.asList(values);
+    }
+
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+      Integer value = reportParameters.getValue(measure1);
+      return values.contains(value);
+    }
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java
new file mode 100644
index 0000000..b0cfcbc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java
@@ -0,0 +1,92 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Crosstab style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class CrosstabStyle3Test extends AbstractJasperCrosstabStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private CrosstabRowGroupBuilder<String> rowGroup;
+  private CrosstabColumnGroupBuilder<String> columnGroup;
+  private CrosstabMeasureBuilder<Integer> measure1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    FieldBuilder<String> field1 = field("field1", String.class);
+    FieldBuilder<String> field2 = field("field2", String.class);
+
+    rowGroup = ctab.rowGroup(field1).setShowTotal(false);
+    columnGroup = ctab.columnGroup(field2).setShowTotal(false);
+
+    measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+
+    CrosstabBuilder crosstab = ctab.crosstab().highlightEvenRows().highlightOddRows()
+        .rowGroups(rowGroup).columnGroups(columnGroup).measures(measure1);
+
+    rb.summary(crosstab);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    setCrosstabBand("summary");
+
+    Color color1 = new Color(240, 240, 240);
+    Color color2 = new Color(200, 200, 200);
+
+    crosstabCellStyleTest(measure1, null, null, 0, Color.BLACK, color2, TEST_FONT_NAME, 10f, null,
+        null);
+    crosstabCellStyleTest(measure1, null, null, 1, Color.BLACK, color1, TEST_FONT_NAME, 10f, null,
+        null);
+    crosstabCellStyleTest(measure1, null, null, 2, Color.BLACK, color2, TEST_FONT_NAME, 10f, null,
+        null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("a", "c", 1);
+    dataSource.add("b", "c", 1);
+    dataSource.add("c", "c", 1);
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java
new file mode 100644
index 0000000..c8e7fd6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java
@@ -0,0 +1,174 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Crosstab style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class CrosstabStyle4Test extends AbstractJasperCrosstabStyleTest {
+  private CrosstabRowGroupBuilder<String> rowGroup1;
+  private CrosstabRowGroupBuilder<String> rowGroup2;
+  private CrosstabColumnGroupBuilder<String> columnGroup1;
+  private CrosstabColumnGroupBuilder<String> columnGroup2;
+  private CrosstabMeasureBuilder<Integer> measure1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    final FieldBuilder<String> field1 = field("field1", String.class);
+    final FieldBuilder<String> field2 = field("field2", String.class);
+    final FieldBuilder<String> field3 = field("field3", String.class);
+    final FieldBuilder<String> field4 = field("field4", String.class);
+
+    rowGroup1 = ctab.rowGroup(field1);
+    rowGroup2 = ctab.rowGroup(field2);
+    columnGroup1 = ctab.columnGroup(field3);
+    columnGroup2 = ctab.columnGroup(field4);
+
+    measure1 = ctab.measure("field5", Integer.class, Calculation.SUM);
+
+    CrosstabBuilder crosstab = ctab.crosstab().highlightEvenRows().setCellWidth(50)
+        .setEvenRowStyle(stl.simpleStyle().setBackgroundColor(Color.LIGHT_GRAY).bold())
+        .setGroupStyle(stl.style(1).setBackgroundColor(Color.BLUE).bold())
+        .setGroupTotalStyle(stl.style(1).setBackgroundColor(Color.RED))
+        .setGrandTotalStyle(stl.style(1).setBackgroundColor(Color.MAGENTA).bold())
+        .setCellStyle(stl.style().setBackgroundColor(Color.YELLOW).italic())
+        .rowGroups(rowGroup1, rowGroup2).columnGroups(columnGroup1, columnGroup2)
+        .measures(measure1);
+
+    rb.summary(crosstab);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    setCrosstabBand("summary");
+
+    final Color color1 = new Color(239, 239, 48);
+    final Color color2 = new Color(239, 48, 239);
+    final Color color3 = new Color(239, 48, 48);
+
+    crosstabGroupHeaderStyleTest(rowGroup1, 0, null, Color.BLUE, TEST_FONT_NAME, 10f, true, null);
+    crosstabGroupTotalHeaderStyleTest(rowGroup1, 0, null, Color.MAGENTA, TEST_FONT_NAME, 10f, true,
+        null);
+
+    crosstabGroupHeaderStyleTest(rowGroup2, 0, null, Color.BLUE, TEST_FONT_NAME, 10f, true, null);
+    crosstabGroupTotalHeaderStyleTest(rowGroup2, 0, null, Color.RED, TEST_FONT_NAME, 10f, null,
+        null);
+
+    crosstabGroupHeaderStyleTest(columnGroup1, 0, null, Color.BLUE, TEST_FONT_NAME, 10f, true,
+        null);
+    crosstabGroupTotalHeaderStyleTest(columnGroup1, 0, null, Color.MAGENTA, TEST_FONT_NAME, 10f,
+        true, null);
+
+    crosstabGroupHeaderStyleTest(columnGroup2, 0, null, Color.BLUE, TEST_FONT_NAME, 10f, true,
+        null);
+    crosstabGroupTotalHeaderStyleTest(columnGroup2, 0, null, Color.RED, TEST_FONT_NAME, 10f, null,
+        null);
+
+    crosstabCellStyleTest(measure1, null, null, 0, null, Color.YELLOW, TEST_FONT_NAME, 10f, null,
+        true);
+    crosstabCellStyleTest(measure1, null, null, 1, null, Color.YELLOW, TEST_FONT_NAME, 10f, null,
+        true);
+    crosstabCellStyleTest(measure1, null, null, 2, null, color1, TEST_FONT_NAME, 10f, true, true);
+    crosstabCellStyleTest(measure1, null, null, 3, null, color1, TEST_FONT_NAME, 10f, true, true);
+    crosstabCellStyleTest(measure1, null, null, 4, null, Color.YELLOW, TEST_FONT_NAME, 10f, null,
+        true);
+    crosstabCellStyleTest(measure1, null, null, 5, null, Color.YELLOW, TEST_FONT_NAME, 10f, null,
+        true);
+    crosstabCellStyleTest(measure1, null, null, 6, null, color1, TEST_FONT_NAME, 10f, true, true);
+    crosstabCellStyleTest(measure1, null, null, 7, null, color1, TEST_FONT_NAME, 10f, true, true);
+
+    crosstabCellStyleTest(measure1, rowGroup1, null, 0, null, Color.MAGENTA, TEST_FONT_NAME, 10f,
+        true, null);
+    crosstabCellStyleTest(measure1, rowGroup1, null, 1, null, Color.MAGENTA, TEST_FONT_NAME, 10f,
+        true, null);
+
+    crosstabCellStyleTest(measure1, rowGroup2, null, 0, null, Color.RED, TEST_FONT_NAME, 10f, null,
+        null);
+    crosstabCellStyleTest(measure1, rowGroup2, null, 1, null, Color.RED, TEST_FONT_NAME, 10f, null,
+        null);
+    crosstabCellStyleTest(measure1, rowGroup2, null, 2, null, Color.RED, TEST_FONT_NAME, 10f, null,
+        null);
+    crosstabCellStyleTest(measure1, rowGroup2, null, 3, null, Color.RED, TEST_FONT_NAME, 10f, null,
+        null);
+
+    crosstabCellStyleTest(measure1, null, columnGroup1, 0, null, Color.MAGENTA, TEST_FONT_NAME, 10f,
+        true, null);
+    crosstabCellStyleTest(measure1, null, columnGroup1, 1, null, color2, TEST_FONT_NAME, 10f, true,
+        null);
+    crosstabCellStyleTest(measure1, null, columnGroup1, 2, null, Color.MAGENTA, TEST_FONT_NAME, 10f,
+        true, null);
+    crosstabCellStyleTest(measure1, null, columnGroup1, 3, null, color2, TEST_FONT_NAME, 10f, true,
+        null);
+
+    crosstabCellStyleTest(measure1, null, columnGroup2, 0, null, Color.RED, TEST_FONT_NAME, 10f,
+        null, null);
+    crosstabCellStyleTest(measure1, null, columnGroup2, 1, null, color3, TEST_FONT_NAME, 10f, true,
+        null);
+    crosstabCellStyleTest(measure1, null, columnGroup2, 2, null, Color.RED, TEST_FONT_NAME, 10f,
+        null, null);
+    crosstabCellStyleTest(measure1, null, columnGroup2, 3, null, color3, TEST_FONT_NAME, 10f, true,
+        null);
+
+    crosstabCellStyleTest(measure1, rowGroup1, columnGroup1, 0, null, Color.MAGENTA, TEST_FONT_NAME,
+        10f, true, null);
+    crosstabCellStyleTest(measure1, rowGroup1, columnGroup2, 0, null, Color.MAGENTA, TEST_FONT_NAME,
+        10f, true, null);
+
+    crosstabCellStyleTest(measure1, rowGroup2, columnGroup1, 0, null, Color.MAGENTA, TEST_FONT_NAME,
+        10f, true, null);
+    crosstabCellStyleTest(measure1, rowGroup2, columnGroup2, 0, null, Color.RED, TEST_FONT_NAME,
+        10f, null, null);
+    crosstabCellStyleTest(measure1, rowGroup2, columnGroup1, 1, null, Color.MAGENTA, TEST_FONT_NAME,
+        10f, true, null);
+    crosstabCellStyleTest(measure1, rowGroup2, columnGroup2, 1, null, Color.RED, TEST_FONT_NAME,
+        10f, null, null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+    dataSource.add("a", "a", "a", "a", 1);
+    dataSource.add("a", "b", "a", "b", 1);
+    dataSource.add("b", "a", "a", "a", 1);
+    dataSource.add("b", "b", "a", "b", 1);
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java
new file mode 100644
index 0000000..86dee2d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java
@@ -0,0 +1,116 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Crosstab style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class CrosstabStyle5Test extends AbstractJasperCrosstabStyleTest {
+  private CrosstabRowGroupBuilder<String> rowGroup;
+  private CrosstabColumnGroupBuilder<String> columnGroup1;
+  private CrosstabColumnGroupBuilder<String> columnGroup2;
+  private CrosstabMeasureBuilder<Integer> measure1;
+  private CrosstabMeasureBuilder<Integer> measure2;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    final FieldBuilder<String> field1 = field("field1", String.class);
+    final FieldBuilder<String> field2 = field("field2", String.class);
+    final StyleBuilder headerStyle = stl.style().setBackgroundColor(Color.LIGHT_GRAY);
+    final StyleBuilder cellStyle = stl.style().bold();
+    final StyleBuilder titleStyle = stl.style(cellStyle).setBackgroundColor(Color.BLUE);
+
+    rowGroup = ctab.rowGroup(field1).setHeaderStyle(headerStyle).setTotalHeaderStyle(headerStyle);
+    columnGroup1 =
+        ctab.columnGroup(field1).setHeaderStyle(headerStyle).setTotalHeaderStyle(headerStyle);
+    columnGroup2 =
+        ctab.columnGroup(field2).setHeaderStyle(headerStyle).setTotalHeaderStyle(headerStyle);
+
+    measure1 = ctab.measure("m1", "field3", Integer.class, Calculation.SUM);
+    measure1.setTitleStyle(titleStyle);
+    measure2 = ctab.measure("m2", "field3", Integer.class, Calculation.SUM);
+
+    CrosstabBuilder crosstab = ctab.crosstab().setCellWidth(50).highlightEvenRows()
+        .setGroupTotalStyle(stl.style().setBackgroundColor(Color.RED)).rowGroups(rowGroup)
+        .columnGroups(columnGroup1, columnGroup2).measures(measure1, measure2);
+
+    rb.summary(crosstab);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    setCrosstabBand("summary");
+
+    crosstabGroupTitleTotalHeaderStyleTest(columnGroup1, measure1, 0, null, Color.BLUE,
+        TEST_FONT_NAME, 10f, true, null);
+    crosstabGroupTitleTotalHeaderStyleTest(columnGroup1, measure2, 0, null, Color.LIGHT_GRAY,
+        TEST_FONT_NAME, 10f, null, null);
+
+    crosstabGroupTitleHeaderStyleTest(columnGroup2, measure1, 0, null, Color.BLUE, TEST_FONT_NAME,
+        10f, true, null);
+    crosstabGroupTitleTotalHeaderStyleTest(columnGroup2, measure1, 0, null, Color.BLUE,
+        TEST_FONT_NAME, 10f, true, null);
+    crosstabGroupTitleHeaderStyleTest(columnGroup2, measure2, 0, null, Color.LIGHT_GRAY,
+        TEST_FONT_NAME, 10f, null, null);
+    crosstabGroupTitleTotalHeaderStyleTest(columnGroup2, measure2, 0, null, Color.LIGHT_GRAY,
+        TEST_FONT_NAME, 10f, null, null);
+
+    crosstabCellStyleTest(measure1, rowGroup, null, 0, null, Color.RED, TEST_FONT_NAME, 10f, null,
+        null);
+    crosstabCellStyleTest(measure1, rowGroup, null, 1, null, Color.RED, TEST_FONT_NAME, 10f, null,
+        null);
+    crosstabCellStyleTest(measure1, rowGroup, columnGroup1, 0, null, Color.RED, TEST_FONT_NAME, 10f,
+        null, null);
+    crosstabCellStyleTest(measure1, rowGroup, columnGroup2, 0, null, Color.RED, TEST_FONT_NAME, 10f,
+        null, null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("a", "c", 1);
+    dataSource.add("a", "c", 2);
+    dataSource.add("a", "d", 3);
+    dataSource.add("a", "d", 4);
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java
new file mode 100644
index 0000000..3c9da0b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java
@@ -0,0 +1,111 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Crosstab style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class CrosstabStyle6Test extends AbstractJasperCrosstabStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private CrosstabRowGroupBuilder<String> rowGroup;
+  private CrosstabColumnGroupBuilder<String> columnGroup;
+  private CrosstabMeasureBuilder<Integer> measure1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    FieldBuilder<String> field1 = field("field1", String.class);
+    FieldBuilder<String> field2 = field("field2", String.class);
+
+    rowGroup = ctab.rowGroup(field1).setShowTotal(false);
+    columnGroup = ctab.columnGroup(field2).setShowTotal(false);
+
+    measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+
+    ConditionalStyleBuilder condition = stl.conditionalStyle(new ConditionExpression())
+        .setBackgroundColor(new Color(200, 200, 200));
+
+    StyleBuilder style = stl.style().conditionalStyles(condition);
+
+    measure1.setStyle(style);
+
+    CrosstabBuilder crosstab = ctab.crosstab().highlightEvenRows().rowGroups(rowGroup)
+        .columnGroups(columnGroup).measures(measure1).setDataSource(createDataSource1());
+
+    rb.summary(crosstab);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    setCrosstabBand("summary");
+
+    Color color1 = new Color(240, 240, 240);
+    Color color2 = new Color(200, 200, 200);
+
+    crosstabCellStyleTest(measure1, null, null, 0, null, color2, TEST_FONT_NAME, 10f, null, null);
+    crosstabCellStyleTest(measure1, null, null, 1, null, color1, TEST_FONT_NAME, 10f, null, null);
+    crosstabCellStyleTest(measure1, null, null, 2, null, color2, TEST_FONT_NAME, 10f, null, null);
+  }
+
+  protected JRDataSource createDataSource1() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("a", "c", 1);
+    dataSource.add("b", "c", 1);
+    dataSource.add("c", "c", 1);
+    return dataSource;
+  }
+
+  private class ConditionExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+      return reportParameters.getCrosstabRowNumber() == 1
+          || reportParameters.getCrosstabRowNumber() == 3;
+    }
+
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabTest.java
new file mode 100644
index 0000000..a118dfa
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabTest.java
@@ -0,0 +1,77 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.test.jasper.AbstractJasperTest;
+import net.sf.jasperreports.crosstabs.base.JRBaseCrosstab;
+import net.sf.jasperreports.crosstabs.type.CrosstabColumnPositionEnum;
+import net.sf.jasperreports.crosstabs.type.CrosstabRowPositionEnum;
+import net.sf.jasperreports.engine.type.RunDirectionEnum;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class CrosstabTest extends AbstractJasperTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+		final TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+		final TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+		
+		final CrosstabBuilder crosstab = ctab.crosstab()
+			.setRepeatColumnHeaders(false)
+			.setRepeatRowHeaders(false)
+			.setColumnBreakOffset(100)
+			.setIgnoreWidth(true)
+			.setRunDirection(RunDirection.RIGHT_TO_LEFT)
+			.rowGroups(ctab.rowGroup(column1))
+			.columnGroups(ctab.columnGroup(column2))
+			.measures(ctab.measure(column3, Calculation.SUM));
+		
+		rb.columns(column1, column2, column3).summary(crosstab);
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+		
+		final JRBaseCrosstab crosstab = (JRBaseCrosstab)this.getJasperReport().getSummary().getElementByKey("summary.crosstab1");
+		Assertions.assertFalse(crosstab.isRepeatColumnHeaders());
+		Assertions.assertFalse(crosstab.isRepeatRowHeaders());
+		Assertions.assertEquals(100, crosstab.getColumnBreakOffset());
+		Assertions.assertTrue(crosstab.getIgnoreWidth());
+		Assertions.assertEquals(RunDirectionEnum.RTL, crosstab.getRunDirectionValue());
+		Assertions.assertEquals(CrosstabRowPositionEnum.STRETCH, crosstab.getRowGroups()[0].getPositionValue());
+		Assertions.assertEquals(CrosstabColumnPositionEnum.STRETCH, crosstab.getColumnGroups()[0].getPositionValue());
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java
new file mode 100644
index 0000000..fb002f1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java
@@ -0,0 +1,63 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabWhenNoDataTest extends AbstractJasperCrosstabPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<Integer> column3 = col.column("Column3", "field3", Integer.class);
+        TextColumnBuilder<Double> column4 = col.column("Column4", "field4", Double.class);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .whenNoDataCell(cmp.text("text"), cmp.text("text"))
+                                       .rowGroups(ctab.rowGroup(column1))
+                                       .columnGroups(ctab.columnGroup(column2))
+                                       .measures(ctab.measure(column3, Calculation.SUM), ctab.measure(column4, Calculation.SUM));
+
+        rb.setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL).columns(column1, column2, column3, column4).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        crosstabWhenNoDataElementPositionTest("textField1", 0, 0, 0, 575, 16);
+        crosstabWhenNoDataElementPositionTest("textField2", 0, 0, 16, 575, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java
new file mode 100644
index 0000000..efdbfec
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java
@@ -0,0 +1,153 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ExpressionCrosstabTest extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabVariableBuilder<Integer> variable1;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Double> measure2;
+    private CrosstabMeasureBuilder<Double> measure3;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        variable1 = ctab.variable("field4", Integer.class, Calculation.SUM);
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+        measure2 = ctab.measure(new MeasureExpression1(), Calculation.SUM);
+        measure3 = ctab.measure(new MeasureExpression2());
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class))
+                                       .columnGroups(columnGroup = ctab.columnGroup("field2", String.class))
+                                       .variables(variable1)
+                                       .measures(measure1, measure2, measure3);
+
+        rb.setLocale(Locale.ENGLISH).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "c", "d");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 2);
+        crosstabGroupHeaderValueTest(rowGroup, "a", "b");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 4);
+        crosstabCellValueTest(measure1, null, null, "15", "11", "7", "3");
+        crosstabCellCountTest(measure1, null, columnGroup, 2);
+        crosstabCellValueTest(measure1, null, columnGroup, "26", "10");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "22", "14");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "36");
+
+        // measure2
+        crosstabCellCountTest(measure2, null, null, 4);
+        crosstabCellValueTest(measure2, null, null, "15.0", "11.0", "7.0", "3.0");
+        crosstabCellCountTest(measure2, null, columnGroup, 2);
+        crosstabCellValueTest(measure2, null, columnGroup, "26.0", "10.0");
+        crosstabCellCountTest(measure2, rowGroup, null, 2);
+        crosstabCellValueTest(measure2, rowGroup, null, "22.0", "14.0");
+        crosstabCellCountTest(measure2, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure2, rowGroup, columnGroup, "36.0");
+
+        // measure3
+        crosstabCellCountTest(measure3, null, null, 4);
+        crosstabCellValueTest(measure3, null, null, "7.5", "5.5", "3.5", "1.5");
+        crosstabCellCountTest(measure3, null, columnGroup, 2);
+        crosstabCellValueTest(measure3, null, columnGroup, "6.5", "2.5");
+        crosstabCellCountTest(measure3, rowGroup, null, 2);
+        crosstabCellValueTest(measure3, rowGroup, null, "5.5", "3.5");
+        crosstabCellCountTest(measure3, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure3, rowGroup, columnGroup, "4.5");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("a", "c", 8, 1);
+        dataSource.add("a", "c", 7, 1);
+        dataSource.add("a", "d", 6, 1);
+        dataSource.add("a", "d", 5, 1);
+        dataSource.add("b", "c", 4, 1);
+        dataSource.add("b", "c", 3, 1);
+        dataSource.add("b", "d", 2, 1);
+        dataSource.add("b", "d", 1, 1);
+        return dataSource;
+    }
+
+    private class MeasureExpression1 extends AbstractSimpleExpression<Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Double evaluate(ReportParameters reportParameters) {
+            Integer value1 = reportParameters.getValue("field3");
+            Integer value2 = reportParameters.getValue("field4");
+            return value1.doubleValue() / value2.doubleValue();
+        }
+    }
+
+    private class MeasureExpression2 extends AbstractSimpleExpression<Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Double evaluate(ReportParameters reportParameters) {
+            Integer value1 = reportParameters.getValue(measure1);
+            Integer value2 = reportParameters.getValue(variable1);
+            return value1.doubleValue() / value2.doubleValue();
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java
new file mode 100644
index 0000000..88fbdf3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java
@@ -0,0 +1,183 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class GroupExpressionCrosstabTest extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<Integer> columnGroup1;
+    private CrosstabColumnGroupBuilder<String> columnGroup2;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .setCellWidth(50)
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class))
+                                       .columnGroups(columnGroup1 = ctab.columnGroup(new GroupExpression1()), columnGroup2 = ctab.columnGroup(new GroupExpression2()))
+                                       .measures(measure1);
+
+        rb.setLocale(Locale.ENGLISH).setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).fields(field("field2", Date.class)).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group 1
+        crosstabGroupHeaderCountTest(columnGroup1, 2);
+        crosstabGroupHeaderValueTest(columnGroup1, "2010", "2011");
+        crosstabGroupTotalHeaderCountTest(columnGroup1, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup1, "Total");
+
+        // column group 2
+        crosstabGroupHeaderCountTest(columnGroup2, 5);
+        crosstabGroupHeaderValueTest(columnGroup2, "Q1", "Q2", "Q3", "Q4", "Q1");
+        crosstabGroupTotalHeaderCountTest(columnGroup2, 2);
+        crosstabGroupTotalHeaderValueTest(columnGroup2, "Total", "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 2);
+        crosstabGroupHeaderValueTest(rowGroup, "a", "b");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 10);
+        crosstabCellValueTest(measure1, null, null, "6", "15", "24", "33", "27", "39", "30", "21", "12", "3");
+        crosstabCellCountTest(measure1, null, columnGroup1, 2);
+        crosstabCellValueTest(measure1, null, columnGroup1, "105", "105");
+        crosstabCellCountTest(measure1, null, columnGroup2, 4);
+        crosstabCellValueTest(measure1, null, columnGroup2, "78", "27", "102", "3");
+        crosstabCellCountTest(measure1, rowGroup, null, 5);
+        crosstabCellValueTest(measure1, rowGroup, null, "45", "45", "45", "45", "30");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup1, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup1, "210");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup2, 2);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup2, "180", "30");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a", toDate(2010, 1, 1), 1);
+        dataSource.add("a", toDate(2010, 2, 1), 2);
+        dataSource.add("a", toDate(2010, 3, 1), 3);
+        dataSource.add("a", toDate(2010, 4, 1), 4);
+        dataSource.add("a", toDate(2010, 5, 1), 5);
+        dataSource.add("a", toDate(2010, 6, 1), 6);
+        dataSource.add("a", toDate(2010, 7, 1), 7);
+        dataSource.add("a", toDate(2010, 8, 1), 8);
+        dataSource.add("a", toDate(2010, 9, 1), 9);
+        dataSource.add("a", toDate(2010, 10, 1), 10);
+        dataSource.add("a", toDate(2010, 11, 1), 11);
+        dataSource.add("a", toDate(2010, 12, 1), 12);
+        dataSource.add("a", toDate(2011, 1, 1), 13);
+        dataSource.add("a", toDate(2011, 2, 1), 14);
+
+        dataSource.add("b", toDate(2010, 1, 1), 14);
+        dataSource.add("b", toDate(2010, 2, 1), 13);
+        dataSource.add("b", toDate(2010, 3, 1), 12);
+        dataSource.add("b", toDate(2010, 4, 1), 11);
+        dataSource.add("b", toDate(2010, 5, 1), 10);
+        dataSource.add("b", toDate(2010, 6, 1), 9);
+        dataSource.add("b", toDate(2010, 7, 1), 8);
+        dataSource.add("b", toDate(2010, 8, 1), 7);
+        dataSource.add("b", toDate(2010, 9, 1), 6);
+        dataSource.add("b", toDate(2010, 10, 1), 5);
+        dataSource.add("b", toDate(2010, 11, 1), 4);
+        dataSource.add("b", toDate(2010, 12, 1), 3);
+        dataSource.add("b", toDate(2011, 1, 1), 2);
+        dataSource.add("b", toDate(2011, 2, 1), 1);
+        return dataSource;
+    }
+
+    private class GroupExpression1 extends AbstractSimpleExpression<Integer> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Integer evaluate(ReportParameters reportParameters) {
+            Date date = reportParameters.getValue("field2");
+            Calendar c = Calendar.getInstance();
+            c.setTime(date);
+            return c.get(Calendar.YEAR);
+        }
+    }
+
+    private class GroupExpression2 extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            Date date = reportParameters.getValue("field2");
+            Calendar c = Calendar.getInstance();
+            c.setTime(date);
+            switch (c.get(Calendar.MONTH)) {
+                case 0:
+                case 1:
+                case 2:
+                    return "Q1";
+                case 3:
+                case 4:
+                case 5:
+                    return "Q2";
+                case 6:
+                case 7:
+                case 8:
+                    return "Q3";
+                case 9:
+                case 10:
+                case 11:
+                    return "Q4";
+            }
+            return null;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java
new file mode 100644
index 0000000..768542e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java
@@ -0,0 +1,161 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.hyperLink;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.dynamicreports.test.jasper.JasperTestUtils;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRPrintElement;
+import net.sf.jasperreports.engine.JRPrintText;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class HyperLinkCrosstabTest extends AbstractJasperCrosstabValueTest implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	private CrosstabRowGroupBuilder<String> rowGroup;
+	private CrosstabColumnGroupBuilder<String> columnGroup;
+	private CrosstabMeasureBuilder<Integer> measure;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+        this.rowGroup = ctab.rowGroup("field1", String.class);
+        this.rowGroup.setHeaderHyperLink(hyperLink(new HyperLinkExpression1(this.rowGroup)));
+        this.columnGroup = ctab.columnGroup("field2", String.class);
+        this.columnGroup.setHeaderHyperLink(hyperLink(new HyperLinkExpression1(this.columnGroup)));
+        this.measure = ctab.measure("field3", Integer.class, Calculation.SUM);
+        this.measure.setHyperLink(hyperLink(new HyperLinkExpression2(this.rowGroup, this.columnGroup, this.measure)));
+		
+		final CrosstabBuilder crosstab = ctab.crosstab().rowGroups(this.rowGroup).columnGroups(this.columnGroup).measures(
+            this.measure);
+		
+		rb.setLocale(Locale.ENGLISH).summary(crosstab);
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.setCrosstabBand("summary");
+		
+		List<JRPrintElement> elements =
+            this.findElement(this.getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(this.rowGroup));
+		Assertions.assertEquals(2, elements.size());
+		JRPrintText element = (JRPrintText)elements.get(0);
+		Assertions.assertEquals("a", element.getHyperlinkReference());
+		element = (JRPrintText)elements.get(1);
+		Assertions.assertEquals("b", element.getHyperlinkReference());
+		
+		elements = this.findElement(this.getPrefix(1) + JasperTestUtils.getCrosstabGroupHeaderName(this.columnGroup));
+		Assertions.assertEquals(2, elements.size());
+		element = (JRPrintText)elements.get(0);
+		Assertions.assertEquals("c", element.getHyperlinkReference());
+		element = (JRPrintText)elements.get(1);
+		Assertions.assertEquals( "d", element.getHyperlinkReference());
+        
+        elements = this.findElement(this.getPrefix(1) + JasperTestUtils.getCrosstabCellName(this.measure, null, null));
+		Assertions.assertEquals(4, elements.size());
+		element = (JRPrintText)elements.get(0);
+		Assertions.assertEquals("a c 3", element.getHyperlinkReference());
+		element = (JRPrintText)elements.get(1);
+		Assertions.assertEquals("a d 7", element.getHyperlinkReference());
+		element = (JRPrintText)elements.get(2);
+		Assertions.assertEquals("b c 11", element.getHyperlinkReference());
+		element = (JRPrintText)elements.get(3);
+		Assertions.assertEquals("b d 15", element.getHyperlinkReference());
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+		dataSource.add("a", "c", 1);
+		dataSource.add("a", "c", 2);
+		dataSource.add("a", "d", 3);
+		dataSource.add("a", "d", 4);
+		dataSource.add("b", "c", 5);
+		dataSource.add("b", "c", 6);
+		dataSource.add("b", "d", 7);
+		dataSource.add("b", "d", 8);
+		return dataSource;
+	}
+	
+	private static class HyperLinkExpression1 extends AbstractComplexExpression<String>
+	{
+		private static final long serialVersionUID = 1L;
+		
+		public HyperLinkExpression1(final AbstractCrosstabGroupBuilder<?, ?, ?> group)
+		{
+            this.addExpression(group);
+		}
+		
+		@Override
+		public String evaluate(final List<?> values, final ReportParameters reportParameters)
+		{
+			return (String)values.get(0);
+		}
+	}
+	
+	
+	private class HyperLinkExpression2 extends AbstractComplexExpression<String>
+	{
+		private static final long serialVersionUID = 1L;
+		
+		public HyperLinkExpression2(
+			final AbstractCrosstabGroupBuilder<?, ?, ?> group1,
+			final AbstractCrosstabGroupBuilder<?, ?, ?> group2,
+			final CrosstabMeasureBuilder<?> measure)
+		{
+            this.addExpression(group1);
+            this.addExpression(group2);
+            this.addExpression(measure);
+		}
+		
+		@Override
+		public String evaluate(final List<?> values, final ReportParameters reportParameters)
+		{
+			return values.get(0) + " " + values.get(1) + " " + values.get(2);
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java
new file mode 100644
index 0000000..ebdfff5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java
@@ -0,0 +1,97 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.crosstab;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.OrderType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class OrderCrosstabTest extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class).setOrderType(OrderType.DESCENDING).setShowTotal(false))
+                                       .columnGroups(columnGroup = ctab.columnGroup("field2", String.class).setShowTotal(false).orderBy(measure1).setOrderType(OrderType.DESCENDING))
+                                       .measures(measure1);
+
+        rb.setLocale(Locale.ENGLISH).summary(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("summary");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "c", "d");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 0);
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 2);
+        crosstabGroupHeaderValueTest(rowGroup, "b", "a");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 0);
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 4);
+        crosstabCellValueTest(measure1, null, null, "7", "3", "15", "11");
+        crosstabCellCountTest(measure1, null, columnGroup, 0);
+        crosstabCellCountTest(measure1, rowGroup, null, 0);
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 0);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a", "c", 8);
+        dataSource.add("a", "c", 7);
+        dataSource.add("a", "d", 6);
+        dataSource.add("a", "d", 5);
+        dataSource.add("b", "c", 4);
+        dataSource.add("b", "c", 3);
+        dataSource.add("b", "d", 2);
+        dataSource.add("b", "d", 1);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java
new file mode 100644
index 0000000..89bf245
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java
@@ -0,0 +1,153 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.dataset;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabDataset1Test extends AbstractJasperCrosstabValueTest {
+    private CrosstabRowGroupBuilder<String> rowGroup1;
+    private CrosstabRowGroupBuilder<String> rowGroup2;
+    private CrosstabColumnGroupBuilder<String> columnGroup1;
+    private CrosstabColumnGroupBuilder<String> columnGroup2;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Integer> measure2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        FieldBuilder<String> field1 = field("field1", String.class);
+        FieldBuilder<String> field2 = field("field2", String.class);
+        FieldBuilder<String> field3 = field("field3", String.class);
+        FieldBuilder<String> field4 = field("field4", String.class);
+        FieldBuilder<Integer> field5 = field("field5", Integer.class);
+
+        measure1 = ctab.measure("measure1", field5, Calculation.SUM);
+        measure2 = ctab.measure("measure2", field5, Calculation.SUM);
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .setDataSource(createCrosstabDataSource())
+                                       .headerCell(cmp.text("Header"))
+                                       .setCellWidth(20)
+                                       .rowGroups(rowGroup1 = ctab.rowGroup(field1), rowGroup2 = ctab.rowGroup(field2))
+                                       .columnGroups(columnGroup1 = ctab.columnGroup(field3), columnGroup2 = ctab.columnGroup(field4))
+                                       .measures(measure1, measure2);
+
+        rb.setLocale(Locale.ENGLISH).setPageFormat(PageType.A3, PageOrientation.LANDSCAPE).title(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("title");
+
+        crosstabHeaderElementCountTest("textField1", 1);
+        crosstabHeaderElementValueTest("textField1", "Header");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup1, 2);
+        crosstabGroupHeaderValueTest(columnGroup1, "g", "h");
+        crosstabGroupTotalHeaderCountTest(columnGroup1, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup1, "Total");
+        crosstabGroupHeaderCountTest(columnGroup2, 4);
+        crosstabGroupHeaderValueTest(columnGroup2, "i", "j", "k", "l");
+        crosstabGroupTotalHeaderCountTest(columnGroup2, 2);
+        crosstabGroupTotalHeaderValueTest(columnGroup2, "Total", "Total");
+
+        // column group title
+        crosstabGroupTitleHeaderCountTest(columnGroup1, measure1, 0);
+        crosstabGroupTitleTotalHeaderCountTest(columnGroup1, measure1, 1);
+        crosstabGroupTitleTotalHeaderValueTest(columnGroup1, measure1, "measure1");
+        crosstabGroupTitleHeaderCountTest(columnGroup2, measure1, 4);
+        crosstabGroupTitleHeaderValueTest(columnGroup2, measure1, "measure1", "measure1", "measure1", "measure1");
+        crosstabGroupTitleTotalHeaderCountTest(columnGroup2, measure1, 2);
+        crosstabGroupTitleTotalHeaderValueTest(columnGroup2, measure1, "measure1", "measure1");
+
+        crosstabGroupTitleHeaderCountTest(columnGroup1, measure2, 0);
+        crosstabGroupTitleTotalHeaderCountTest(columnGroup1, measure2, 1);
+        crosstabGroupTitleTotalHeaderValueTest(columnGroup1, measure2, "measure2");
+        crosstabGroupTitleHeaderCountTest(columnGroup2, measure2, 4);
+        crosstabGroupTitleHeaderValueTest(columnGroup2, measure2, "measure2", "measure2", "measure2", "measure2");
+        crosstabGroupTitleTotalHeaderCountTest(columnGroup2, measure2, 2);
+        crosstabGroupTitleTotalHeaderValueTest(columnGroup2, measure2, "measure2", "measure2");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup1, 2);
+        crosstabGroupHeaderValueTest(rowGroup1, "a", "b");
+        crosstabGroupTotalHeaderCountTest(rowGroup1, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup1, "Total");
+        crosstabGroupHeaderCountTest(rowGroup2, 4);
+        crosstabGroupHeaderValueTest(rowGroup2, "c", "d", "e", "f");
+        crosstabGroupTotalHeaderCountTest(rowGroup2, 2);
+        crosstabGroupTotalHeaderValueTest(rowGroup2, "Total", "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 16);
+        crosstabCellValueTest(measure1, null, null, "1", "2", "0", "0", "3", "4", "0", "0", "0", "0", "5", "6", "0", "0", "7", "8");
+        crosstabCellCountTest(measure1, null, columnGroup1, 4);
+        crosstabCellValueTest(measure1, null, columnGroup1, "3", "7", "11", "15");
+        crosstabCellCountTest(measure1, null, columnGroup2, 8);
+        crosstabCellValueTest(measure1, null, columnGroup2, "3", "0", "7", "0", "0", "11", "0", "15");
+        crosstabCellCountTest(measure1, rowGroup1, null, 4);
+        crosstabCellValueTest(measure1, rowGroup1, null, "4", "6", "12", "14");
+        crosstabCellCountTest(measure1, rowGroup2, null, 8);
+        crosstabCellValueTest(measure1, rowGroup2, null, "4", "6", "0", "0", "0", "0", "12", "14");
+        crosstabCellCountTest(measure1, rowGroup1, columnGroup1, 1);
+        crosstabCellValueTest(measure1, rowGroup1, columnGroup1, "36");
+        crosstabCellCountTest(measure1, rowGroup2, columnGroup2, 4);
+        crosstabCellValueTest(measure1, rowGroup2, columnGroup2, "10", "0", "0", "26");
+        crosstabCellCountTest(measure1, rowGroup1, columnGroup2, 2);
+        crosstabCellValueTest(measure1, rowGroup1, columnGroup2, "10", "26");
+        crosstabCellCountTest(measure1, rowGroup2, columnGroup1, 2);
+        crosstabCellValueTest(measure1, rowGroup2, columnGroup1, "10", "26");
+    }
+
+    private JRDataSource createCrosstabDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+        dataSource.add("a", "c", "g", "i", 1);
+        dataSource.add("a", "c", "g", "j", 2);
+        dataSource.add("a", "d", "g", "i", 3);
+        dataSource.add("a", "d", "g", "j", 4);
+        dataSource.add("b", "e", "h", "k", 5);
+        dataSource.add("b", "e", "h", "l", 6);
+        dataSource.add("b", "f", "h", "k", 7);
+        dataSource.add("b", "f", "h", "l", 8);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java
new file mode 100644
index 0000000..ad75990
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java
@@ -0,0 +1,137 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.dataset;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabDataset2Test extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+        measure1.setValueFormatter(new ValueFormatter1());
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .setDataSource(createCrosstabDataSource())
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class).setHeaderValueFormatter(new ValueFormatter2()))
+                                       .columnGroups(columnGroup = ctab.columnGroup("field2", String.class).setHeaderValueFormatter(new ValueFormatter2()))
+                                       .measures(measure1);
+
+        rb.setLocale(Locale.ENGLISH).addParameter("parameter", "parameter_value").title(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("title");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "value = c", "value = d");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 2);
+        crosstabGroupHeaderValueTest(rowGroup, "value = a", "value = b");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 4);
+        crosstabCellValueTest(measure1, null, null, "value = 3", "value = 7", "value = 11", "value = 15");
+        crosstabCellCountTest(measure1, null, columnGroup, 2);
+        crosstabCellValueTest(measure1, null, columnGroup, "value = 10", "value = 26");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "value = 14", "value = 22");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "value = 36");
+    }
+
+    private JRDataSource createCrosstabDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a", "c", 1);
+        dataSource.add("a", "c", 2);
+        dataSource.add("a", "d", 3);
+        dataSource.add("a", "d", 4);
+        dataSource.add("b", "c", 5);
+        dataSource.add("b", "c", 6);
+        dataSource.add("b", "d", 7);
+        dataSource.add("b", "d", 8);
+        return dataSource;
+    }
+
+    private class ValueFormatter1 extends AbstractValueFormatter<String, Integer> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String format(Integer value, ReportParameters reportParameters) {
+            Assertions.assertNotNull(reportParameters.getMasterParameters());
+            try {
+                reportParameters.getValue("parameter");
+                Assertions.fail("parameter is not null");
+            } catch (Exception e) {
+            }
+            Assertions.assertEquals("parameter_value", reportParameters.getMasterParameters().getValue("parameter"));
+            return "value = " + value;
+        }
+    }
+
+    private class ValueFormatter2 extends AbstractValueFormatter<String, String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String format(String value, ReportParameters reportParameters) {
+            Assertions.assertNotNull(reportParameters.getMasterParameters());
+            try {
+                reportParameters.getValue("parameter");
+                Assertions.fail("parameter is not null");
+            } catch (Exception e) {
+            }
+            Assertions.assertEquals("parameter_value", reportParameters.getMasterParameters().getValue("parameter"));
+            return "value = " + value;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java
new file mode 100644
index 0000000..d371e6e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java
@@ -0,0 +1,168 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.dataset;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CrosstabDataset3Test extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabVariableBuilder<Integer> variable1;
+    private CrosstabMeasureBuilder<Integer> measure1;
+    private CrosstabMeasureBuilder<Double> measure2;
+    private CrosstabMeasureBuilder<Double> measure3;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        variable1 = ctab.variable("field4", Integer.class, Calculation.SUM);
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+        measure2 = ctab.measure(new MeasureExpression1(), Calculation.SUM);
+        measure3 = ctab.measure(new MeasureExpression2());
+
+        CrosstabBuilder crosstab = ctab.crosstab()
+                                       .setDataSource(createCrosstabDataSource())
+                                       .rowGroups(rowGroup = ctab.rowGroup("field1", String.class))
+                                       .columnGroups(columnGroup = ctab.columnGroup("field2", String.class))
+                                       .variables(variable1)
+                                       .measures(measure1, measure2, measure3);
+
+        rb.setLocale(Locale.ENGLISH).addParameter("parameter", "parameter_value").title(crosstab);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        setCrosstabBand("title");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "c", "d");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 2);
+        crosstabGroupHeaderValueTest(rowGroup, "a", "b");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 4);
+        crosstabCellValueTest(measure1, null, null, "15", "11", "7", "3");
+        crosstabCellCountTest(measure1, null, columnGroup, 2);
+        crosstabCellValueTest(measure1, null, columnGroup, "26", "10");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "22", "14");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "36");
+
+        // measure2
+        crosstabCellCountTest(measure2, null, null, 4);
+        crosstabCellValueTest(measure2, null, null, "15.0", "11.0", "7.0", "3.0");
+        crosstabCellCountTest(measure2, null, columnGroup, 2);
+        crosstabCellValueTest(measure2, null, columnGroup, "26.0", "10.0");
+        crosstabCellCountTest(measure2, rowGroup, null, 2);
+        crosstabCellValueTest(measure2, rowGroup, null, "22.0", "14.0");
+        crosstabCellCountTest(measure2, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure2, rowGroup, columnGroup, "36.0");
+
+        // measure3
+        crosstabCellCountTest(measure3, null, null, 4);
+        crosstabCellValueTest(measure3, null, null, "7.5", "5.5", "3.5", "1.5");
+        crosstabCellCountTest(measure3, null, columnGroup, 2);
+        crosstabCellValueTest(measure3, null, columnGroup, "6.5", "2.5");
+        crosstabCellCountTest(measure3, rowGroup, null, 2);
+        crosstabCellValueTest(measure3, rowGroup, null, "5.5", "3.5");
+        crosstabCellCountTest(measure3, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure3, rowGroup, columnGroup, "4.5");
+    }
+
+    private JRDataSource createCrosstabDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add("a", "c", 8, 1);
+        dataSource.add("a", "c", 7, 1);
+        dataSource.add("a", "d", 6, 1);
+        dataSource.add("a", "d", 5, 1);
+        dataSource.add("b", "c", 4, 1);
+        dataSource.add("b", "c", 3, 1);
+        dataSource.add("b", "d", 2, 1);
+        dataSource.add("b", "d", 1, 1);
+        return dataSource;
+    }
+
+    private class MeasureExpression1 extends AbstractSimpleExpression<Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Double evaluate(ReportParameters reportParameters) {
+            Assertions.assertNotNull(reportParameters.getMasterParameters());
+            try {
+                reportParameters.getValue("parameter");
+                Assertions.fail("parameter is not null");
+            } catch (Exception e) {
+            }
+            Assertions.assertEquals("parameter_value", reportParameters.getMasterParameters().getValue("parameter"));
+            Integer value1 = reportParameters.getValue("field3");
+            Integer value2 = reportParameters.getValue("field4");
+            return value1.doubleValue() / value2.doubleValue();
+        }
+    }
+
+    private class MeasureExpression2 extends AbstractSimpleExpression<Double> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Double evaluate(ReportParameters reportParameters) {
+            Assertions.assertNotNull(reportParameters.getMasterParameters());
+            try {
+                reportParameters.getValue("parameter");
+                Assertions.fail("parameter is not null");
+            } catch (Exception e) {
+            }
+            Assertions.assertEquals("parameter_value", reportParameters.getMasterParameters().getValue("parameter"));
+            Integer value1 = reportParameters.getValue(measure1);
+            Integer value2 = reportParameters.getValue(variable1);
+            return value1.doubleValue() / value2.doubleValue();
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java
new file mode 100644
index 0000000..c7427ba
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java
@@ -0,0 +1,146 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.dataset;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import org.junit.jupiter.api.Assertions;
+
+/**
+ * Crosstab dataset style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class CrosstabDatasetStyleTest extends AbstractJasperCrosstabStyleTest
+    implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private CrosstabRowGroupBuilder<String> rowGroup;
+  private CrosstabColumnGroupBuilder<String> columnGroup;
+  private CrosstabMeasureBuilder<Integer> measure1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    FieldBuilder<String> field1 = field("field1", String.class);
+    FieldBuilder<String> field2 = field("field2", String.class);
+
+    final StyleBuilder cellStyle =
+        stl.style().conditionalStyles(stl.conditionalStyle(new ConditionExpression(10, 15, 14, 36))
+            .setBackgroundColor(Color.ORANGE));
+
+    rowGroup = ctab.rowGroup(field1);
+    columnGroup = ctab.columnGroup(field2);
+
+    measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+    measure1.setStyle(cellStyle);
+
+    CrosstabBuilder crosstab = ctab.crosstab().setDataSource(createCrosstabDataSource())
+        .highlightEvenRows().rowGroups(rowGroup).columnGroups(columnGroup).measures(measure1);
+
+    rb.addParameter("parameter", "parameter_value").title(crosstab);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    setCrosstabBand("title");
+
+    Color color = new Color(240, 240, 240);
+
+    crosstabCellStyleTest(measure1, null, null, 0, null, null, TEST_FONT_NAME, 10f, null, null);
+    crosstabCellStyleTest(measure1, null, null, 1, null, null, TEST_FONT_NAME, 10f, null, null);
+    crosstabCellStyleTest(measure1, null, null, 2, null, color, TEST_FONT_NAME, 10f, null, null);
+    crosstabCellStyleTest(measure1, null, null, 3, null, Color.ORANGE, TEST_FONT_NAME, 10f, null,
+        null);
+
+    crosstabCellStyleTest(measure1, rowGroup, null, 0, null, Color.ORANGE, TEST_FONT_NAME, 10f,
+        null, null);
+    crosstabCellStyleTest(measure1, rowGroup, null, 1, null, null, TEST_FONT_NAME, 10f, null, null);
+
+    crosstabCellStyleTest(measure1, null, columnGroup, 0, null, Color.ORANGE, TEST_FONT_NAME, 10f,
+        null, null);
+    crosstabCellStyleTest(measure1, null, columnGroup, 1, null, color, TEST_FONT_NAME, 10f, null,
+        null);
+
+    crosstabCellStyleTest(measure1, rowGroup, columnGroup, 0, null, Color.ORANGE, TEST_FONT_NAME,
+        10f, null, null);
+
+  }
+
+  private JRDataSource createCrosstabDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("a", "c", 1);
+    dataSource.add("a", "c", 2);
+    dataSource.add("a", "d", 3);
+    dataSource.add("a", "d", 4);
+    dataSource.add("b", "c", 5);
+    dataSource.add("b", "c", 6);
+    dataSource.add("b", "d", 7);
+    dataSource.add("b", "d", 8);
+    return dataSource;
+  }
+
+  private class ConditionExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = 1L;
+
+    private List<Integer> values;
+
+    private ConditionExpression(Integer... values) {
+      this.values = Arrays.asList(values);
+    }
+
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+      Assertions.assertNotNull(reportParameters.getMasterParameters());
+      try {
+        reportParameters.getValue("parameter");
+        Assertions.fail("parameter is not null");
+      } catch (Exception e) {
+        // required
+      }
+      Assertions.assertEquals("parameter_value",
+          reportParameters.getMasterParameters().getValue("parameter"));
+      Integer value = reportParameters.getValue(measure1);
+      return values.contains(value);
+    }
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseReportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseReportTest.java
new file mode 100644
index 0000000..f912661
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseReportTest.java
@@ -0,0 +1,98 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.datasource;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class DatabaseReportTest extends AbstractJasperValueTest {
+    private Connection connection;
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<BigDecimal> column3;
+
+    @Override
+    public void init() {
+        try {
+            Class.forName("org.hsqldb.jdbcDriver");
+            connection = DriverManager.getConnection("jdbc:hsqldb:mem:test");
+            createTable();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Assertions.fail(e.getMessage());
+        }
+        super.init();
+    }
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", type.stringType()), column2 = col.column("Column2", "field2", type.integerType()),
+                   column3 = col.column("Column3", "field3", type.bigDecimalType()))
+          .setDataSource("SELECT * FROM test_table1", connection);
+    }
+
+    @Override
+    protected boolean serializableTest() {
+        return false;
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnTitleCountTest(column1, 1);
+        columnTitleValueTest(column1, "Column1");
+        columnDetailCountTest(column1, 1);
+        columnDetailValueTest(column1, 0, "text");
+        // column2
+        columnTitleCountTest(column2, 1);
+        columnTitleValueTest(column2, "Column2");
+        columnDetailCountTest(column2, 1);
+        columnDetailValueTest(column2, 0, "5");
+        // column3
+        columnTitleCountTest(column3, 1);
+        columnTitleValueTest(column3, "Column3");
+        columnDetailCountTest(column3, 1);
+        columnDetailValueTest(column3, 0, "100.00");
+    }
+
+    private void createTable() throws SQLException {
+        Statement st = connection.createStatement();
+        st.execute("CREATE TABLE test_table1 (field1 VARCHAR(50), field2 INTEGER, field3 DECIMAL)");
+        st.execute("INSERT INTO test_table1 VALUES ('text', 5, 100)");
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java
new file mode 100644
index 0000000..18a036c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java
@@ -0,0 +1,130 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.datasource;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.List;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class DatabaseSubreportTest extends AbstractJasperValueTest {
+    private Connection connection;
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<BigDecimal> column3;
+
+    @Override
+    public void init() {
+        try {
+            Class.forName("org.hsqldb.jdbcDriver");
+            connection = DriverManager.getConnection("jdbc:hsqldb:mem:test");
+            createTable();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Assertions.fail(e.getMessage());
+        }
+        super.init();
+    }
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder subreport = cmp.subreport(new SubreportExpression());
+        subreport.setConnection(connection);
+
+        CustomGroupBuilder group = grp.group(field("field4", Integer.class));
+        group.footer(subreport);
+
+        rb.groupBy(group).setDataSource("SELECT * FROM test_table2", connection);
+    }
+
+    @Override
+    protected boolean serializableTest() {
+        return false;
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnTitleCountTest(column1, 2);
+        columnTitleValueTest(column1, "Column1", "Column1");
+        columnDetailCountTest(column1, 3);
+        columnDetailValueTest(column1, "text", "text", "text");
+        // column2
+        columnTitleCountTest(column2, 2);
+        columnTitleValueTest(column2, "Column2", "Column2");
+        columnDetailCountTest(column2, 3);
+        columnDetailValueTest(column2, "5", "6", "7");
+        // column3
+        columnTitleCountTest(column3, 2);
+        columnTitleValueTest(column3, "Column3", "Column3");
+        columnDetailCountTest(column3, 3);
+        columnDetailValueTest(column3, "100.00", "200.00", "300.00");
+    }
+
+    private void createTable() throws SQLException {
+        Statement st = connection.createStatement();
+        st.execute("CREATE TABLE test_table2 (field1 VARCHAR(50), field2 INTEGER, field3 DECIMAL, field4 INTEGER)");
+        st.execute("INSERT INTO test_table2 VALUES ('text', 5, 100, 1)");
+        st.execute("INSERT INTO test_table2 VALUES ('text', 6, 200, 1)");
+        st.execute("INSERT INTO test_table2 VALUES ('text', 7, 300, 2)");
+    }
+
+    private class SubreportExpression extends AbstractComplexExpression<JasperReportBuilder> {
+        private static final long serialVersionUID = 1L;
+
+        public SubreportExpression() {
+            addExpression(field("field4", Integer.class));
+        }
+
+        @Override
+        public JasperReportBuilder evaluate(List<?> values, ReportParameters reportParameters) {
+            JasperReportBuilder report = report();
+            report.setLocale(Locale.ENGLISH)
+                  .columns(column1 = col.column("Column1", "field1", type.stringType()), column2 = col.column("Column2", "field2", type.integerType()),
+                           column3 = col.column("Column3", "field3", type.bigDecimalType()))
+                  .setQuery("SELECT * FROM test_table2 WHERE field4 = " + values.get(0));
+            return report;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/FilterTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/FilterTest.java
new file mode 100644
index 0000000..ead9968
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/FilterTest.java
@@ -0,0 +1,154 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.datasource;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.DatasetBuilder;
+import net.sf.dynamicreports.report.builder.DynamicReports;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class FilterTest extends AbstractJasperCrosstabValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+
+    private CrosstabRowGroupBuilder<String> rowGroup;
+    private CrosstabColumnGroupBuilder<String> columnGroup;
+    private CrosstabMeasureBuilder<Integer> measure1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        measure1 = ctab.measure("field3", Integer.class, Calculation.SUM);
+
+        DatasetBuilder dataset = DynamicReports.dataset();
+        dataset.setDataSource(createCrosstabDataSource());
+        dataset.setFilterExpression(new CrosstabFilterExpression());
+
+        CrosstabBuilder crosstab =
+            ctab.crosstab().setSubDataset(dataset).rowGroups(rowGroup = ctab.rowGroup("field1", String.class)).columnGroups(columnGroup = ctab.columnGroup("field2", String.class)).measures(measure1);
+
+        rb.columns(column1 = col.column("Column1", "field1", type.stringType()), column2 = col.column("Column2", "field2", type.stringType()))
+          .title(crosstab)
+          .setFilterExpression(new FilterExpression());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnTitleCountTest(column1, 1);
+        columnTitleValueTest(column1, "Column1");
+        columnDetailCountTest(column1, 1);
+        columnDetailValueTest(column1, "1");
+        // column2
+        columnTitleCountTest(column2, 1);
+        columnTitleValueTest(column2, "Column2");
+        columnDetailCountTest(column2, 1);
+        columnDetailValueTest(column2, "text1");
+
+        setCrosstabBand("title");
+
+        // column group
+        crosstabGroupHeaderCountTest(columnGroup, 2);
+        crosstabGroupHeaderValueTest(columnGroup, "c", "d");
+        crosstabGroupTotalHeaderCountTest(columnGroup, 1);
+        crosstabGroupTotalHeaderValueTest(columnGroup, "Total");
+
+        // row group
+        crosstabGroupHeaderCountTest(rowGroup, 1);
+        crosstabGroupHeaderValueTest(rowGroup, "a");
+        crosstabGroupTotalHeaderCountTest(rowGroup, 1);
+        crosstabGroupTotalHeaderValueTest(rowGroup, "Total");
+
+        // measure1
+        crosstabCellCountTest(measure1, null, null, 2);
+        crosstabCellValueTest(measure1, null, null, "3", "7");
+        crosstabCellCountTest(measure1, null, columnGroup, 1);
+        crosstabCellValueTest(measure1, null, columnGroup, "10");
+        crosstabCellCountTest(measure1, rowGroup, null, 2);
+        crosstabCellValueTest(measure1, rowGroup, null, "3", "7");
+        crosstabCellCountTest(measure1, rowGroup, columnGroup, 1);
+        crosstabCellValueTest(measure1, rowGroup, columnGroup, "10");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        dataSource.add("1", "text1");
+        dataSource.add("2", "text2");
+        dataSource.add("3", "text3");
+        dataSource.add("4", "text4");
+        return dataSource;
+    }
+
+    private JRDataSource createCrosstabDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("a", "c", 1);
+        dataSource.add("a", "c", 2);
+        dataSource.add("a", "d", 3);
+        dataSource.add("a", "d", 4);
+        dataSource.add("b", "c", 5);
+        dataSource.add("b", "c", 6);
+        dataSource.add("b", "d", 7);
+        dataSource.add("b", "d", 8);
+        return dataSource;
+    }
+
+    private class FilterExpression extends AbstractSimpleExpression<Boolean> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Boolean evaluate(ReportParameters reportParameters) {
+            String value = reportParameters.getValue("field1");
+            return value.equals("1");
+        }
+    }
+
+    private class CrosstabFilterExpression extends AbstractSimpleExpression<Boolean> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Boolean evaluate(ReportParameters reportParameters) {
+            String value = reportParameters.getValue("field1");
+            return value.equals("a");
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/SubDatasourceTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/SubDatasourceTest.java
new file mode 100644
index 0000000..8c03337
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/SubDatasourceTest.java
@@ -0,0 +1,122 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.datasource;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Arrays;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubDatasourceTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<String> column4;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", type.stringType()), column2 = col.column("Column2", "field2", type.stringType()))
+          .detailFooter(cmp.subreport(createSubreport()).setDataSource(exp.subDatasourceBeanCollection("field3")));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnTitleCountTest(column1, 1);
+        columnTitleValueTest(column1, "Column1");
+        columnDetailCountTest(column1, 2);
+        columnDetailValueTest(column1, "1", "2");
+        // column2
+        columnTitleCountTest(column2, 1);
+        columnTitleValueTest(column2, "Column2");
+        columnDetailCountTest(column2, 2);
+        columnDetailValueTest(column2, "text1", "text2");
+
+        // column3
+        columnTitleCountTest(column3, 2);
+        columnTitleValueTest(column3, "Column3", "Column3");
+        columnDetailCountTest(column3, 3);
+        columnDetailValueTest(column3, "texta1", "texta3", "textb1");
+        // column4
+        columnTitleCountTest(column4, 2);
+        columnTitleValueTest(column4, "Column4", "Column4");
+        columnDetailCountTest(column4, 3);
+        columnDetailValueTest(column4, "texta2", "texta4", "textb2");
+
+    }
+
+    private JasperReportBuilder createSubreport() {
+        JasperReportBuilder report = report();
+        report.columns(column3 = col.column("Column3", "field3", type.stringType()), column4 = col.column("Column4", "field4", type.stringType()));
+        return report;
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("1", "text1", Arrays.asList(new SubData("texta1", "texta2"), new SubData("texta3", "texta4")));
+        dataSource.add("2", "text2", Arrays.asList(new SubData("textb1", "textb2")));
+        return dataSource;
+    }
+
+    public class SubData {
+        private String field3;
+        private String field4;
+
+        private SubData(String field3, String field4) {
+            this.field3 = field3;
+            this.field4 = field4;
+
+        }
+
+        public String getField3() {
+            return field3;
+        }
+
+        public void setField3(String field3) {
+            this.field3 = field3;
+        }
+
+        public String getField4() {
+            return field4;
+        }
+
+        public void setField4(String field4) {
+            this.field4 = field4;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/XmlReportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/XmlReportTest.java
new file mode 100644
index 0000000..2367ccb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/XmlReportTest.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.datasource;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.QueryLanguage;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.data.JRXmlDataSource;
+import net.sf.jasperreports.engine.query.JRXPathQueryExecuterFactory;
+import net.sf.jasperreports.engine.util.JRXmlUtils;
+import org.junit.jupiter.api.Assertions;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class XmlReportTest extends AbstractJasperValueTest {
+    private TextColumnBuilder<Object> column1;
+    private TextColumnBuilder<Object> column2;
+    private TextColumnBuilder<Object> column3;
+    private TextColumnBuilder<Object> column4;
+    private TextColumnBuilder<Object> column5;
+    private TextColumnBuilder<Object> column6;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        try {
+            rb.setLocale(Locale.ENGLISH)
+              .columns(column1 = col.column("Column1", field("field1", type.stringType()).setDescription("@field1")), column2 = col.column("Column2", field("field2", type.integerType())),
+                       column3 = col.column("Column3", field("field3", type.bigDecimalType())))
+              .setQuery("/data/row1", QueryLanguage.XPATH)
+              .setParameter(JRXPathQueryExecuterFactory.PARAMETER_XML_DATA_DOCUMENT, JRXmlUtils.parse(XmlReportTest.class.getResourceAsStream("data.xml")))
+              .summary(cmp.subreport(createSubreport()));
+        } catch (JRException e) {
+            e.printStackTrace();
+            Assertions.fail(e.getMessage());
+        }
+    }
+
+    private JasperReportBuilder createSubreport() throws JRException {
+        JasperReportBuilder report = report();
+        report.setLocale(Locale.ENGLISH)
+              .columns(column4 = col.column("Column4", field("field4", type.stringType()).setDescription("@field4")),
+                       column5 = col.column("Column5", field("field5", type.integerType()).setDescription("field5")), column6 = col.column("Column6", field("field6", type.bigDecimalType())))
+              .setUseFieldNameAsDescription(false)
+              .setDataSource(new JRXmlDataSource(XmlReportTest.class.getResourceAsStream("data.xml"), "/data/row2"));
+        return report;
+    }
+
+    @Override
+    protected boolean serializableTest() {
+        return false;
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnTitleCountTest(column1, 1);
+        columnTitleValueTest(column1, "Column1");
+        columnDetailCountTest(column1, 1);
+        columnDetailValueTest(column1, 0, "text1");
+        // column2
+        columnTitleCountTest(column2, 1);
+        columnTitleValueTest(column2, "Column2");
+        columnDetailCountTest(column2, 1);
+        columnDetailValueTest(column2, 0, "5");
+        // column3
+        columnTitleCountTest(column3, 1);
+        columnTitleValueTest(column3, "Column3");
+        columnDetailCountTest(column3, 1);
+        columnDetailValueTest(column3, 0, "100.00");
+
+        // column4
+        columnTitleCountTest(column4, 1);
+        columnTitleValueTest(column4, "Column4");
+        columnDetailCountTest(column4, 1);
+        columnDetailValueTest(column4, 0, "text2");
+        // column5
+        columnTitleCountTest(column5, 1);
+        columnTitleValueTest(column5, "Column5");
+        columnDetailCountTest(column5, 1);
+        columnDetailValueTest(column5, 0, "1");
+        // column6
+        columnTitleCountTest(column6, 1);
+        columnTitleValueTest(column6, "Column6");
+        columnDetailCountTest(column6, 1);
+        columnDetailValueTest(column6, 0, "10.00");
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/CustomGroupTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/CustomGroupTest.java
new file mode 100644
index 0000000..ae8db22
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/CustomGroupTest.java
@@ -0,0 +1,93 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CustomGroupTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private CustomGroupBuilder group1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        YearExpression yearExpression = new YearExpression();
+        rb.columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", yearExpression)).groupBy(group1 = grp.group(yearExpression));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnTitleCountTest(column1, 1);
+        columnTitleValueTest(column1, "Column1");
+        columnDetailCountTest(column1, 2);
+        columnDetailValueTest(column1, "2009-12-01", "2010-01-01");
+
+        // column2
+        columnTitleCountTest(column2, 1);
+        columnTitleValueTest(column2, "Column2");
+        columnDetailCountTest(column2, 2);
+        columnDetailValueTest(column2, "2009", "2010");
+
+        // group1
+        groupHeaderTitleCountTest(group1, 0);
+        groupHeaderCountTest(group1, 2);
+        groupHeaderValueTest(group1, "2009", "2010");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 1; i++) {
+            dataSource.add("2009-12-01");
+            dataSource.add("2010-01-01");
+        }
+        return dataSource;
+    }
+
+    private class YearExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            String orderDate = reportParameters.getValue("field1");
+            return orderDate.split("-")[0];
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/DataTypeGroupTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/DataTypeGroupTest.java
new file mode 100644
index 0000000..ebe6bae
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/DataTypeGroupTest.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Date;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class DataTypeGroupTest extends AbstractJasperValueTest {
+    private TextColumnBuilder<Date> column1;
+    private TextColumnBuilder<Date> column2;
+    private ColumnGroupBuilder group1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", type.dateMonthType()), column2 = col.column("Column2", "field1", type.dateType()))
+          .groupBy(group1 = grp.group(column1).groupByDataType());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column2
+        columnTitleCountTest(column2, 1);
+        columnTitleValueTest(column2, "Column2");
+        columnDetailCountTest(column2, 2);
+        columnDetailValueTest(column2, "01/01/2010", "02/01/2010");
+
+        // group1
+        groupHeaderTitleCountTest(group1, 0);
+        groupHeaderCountTest(group1, 2);
+        groupHeaderValueTest(group1, "January", "February");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 1; i++) {
+            dataSource.add(toDate(2010, 1, 1));
+            dataSource.add(toDate(2010, 2, 1));
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group1Test.java
new file mode 100644
index 0000000..d89f866
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group1Test.java
@@ -0,0 +1,126 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Group1Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private ColumnGroupBuilder group1;
+    private ColumnGroupBuilder group2;
+    private ColumnGroupBuilder group3;
+    private CustomGroupBuilder group4;
+    private CustomGroupBuilder group5;
+    private ColumnGroupBuilder group6;
+    private FieldBuilder<String> field3;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<Integer> column4;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class), column3 = col.column("Column3", "field4", String.class),
+                   column4 = col.column("Column4", "field5", Integer.class).setPattern("#,###.00"))
+          .groupBy(group1 = grp.group(column1), group2 = grp.group(column3).setHeaderLayout(GroupHeaderLayout.EMPTY).setHideColumn(false),
+                   group3 = grp.group(column1).setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE), group4 = grp.group(field3 = field("field3", String.class)),
+                   group5 = grp.group(new ValueExpression()).setTitle("Expression"), group6 = grp.group(column4));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // group1
+        groupHeaderTitleCountTest(group1, 0);
+        groupHeaderCountTest(group1, 2);
+        groupHeaderValueTest(group1, "group1", "group2");
+        // group2
+        groupHeaderTitleCountTest(group1, 0);
+        groupHeaderCountTest(group2, 0);
+        // group3
+        groupHeaderTitleCountTest(group3, 2);
+        groupHeaderTitleValueTest(group3, "Column1", "Column1");
+        groupHeaderCountTest(group3, 2);
+        groupHeaderValueTest(group3, "group1", "group2");
+        // group4
+        groupHeaderCountTest(group4, 2);
+        groupHeaderValueTest(group4, "group1_1", "group2_1");
+        // group5
+        groupHeaderTitleCountTest(group5, 2);
+        groupHeaderTitleValueTest(group5, "Expression", "Expression");
+        groupHeaderCountTest(group5, 2);
+        groupHeaderValueTest(group5, "group1_1_1", "group2_1_1");
+        // group6
+        groupHeaderTitleCountTest(group6, 0);
+        groupHeaderCountTest(group6, 2);
+        groupHeaderValueTest(group6, "1.00", "2.00");
+        // column2
+        columnDetailCountTest(column2, 20);
+        columnDetailValueTest(column2, "0", "1");
+        // column3
+        columnDetailCountTest(column3, 20);
+        columnDetailValueTest(column3, "group1", "group1");
+        columnDetailValueTest(column3, 10, "group2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group1", i, "group1_1", "group1", 1);
+        }
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group2", i, "group2_1", "group2", 2);
+        }
+        return dataSource;
+    }
+
+    private class ValueExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            return reportParameters.getValue(field3) + "_1";
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group2Test.java
new file mode 100644
index 0000000..a8e1709
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group2Test.java
@@ -0,0 +1,109 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Group2Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<Integer> column3;
+    private TextColumnBuilder<Integer> column4;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+        ColumnGroupBuilder group1;
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class), column3 = col.column("Column3", "field3", Integer.class),
+                   column4 = col.column("Column4", "field4", Integer.class))
+          .groupBy(grp.group(column1).setStartInNewPage(true).header(cmp.text("header1")).footer(cmp.text("footer1")), group1 = grp.group(column1)
+                                                                                                                                   .header(cmp.text("header2"))
+                                                                                                                                   .footer(cmp.text("footer2"))
+                                                                                                                                   .setShowColumnHeaderAndFooter(true)
+                                                                                                                                   .setReprintHeaderOnEachPage(true)
+                                                                                                                                   .setPrintSubtotalsWhenExpression(exp.printNotInFirstPage()))
+          .subtotalsAtGroupFooter(group1, subtotal1 = sbt.sum(column4));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+
+        columnTitleCountTest(column2, 3);
+        columnTitleValueTest(column2, "Column2", "Column2", "Column2");
+        columnTitleCountTest(column3, 3);
+        columnTitleValueTest(column3, "Column3", "Column3", "Column3");
+        columnTitleCountTest(column4, 3);
+        columnTitleValueTest(column4, "Column4", "Column4", "Column4");
+
+        elementCountTest("columnHeaderForGroup.column_field2.title1", 3);
+        elementValueTest("columnHeaderForGroup.column_field2.title1", "Column2", "Column2", "Column2");
+        elementCountTest("columnHeaderForGroup.column_field3.title1", 3);
+        elementValueTest("columnHeaderForGroup.column_field3.title1", "Column3", "Column3", "Column3");
+        elementCountTest("columnHeaderForGroup.column_field4.title1", 3);
+        elementValueTest("columnHeaderForGroup.column_field4.title1", "Column4", "Column4", "Column4");
+
+        elementCountTest("groupHeader.textField1", 2);
+        elementValueTest("groupHeader.textField1", "header1", "header1");
+
+        elementCountTest("groupFooter.textField1", 2);
+        elementValueTest("groupFooter.textField1", "footer1", "footer1");
+
+        elementCountTest("groupHeader.textField2", 3);
+        elementValueTest("groupHeader.textField2", "header2", "header2", "header2");
+
+        elementCountTest("groupFooter.textField2", 2);
+        elementValueTest("groupFooter.textField2", "footer2", "footer2");
+
+        subtotalCountTest(subtotal1, 1);
+        subtotalValueTest(subtotal1, "1,225");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group1", i, i, i);
+        }
+        for (int i = 0; i < 50; i++) {
+            dataSource.add("group2", i, i, i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group3Test.java
new file mode 100644
index 0000000..d6e1460
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group3Test.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Group3Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setShowColumnTitle(false)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", String.class))
+          .groupBy(grp.group(column1).setShowColumnHeaderAndFooter(true));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnTitleCountTest(column1, 0);
+        columnTitleCountTest(column2, 0);
+
+        elementCountTest("columnHeaderForGroup.column_field2.title1", 1);
+        elementValueTest("columnHeaderForGroup.column_field2.title1", "Column2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 1; i++) {
+            dataSource.add("1", "1");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition1Test.java
new file mode 100644
index 0000000..fe09832
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition1Test.java
@@ -0,0 +1,71 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class GroupPosition1Test extends AbstractJasperPositionTest {
+
+    private ColumnGroupBuilder group1;
+    private TextColumnBuilder<Integer> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+
+        rb.columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class)).groupBy(group1 = grp.group(column1));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 16);
+        elementPositionTest("columnHeader.filler1", 0, 0, 0, 10, 16);
+        elementPositionTest("detail.list1", 0, 10, 42, 575, 16);
+        elementPositionTest("detail.list1", 1, 10, 58, 575, 16);
+
+        // group1
+        groupHeaderPositionTest(group1, 0, 10, 26, 575, 16);
+        // column2
+        columnTitlePositionTest(column2, 0, 10, 0, 565, 16);
+        columnDetailPositionTest(column2, 0, 10, 0, 565, 16);
+        columnDetailPositionTest(column2, 1, 10, 0, 565, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("group1", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition2Test.java
new file mode 100644
index 0000000..24dee71
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition2Test.java
@@ -0,0 +1,91 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class GroupPosition2Test extends AbstractJasperPositionTest {
+    private ColumnGroupBuilder group1;
+    private ColumnGroupBuilder group2;
+    private TextColumnBuilder<Integer> column3;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1, column2;
+
+        rb.columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", String.class), column3 = col.column("Column3", "field3", Integer.class))
+          .groupBy(group1 = grp.group(column1), group2 = grp.group(column2).setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE).header(cmp.text("header")).footer(cmp.text("footer")))
+          .subtotalsAtGroupFooter(group2, subtotal1 = sbt.sum(column3));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 16);
+        elementPositionTest("columnHeader.filler1", 0, 0, 0, 20, 16);
+        elementPositionTest("detail.list1", 0, 10, 74, 575, 16);
+        elementPositionTest("detail.list1", 1, 10, 90, 575, 16);
+
+        // group1
+        groupHeaderPositionTest(group1, 0, 10, 26, 575, 16);
+        // group2
+        elementPositionTest("groupHeaderTitleAndValue.list1", 0, 10, 42, 575, 16);
+        groupHeaderTitlePositionTest(group2, 0, 10, 0, 100, 16);
+        groupHeaderPositionTest(group2, 0, 110, 0, 465, 16);
+
+        elementPositionTest("groupHeader.list1", 0, 10, 58, 575, 16);
+        elementPositionTest("groupHeader.textField1", 0, 10, 0, 565, 16);
+
+        elementPositionTest("subtotalGroupFooter.list1", 0, 10, 106, 575, 16);
+        subtotalPositionTest(subtotal1, 0, 20, 0, 555, 16);
+
+        elementPositionTest("groupFooter.list1", 0, 10, 122, 575, 16);
+        elementPositionTest("groupFooter.textField1", 0, 10, 0, 565, 16);
+        // column3
+        columnTitlePositionTest(column3, 0, 20, 0, 555, 16);
+        columnDetailPositionTest(column3, 0, 20, 0, 555, 16);
+        columnDetailPositionTest(column3, 1, 20, 0, 555, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("group1", "group2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition3Test.java
new file mode 100644
index 0000000..d9de2bb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition3Test.java
@@ -0,0 +1,100 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRGroup;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class GroupPosition3Test extends AbstractJasperPositionTest
+{
+	
+	private ColumnGroupBuilder group1;
+	private TextColumnBuilder<Integer> column2;
+	private AggregationSubtotalBuilder<Integer> subtotal1;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final TextColumnBuilder<String> column1;
+		
+		rb.columns(
+				column1 = col.column("Column1", "field1", String.class),
+                this.column2 = col.column("Column2", "field2", Integer.class))
+			.groupBy(this.group1 = grp.group(column1)
+				.setFooterPosition(GroupFooterPosition.FORCE_AT_BOTTOM)
+				.keepTogether()
+				.setMinHeightToStartNewPage(100))
+			.subtotalsAtFirstGroupFooter(this.subtotal1 = sbt.sum(this.column2));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        this.elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 16);
+        this.elementPositionTest("columnHeader.filler1", 0, 0, 0, 10, 16);
+        this.elementPositionTest("detail.list1", 0, 10, 42, 575, 16);
+        this.elementPositionTest("detail.list1", 1, 10, 58, 575, 16);
+		
+		// group1
+        this.groupHeaderPositionTest(this.group1, 0, 10, 26, 575, 16);
+		// column2
+        this.columnTitlePositionTest(this.column2, 0, 10, 0, 565, 16);
+        this.columnDetailPositionTest(this.column2, 0, 10, 0, 565, 16);
+        this.columnDetailPositionTest(this.column2, 1, 10, 0, 565, 16);
+		// summary
+        this.elementPositionTest("subtotalGroupFooter.list1", 0, 10, 816, 575, 16);
+        this.subtotalPositionTest(this.subtotal1, 0, 10, 0, 565, 16);
+		
+		final JRGroup jrGroup = this.getJasperReport().getGroups()[0];
+		Assertions.assertTrue(jrGroup.isKeepTogether());
+		// Assertions.assertEquals("Min height to start new page", new Integer(100), jrGroup
+        // .getMinHeightToStartNewPage()); // remove this ambiguous function call
+		Assertions.assertEquals(100, jrGroup.getMinHeightToStartNewPage());
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1", "field2");
+		for(int i = 0; i < 10; i++)
+		{
+			dataSource.add("group1", i);
+		}
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup1Test.java
new file mode 100644
index 0000000..7f09652
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup1Test.java
@@ -0,0 +1,74 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.PercentageColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.PercentageTotalType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PercentageGroup1Test extends AbstractJasperValueTest {
+    private PercentageColumnBuilder percentage1;
+    private PercentageColumnBuilder percentage2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+        TextColumnBuilder<Integer> column2;
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class), percentage1 = col.percentageColumn(column2),
+                   percentage2 = col.percentageColumn(column2).setTotalType(PercentageTotalType.REPORT))
+          .groupBy(column1);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // percentage1
+        columnDetailCountTest(percentage1, 6);
+        columnDetailValueTest(percentage1, "16.67%", "33.33%", "50.00%", "26.67%", "33.33%", "40.00%");
+        // percentage2
+        columnDetailCountTest(percentage2, 6);
+        columnDetailValueTest(percentage2, "4.76%", "9.52%", "14.29%", "19.05%", "23.81%", "28.57%");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group1", i);
+        }
+        for (int i = 4; i <= 6; i++) {
+            dataSource.add("group2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup2Test.java
new file mode 100644
index 0000000..17b8783
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup2Test.java
@@ -0,0 +1,149 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.group;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.PercentageColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.PercentageTotalType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PercentageGroup2Test extends AbstractJasperValueTest {
+    private PercentageColumnBuilder percentage1;
+    private PercentageColumnBuilder percentage2;
+    private PercentageColumnBuilder percentage3;
+    private PercentageColumnBuilder percentage4;
+    private PercentageSubtotalBuilder subtotal1;
+    private PercentageSubtotalBuilder subtotal2;
+    private PercentageSubtotalBuilder subtotal3;
+    private PercentageSubtotalBuilder subtotal4;
+    private PercentageSubtotalBuilder subtotal5;
+    private PercentageSubtotalBuilder subtotal6;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        TextColumnBuilder<String> column2 = col.column("Column2", "field2", String.class);
+        TextColumnBuilder<String> column3 = col.column("Column3", "field3", String.class);
+        TextColumnBuilder<Integer> column4 = col.column("Column4", "field4", Integer.class);
+        ColumnGroupBuilder group1 = grp.group(column1);
+        ColumnGroupBuilder group2 = grp.group(column2);
+        ColumnGroupBuilder group3 = grp.group(column3);
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1, column2, column3, column4, percentage1 = col.percentageColumn(column4), percentage2 = col.percentageColumn(column4).setTotalGroup(group2),
+                   percentage3 = col.percentageColumn(column4).setTotalGroup(group1), percentage4 = col.percentageColumn(column4).setTotalType(PercentageTotalType.REPORT))
+          .groupBy(group1, group2, group3)
+          .subtotalsOfPercentageAtGroupFooter(group3, subtotal1 = sbt.percentage(column4), subtotal2 = sbt.percentage(column4).setTotalGroup(group1),
+                                              subtotal3 = sbt.percentage(column4).setTotalType(PercentageTotalType.REPORT))
+          .subtotalsOfPercentageAtGroupFooter(group2, subtotal4 = sbt.percentage(column4), subtotal5 = sbt.percentage(column4).setTotalType(PercentageTotalType.REPORT))
+          .subtotalsOfPercentageAtGroupFooter(group1, subtotal6 = sbt.percentage(column4));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+        // percentage1
+        columnDetailCountTest(percentage1, 24);
+        columnDetailValueTest(percentage1, "16.67%", "33.33%", "50.00%", "26.67%", "33.33%", "40.00%", "29.17%", "33.33%", "37.50%", "30.30%", "33.33%", "36.36%", "30.95%", "33.33%", "35.71%",
+                              "31.37%", "33.33%", "35.29%", "31.67%", "33.33%", "35.00%", "31.88%", "33.33%", "34.78%");
+        // percentage2
+        columnDetailCountTest(percentage2, 24);
+        columnDetailValueTest(percentage2, "4.76%", "9.52%", "14.29%", "19.05%", "23.81%", "28.57%", "12.28%", "14.04%", "15.79%", "17.54%", "19.30%", "21.05%", "13.98%", "15.05%", "16.13%", "17.20%",
+                              "18.28%", "19.35%", "14.73%", "15.50%", "16.28%", "17.05%", "17.83%", "18.60%");
+        // percentage3
+        columnDetailCountTest(percentage3, 24);
+        columnDetailValueTest(percentage3, "1.28%", "2.56%", "3.85%", "5.13%", "6.41%", "7.69%", "8.97%", "10.26%", "11.54%", "12.82%", "14.10%", "15.38%", "5.86%", "6.31%", "6.76%", "7.21%", "7.66%",
+                              "8.11%", "8.56%", "9.01%", "9.46%", "9.91%", "10.36%", "10.81%");
+        // percentage4
+        columnDetailCountTest(percentage4, 24);
+        columnDetailValueTest(percentage4, "0.33%", "0.67%", "1.00%", "1.33%", "1.67%", "2.00%", "2.33%", "2.67%", "3.00%", "3.33%", "3.67%", "4.00%", "4.33%", "4.67%", "5.00%", "5.33%", "5.67%",
+                              "6.00%", "6.33%", "6.67%", "7.00%", "7.33%", "7.67%", "8.00%");
+
+        // subtotal1
+        subtotalIndexCountTest(subtotal1, 4, 8);
+        subtotalIndexValueTest(subtotal1, 4, "28.57%", "71.43%", "42.11%", "57.89%", "45.16%", "54.84%", "46.51%", "53.49%");
+
+        // subtotal2
+        subtotalIndexCountTest(subtotal2, 5, 8);
+        subtotalIndexValueTest(subtotal2, 5, "7.69%", "19.23%", "30.77%", "42.31%", "18.92%", "22.97%", "27.03%", "31.08%");
+
+        // subtotal3
+        subtotalIndexCountTest(subtotal3, 6, 8);
+        subtotalIndexValueTest(subtotal3, 6, "2.00%", "5.00%", "8.00%", "11.00%", "14.00%", "17.00%", "20.00%", "23.00%");
+
+        // subtotal4
+        subtotalIndexCountTest(subtotal4, 2, 4);
+        subtotalIndexValueTest(subtotal4, 2, "26.92%", "73.08%", "41.89%", "58.11%");
+
+        // subtotal5
+        subtotalIndexCountTest(subtotal5, 3, 4);
+        subtotalIndexValueTest(subtotal5, 3, "7.00%", "19.00%", "31.00%", "43.00%");
+
+        // subtotal6
+        subtotalCountTest(subtotal6, 2);
+        subtotalValueTest(subtotal6, "26.00%", "74.00%");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        int count = 1;
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group1", "group1_1", "group1_1_1", count++);
+        }
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group1", "group1_1", "group1_1_2", count++);
+        }
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group1", "group1_2", "group1_2_1", count++);
+        }
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group1", "group1_2", "group1_2_2", count++);
+        }
+
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group2", "group2_1", "group2_1_1", count++);
+        }
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group2", "group2_1", "group2_1_2", count++);
+        }
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group2", "group2_2", "group2_2_1", count++);
+        }
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group2", "group2_2", "group2_2_2", count++);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/BandTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/BandTest.java
new file mode 100644
index 0000000..9f01441
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/BandTest.java
@@ -0,0 +1,167 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BandTest extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<Integer> column2;
+    private ColumnGroupBuilder group1;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<Integer> subtotal3;
+    private AggregationSubtotalBuilder<Integer> subtotal4;
+    private AggregationSubtotalBuilder<Integer> subtotal5;
+    private AggregationSubtotalBuilder<Integer> subtotal6;
+    private AggregationSubtotalBuilder<Integer> subtotal7;
+    private AggregationSubtotalBuilder<Integer> subtotal8;
+    private AggregationSubtotalBuilder<Integer> subtotal9;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+
+        rb.setPageColumnsPerPage(2)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class).setWidth(500))
+          .groupBy(group1 = grp.group(column1))
+
+          .subtotalsAtTitle(subtotal1 = sbt.sum(column2))
+          .subtotalsAtPageHeader(subtotal2 = sbt.sum(column2))
+          .subtotalsAtPageFooter(subtotal3 = sbt.sum(column2))
+          .subtotalsAtColumnHeader(subtotal4 = sbt.sum(column2))
+          .subtotalsAtColumnFooter(subtotal5 = sbt.sum(column2))
+          .subtotalsAtGroupHeader(group1, subtotal6 = sbt.sum(column2))
+          .subtotalsAtGroupFooter(group1, subtotal7 = sbt.sum(column2))
+          .subtotalsAtLastPageFooter(subtotal8 = sbt.sum(column2))
+          .subtotalsAtSummary(subtotal9 = sbt.sum(column2))
+
+          .title(cmp.text("title"))
+          .pageHeader(cmp.text("pageHeader"))
+          .pageFooter(cmp.text("pageFooter"))
+          .columnHeader(cmp.text("columnHeader"))
+          .columnFooter(cmp.text("columnFooter"))
+          .groupHeader(group1, cmp.text("groupHeader"))
+          .groupFooter(group1, cmp.text("groupFooter"))
+          .detail(cmp.text("detail"))
+          .lastPageFooter(cmp.text("lastPageFooter"))
+          .summary(cmp.text("summary"))
+          .background(cmp.text("background"));
+
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        // title
+        // elementPositionTest("title.list1", 0, 10, 10, 575, 32);
+        elementPositionTest("title.textField1", 0, 10, 10, 575, 16);
+        elementPositionTest("title.list2", 0, 10, 26, 575, 16);
+        subtotalPositionTest(subtotal1, 0, 10, 0, 277, 16);
+
+        // page header
+        // elementPositionTest("pageHeader.list1", 0, 10, 42, 575, 32);
+        elementPositionTest("pageHeader.textField1", 0, 10, 42, 575, 16);
+        elementPositionTest("pageHeader.list2", 0, 10, 58, 575, 16);
+        subtotalPositionTest(subtotal2, 0, 10, 0, 277, 16);
+
+        // page footer
+        // elementPositionTest("pageFooter.list1", 0, 10, 800, 575, 32);
+        elementPositionTest("pageFooter.list2", 0, 10, 800, 575, 16);
+        subtotalPositionTest(subtotal3, 0, 10, 0, 277, 16);
+        elementPositionTest("pageFooter.textField1", 0, 10, 816, 575, 16);
+
+        // column header
+        // elementPositionTest("columnHeader.list1", 0, 10, 74, 287, 48);
+        elementPositionTest("columnHeader.list2", 0, 10, 74, 287, 16);
+        columnTitlePositionTest(column2, 0, 10, 0, 277, 16);
+        elementPositionTest("columnHeader.textField1", 0, 10, 90, 287, 16);
+        elementPositionTest("columnHeader.list3", 0, 10, 106, 287, 16);
+        subtotalPositionTest(subtotal4, 0, 10, 0, 277, 16);
+
+        // column footer
+        // elementPositionTest("columnFooter.list1", 0, 10, 768, 287, 32);
+        elementPositionTest("columnFooter.list2", 0, 10, 768, 287, 16);
+        subtotalPositionTest(subtotal5, 0, 10, 0, 277, 16);
+        elementPositionTest("columnFooter.textField1", 0, 10, 784, 287, 16);
+
+        // group header
+        groupHeaderPositionTest(group1, 0, 10, 122, 287, 16);
+        elementPositionTest("groupHeader.textField1", 0, 10, 138, 287, 16);
+        elementPositionTest("subtotalGroupHeader.list1", 0, 10, 154, 287, 16);
+        subtotalPositionTest(subtotal6, 0, 10, 0, 277, 16);
+
+        // group footer
+        elementPositionTest("subtotalGroupFooter.list1", 0, 297, 346, 287, 16);
+        subtotalPositionTest(subtotal7, 0, 10, 0, 277, 16);
+        elementPositionTest("groupFooter.textField1", 0, 297, 362, 287, 16);
+
+        // detail
+        // elementPositionTest("detail.list1", 0, 10, 170, 287, 32);
+        elementPositionTest("detail.textField1", 0, 10, 170, 287, 16);
+        elementPositionTest("detail.list2", 0, 10, 186, 287, 16);
+        columnDetailPositionTest(column2, 0, 10, 0, 277, 16);
+
+        // last page footer
+        // elementPositionTest("lastPageFooter.list1", 0, 10, 800, 575, 32);
+        elementPositionTest("lastPageFooter.list2", 0, 10, 800, 575, 16);
+        subtotalPositionTest(subtotal8, 0, 10, 0, 277, 16);
+        elementPositionTest("lastPageFooter.textField1", 0, 10, 816, 575, 16);
+
+        // summary
+        // elementPositionTest("summary.list1", 0, 10, 602, 575, 32);
+        elementPositionTest("summary.list2", 0, 10, 602, 575, 16);
+        subtotalPositionTest(subtotal9, 0, 10, 0, 277, 16);
+        elementPositionTest("summary.textField1", 0, 10, 618, 575, 16);
+
+        // background
+        elementPositionTest("background.textField1", 0, 10, 10, 575, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 25; i++) {
+            dataSource.add("group1", i);
+        }
+        for (int i = 0; i < 25; i++) {
+            dataSource.add("group2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnGridTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnGridTest.java
new file mode 100644
index 0000000..5daddb5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnGridTest.java
@@ -0,0 +1,124 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnGridTest extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<Integer> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<Integer> column3;
+    private TextColumnBuilder<Integer> column4;
+    private TextColumnBuilder<Integer> column5;
+    private TextColumnBuilder<Integer> column6;
+    private TextColumnBuilder<Integer> column7;
+    private TextColumnBuilder<Integer> column8;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<Double> subtotal3;
+    private AggregationSubtotalBuilder<Integer> subtotal4;
+    private AggregationSubtotalBuilder<Double> subtotal5;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setTextStyle(stl.style().setPadding(1))
+          .columnGrid(ListType.HORIZONTAL_FLOW)
+          .columns(column1 = col.column("Column1", "field1", Integer.class), column2 = col.column("Column2", "field2", Integer.class), column3 = col.column("Column3", "field3", Integer.class),
+                   column4 = col.column("Column4", "field4", Integer.class), column5 = col.column("Column5", "field5", Integer.class), column6 = col.column("Column6", "field6", Integer.class),
+                   column7 = col.column("Column7", "field7", Integer.class), column8 = col.column("Column8", "field8", Integer.class))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column1), subtotal2 = sbt.sum(column5), subtotal3 = sbt.aggregate(column5, Calculation.AVERAGE), subtotal4 = sbt.sum(column7),
+                              subtotal5 = sbt.aggregate(column7, Calculation.AVERAGE));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // column header
+        // elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 28);
+
+        elementPositionTest("columnHeader.list2", 0, 10, 10, 575, 14);
+        columnTitlePositionTest(column1, 0, 0, 0, 115, 14);
+        columnTitlePositionTest(column2, 0, 115, 0, 115, 14);
+        columnTitlePositionTest(column3, 0, 230, 0, 115, 14);
+        columnTitlePositionTest(column4, 0, 345, 0, 115, 14);
+        columnTitlePositionTest(column5, 0, 460, 0, 115, 14);
+
+        elementPositionTest("columnHeader.list3", 0, 10, 24, 575, 14);
+        columnTitlePositionTest(column6, 0, 0, 0, 191, 14);
+        columnTitlePositionTest(column7, 0, 191, 0, 192, 14);
+        columnTitlePositionTest(column8, 0, 383, 0, 192, 14);
+
+        // detail
+        // elementPositionTest("detail.list1", 0, 10, 38, 575, 28);
+
+        elementPositionTest("detail.list2", 0, 10, 38, 575, 14);
+        columnDetailPositionTest(column1, 0, 0, 0, 115, 14);
+        columnDetailPositionTest(column2, 0, 115, 0, 115, 14);
+        columnDetailPositionTest(column3, 0, 230, 0, 115, 14);
+        columnDetailPositionTest(column4, 0, 345, 0, 115, 14);
+        columnDetailPositionTest(column5, 0, 460, 0, 115, 14);
+
+        elementPositionTest("detail.list3", 0, 10, 52, 575, 14);
+        columnDetailPositionTest(column6, 0, 0, 0, 191, 14);
+        columnDetailPositionTest(column7, 0, 191, 0, 192, 14);
+        columnDetailPositionTest(column8, 0, 383, 0, 192, 14);
+
+        // subtotal
+        // elementPositionTest("summary.list1", 0, 10, 318, 575, 56);
+
+        elementPositionTest("summary.list2", 0, 10, 318, 575, 28);
+        subtotalPositionTest(subtotal1, 0, 0, 0, 115, 14);
+        // elementPositionTest("summary.list3", 0, 460, 0, 115, 28);
+        subtotalPositionTest(subtotal2, 0, 460, 0, 115, 14);
+        subtotalIndexPositionTest(subtotal3, 2, 0, 460, 14, 115, 14);
+
+        elementPositionTest("summary.list4", 0, 10, 346, 575, 28);
+        // elementPositionTest("summary.list5", 0, 191, 0, 192, 28);
+        subtotalPositionTest(subtotal4, 0, 191, 0, 192, 14);
+        subtotalIndexPositionTest(subtotal5, 2, 0, 191, 14, 192, 14);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5", "field6", "field7", "field8");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add(1, 1, 1, 1, 1, 1, 1, 1);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnsPerPageTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnsPerPageTest.java
new file mode 100644
index 0000000..677a6b9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnsPerPageTest.java
@@ -0,0 +1,164 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.ListType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ColumnsPerPageTest extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<Integer> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<Integer> column3;
+    private TextColumnBuilder<Integer> column4;
+    private TextColumnBuilder<Integer> column5;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<?> subtotal3;
+    private AggregationSubtotalBuilder<Integer> subtotal4;
+    private AggregationSubtotalBuilder<?> subtotal5;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setTextStyle(stl.style().setPadding(1))
+          .setPageColumnSpace(10)
+          .setPageColumnsPerPage(3)
+          .columnGrid(ListType.HORIZONTAL_FLOW)
+          .columns(column1 = col.column("Column1", "field1", Integer.class).setWidth(50), column2 = col.column("Column2", "field2", Integer.class).setWidth(50),
+                   column3 = col.column("Column3", "field3", Integer.class).setWidth(50), column4 = col.column("Column4", "field4", Integer.class).setWidth(50),
+                   column5 = col.column("Column5", "field5", Integer.class).setWidth(50))
+          .subtotalsAtColumnFooter(subtotal1 = sbt.sum(column1).setLabel("sum"), subtotal2 = sbt.sum(column3).setLabel("sum"), subtotal3 = sbt.aggregate(column3, Calculation.AVERAGE).setLabel("avg"),
+                                   subtotal4 = sbt.sum(column4).setLabel("sum"), subtotal5 = sbt.aggregate(column4, Calculation.AVERAGE).setLabel("avg"))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column1).setLabel("sum"), subtotal2 = sbt.sum(column3).setLabel("sum"), subtotal3 = sbt.aggregate(column3, Calculation.AVERAGE).setLabel("avg"),
+                              subtotal4 = sbt.sum(column4).setLabel("sum"), subtotal5 = sbt.aggregate(column4, Calculation.AVERAGE).setLabel("avg"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+        // column header
+        // elementPositionTest("columnHeader.list1", 0, 10, 10, 185, 28);
+        // elementPositionTest("columnHeader.list1", 1, 205, 10, 185, 28);
+        // elementPositionTest("columnHeader.list1", 2, 400, 10, 185, 28);
+        // elementPositionTest("columnHeader.list1", 3, 10, 10, 185, 28);
+
+        elementPositionTest("columnHeader.list2", 0, 10, 10, 185, 14);
+        columnTitlePositionTest(column1, 0, 0, 0, 61, 14);
+        columnTitlePositionTest(column2, 0, 61, 0, 62, 14);
+        columnTitlePositionTest(column3, 0, 123, 0, 62, 14);
+
+        elementPositionTest("columnHeader.list3", 0, 10, 24, 185, 14);
+        columnTitlePositionTest(column4, 0, 0, 0, 92, 14);
+        columnTitlePositionTest(column5, 0, 92, 0, 93, 14);
+
+        // detail
+        // elementPositionTest("detail.list1", 0, 10, 38, 185, 28);
+        // elementPositionTest("detail.list1", 24, 205, 38, 185, 28);
+        // elementPositionTest("detail.list1", 48, 400, 38, 185, 28);
+        // elementPositionTest("detail.list1", 72, 10, 38, 185, 28);
+
+        elementPositionTest("detail.list2", 0, 10, 38, 185, 14);
+        columnDetailPositionTest(column1, 0, 0, 0, 61, 14);
+        columnDetailPositionTest(column2, 0, 61, 0, 62, 14);
+        columnDetailPositionTest(column3, 0, 123, 0, 62, 14);
+
+        elementPositionTest("detail.list3", 0, 10, 52, 185, 14);
+        columnDetailPositionTest(column4, 0, 0, 0, 92, 14);
+        columnDetailPositionTest(column5, 0, 92, 0, 93, 14);
+
+        // subtotal at column footer
+        // elementPositionTest("columnFooter.list1", 0, 10, 720, 185, 112);
+        // elementPositionTest("columnFooter.list1", 1, 205, 720, 185, 112);
+        // elementPositionTest("columnFooter.list1", 2, 400, 720, 185, 112);
+        // elementPositionTest("columnFooter.list1", 3, 10, 720, 185, 112);
+
+        elementPositionTest("columnFooter.list2", 0, 10, 720, 185, 56);
+        // elementPositionTest("columnFooter.list3", 0, 0, 0, 61, 28);
+        subtotalLabelPositionTest(subtotal1, 0, 0, 0, 61, 14);
+        subtotalPositionTest(subtotal1, 0, 0, 14, 61, 14);
+
+        // elementPositionTest("columnFooter.list4", 0, 123, 0, 62, 56);
+        // elementPositionTest("columnFooter.list5", 0, 0, 0, 62, 28);
+        subtotalLabelPositionTest(subtotal2, 0, 123, 0, 62, 14);
+        subtotalPositionTest(subtotal2, 0, 123, 14, 62, 14);
+        // elementPositionTest("columnFooter.list6", 0, 0, 28, 62, 28);
+        subtotalLabelPositionTest(subtotal3, 0, 123, 0, 62, 14);
+        subtotalPositionTest(subtotal3, 0, 123, 14, 62, 14);
+
+        elementPositionTest("columnFooter.list7", 0, 10, 776, 185, 56);
+        // elementPositionTest("columnFooter.list8", 0, 0, 0, 92, 56);
+        // elementPositionTest("columnFooter.list9", 0, 0, 0, 92, 28);
+        subtotalLabelPositionTest(subtotal4, 0, 0, 0, 92, 14);
+        subtotalPositionTest(subtotal4, 0, 0, 14, 92, 14);
+        // elementPositionTest("columnFooter.list10", 0, 0, 28, 92, 28);
+        subtotalLabelPositionTest(subtotal5, 0, 0, 0, 92, 14);
+        subtotalPositionTest(subtotal5, 0, 0, 14, 92, 14);
+
+        // subtotal at summary
+        elementPositionTest("summary.list1", 0, 10, 262, 575, 112);
+
+        // elementPositionTest("summary.list2", 0, 0, 0, 185, 112);
+        elementPositionTest("summary.list3", 0, 0, 0, 185, 56);
+        subtotalLabelPositionTest(subtotal1, 0, 0, 0, 61, 14);
+        subtotalPositionTest(subtotal1, 0, 0, 14, 61, 14);
+
+        // elementPositionTest("summary.list4", 0, 0, 0, 61, 28);
+        // elementPositionTest("summary.list5", 0, 123, 0, 62, 56);
+        subtotalLabelPositionTest(subtotal2, 0, 123, 0, 62, 14);
+        subtotalPositionTest(subtotal2, 0, 123, 14, 62, 14);
+        // elementPositionTest("summary.list6", 0, 0, 0, 62, 28);
+        subtotalLabelPositionTest(subtotal3, 0, 123, 0, 62, 14);
+        subtotalPositionTest(subtotal3, 0, 123, 14, 62, 14);
+
+        // elementPositionTest("summary.list7", 0, 0, 28, 62, 28);
+        elementPositionTest("summary.list8", 0, 0, 56, 185, 56);
+        // elementPositionTest("summary.list9", 0, 0, 0, 92, 56);
+        subtotalLabelPositionTest(subtotal4, 0, 0, 0, 92, 14);
+        subtotalPositionTest(subtotal4, 0, 0, 14, 92, 14);
+        // elementPositionTest("summary.list10", 0, 0, 0, 92, 28);
+        subtotalLabelPositionTest(subtotal5, 0, 0, 0, 92, 14);
+        subtotalPositionTest(subtotal5, 0, 0, 14, 92, 14);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5");
+        for (int i = 0; i < 80; i++) {
+            dataSource.add(1, 1, 1, 1, 1);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java
new file mode 100644
index 0000000..5958621
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java
@@ -0,0 +1,84 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.exception.DRException;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ConcatenatedReport1Test
+{
+	JasperConcatenatedReportBuilder concatenatedReport;
+	
+	@BeforeEach
+	public void init()
+	{
+		final JasperReportBuilder report1 = report().title(cmp.text("text1")).pageFooter(cmp.pageNumber());
+		final JasperReportBuilder report2 = report().title(cmp.text("text2")).pageFooter(cmp.pageNumber());
+		final JasperReportBuilder report3 = report().title(cmp.text("text3")).pageFooter(cmp.pageNumber());
+		
+		this.concatenatedReport = concatenatedReport();
+		this.concatenatedReport.concatenate(report1, report2, report3);
+	}
+	
+	@Test
+	void test()
+	{
+		try
+		{
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n1\ntext3\n1\n",
+                bos.toString());
+			
+			this.concatenatedReport.continuousPageNumbering();
+			bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n2\ntext3\n3\n",
+                bos.toString());
+			
+			this.concatenatedReport.setContinuousPageNumbering(false);
+			bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n1\ntext3\n1\n",
+                bos.toString());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java
new file mode 100644
index 0000000..d384b3a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java
@@ -0,0 +1,100 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ConcatenatedReport2Test
+{
+	JasperConcatenatedReportBuilder concatenatedReport;
+	
+	@BeforeEach
+	public void init()
+	{
+		final JasperReportBuilder report1 =
+			report().columns(col.column("field1", String.class)).pageFooter(cmp.pageNumber()).setDataSource(
+				this.createDataSource("text1"));
+		final JasperReportBuilder report2 =
+			report().columns(col.column("field1", String.class)).pageFooter(cmp.pageNumber()).setDataSource(
+				this.createDataSource("text2"));
+		final JasperReportBuilder report3 =
+			report().columns(col.column("field1", String.class)).pageFooter(cmp.pageNumber()).setDataSource(
+				this.createDataSource("text3"));
+		
+		this.concatenatedReport = concatenatedReport();
+		this.concatenatedReport.concatenate(report1, report2, report3);
+	}
+	
+	@Test
+	void test()
+	{
+		try
+		{
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n1\ntext3\n1\n",
+                bos.toString());
+			
+			this.concatenatedReport.continuousPageNumbering();
+			bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n2\ntext3\n3\n",
+                bos.toString());
+			
+			this.concatenatedReport.setContinuousPageNumbering(false);
+			bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n1\ntext3\n1\n",
+                bos.toString());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	private JRDataSource createDataSource(final String text)
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add(text);
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java
new file mode 100644
index 0000000..9197187
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java
@@ -0,0 +1,85 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.jasper.base.reporthandler.JasperPrintListFileHandler;
+import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.fill.JRSwapFileVirtualizer;
+import net.sf.jasperreports.engine.util.JRSwapFile;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ConcatenatedReport3Test
+{
+	JasperConcatenatedReportBuilder concatenatedReport;
+	
+	@BeforeEach
+	public void init()
+	{
+		final JasperReportBuilder report1 = report().title(cmp.text("text1")).pageFooter(cmp.pageNumber());
+		final JasperReportBuilder report2 = report().title(cmp.text("text2")).pageFooter(cmp.pageNumber());
+		final JasperReportBuilder report3 = report().title(cmp.text("text3")).pageFooter(cmp.pageNumber());
+		
+		final JRSwapFile swapFile = new JRSwapFile(System.getProperty("java.io.tmpdir"), 2000, 5000);
+		this.concatenatedReport = concatenatedReport(new JasperPrintListFileHandler(
+			System.getProperty("java.io.tmpdir"),
+			new JRSwapFileVirtualizer(3, swapFile)));
+		this.concatenatedReport.continuousPageNumbering();
+		this.concatenatedReport.concatenate(report1, report2, report3);
+	}
+	
+	@Test
+	void test()
+	{
+		try
+		{
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n2\ntext3\n3\n",
+				new String(bos.toByteArray()));
+			
+			this.concatenatedReport.setContinuousPageNumbering(false);
+			bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n2\ntext3\n3\n",
+				new String(bos.toByteArray()));
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java
new file mode 100644
index 0000000..8494d65
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java
@@ -0,0 +1,79 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.jasper.base.reporthandler.JasperPrintListHandler;
+import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.exception.DRException;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ConcatenatedReport4Test
+{
+	JasperConcatenatedReportBuilder concatenatedReport;
+	
+	@BeforeEach
+	public void init()
+	{
+		final JasperReportBuilder report1 = report().title(cmp.text("text1")).pageFooter(cmp.pageNumber());
+		final JasperReportBuilder report2 = report().title(cmp.text("text2")).pageFooter(cmp.pageNumber());
+		final JasperReportBuilder report3 = report().title(cmp.text("text3")).pageFooter(cmp.pageNumber());
+		
+		this.concatenatedReport = concatenatedReport(new JasperPrintListHandler());
+		this.concatenatedReport.continuousPageNumbering();
+		this.concatenatedReport.concatenate(report1, report2, report3);
+	}
+	
+	@Test
+	void test()
+	{
+		try
+		{
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n2\ntext3\n3\n",
+				bos.toString());
+			
+			this.concatenatedReport.setContinuousPageNumbering(false);
+			bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals(
+				"text1\n1\ntext2\n2\ntext3\n3\n",
+				bos.toString());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java
new file mode 100644
index 0000000..0296b1e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java
@@ -0,0 +1,104 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRField;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ConcatenatedReport5Test
+{
+	JasperConcatenatedReportBuilder concatenatedReport;
+	
+	@BeforeEach
+	public void init()
+	{
+		final JasperReportBuilder report1 = report().title(cmp.text("text1"))
+			.setWhenNoDataType(WhenNoDataType.BLANK_PAGE)
+			.setDataSource(new DataSource());
+		final JasperReportBuilder report2 = report().title(cmp.text("text2"))
+			.setWhenNoDataType(WhenNoDataType.BLANK_PAGE)
+			.setDataSource(new DataSource());
+		final JasperReportBuilder report3 = report().title(cmp.text("text3"))
+			.setWhenNoDataType(WhenNoDataType.BLANK_PAGE)
+			.setDataSource(new DataSource());
+		
+		this.concatenatedReport = concatenatedReport();
+		this.concatenatedReport.concatenate(report1, report2, report3);
+	}
+	
+	@Test
+	void test()
+	{
+		try
+		{
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals("text1\ntext2\ntext3\n", new String(bos.toByteArray()));
+			
+			bos = new ByteArrayOutputStream();
+			this.concatenatedReport.toCsv(bos);
+			Assertions.assertEquals("text1\ntext2\ntext3\n", new String(bos.toByteArray()));
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	private class DataSource implements JRDataSource
+	{
+		private boolean next = true;
+		
+		@Override
+		public boolean next() throws JRException
+		{
+			if(this.next)
+			{
+				this.next = false;
+				return true;
+			}
+			return this.next;
+		}
+		
+		@Override
+		public Object getFieldValue(final JRField jrField) throws JRException
+		{
+			return null;
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/CustomFontTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/CustomFontTest.java
new file mode 100644
index 0000000..801bcfe
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/CustomFontTest.java
@@ -0,0 +1,71 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class CustomFontTest extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private AggregationSubtotalBuilder<String> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        StyleBuilder style = stl.style().setFontName("FreeUniversal");
+
+        rb.columns(column1 = col.column("Column1", "field1", type.stringType())).subtotalsAtColumnFooter(subtotal1 = sbt.text("text", column1).setStyle(style));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column1
+        columnTitlePositionTest(column1, 0, 10, 10, 575, 16);
+        columnDetailPositionTest(column1, 0, 10, 26, 575, 16);
+
+        // subtotal1
+        subtotalPositionTest(subtotal1, 0, 10, 818, 575, 14);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add("1");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand1Test.java
new file mode 100644
index 0000000..64b171f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand1Test.java
@@ -0,0 +1,69 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class DetailBand1Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", String.class)).detailHeader(cmp.text("detailHeader")).detailFooter(cmp.text("detailFooter"));
+
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementCountTest("detailHeader.textField1", 2);
+        elementValueTest("detailHeader.textField1", "detailHeader", "detailHeader");
+
+        columnDetailCountTest(column1, 2);
+        columnDetailValueTest(column1, "detail", "detail");
+
+        elementCountTest("detailFooter.textField1", 2);
+        elementValueTest("detailFooter.textField1", "detailFooter", "detailFooter");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("detail");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand2Test.java
new file mode 100644
index 0000000..46333e2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand2Test.java
@@ -0,0 +1,63 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class DetailBand2Test extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", String.class)).detailHeader(cmp.filler().setFixedHeight(10)).detailFooter(cmp.filler().setFixedHeight(15));
+
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnDetailPositionTest(column1, 0, 10, 36, 575, 16);
+        columnDetailPositionTest(column1, 1, 10, 77, 575, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("detail");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExportTest.java
new file mode 100644
index 0000000..ee6bef2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExportTest.java
@@ -0,0 +1,114 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.jasper.constant.ImageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class ExportTest
+{
+	JasperReportBuilder report;
+	JasperConcatenatedReportBuilder concatenatedReport;
+	
+	@BeforeEach
+	public void init()
+	{
+		this.report = report();
+		this.report.columns(col.column("Column1", "field1", String.class));
+		this.report.setDataSource(this.createDataSource());
+		
+		this.concatenatedReport = concatenatedReport();
+		this.concatenatedReport.concatenate(this.report, this.report, this.report);
+	}
+	
+	@Test
+	void exportTest()
+	{
+		try
+		{
+			this.report.toJrXml(new ByteArrayOutputStream());
+			this.report.toImage(new ByteArrayOutputStream(), ImageType.PNG);
+			this.report.toCsv(new ByteArrayOutputStream());
+			this.report.toDocx(new ByteArrayOutputStream());
+			this.report.toHtml(new ByteArrayOutputStream());
+			this.report.toOds(new ByteArrayOutputStream());
+			this.report.toOdt(new ByteArrayOutputStream());
+			this.report.toPdf(new ByteArrayOutputStream());
+			this.report.toRtf(new ByteArrayOutputStream());
+			this.report.toText(new ByteArrayOutputStream());
+			this.report.toXlsx(new ByteArrayOutputStream());
+			this.report.toXml(new ByteArrayOutputStream());
+			this.report.toPptx(new ByteArrayOutputStream());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	@Test
+	void concatenatedExportTest()
+	{
+		try
+		{
+			this.concatenatedReport.toPng(new ByteArrayOutputStream());
+			this.concatenatedReport.toCsv(new ByteArrayOutputStream());
+			this.concatenatedReport.toDocx(new ByteArrayOutputStream());
+			this.concatenatedReport.toHtml(new ByteArrayOutputStream());
+			this.concatenatedReport.toOds(new ByteArrayOutputStream());
+			this.concatenatedReport.toOdt(new ByteArrayOutputStream());
+			this.concatenatedReport.toPdf(new ByteArrayOutputStream());
+			this.concatenatedReport.toRtf(new ByteArrayOutputStream());
+			this.concatenatedReport.toText(new ByteArrayOutputStream());
+			this.concatenatedReport.toXlsx(new ByteArrayOutputStream());
+			this.concatenatedReport.toXml(new ByteArrayOutputStream());
+			this.concatenatedReport.toPptx(new ByteArrayOutputStream());
+		}
+		catch(final DRException e)
+		{
+			e.printStackTrace();
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	private JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add("field1");
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExpressionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExpressionTest.java
new file mode 100644
index 0000000..2a2fbd7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExpressionTest.java
@@ -0,0 +1,91 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ExpressionTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setLocale(Locale.ENGLISH).title(cmp.text(new Expression1()), cmp.text(new Expression2<String>("text2")), cmp.text(new Expression4()).setDataType(type.integerType()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementValueTest("title.textField1", "text1");
+        elementValueTest("title.textField2", "text2");
+        elementValueTest("title.textField3", "1,000");
+    }
+
+    @SuppressWarnings("rawtypes")
+    private class Expression1 extends AbstractSimpleExpression {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Object evaluate(ReportParameters reportParameters) {
+            return "text1";
+        }
+    }
+
+    private class Expression2<T> extends AbstractSimpleExpression<T> {
+        private static final long serialVersionUID = 1L;
+
+        private T value;
+
+        private Expression2(T value) {
+            this.value = value;
+        }
+
+        @Override
+        public T evaluate(ReportParameters reportParameters) {
+            return value;
+        }
+    }
+
+    private class Expression3 extends AbstractSimpleExpression<Integer> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Integer evaluate(ReportParameters reportParameters) {
+            return 1000;
+        }
+    }
+
+    private class Expression4 extends Expression3 {
+        private static final long serialVersionUID = 1L;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/FieldDataTypeTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/FieldDataTypeTest.java
new file mode 100644
index 0000000..c5f31b9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/FieldDataTypeTest.java
@@ -0,0 +1,194 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.FieldBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class FieldDataTypeTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<BigDecimal> column1;
+    private TextColumnBuilder<Integer> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<Date> column4;
+
+    private AggregationSubtotalBuilder<BigDecimal> subtotal1;
+    private AggregationSubtotalBuilder<Number> subtotal2;
+    private AggregationSubtotalBuilder<Long> subtotal3;
+    private AggregationSubtotalBuilder<Long> subtotal4;
+    private AggregationSubtotalBuilder<BigDecimal> subtotal5;
+    private AggregationSubtotalBuilder<BigDecimal> subtotal6;
+    private AggregationSubtotalBuilder<BigDecimal> subtotal7;
+    private AggregationSubtotalBuilder<Number> subtotal8;
+    private AggregationSubtotalBuilder<Number> subtotal9;
+
+    private AggregationSubtotalBuilder<Integer> subtotal10;
+    private AggregationSubtotalBuilder<Number> subtotal11;
+    private AggregationSubtotalBuilder<Long> subtotal12;
+    private AggregationSubtotalBuilder<Long> subtotal13;
+    private AggregationSubtotalBuilder<Integer> subtotal14;
+    private AggregationSubtotalBuilder<Integer> subtotal15;
+    private AggregationSubtotalBuilder<Integer> subtotal16;
+    private AggregationSubtotalBuilder<Number> subtotal17;
+    private AggregationSubtotalBuilder<Number> subtotal18;
+
+    private AggregationSubtotalBuilder<Long> subtotal19;
+    private AggregationSubtotalBuilder<Long> subtotal20;
+    private AggregationSubtotalBuilder<String> subtotal21;
+    private AggregationSubtotalBuilder<String> subtotal22;
+    private AggregationSubtotalBuilder<String> subtotal23;
+
+    private AggregationSubtotalBuilder<Long> subtotal24;
+    private AggregationSubtotalBuilder<Long> subtotal25;
+    private AggregationSubtotalBuilder<Date> subtotal26;
+    private AggregationSubtotalBuilder<Date> subtotal27;
+    private AggregationSubtotalBuilder<Date> subtotal28;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        FieldBuilder<BigDecimal> field1;
+        FieldBuilder<Integer> field2;
+        FieldBuilder<String> field3;
+        FieldBuilder<Date> field4;
+
+        rb.setLocale(Locale.ENGLISH)
+          .fields(field1 = field("field1", type.bigDecimalType()), field2 = field("field2", type.integerType()), field3 = field("field3", type.stringType()), field4 = field("field4", type.dateType()))
+          .columns(column1 = col.column("Column1", field1), column2 = col.column("Column2", field2), column3 = col.column("Column2", field3), column4 = col.column("Column3", field4))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(field1, column1), subtotal2 = sbt.avg(field1, column1), subtotal3 = sbt.count(field1, column1), subtotal4 = sbt.distinctCount(field1, column1),
+                              subtotal5 = sbt.first(field1, column1), subtotal6 = sbt.min(field1, column1), subtotal7 = sbt.max(field1, column1), subtotal8 = sbt.stdDev(field1, column1),
+                              subtotal9 = sbt.var(field1, column1),
+
+                              subtotal10 = sbt.sum(field2, column2), subtotal11 = sbt.avg(field2, column2), subtotal12 = sbt.count(field2, column2), subtotal13 = sbt.distinctCount(field2, column2),
+                              subtotal14 = sbt.first(field2, column2), subtotal15 = sbt.min(field2, column2), subtotal16 = sbt.max(field2, column2), subtotal17 = sbt.stdDev(field2, column2),
+                              subtotal18 = sbt.var(field2, column2),
+
+                              subtotal19 = sbt.count(field3, column3), subtotal20 = sbt.distinctCount(field3, column3), subtotal21 = sbt.first(field3, column3), subtotal22 = sbt.min(field3, column3),
+                              subtotal23 = sbt.max(field3, column3),
+
+                              subtotal24 = sbt.count(field4, column4), subtotal25 = sbt.distinctCount(field4, column4), subtotal26 = sbt.first(field4, column4), subtotal27 = sbt.min(field4, column4),
+                              subtotal28 = sbt.max(field4, column4));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // column
+        columnDetailCountTest(column1, 5);
+        columnDetailValueTest(column1, "1.01", "2.01", "9.01", "11.01", "2.01");
+        columnDetailCountTest(column2, 5);
+        columnDetailValueTest(column2, "5", "5", "8", "12", "6");
+        columnDetailCountTest(column3, 5);
+        columnDetailValueTest(column3, "value8", "value2", "value3", "value3", "value1");
+        columnDetailCountTest(column4, 5);
+        columnDetailValueTest(column4, "01/01/2010", "02/01/2010", "02/01/2010", "03/01/2010", "04/01/2010");
+
+        // summary
+        subtotalIndexCountTest(subtotal1, 1, 1);
+        subtotalIndexValueTest(subtotal1, 1, "25.05");
+        subtotalIndexCountTest(subtotal2, 2, 1);
+        subtotalIndexValueTest(subtotal2, 2, "5");
+        subtotalIndexCountTest(subtotal3, 3, 1);
+        subtotalIndexValueTest(subtotal3, 3, "5");
+        subtotalIndexCountTest(subtotal4, 4, 1);
+        subtotalIndexValueTest(subtotal4, 4, "4");
+        subtotalIndexCountTest(subtotal5, 5, 1);
+        subtotalIndexValueTest(subtotal5, 5, "1.01");
+        subtotalIndexCountTest(subtotal6, 6, 1);
+        subtotalIndexValueTest(subtotal6, 6, "1.01");
+        subtotalIndexCountTest(subtotal7, 7, 1);
+        subtotalIndexValueTest(subtotal7, 7, "11.01");
+        subtotalIndexCountTest(subtotal8, 8, 1);
+        subtotalIndexValueTest(subtotal8, 8, "4.1");
+        subtotalIndexCountTest(subtotal9, 9, 1);
+        subtotalIndexValueTest(subtotal9, 9, "17.2");
+
+        subtotalIndexCountTest(subtotal10, 1, 1);
+        subtotalIndexValueTest(subtotal10, 1, "36");
+        subtotalIndexCountTest(subtotal11, 2, 1);
+        subtotalIndexValueTest(subtotal11, 2, "7.2");
+        subtotalIndexCountTest(subtotal12, 3, 1);
+        subtotalIndexValueTest(subtotal12, 3, "5");
+        subtotalIndexCountTest(subtotal13, 4, 1);
+        subtotalIndexValueTest(subtotal13, 4, "4");
+        subtotalIndexCountTest(subtotal14, 5, 1);
+        subtotalIndexValueTest(subtotal14, 5, "5");
+        subtotalIndexCountTest(subtotal15, 6, 1);
+        subtotalIndexValueTest(subtotal15, 6, "5");
+        subtotalIndexCountTest(subtotal16, 7, 1);
+        subtotalIndexValueTest(subtotal16, 7, "12");
+        subtotalIndexCountTest(subtotal17, 8, 1);
+        subtotalIndexValueTest(subtotal17, 8, "2.6");
+        subtotalIndexCountTest(subtotal18, 9, 1);
+        subtotalIndexValueTest(subtotal18, 9, "7");
+
+        subtotalIndexCountTest(subtotal19, 1, 1);
+        subtotalIndexValueTest(subtotal19, 1, "5");
+        subtotalIndexCountTest(subtotal20, 2, 1);
+        subtotalIndexValueTest(subtotal20, 2, "4");
+        subtotalIndexCountTest(subtotal21, 3, 1);
+        subtotalIndexValueTest(subtotal21, 3, "value8");
+        subtotalIndexCountTest(subtotal22, 4, 1);
+        subtotalIndexValueTest(subtotal22, 4, "value1");
+        subtotalIndexCountTest(subtotal23, 5, 1);
+        subtotalIndexValueTest(subtotal23, 5, "value8");
+
+        subtotalIndexCountTest(subtotal24, 1, 1);
+        subtotalIndexValueTest(subtotal24, 1, "5");
+        subtotalIndexCountTest(subtotal25, 2, 1);
+        subtotalIndexValueTest(subtotal25, 2, "4");
+        subtotalIndexCountTest(subtotal26, 3, 1);
+        subtotalIndexValueTest(subtotal26, 3, "01/01/2010");
+        subtotalIndexCountTest(subtotal27, 4, 1);
+        subtotalIndexValueTest(subtotal27, 4, "01/01/2010");
+        subtotalIndexCountTest(subtotal28, 5, 1);
+        subtotalIndexValueTest(subtotal28, 5, "04/01/2010");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add(new BigDecimal(1.01), 5, "value8", toDate(2010, 1, 1));
+        dataSource.add(new BigDecimal(2.01), 5, "value2", toDate(2010, 2, 1));
+        dataSource.add(new BigDecimal(9.01), 8, "value3", toDate(2010, 2, 1));
+        dataSource.add(new BigDecimal(11.01), 12, "value3", toDate(2010, 3, 1));
+        dataSource.add(new BigDecimal(2.01), 6, "value1", toDate(2010, 4, 1));
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/HyperLinkTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/HyperLinkTest.java
new file mode 100644
index 0000000..37cff23
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/HyperLinkTest.java
@@ -0,0 +1,82 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.hyperLink;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
+import net.sf.dynamicreports.report.constant.HyperLinkTarget;
+import net.sf.dynamicreports.report.constant.HyperLinkType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRPrintText;
+import net.sf.jasperreports.engine.type.HyperlinkTargetEnum;
+import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class HyperLinkTest extends AbstractJasperValueTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final HyperLinkBuilder hyperLink1 = hyperLink().setReference("reference")
+			.setTooltip("tooltip")
+			.setAnchor("anchor")
+			.setPage(1)
+			.setType(HyperLinkType.LOCAL_ANCHOR)
+			.setTarget(HyperLinkTarget.TOP);
+		final HyperLinkBuilder hyperLink2 = hyperLink().setType("customType").setTarget("customTarget");
+		
+		rb.title(
+			cmp.text("title 1").setHyperLink(hyperLink1).setAnchorName("anchorName").setBookmarkLevel(1),
+			cmp.text("title 2").setHyperLink(hyperLink2));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+		
+		this.numberOfPagesTest(1);
+		
+		JRPrintText textField = (JRPrintText)this.getElementAt("title.textField1", 0);
+		Assertions.assertEquals("reference", textField.getHyperlinkReference());
+		Assertions.assertEquals("tooltip", textField.getHyperlinkTooltip());
+		Assertions.assertEquals("anchor", textField.getHyperlinkAnchor());
+		Assertions.assertEquals("anchorName", textField.getAnchorName());
+		Assertions.assertEquals(1, textField.getBookmarkLevel());
+		Assertions.assertEquals(Integer.valueOf(1), textField.getHyperlinkPage());
+		Assertions.assertEquals(HyperlinkTypeEnum.LOCAL_ANCHOR, textField.getHyperlinkTypeValue());
+		Assertions.assertEquals(HyperlinkTypeEnum.LOCAL_ANCHOR.getName(), textField.getLinkType());
+		Assertions.assertEquals(HyperlinkTargetEnum.TOP, textField.getHyperlinkTargetValue());
+		Assertions.assertEquals(HyperlinkTargetEnum.TOP.getName(), textField.getLinkTarget());
+		
+		textField = (JRPrintText)this.getElementAt("title.textField2", 0);
+		Assertions.assertEquals(HyperlinkTypeEnum.CUSTOM, textField.getHyperlinkTypeValue());
+		Assertions.assertEquals("customType", textField.getLinkType());
+		Assertions.assertEquals(HyperlinkTargetEnum.CUSTOM, textField.getHyperlinkTargetValue());
+		Assertions.assertEquals("customTarget", textField.getLinkTarget());
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePageWidthTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePageWidthTest.java
new file mode 100644
index 0000000..f8787f4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePageWidthTest.java
@@ -0,0 +1,92 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class IgnorePageWidthTest extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<String> column4;
+    private TextColumnBuilder<String> column5;
+    private TextColumnBuilder<String> column6;
+    private TextColumnBuilder<String> column7;
+    private TextColumnBuilder<String> column8;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.ignorePageWidth()
+          .title(cmp.text("text"))
+          .columns(column1 = col.column("Column2", "field1", String.class), column2 = col.column("Column2", "field2", String.class), column3 = col.column("Column3", "field3", String.class),
+                   column4 = col.column("Column4", "field4", String.class).setWidth(150), column5 = col.column("Column5", "field5", String.class).setFixedWidth(50),
+                   column6 = col.column("Column6", "field6", String.class), column7 = col.column("Column7", "field7", String.class), column8 = col.column("Column8", "field8", String.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 800, 16);
+        elementPositionTest("columnHeader.list1", 0, 10, 26, 800, 16);
+
+        // column1
+        columnTitlePositionTest(column1, 0, 0, 0, 100, 16);
+        columnDetailPositionTest(column1, 0, 0, 0, 100, 16);
+        // column2
+        columnTitlePositionTest(column2, 0, 100, 0, 100, 16);
+        columnDetailPositionTest(column2, 0, 100, 0, 100, 16);
+        // column3
+        columnTitlePositionTest(column3, 0, 200, 0, 100, 16);
+        columnDetailPositionTest(column3, 0, 200, 0, 100, 16);
+        // column4
+        columnTitlePositionTest(column4, 0, 300, 0, 150, 16);
+        columnDetailPositionTest(column4, 0, 300, 0, 150, 16);
+        // column5
+        columnTitlePositionTest(column5, 0, 450, 0, 50, 16);
+        columnDetailPositionTest(column5, 0, 450, 0, 50, 16);
+        // column6
+        columnTitlePositionTest(column6, 0, 500, 0, 100, 16);
+        columnDetailPositionTest(column6, 0, 500, 0, 100, 16);
+        // column7
+        columnTitlePositionTest(column7, 0, 600, 0, 100, 16);
+        columnDetailPositionTest(column7, 0, 600, 0, 100, 16);
+        // column8
+        columnTitlePositionTest(column8, 0, 700, 0, 100, 16);
+        columnDetailPositionTest(column8, 0, 700, 0, 100, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5", "field6", "field7", "field8");
+        dataSource.add("text", "text", "text", "text", "text", "text", "text", "text");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePaginationTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePaginationTest.java
new file mode 100644
index 0000000..a4170a7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePaginationTest.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.type.OrientationEnum;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class IgnorePaginationTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+
+        rb.columns(col.column("Column1", "field1", Integer.class)).setIgnorePagination(true);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        JasperPrint jasperPrint = getJasperPrint();
+        Assertions.assertEquals(OrientationEnum.PORTRAIT, jasperPrint.getOrientationValue());
+        Assertions.assertEquals(595, jasperPrint.getPageWidth());
+        Assertions.assertEquals(1636, jasperPrint.getPageHeight());
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 100; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/JasperExpressionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/JasperExpressionTest.java
new file mode 100644
index 0000000..01911a9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/JasperExpressionTest.java
@@ -0,0 +1,89 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class JasperExpressionTest extends AbstractJasperValueTest implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	private TextColumnBuilder<Integer> column2;
+	private TextColumnBuilder<Integer> column3;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.columns(
+            this.column2 = col.column("field2", Integer.class).setTitle(exp.jasperSyntax("\"Column2\"", String.class)),
+            this.column3 = col.column(exp.jasperSyntax("$F{field1} - $F{field2}", Integer.class)));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+        
+        this.columnTitleCountTest(this.column2, 1);
+        this.columnTitleValueTest(this.column2, "Column2");
+        
+        this.columnDetailValueTest(this.column3, "0", "8", "3");
+		
+		try
+		{
+			final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            this.getReportBuilder().toJrXml(bos);
+			final String jrxml = bos.toString();
+			Assertions.assertFalse(StringUtils.contains(jrxml, "net.sf.dynamicreports"));
+		}
+		catch(final DRException e)
+		{
+			Assertions.fail(e.getMessage());
+		}
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1", "field2");
+		dataSource.add(1, 1);
+		dataSource.add(10, 2);
+		dataSource.add(5, 2);
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ListDataTypeTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ListDataTypeTest.java
new file mode 100644
index 0000000..a14e129
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ListDataTypeTest.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ListDataTypeTest extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+    @SuppressWarnings("rawtypes")
+    private TextColumnBuilder<List> column2;
+    @SuppressWarnings("rawtypes")
+    private TextColumnBuilder<List> column3;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+
+        rb.columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", List.class), column3 = col.column("Column3", "field2", type.listType()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnDetailValueTest(column1, "row1", "row2");
+        columnDetailValueTest(column2, "comment1\ncomment2\ncomment3", "comment1\ncomment2");
+        columnDetailValueTest(column3, "comment1\ncomment2\ncomment3", "comment1\ncomment2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        List<String> comments = new ArrayList<String>();
+        comments.add("comment1");
+        comments.add("comment2");
+        comments.add("comment3");
+        dataSource.add("row1", comments);
+        comments = new ArrayList<String>();
+        comments.add("comment1");
+        comments.add("comment2");
+        dataSource.add("row2", comments);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/MarkupTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/MarkupTest.java
new file mode 100644
index 0000000..68b6f82
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/MarkupTest.java
@@ -0,0 +1,71 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Markup;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class MarkupTest extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        StyleBuilder style = stl.style().setMarkup(Markup.HTML);
+
+        rb.setColumnStyle(style)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column2).setLabel("subtotal <b>subtotal</b> subtotal").setLabelStyle(style))
+          .title(cmp.text("title <b>title</b> title").setMarkup(Markup.HTML));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnDetailValueTest(column1, "column <style isItalic=\"true\">column</style> column");
+        elementValueTest("title.textField1", "title <style isBold=\"true\">title</style> title");
+        subtotalLabelValueTest(subtotal1, "subtotal <style isBold=\"true\">subtotal</style> subtotal");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 1; i++) {
+            dataSource.add("column <i>column</i> column", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDataSectionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDataSectionTest.java
new file mode 100644
index 0000000..9a6e719
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDataSectionTest.java
@@ -0,0 +1,43 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class NoDataSectionTest extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.noData(cmp.text("Empty data"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementCountTest("noData.textField1", 1);
+        elementValueTest("noData.textField1", "Empty data");
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDetailSectionTest.java
similarity index 57%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDetailSectionTest.java
index 093dfea..950a179 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDetailSectionTest.java
@@ -15,24 +15,29 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package net.sf.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.base.export.JasperXlsExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
- * <p>JasperXlsExporterBuilder class.</p>
- *
  * @author Ricardo Mariaca
- * 
  */
-public class JasperXlsExporterBuilder extends AbstractJasperExcelExporterBuilder<JasperXlsExporterBuilder, JasperXlsExporter> {
-    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
+public class NoDetailSectionTest extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.title(cmp.text("Empty data"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
 
-    /**
-     * <p>Constructor for JasperXlsExporterBuilder.</p>
-     */
-    protected JasperXlsExporterBuilder() {
-        super(new JasperXlsExporter());
+        numberOfPagesTest(1);
+        elementCountTest("title.textField1", 1);
+        elementValueTest("title.textField1", "Empty data");
     }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ParametersTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ParametersTest.java
new file mode 100644
index 0000000..cbde64c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ParametersTest.java
@@ -0,0 +1,95 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperReport;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ParametersTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.title(cmp.text(new TitleExpression())).addParameter("title", String.class);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementValueTest("title.textField1", "");
+
+        try {
+            JasperReport jasperReport = getJasperReport();
+            JasperPrint jasperPrint = getJasperPrint();
+            getReportBuilder().setParameter("title", "1");
+            build();
+            elementValueTest("title.textField1", "1");
+            Assertions.assertSame(jasperReport, getJasperReport());
+            Assertions.assertNotSame(jasperPrint, getJasperPrint());
+
+            jasperReport = getJasperReport();
+            jasperPrint = getJasperPrint();
+            getReportBuilder().setParameter("title", "2");
+            build();
+            elementValueTest("title.textField1", "2");
+            Assertions.assertSame(jasperReport, getJasperReport());
+            Assertions.assertNotSame(jasperPrint, getJasperPrint());
+
+            jasperReport = getJasperReport();
+            jasperPrint = getJasperPrint();
+            Map<String, Object> parameters = new HashMap<String, Object>();
+            parameters.put("title", "3");
+            getReportBuilder().setParameters(parameters);
+            build();
+            elementValueTest("title.textField1", "3");
+            Assertions.assertSame(jasperReport, getJasperReport());
+            Assertions.assertNotSame(jasperPrint, getJasperPrint());
+        } catch (DRException e) {
+            e.printStackTrace();
+            Assertions.fail(e.getMessage());
+        }
+    }
+
+    private class TitleExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            return reportParameters.getValue("title");
+        }
+
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java
new file mode 100644
index 0000000..ee63642
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java
@@ -0,0 +1,55 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PrintWhenExpressionTest extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.title(cmp.text("title1").setPrintWhenExpression(exp.value(true)), cmp.text("title2").setPrintWhenExpression(exp.value(false)))
+          .summary(cmp.text("summary1"))
+          .setSummaryPrintWhenExpression(exp.value(true))
+          .pageFooter(cmp.text("pageFooter1"))
+          .setPageFooterPrintWhenExpression(exp.value(false));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementCountTest("title.textField1", 1);
+        elementValueTest("title.textField1", "title1");
+        elementCountTest("title.textField2", 0);
+
+        elementCountTest("summary.textField1", 1);
+        elementValueTest("summary.textField1", "summary1");
+
+        elementCountTest("pageFooter.textField1", 0);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report1Test.java
new file mode 100644
index 0000000..8effbb7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report1Test.java
@@ -0,0 +1,136 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.parameter;
+
+import java.math.BigDecimal;
+import java.util.ListResourceBundle;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.AbstractScriptlet;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.DefaultJasperReportsContext;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.fonts.FontUtil;
+import net.sf.jasperreports.engine.type.OrientationEnum;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Report1Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<Integer> column1;
+    private ReportScriptlet scriptlet;
+    private BigDecimal parameter1;
+    private BigDecimal parameter2;
+
+    @Override
+    protected void configureReport(final JasperReportBuilder rb) {
+        rb.columns(this.column1 = col.column("Column1", "field1", Integer.class))
+          .title(cmp.text(exp.jasperSyntax("$R{bundleKey3}", String.class)),
+                 cmp.multiPageList(cmp.text(exp.jasperSyntax("$R{bundleKey3}", String.class)), cmp.text(exp.jasperSyntax("$R{bundleKey1}", String.class))))
+          .setLocale(Locale.ENGLISH)
+          .setResourceBundle(new ResourceBundle())
+          .setWhenResourceMissingType(WhenResourceMissingType.KEY)
+          .setShowColumnTitle(false)
+          .setShowColumnValues(false)
+          .setPageFormat(PageType.A3, PageOrientation.LANDSCAPE)
+          .scriptlets(this.scriptlet = new ReportScriptlet())
+          .parameters(parameter("parameter1", this.parameter1 = new BigDecimal(10)))
+          .addParameter("parameter2", this.parameter2 = new BigDecimal(20));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+        
+        this.numberOfPagesTest(1);
+        this.columnTitleCountTest(this.column1, 0);
+        this.columnDetailCountTest(this.column1, 0);
+        
+        this.elementCountTest("title.textField1", 3);
+        this.elementValueTest("title.textField1", "bundleKey3", "bundleKey3", "bundleValue");
+
+        final FontUtil fontUtil = FontUtil.getInstance(DefaultJasperReportsContext.getInstance());
+        Assertions.assertFalse(fontUtil.getFontFamilyNames().isEmpty());
+
+        final JasperPrint jasperPrint = this.getJasperPrint();
+        Assertions.assertEquals("Report", jasperPrint.getName());
+        Assertions.assertEquals(OrientationEnum.LANDSCAPE, jasperPrint.getOrientationValue());
+        Assertions.assertEquals(1190, jasperPrint.getPageWidth());
+        Assertions.assertEquals(842, jasperPrint.getPageHeight());
+
+        Assertions.assertEquals(50, this.scriptlet.count);
+    }
+
+    @Override
+    protected boolean serializableTest() {
+        return false;
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        final DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 50; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+
+    private class ResourceBundle extends ListResourceBundle {
+
+        @Override
+        protected Object[][] getContents() {
+            return new Object[][] {{"bundleKey1", "bundleValue"}, {"bundleKey2", "bundleValue {0} - {1}"}};
+        }
+    }
+
+    private class ReportScriptlet extends AbstractScriptlet {
+        private int count;
+
+        @Override
+        public void afterReportInit(final ReportParameters reportParameters) {
+            super.afterReportInit(reportParameters);
+            Assertions.assertEquals(Locale.ENGLISH, reportParameters.getLocale());
+            Assertions.assertEquals("bundleValue", reportParameters.getMessage("bundleKey1"));
+            Assertions.assertEquals("bundleValue a - b", reportParameters.getMessage("bundleKey2", new Object[] {"a", "b"}));
+            Assertions.assertEquals(Report1Test.this.parameter1, reportParameters.getValue("parameter1"));
+            Assertions.assertEquals(Report1Test.this.parameter2, reportParameters.getValue("parameter2"));
+            Assertions.assertEquals(this, reportParameters.getScriptlet(this.getName()));
+        }
+
+        @Override
+        public void afterDetailEval(final ReportParameters reportParameters) {
+            super.afterDetailEval(reportParameters);
+            this.count++;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report2Test.java
new file mode 100644
index 0000000..bbe4fcc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report2Test.java
@@ -0,0 +1,79 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Report2Test extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<Integer> column1;
+
+        rb.setTitleOnANewPage(true)
+          .setSummaryOnANewPage(true)
+          .setFloatColumnFooter(true)
+          .columns(column1 = col.column("Column1", "field1", Integer.class))
+          .subtotalsAtColumnFooter(subtotal1 = sbt.sum(column1))
+          .subtotalsAtSummary(subtotal2 = sbt.sum(column1))
+          .title(cmp.text("title"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+
+        // title
+        elementPositionTest("title.textField1", 0, 10, 10, 575, 16);
+
+        // column footer
+        subtotalPositionTest(subtotal1, 0, 10, 186, 575, 16);
+
+        // summary
+        subtotalPositionTest(subtotal2, 0, 10, 10, 575, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report3Test.java
new file mode 100644
index 0000000..4faa3a2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report3Test.java
@@ -0,0 +1,68 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JasperPrint;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Report3Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setReportName("report1")
+          .setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL)
+          .setSummaryOnANewPage(true)
+          .setSummaryWithPageHeaderAndFooter(true)
+          .pageHeader(cmp.text("page header"))
+          .pageFooter(cmp.text("page footer"))
+          .summary(cmp.text("summary"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        JasperPrint jasperPrint = getJasperPrint();
+        Assertions.assertEquals("report1", jasperPrint.getName());
+
+        // page header
+        elementCountTest("pageHeader.textField1", 2);
+        elementValueTest("pageHeader.textField1", "page header", "page header");
+
+        // page footer
+        elementCountTest("pageFooter.textField1", 2);
+        elementValueTest("pageFooter.textField1", "page footer", "page footer");
+
+        // summary
+        elementCountTest("summary.textField1", 1);
+        elementValueTest("summary.textField1", "summary");
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report4Test.java
new file mode 100644
index 0000000..5aebfcc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report4Test.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.Language;
+import net.sf.dynamicreports.report.constant.Orientation;
+import net.sf.dynamicreports.report.constant.RunDirection;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Report4Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<Integer> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageColumnsPerPage(2)
+          .setPrintOrder(Orientation.HORIZONTAL)
+          .setColumnDirection(RunDirection.RIGHT_TO_LEFT)
+          .setLanguage(Language.GROOVY)
+          .columns(column1 = col.column("Column1", "field1", Integer.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnDetailPositionTest(column1, 0, 298, 26, 287, 16);
+        columnDetailPositionTest(column1, 1, 11, 26, 287, 16);
+        columnDetailPositionTest(column1, 2, 298, 42, 287, 16);
+        columnDetailPositionTest(column1, 3, 11, 42, 287, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 4; i++) {
+            dataSource.add(i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report5Test.java
new file mode 100644
index 0000000..608273d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report5Test.java
@@ -0,0 +1,100 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JasperPrint;
+
+import java.util.HashMap;
+import java.util.ListResourceBundle;
+import java.util.Locale;
+import java.util.Map;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Report5Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder detailSubreport = cmp.subreport(detailSubreport()).setParameters(new SubreportParametersExpression());
+
+        rb.title(cmp.text(exp.jasperSyntax("$R{bundleKey1}", String.class))).detail(detailSubreport).setLocale(Locale.ENGLISH).setResourceBundle(new ResourceBundle());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementCountTest("title.textField1", 3);
+        elementValueTest("title.textField1", "bundleValue1", "bundleValue1", "bundleValue1");
+
+        JasperPrint jasperPrint = getJasperPrint();
+        Assertions.assertEquals(Locale.ENGLISH.getLanguage(), jasperPrint.getLocaleCode());
+    }
+
+    @Override
+    protected boolean serializableTest() {
+        return false;
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(2);
+    }
+
+    private JasperReportBuilder detailSubreport() {
+        JasperReportBuilder report = report();
+        report.title(cmp.text(exp.jasperSyntax("$R{bundleKey1}", String.class)));
+        return report;
+    }
+
+    private class SubreportParametersExpression extends AbstractSimpleExpression<Map<String, Object>> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Map<String, Object> evaluate(ReportParameters reportParameters) {
+            Map<String, Object> parameters = new HashMap<String, Object>();
+            parameters.put(JRParameter.REPORT_LOCALE, reportParameters.getParameterValue(JRParameter.REPORT_LOCALE));
+            parameters.put(JRParameter.REPORT_RESOURCE_BUNDLE, reportParameters.getParameterValue(JRParameter.REPORT_RESOURCE_BUNDLE));
+            return parameters;
+        }
+    }
+
+    private class ResourceBundle extends ListResourceBundle {
+
+        @Override
+        protected Object[][] getContents() {
+            return new Object[][] {{"bundleKey1", "bundleValue1"}};
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground1Test.java
new file mode 100644
index 0000000..60b534f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground1Test.java
@@ -0,0 +1,47 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ReportBackground1Test extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).background(cmp.text("text")).setBackgroundStyle(stl.style());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("background.list1", 0, 10, 10, 822, 575);
+        elementPositionTest("background.textField1", 0, 0, 0, 822, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground2Test.java
new file mode 100644
index 0000000..8572f63
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground2Test.java
@@ -0,0 +1,45 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ReportBackground2Test extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).setBackgroundStyle(stl.style());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("background.list1", 0, 10, 10, 822, 575);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground3Test.java
new file mode 100644
index 0000000..272ce9d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground3Test.java
@@ -0,0 +1,46 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ReportBackground3Test extends AbstractJasperPositionTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageFormat(PageType.A4, PageOrientation.LANDSCAPE).setBackgroundBackgroundComponent(cmp.rectangle());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("background.list1", 0, 10, 10, 822, 575);
+        elementPositionTest("background.list1.background", 0, 0, 0, 822, 575);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/TitleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/TitleTest.java
new file mode 100644
index 0000000..ee70ccc
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/TitleTest.java
@@ -0,0 +1,87 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.hyperLink;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRPrintText;
+import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class TitleTest extends AbstractJasperValueTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.setResourceBundle("net.sf.dynamicreports.test.jasper.report.test")
+			.columns(col.column("Column1", "field1", Integer.class))
+			.title(cmp.text("title 1").setHyperLink(hyperLink("link").setTooltip("tooltip")),
+				cmp.text("title 2"),
+				cmp.text("title 3"),
+				cmp.text(exp.message("title")),
+				cmp.multiPageList(cmp.text(exp.message("title"))));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(2);
+        this.elementCountTest("title.textField1", 2);
+        this.elementValueTest("title.textField1", "title 1", "test title");
+		
+		final JRPrintText textField = (JRPrintText)this.getElementAt("title.textField1", 0);
+		Assertions.assertEquals("link", textField.getHyperlinkReference());
+		Assertions.assertEquals("tooltip", textField.getHyperlinkTooltip());
+		Assertions.assertEquals(HyperlinkTypeEnum.REFERENCE, textField.getHyperlinkTypeValue());
+        
+        this.elementCountTest("title.textField2", 1);
+        this.elementValueTest("title.textField2", "title 2");
+        
+        this.elementCountTest("title.textField3", 1);
+        this.elementValueTest("title.textField3", "title 3");
+        
+        this.elementCountTest("title.textField4", 1);
+        this.elementValueTest("title.textField4", "test title");
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		for(int i = 0; i < 50; i++)
+		{
+			dataSource.add(i);
+		}
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ValueTypeNamesTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ValueTypeNamesTest.java
new file mode 100644
index 0000000..02cbc79
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ValueTypeNamesTest.java
@@ -0,0 +1,81 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.parameter;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.io.Serializable;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ValueTypeNamesTest extends AbstractJasperValueTest implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.columns(col.column("Column1", new ColumnExpression()))
+			.fields(field("field1", type.stringType()))
+			.parameters(parameter("field1", "parameterValue"));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		dataSource.add("fieldValue");
+		return dataSource;
+	}
+	
+	private class ColumnExpression extends AbstractSimpleExpression<String>
+	{
+		private static final long serialVersionUID = 1L;
+		
+		@Override
+		public String evaluate(final ReportParameters reportParameters)
+		{
+			Assertions.assertEquals("fieldValue", reportParameters.getValue("field1"));
+			Assertions.assertEquals("fieldValue", reportParameters.getFieldValue("field1"));
+			Assertions.assertEquals("parameterValue", reportParameters.getParameterValue("field1"));
+			return "";
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VariableTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VariableTest.java
new file mode 100644
index 0000000..b81bc6e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VariableTest.java
@@ -0,0 +1,58 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.VariableBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.variable;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class VariableTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        VariableBuilder<Integer> variable1 = variable("field1", Integer.class, Calculation.SUM);
+        VariableBuilder<Integer> variable2 = variable(exp.number(5), Calculation.SUM);
+        variable2.setInitialValueExpression(exp.jasperSyntax("new Integer(10)"));
+
+        rb.summary(cmp.text(variable1), cmp.text(variable2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // summary
+        elementCountTest("summary.textField1", 1);
+        elementValueTest("summary.textField1", "");
+        elementCountTest("summary.textField2", 1);
+        elementValueTest("summary.textField2", "10");
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VirtualizerTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VirtualizerTest.java
new file mode 100644
index 0000000..3b9338a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VirtualizerTest.java
@@ -0,0 +1,56 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.report;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+import net.sf.jasperreports.engine.fill.JRFileVirtualizer;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class VirtualizerTest extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.title(cmp.text("title")).setVirtualizer(new JRFileVirtualizer(2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        elementCountTest("title.textField1", 1);
+        elementValueTest("title.textField1", "title");
+    }
+
+    @Override
+    protected boolean serializableTest() {
+        return false;
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(10);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle1Test.java
new file mode 100644
index 0000000..3efb1a5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle1Test.java
@@ -0,0 +1,152 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BandStyle1Test extends AbstractJasperStyleTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    Color color1 = new Color(240, 240, 240);
+    Color color2 = new Color(230, 230, 230);
+    Color color3 = new Color(220, 220, 220);
+    Color color4 = new Color(210, 210, 210);
+    Color color5 = new Color(190, 190, 190);
+    Color color6 = new Color(180, 180, 180);
+    Color color7 = new Color(170, 170, 170);
+    Color color8 = new Color(160, 160, 160);
+    Color color9 = new Color(150, 150, 150);
+    Color color10 = new Color(140, 140, 140);
+    Color color11 = new Color(130, 130, 130);
+    Color color12 = new Color(120, 120, 120);
+    Color color13 = new Color(110, 110, 110);
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+        TextColumnBuilder<Integer> column2;
+        ColumnGroupBuilder group1;
+
+        rb.setPageColumnsPerPage(2)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+          .groupBy(group1 = grp.group(column1).setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE))
+
+          .subtotalsAtTitle(sbt.sum(column2))
+          .subtotalsAtPageHeader(sbt.sum(column2))
+          .subtotalsAtPageFooter(sbt.sum(column2))
+          .subtotalsAtColumnHeader(sbt.sum(column2))
+          .subtotalsAtColumnFooter(sbt.sum(column2))
+          .subtotalsAtGroupHeader(group1, sbt.sum(column2))
+          .subtotalsAtGroupFooter(group1, sbt.sum(column2))
+          .subtotalsAtLastPageFooter(sbt.sum(column2))
+          .subtotalsAtSummary(sbt.sum(column2))
+
+          .title(cmp.text("title"))
+          .setTitleStyle(stl.style().setBackgroundColor(color1))
+
+          .pageHeader(cmp.text("pageHeader"))
+          .setPageHeaderStyle(stl.style().setBackgroundColor(color2))
+
+          .pageFooter(cmp.text("pageFooter"))
+          .setPageFooterStyle(stl.style().setBackgroundColor(color3))
+
+          .columnHeader(cmp.text("columnHeader"))
+          .setColumnHeaderStyle(stl.style().setBackgroundColor(color4))
+
+          .columnFooter(cmp.text("columnFooter"))
+          .setColumnFooterStyle(stl.style().setBackgroundColor(color5))
+
+          .groupHeader(group1, cmp.text("groupHeader"))
+          .setGroupHeaderStyle(group1, stl.style().setBackgroundColor(color6))
+
+          .groupFooter(group1, cmp.text("groupFooter"))
+          .setGroupFooterStyle(group1, stl.style().setBackgroundColor(color7))
+
+          .detailHeader(cmp.text("detailHeader"))
+          .setDetailHeaderStyle(stl.style().setBackgroundColor(color8))
+
+          .detail(cmp.text("detail"))
+          .setDetailStyle(stl.style().setBackgroundColor(color9))
+
+          .detailFooter(cmp.text("detailFooter"))
+          .setDetailFooterStyle(stl.style().setBackgroundColor(color10))
+
+          .lastPageFooter(cmp.text("lastPageFooter"))
+          .setLastPageFooterStyle(stl.style().setBackgroundColor(color11))
+
+          .summary(cmp.text("summary"))
+          .setSummaryStyle(stl.style().setBackgroundColor(color12))
+
+          .background(cmp.text("background"))
+          .setBackgroundStyle(stl.style().setBackgroundColor(color13));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        styleTest("title.list1", 0, null, color1, "SansSerif", null, null, null);
+        styleTest("pageHeader.list1", 0, null, color2, "SansSerif", null, null, null);
+        styleTest("pageFooter.list1", 0, null, color3, "SansSerif", null, null, null);
+        styleTest("columnHeader.list1", 0, null, color4, "SansSerif", null, null, null);
+        styleTest("columnFooter.list1", 0, null, color5, "SansSerif", null, null, null);
+        styleTest("groupHeaderTitleAndValue.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("groupHeader.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("subtotalGroupHeader.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("groupFooter.list1", 0, null, color7, "SansSerif", null, null, null);
+        styleTest("subtotalGroupFooter.list1", 0, null, color7, "SansSerif", null, null, null);
+        styleTest("detailHeader.list1", 0, null, color8, "SansSerif", null, null, null);
+        styleTest("detail.list1", 0, null, color9, "SansSerif", null, null, null);
+        styleTest("detailFooter.list1", 0, null, color10, "SansSerif", null, null, null);
+        styleTest("lastPageFooter.list1", 0, null, color11, "SansSerif", null, null, null);
+        styleTest("summary.list1", 0, null, color12, "SansSerif", null, null, null);
+        styleTest("background.list1", 0, null, color13, "SansSerif", null, null, null);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group1", i);
+        }
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle2Test.java
new file mode 100644
index 0000000..e827316
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle2Test.java
@@ -0,0 +1,143 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BandStyle2Test extends AbstractJasperStyleTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    Color color1 = new Color(240, 240, 240);
+    Color color2 = new Color(230, 230, 230);
+    Color color3 = new Color(220, 220, 220);
+    Color color4 = new Color(210, 210, 210);
+    Color color5 = new Color(190, 190, 190);
+    Color color6 = new Color(180, 180, 180);
+    Color color7 = new Color(170, 170, 170);
+    Color color8 = new Color(160, 160, 160);
+    Color color9 = new Color(150, 150, 150);
+    Color color10 = new Color(140, 140, 140);
+    Color color11 = new Color(130, 130, 130);
+    Color color12 = new Color(120, 120, 120);
+    Color color13 = new Color(110, 110, 110);
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+        TextColumnBuilder<Integer> column2;
+        ColumnGroupBuilder group1;
+
+        ReportTemplateBuilder template = template().setTitleStyle(stl.style().setBackgroundColor(color1))
+                                                   .setPageHeaderStyle(stl.style().setBackgroundColor(color2))
+                                                   .setPageFooterStyle(stl.style().setBackgroundColor(color3))
+                                                   .setColumnHeaderStyle(stl.style().setBackgroundColor(color4))
+                                                   .setColumnFooterStyle(stl.style().setBackgroundColor(color5))
+                                                   .setGroupHeaderStyle(stl.style().setBackgroundColor(color6))
+                                                   .setGroupFooterStyle(stl.style().setBackgroundColor(color7))
+                                                   .setDetailHeaderStyle(stl.style().setBackgroundColor(color8))
+                                                   .setDetailStyle(stl.style().setBackgroundColor(color9))
+                                                   .setDetailFooterStyle(stl.style().setBackgroundColor(color10))
+                                                   .setLastPageFooterStyle(stl.style().setBackgroundColor(color11))
+                                                   .setSummaryStyle(stl.style().setBackgroundColor(color12))
+                                                   .setBackgroundStyle(stl.style().setBackgroundColor(color13));
+
+        rb.setPageColumnsPerPage(2)
+          .setTemplate(template)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+          .groupBy(group1 = grp.group(column1).setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE))
+
+          .subtotalsAtTitle(sbt.sum(column2))
+          .subtotalsAtPageHeader(sbt.sum(column2))
+          .subtotalsAtPageFooter(sbt.sum(column2))
+          .subtotalsAtColumnHeader(sbt.sum(column2))
+          .subtotalsAtColumnFooter(sbt.sum(column2))
+          .subtotalsAtGroupHeader(group1, sbt.sum(column2))
+          .subtotalsAtGroupFooter(group1, sbt.sum(column2))
+          .subtotalsAtLastPageFooter(sbt.sum(column2))
+          .subtotalsAtSummary(sbt.sum(column2))
+          .title(cmp.text("title"))
+          .pageHeader(cmp.text("pageHeader"))
+          .pageFooter(cmp.text("pageFooter"))
+          .columnHeader(cmp.text("columnHeader"))
+          .columnFooter(cmp.text("columnFooter"))
+          .groupHeader(group1, cmp.text("groupHeader"))
+          .groupFooter(group1, cmp.text("groupFooter"))
+          .detailHeader(cmp.text("detailHeader"))
+          .detail(cmp.text("detail"))
+          .detailFooter(cmp.text("detailFooter"))
+          .lastPageFooter(cmp.text("lastPageFooter"))
+          .summary(cmp.text("summary"))
+          .background(cmp.text("background"));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        styleTest("title.list1", 0, null, color1, "SansSerif", null, null, null);
+        styleTest("pageHeader.list1", 0, null, color2, "SansSerif", null, null, null);
+        styleTest("pageFooter.list1", 0, null, color3, "SansSerif", null, null, null);
+        styleTest("columnHeader.list1", 0, null, color4, "SansSerif", null, null, null);
+        styleTest("columnFooter.list1", 0, null, color5, "SansSerif", null, null, null);
+        styleTest("groupHeaderTitleAndValue.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("groupHeader.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("subtotalGroupHeader.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("groupFooter.list1", 0, null, color7, "SansSerif", null, null, null);
+        styleTest("subtotalGroupFooter.list1", 0, null, color7, "SansSerif", null, null, null);
+        styleTest("detailHeader.list1", 0, null, color8, "SansSerif", null, null, null);
+        styleTest("detail.list1", 0, null, color9, "SansSerif", null, null, null);
+        styleTest("detailFooter.list1", 0, null, color10, "SansSerif", null, null, null);
+        styleTest("lastPageFooter.list1", 0, null, color11, "SansSerif", null, null, null);
+        styleTest("summary.list1", 0, null, color12, "SansSerif", null, null, null);
+        styleTest("background.list1", 0, null, color13, "SansSerif", null, null, null);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group1", i);
+        }
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle3Test.java
new file mode 100644
index 0000000..1d4af1f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle3Test.java
@@ -0,0 +1,131 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class BandStyle3Test extends AbstractJasperStyleTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    Color color1 = new Color(240, 240, 240);
+    Color color2 = new Color(230, 230, 230);
+    Color color3 = new Color(220, 220, 220);
+    Color color4 = new Color(210, 210, 210);
+    Color color5 = new Color(190, 190, 190);
+    Color color6 = new Color(180, 180, 180);
+    Color color7 = new Color(170, 170, 170);
+    Color color8 = new Color(160, 160, 160);
+    Color color9 = new Color(150, 150, 150);
+    Color color10 = new Color(140, 140, 140);
+    Color color11 = new Color(130, 130, 130);
+    Color color12 = new Color(120, 120, 120);
+    Color color13 = new Color(110, 110, 110);
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+        TextColumnBuilder<Integer> column2;
+        ColumnGroupBuilder group1;
+
+        rb.setPageColumnsPerPage(2)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+          .groupBy(group1 = grp.group(column1).setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE))
+          .setTitleStyle(stl.style().setBackgroundColor(color1))
+          .setPageHeaderStyle(stl.style().setBackgroundColor(color2))
+          .setPageFooterStyle(stl.style().setBackgroundColor(color3))
+          .setColumnHeaderStyle(stl.style().setBackgroundColor(color4))
+          .setColumnFooterStyle(stl.style().setBackgroundColor(color5))
+          .setGroupHeaderStyle(group1, stl.style().setBackgroundColor(color6))
+          .setGroupFooterStyle(group1, stl.style().setBackgroundColor(color7))
+          .setDetailHeaderStyle(stl.style().setBackgroundColor(color8))
+          .setDetailStyle(stl.style().setBackgroundColor(color9))
+          .setDetailFooterStyle(stl.style().setBackgroundColor(color10))
+          .setLastPageFooterStyle(stl.style().setBackgroundColor(color11))
+          .setSummaryStyle(stl.style().setBackgroundColor(color12))
+          .setBackgroundStyle(stl.style().setBackgroundColor(color13))
+          .subtotalsAtGroupHeader(group1, sbt.sum(column2))
+          .subtotalsAtGroupFooter(group1, sbt.sum(column2))
+          .title(cmp.verticalGap(10), cmp.verticalGap(10))
+          .pageHeader(cmp.verticalGap(10))
+          .pageFooter(cmp.verticalGap(10))
+          .columnHeader(cmp.verticalGap(10))
+          .columnFooter(cmp.verticalGap(10))
+          .groupHeader(group1, cmp.verticalGap(10))
+          .groupFooter(group1, cmp.verticalGap(10))
+          .detailHeader(cmp.verticalGap(10))
+          .detail(cmp.verticalGap(10))
+          .detailFooter(cmp.verticalGap(10))
+          .lastPageFooter(cmp.verticalGap(10))
+          .summary(cmp.verticalGap(10))
+          .background(cmp.verticalGap(10));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        styleTest("title.list1", 0, null, color1, "SansSerif", null, null, null);
+        styleTest("pageHeader.list1", 0, null, color2, "SansSerif", null, null, null);
+        styleTest("pageFooter.list1", 0, null, color3, "SansSerif", null, null, null);
+        styleTest("columnHeader.list1", 0, null, color4, "SansSerif", null, null, null);
+        styleTest("columnFooter.list1", 0, null, color5, "SansSerif", null, null, null);
+        styleTest("groupHeaderTitleAndValue.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("groupHeader.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("subtotalGroupHeader.list1", 0, null, color6, "SansSerif", null, null, null);
+        styleTest("groupFooter.list1", 0, null, color7, "SansSerif", null, null, null);
+        styleTest("subtotalGroupFooter.list1", 0, null, color7, "SansSerif", null, null, null);
+        styleTest("detailHeader.list1", 0, null, color8, "SansSerif", null, null, null);
+        styleTest("detail.list1", 0, null, color9, "SansSerif", null, null, null);
+        styleTest("detailFooter.list1", 0, null, color10, "SansSerif", null, null, null);
+        styleTest("lastPageFooter.list1", 0, null, color11, "SansSerif", null, null, null);
+        styleTest("summary.list1", 0, null, color12, "SansSerif", null, null, null);
+        styleTest("background.list1", 0, null, color13, "SansSerif", null, null, null);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group1", i);
+        }
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("group2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/DefaultFontTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/DefaultFontTest.java
new file mode 100644
index 0000000..ef0934c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/DefaultFontTest.java
@@ -0,0 +1,79 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.FontBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Default font tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class DefaultFontTest extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<String> column1;
+  private TextColumnBuilder<String> column2;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    FontBuilder defaultFont = stl.font().setFontSize(12);
+
+    rb.setDefaultFont(defaultFont).columns(
+        column1 = col.column("Column1", "field1", type.stringType()).setStyle(stl.style().bold()),
+        column2 = col.column("Column2", "field2", type.stringType()));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    // column1
+    columnDetailStyleTest(column1, 0, null, null, TEST_FONT_NAME, 12f, true, null);
+    columnDetailStyleTest(column1, 1, null, null, TEST_FONT_NAME, 12f, true, null);
+    columnDetailStyleTest(column1, 2, null, null, TEST_FONT_NAME, 12f, true, null);
+
+    // column2
+    columnDetailStyleTest(column2, 0, Color.BLACK, null, TEST_FONT_NAME, 12f, null, null);
+    columnDetailStyleTest(column2, 1, Color.BLACK, null, TEST_FONT_NAME, 12f, null, null);
+    columnDetailStyleTest(column2, 2, Color.BLACK, null, TEST_FONT_NAME, 12f, null, null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("1", "1", "1");
+    dataSource.add("1", "1", "1");
+    dataSource.add("1", "1", "1");
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style1Test.java
new file mode 100644
index 0000000..4902083
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style1Test.java
@@ -0,0 +1,180 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+/**
+ * Style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class Style1Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<Integer> column1;
+  private TextColumnBuilder<Integer> column2;
+  private TextColumnBuilder<Integer> column3;
+  private AggregationSubtotalBuilder<Integer> subtotal1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder textStyle = stl.style().setForegroundColor(Color.BLACK).setPadding(2);
+    StyleBuilder columnStyle = stl.style(textStyle).italic();
+
+    StyleBuilder columnStyle1 = stl.style(columnStyle).conditionalStyles(
+        stl.conditionalStyle(new ConditionExpression(2, 5, 6, 7)).bold(),
+        stl.conditionalStyle(new ConditionExpression(16)).setBackgroundColor(Color.ORANGE));
+
+    StyleBuilder columnStyle2 = stl.style(columnStyle).bold();
+    StyleBuilder titleStyle0 = stl.style(textStyle).bold();
+    StyleBuilder titleStyle = stl.style(titleStyle0).setBottomBorder(stl.pen2Point());
+    StyleBuilder columnTitleStyle3 = stl.style(titleStyle).setBorder(stl.pen2Point());
+    StyleBuilder subtotalStyle =
+        stl.style(textStyle).bold().setTopBorder(stl.pen1Point()).setBackgroundColor(Color.YELLOW);
+
+    rb.columns(column1 = col.column("Column1", "field1", Integer.class).setStyle(columnStyle1),
+        column2 = col.column("Column2", "field2", Integer.class).setStyle(columnStyle2),
+        column3 = col.column("Column3", "field3", Integer.class).setTitleStyle(columnTitleStyle3))
+        .setTextStyle(textStyle).setColumnTitleStyle(titleStyle).setColumnStyle(columnStyle)
+        .setSubtotalStyle(subtotalStyle).setHighlightDetailOddRows(true)
+        .setHighlightDetailEvenRows(true).subtotalsAtSummary(subtotal1 = sbt.sum(column1))
+        .detailRowHighlighters(
+            stl.conditionalStyle(new ConditionExpression(5, 16)).setBackgroundColor(Color.RED),
+            stl.conditionalStyle(new ConditionExpression(2, 9)).setForegroundColor(Color.RED))
+        .title(cmp.horizontalList().setStyle(stl.style(stl.pen1Point()))
+            .add(cmp.text("text").setStyle(stl.style(textStyle).setBold(true).setFontSize(15)))
+            .add(cmp.text("text")));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    final Color color1 = new Color(240, 240, 240);
+    final Color color2 = new Color(200, 200, 200);
+
+    // column1
+    columnTitleStyleTest(column1, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column1, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    columnTitlePaddingTest(column1, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column1, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column1, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 2, Color.RED, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 9, Color.RED, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 16, Color.BLACK, Color.ORANGE, TEST_FONT_NAME, 10f, null, true);
+
+    // column2
+    columnTitleStyleTest(column2, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column2, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    columnTitlePaddingTest(column2, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column2, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column2, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 2, Color.RED, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 9, Color.RED, color2, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 16, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+
+    // column3
+    columnTitleStyleTest(column3, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column3, 0, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK,
+        LineStyleEnum.SOLID, 2);
+    columnTitlePaddingTest(column3, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column3, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column3, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 2, Color.RED, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 9, Color.RED, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 16, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, null, true);
+
+    // subtotal1
+    subtotalStyleTest(subtotal1, 0, Color.BLACK, Color.YELLOW, TEST_FONT_NAME, 10f, true, null);
+    subtotalBorderTest(subtotal1, 0, Color.BLACK, LineStyleEnum.SOLID, 1, Color.BLACK,
+        LineStyleEnum.SOLID, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    subtotalPaddingTest(subtotal1, 0, 2, 2, 2, 2);
+
+    // title
+    styleTest("title.list1", 0, null, null, "SansSerif", null, null, null);
+    borderTest("title.list1", 0, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1, null,
+        LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1);
+    paddingTest("title.list1", 0, 0, 0, 0, 0);
+    styleTest("title.textField1", 0, Color.BLACK, null, TEST_FONT_NAME, 15f, true, null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    for (int i = 0; i < 20; i++) {
+      dataSource.add(i, i + 1, i + 2);
+    }
+    return dataSource;
+  }
+
+  private class ConditionExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = 1L;
+
+    private List<Integer> values;
+
+    private ConditionExpression(Integer... values) {
+      this.values = Arrays.asList(values);
+    }
+
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+      Integer value = (Integer) reportParameters.getValue("field1");
+      return values.contains(value);
+    }
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style2Test.java
new file mode 100644
index 0000000..2be6810
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style2Test.java
@@ -0,0 +1,93 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+/**
+ * Style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class Style2Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<Integer> column1;
+  private TextColumnBuilder<String> column2;
+  private ColumnGroupBuilder group1;
+  private AggregationSubtotalBuilder<Integer> subtotal1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder textStyle = stl.style().setPadding(2);
+    StyleBuilder titleStyle = stl.style(textStyle).bold();
+    StyleBuilder subtotalStyle = stl.style(2).setTopBorder(stl.pen1Point()).bold();
+
+    rb.setTextStyle(textStyle).setColumnTitleStyle(titleStyle).setSubtotalStyle(subtotalStyle)
+        .columns(column1 = col.column("Column1", "field1", type.integerType()),
+            column2 =
+                col.column("Column2", "field2", type.stringType()).setStyle(stl.style().bold()))
+        .groupBy(group1 = grp.group(column2)).subtotalsAtSummary(
+            subtotal1 = sbt.sum(column1).setLabel("total").setLabelStyle(stl.style().bold()));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    // column1
+    columnTitleStyleTest(column1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitlePaddingTest(column1, 0, 2, 2, 2, 2);
+
+    columnDetailStyleTest(column1, 0, null, null, TEST_FONT_NAME, 10f, null, null);
+    columnDetailPaddingTest(column1, 0, 2, 2, 2, 2);
+
+    // column2
+    groupHeaderStyleTest(group1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+
+    // subtotal
+    subtotalLabelStyleTest(subtotal1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    subtotalLabelBorderTest(subtotal1, 0, null, LineStyleEnum.SOLID, 0, null, LineStyleEnum.SOLID,
+        0, null, LineStyleEnum.SOLID, 0, null, LineStyleEnum.SOLID, 0);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2");
+    dataSource.add(1, "1");
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style3Test.java
new file mode 100644
index 0000000..d74a9bf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style3Test.java
@@ -0,0 +1,95 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class Style3Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<String> column1;
+  private TextColumnBuilder<String> column2;
+  private TextColumnBuilder<String> column3;
+  private TextColumnBuilder<String> column4;
+  private ColumnGroupBuilder group1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder titleStyle = stl.style().setForegroundColor(Color.RED);
+    StyleBuilder columnStyle = stl.style().setForegroundColor(Color.BLUE);
+
+    rb.setColumnTitleStyle(titleStyle).setColumnStyle(columnStyle).columns(
+        column1 = col.column("Column1", "field1", type.stringType()).setStyle(stl.style().italic())
+            .setTitleStyle(stl.style().bold()),
+        column2 = col.column("Column2", "field2", type.stringType()),
+        column3 = col.column("Column3", "field3", type.stringType()).setStyle(stl.style().bold()),
+        column4 = col.column("Column4", "field4", type.stringType())
+            .setStyle(stl.style(columnStyle).bold()).setTitleStyle(stl.style().italic()))
+        .groupBy(group1 = grp.group(column1).setHeaderLayout(GroupHeaderLayout.TITLE_AND_VALUE));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    // column2
+    columnTitleStyleTest(column2, 0, Color.RED, null, TEST_FONT_NAME, 10f, null, null);
+    columnDetailStyleTest(column2, 0, Color.BLUE, null, TEST_FONT_NAME, 10f, null, null);
+
+    // column3
+    columnTitleStyleTest(column3, 0, Color.RED, null, TEST_FONT_NAME, 10f, null, null);
+    columnDetailStyleTest(column3, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+
+    // column4
+    columnTitleStyleTest(column4, 0, null, null, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column4, 0, Color.BLUE, null, TEST_FONT_NAME, 10f, true, null);
+
+    // group1
+    groupHeaderTitleStyleTest(group1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    groupHeaderStyleTest(group1, 0, null, null, TEST_FONT_NAME, 10f, null, true);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("1", "1", "1");
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style4Test.java
new file mode 100644
index 0000000..8bd8bed
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style4Test.java
@@ -0,0 +1,83 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.awt.Color;
+import java.io.Serializable;
+import java.util.Date;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
+
+/**
+ * Style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class Style4Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<Date> column1;
+  private ColumnGroupBuilder group1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder groupStyle =
+        stl.style().bold().setHorizontalTextAlignment(HorizontalTextAlignment.LEFT);
+
+    column1 = col.column("field1", type.dateYearType());
+
+    group1 = grp.group(column1).setHideColumn(false).groupByDataType().setStyle(groupStyle);
+
+    rb.columns(column1).groupBy(group1);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    // column1
+    columnDetailStyleTest(column1, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, null, null);
+    columnDetailAlignmentTest(column1, 0, HorizontalTextAlignEnum.RIGHT);
+
+    // group1
+    groupHeaderStyleTest(group1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    groupHeaderAlignmentTest(group1, 0, HorizontalTextAlignEnum.LEFT);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1");
+    dataSource.add(new Date());
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style5Test.java
new file mode 100644
index 0000000..ce65514
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style5Test.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+/**
+ * Style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class Style5Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    rb.setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL)
+        .setTextStyle(stl.style(stl.pen1Point()).setPadding(2)).pageFooter(cmp.pageXofY());
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    // column1
+    styleTest("pageFooter.textField1", 0, null, null, TEST_FONT_NAME, 10f, null, null);
+    horizontalAlignmentTest("pageFooter.textField1", 0, HorizontalTextAlignEnum.RIGHT);
+    paddingTest("pageFooter.textField1", 0, 2, 2, 2, 0);
+    borderTest("pageFooter.textField1", 0, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID,
+        1, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 0);
+
+    styleTest("pageFooter.textField2", 0, null, null, TEST_FONT_NAME, 10f, null, null);
+    horizontalAlignmentTest("pageFooter.textField2", 0, HorizontalTextAlignEnum.LEFT);
+    paddingTest("pageFooter.textField2", 0, 2, 2, 0, 2);
+    borderTest("pageFooter.textField2", 0, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID,
+        1, null, LineStyleEnum.SOLID, 0, null, LineStyleEnum.SOLID, 1);
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style6Test.java
new file mode 100644
index 0000000..eacf440
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style6Test.java
@@ -0,0 +1,99 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cnd;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class Style6Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<String> column1;
+  private TextColumnBuilder<String> column2;
+  private TextColumnBuilder<String> column3;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder style = stl.style();
+    style.setBackgroundColor(Color.WHITE);
+    ConditionalStyleBuilder conditionalStyle =
+        stl.conditionalStyle(cnd.equal(field("field3", type.stringType()), "2"));
+    conditionalStyle.setForegroundColor(Color.BLUE);
+    style.conditionalStyles(conditionalStyle);
+
+    rb.highlightDetailEvenRows().columns(
+        column1 = col.column("Column1", "field1", type.stringType())
+            .setStyle(stl.style().setBackgroundColor(Color.BLUE)),
+        column2 = col.column("Column2", "field2", type.stringType()),
+        column3 = col.column("Column3", "field3", type.stringType()).setStyle(style));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    final Color color1 = new Color(60, 60, 251);
+    final Color color2 = new Color(240, 240, 240);
+    final Color color3 = new Color(251, 251, 251);
+
+    // column1
+    columnDetailStyleTest(column1, 0, null, color1, TEST_FONT_NAME, 10f, null, null);
+    columnDetailStyleTest(column1, 1, null, Color.BLUE, TEST_FONT_NAME, 10f, null, null);
+    columnDetailStyleTest(column1, 2, null, color1, TEST_FONT_NAME, 10f, null, null);
+
+    // column2
+    columnDetailStyleTest(column2, 0, Color.BLACK, color2, TEST_FONT_NAME, 10f, null, null);
+    columnDetailStyleTest(column2, 1, Color.BLACK, null, TEST_FONT_NAME, 10f, null, null);
+    columnDetailStyleTest(column2, 2, Color.BLACK, color2, TEST_FONT_NAME, 10f, null, null);
+
+    // column3
+    columnDetailStyleTest(column3, 0, null, color3, TEST_FONT_NAME, 10f, null, null);
+    columnDetailStyleTest(column3, 1, Color.BLUE, Color.WHITE, TEST_FONT_NAME, 10f, null, null);
+    columnDetailStyleTest(column3, 2, null, color3, TEST_FONT_NAME, 10f, null, null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    dataSource.add("1", "1", "1");
+    dataSource.add("1", "1", "2");
+    dataSource.add("1", "1", "1");
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style7Test.java
new file mode 100644
index 0000000..4df05ea
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style7Test.java
@@ -0,0 +1,83 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.io.Serializable;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.constant.LineSpacing;
+import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRStyle;
+import net.sf.jasperreports.engine.TabStop;
+import net.sf.jasperreports.engine.type.LineSpacingEnum;
+import net.sf.jasperreports.engine.type.TabStopAlignEnum;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class Style7Test extends AbstractJasperStyleTest implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final StyleBuilder style = stl.style()
+			.setLineSpacing(LineSpacing.DOUBLE)
+			.setLineSpacingSize(2f)
+			.setFirstLineIndent(10)
+			.setLeftIndent(15)
+			.setRightIndent(20)
+			.setSpacingBefore(5)
+			.setSpacingAfter(6)
+			.setTabStopWidth(9)
+			.addTabStop(12, TabStopAlignment.CENTER);
+		
+		rb.setTextStyle(style).title(cmp.text(""));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(1);
+		
+		final JRStyle style = this.getElementAt("title.textField1", 0).getStyle();
+		Assertions.assertEquals(LineSpacingEnum.DOUBLE, style.getParagraph().getLineSpacing());
+		Assertions.assertEquals(Float.valueOf(2), style.getParagraph().getLineSpacingSize());
+		Assertions.assertEquals(Integer.valueOf(10), style.getParagraph().getFirstLineIndent());
+		Assertions.assertEquals(Integer.valueOf(15), style.getParagraph().getLeftIndent());
+		Assertions.assertEquals(Integer.valueOf(20), style.getParagraph().getRightIndent());
+		Assertions.assertEquals(Integer.valueOf(5), style.getParagraph().getSpacingBefore());
+		Assertions.assertEquals(Integer.valueOf(6), style.getParagraph().getSpacingAfter());
+		Assertions.assertEquals(Integer.valueOf(9), style.getParagraph().getTabStopWidth());
+		final TabStop[] tabStops = style.getParagraph().getTabStops();
+		Assertions.assertNotNull(tabStops);
+		Assertions.assertEquals(12, tabStops[0].getPosition());
+		Assertions.assertEquals(TabStopAlignEnum.CENTER, tabStops[0].getAlignment());
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style8Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style8Test.java
new file mode 100644
index 0000000..ef5b251
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style8Test.java
@@ -0,0 +1,103 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.BooleanColumnBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
+import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.HorizontalImageAlignEnum;
+import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+import net.sf.jasperreports.engine.type.VerticalImageAlignEnum;
+import net.sf.jasperreports.engine.type.VerticalTextAlignEnum;
+
+
+/**
+ * Style tests.
+ *
+ * @author Ricardo Mariaca
+ */
+public class Style8Test extends AbstractJasperStyleTest
+{
+	private BooleanColumnBuilder column1;
+	private BooleanColumnBuilder column2;
+	private BooleanColumnBuilder column3;
+	private TextColumnBuilder<String> column4;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		rb.setColumnStyle(stl.style(stl.pen1Point()).bold()).columns(
+			this.column1 = col.booleanColumn("field1"),
+			this.column2 = col.booleanColumn("field2")
+				.setHorizontalImageAlignment(HorizontalImageAlignment.RIGHT),
+			this.column3 = col.booleanColumn("field3")
+				.setStyle(stl.style(stl.pen2Point())
+					.setHorizontalImageAlignment(HorizontalImageAlignment.CENTER)
+					.setVerticalImageAlignment(VerticalImageAlignment.MIDDLE)),
+			this.column4 = col.column("field4", type.stringType()));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+		
+		this.numberOfPagesTest(1);
+		
+		this.columnDetailStyleTest(this.column1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+		this.columnDetailBorderTest(
+			this.column1, 0, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1,
+			null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1);
+		this.columnDetailBorderTest(
+			this.column2, 0, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1,
+			null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1);
+		this.columnDetailBorderTest(
+			this.column3, 0, null, LineStyleEnum.SOLID, 2, null, LineStyleEnum.SOLID, 2,
+			null, LineStyleEnum.SOLID, 2, null, LineStyleEnum.SOLID, 2);
+		this.columnDetailStyleTest(this.column4, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+		this.columnDetailBorderTest(
+			this.column4, 0, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1,
+			null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1);
+		
+		this.columnDetailAlignmentTest(this.column1, 0, HorizontalTextAlignEnum.CENTER);
+		this.columnDetailAlignmentTest(this.column2, 0, HorizontalImageAlignEnum.RIGHT);
+		this.columnDetailAlignmentTest(this.column3, 0, HorizontalImageAlignEnum.CENTER);
+		
+		this.columnDetailAlignmentTest(this.column1, 0, VerticalTextAlignEnum.TOP);
+		this.columnDetailAlignmentTest(this.column2, 0, VerticalImageAlignEnum.TOP);
+		this.columnDetailAlignmentTest(this.column3, 0, VerticalImageAlignEnum.MIDDLE);
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+		dataSource.add(true, true, true, "text");
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style9Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style9Test.java
new file mode 100644
index 0000000..3e5755c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style9Test.java
@@ -0,0 +1,60 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRStyle;
+
+
+/**
+ * Style tests.
+ *
+ * @author Ricardo Mariaca
+ */
+public class Style9Test extends AbstractJasperStyleTest
+{
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final StyleBuilder style = stl.style().bold().setForegroundColor(Color.BLUE);
+		
+		rb.title(cmp.rectangle().setStyle(style), cmp.text("text").setStyle(style));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+      
+      this.numberOfPagesTest(1);
+		
+		final JRStyle style = this.getElementAt("title.rectangle1", 0).getStyle();
+		Assertions.assertEquals(Color.BLUE, style.getForecolor());
+      this.styleTest("title.textField1", 0, Color.BLUE, null, TEST_FONT_NAME, 10f, true, null);
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/StyleNamesTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/StyleNamesTest.java
new file mode 100644
index 0000000..3254090
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/StyleNamesTest.java
@@ -0,0 +1,89 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.Charset;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.style.TemplateStyleBuilder;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRStyle;
+import net.sf.jasperreports.engine.design.JasperDesign;
+
+
+/**
+ * @author Ramunas Belkauskas
+ */
+class StyleNamesTest
+{
+	
+	private static final String jrtxStr =
+		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+			+ "<!DOCTYPE jasperTemplate PUBLIC \"-//JasperReports//DTD Template//EN\" \"http://jasperreports"
+            + ".sourceforge.net/dtds/jaspertemplate.dtd\">\n"
+			+
+			"<jasperTemplate>\n" + "  <style name=\"MyBoldStyle2\" isBold=\"true\"/>\n" + "</jasperTemplate>";
+	
+	private static void assertContainsStyleWithName(final String name, final Iterable<JRStyle> styles)
+	{
+		Assertions.assertNotNull(name);
+		Assertions.assertNotNull(styles);
+		JRStyle found = null;
+		for(final JRStyle style : styles)
+		{
+			if(name.equals(style.getName()))
+			{
+				found = style;
+				break;
+			}
+		}
+		Assertions.assertNotNull(found, String.format("Style with name \"%s\" not found", name));
+	}
+	
+	@Test
+	void testStyleFromTemplateName() throws DRException
+	{
+		final ByteArrayInputStream is = new ByteArrayInputStream(jrtxStr.getBytes(Charset.forName("UTF-8")));
+		// name defined in style template:
+		final TemplateStyleBuilder templateStyle = stl.templateStyle("MyBoldStyle2");
+		final JasperReportBuilder builder =
+			report().addTemplateStyle(stl.loadStyles(is)).title(cmp.text("Some title").setStyle(templateStyle));
+		final JasperDesign design = builder.toJasperDesign();
+		assertContainsStyleWithName("MyBoldStyle2", design.getStylesList());
+	}
+	
+	@Test
+	void testStyleName() throws DRException
+	{
+		final String styleName = "MyBoldStyle";
+		// name explicitly set:
+		final StyleBuilder tucne = stl.style().setName(styleName).setFont(stl.font().bold());
+		final JasperReportBuilder builder = report().title(cmp.text("Some title").setStyle(tucne));
+		final JasperDesign design = builder.toJasperDesign();
+		assertContainsStyleWithName(styleName, design.getStylesList());
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle1Test.java
new file mode 100644
index 0000000..688293b
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle1Test.java
@@ -0,0 +1,192 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+/**
+ * Template style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class TemplateStyle1Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<Integer> column1;
+  private TextColumnBuilder<Integer> column2;
+  private TextColumnBuilder<Integer> column3;
+  private AggregationSubtotalBuilder<Integer> subtotal1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder textStyle =
+        stl.style().setName("textStyle").setForegroundColor(Color.BLACK).setPadding(2);
+    StyleBuilder columnStyle = stl.style(textStyle).setName("columnStyle").italic();
+
+    StyleBuilder columnStyle1 = stl.style(columnStyle).setName("columnStyle1").conditionalStyles(
+        stl.conditionalStyle(new ConditionExpression(2, 5, 6, 7)).bold(),
+        stl.conditionalStyle(new ConditionExpression(16)).setBackgroundColor(Color.ORANGE));
+
+    StyleBuilder columnStyle2 = stl.style(stl.templateStyle("columnStyle")).bold();
+    StyleBuilder titleStyle0 = stl.style(textStyle).bold();
+    StyleBuilder titleStyle =
+        stl.style(titleStyle0).setName("titleStyle").setBottomBorder(stl.pen2Point());
+    StyleBuilder columnTitleStyle3 =
+        stl.style(titleStyle).setName("columnTitleStyle3").setBorder(stl.pen2Point());
+    StyleBuilder subtotalStyle = stl.style(stl.templateStyle("textStyle")).setName("subtotalStyle")
+        .bold().setTopBorder(stl.pen1Point()).setBackgroundColor(Color.YELLOW);
+    StyleBuilder textFieldStyle =
+        stl.style(textStyle).setName("textFieldStyle").setBold(true).setFontSize(15);
+
+    rb.templateStyles(textStyle, columnStyle, columnStyle1, titleStyle, columnTitleStyle3,
+        subtotalStyle, textFieldStyle)
+        .columns(
+            column1 = col.column("Column1", "field1", Integer.class)
+                .setStyle(stl.templateStyle("columnStyle1")),
+            column2 = col.column("Column2", "field2", Integer.class).setStyle(columnStyle2),
+            column3 = col.column("Column3", "field3", Integer.class)
+                .setTitleStyle(stl.templateStyle("columnTitleStyle3")))
+        .setTextStyle(stl.templateStyle("textStyle"))
+        .setColumnTitleStyle(stl.templateStyle("titleStyle"))
+        .setColumnStyle(stl.templateStyle("columnStyle"))
+        .setSubtotalStyle(stl.templateStyle("subtotalStyle")).setHighlightDetailOddRows(true)
+        .setHighlightDetailEvenRows(true).subtotalsAtSummary(subtotal1 = sbt.sum(column1))
+        .detailRowHighlighters(
+            stl.conditionalStyle(new ConditionExpression(5, 16)).setBackgroundColor(Color.RED),
+            stl.conditionalStyle(new ConditionExpression(2, 9)).setForegroundColor(Color.RED))
+        .title(cmp.horizontalList().setStyle(stl.style(stl.pen1Point()))
+            .add(cmp.text("text").setStyle(stl.templateStyle("textFieldStyle")))
+            .add(cmp.text("text")));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    final Color color1 = new Color(240, 240, 240);
+    final Color color2 = new Color(200, 200, 200);
+
+    // column1
+    columnTitleStyleTest(column1, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column1, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    columnTitlePaddingTest(column1, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column1, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column1, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 2, Color.RED, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 9, Color.RED, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 16, Color.BLACK, Color.ORANGE, TEST_FONT_NAME, 10f, null, true);
+
+    // column2
+    columnTitleStyleTest(column2, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column2, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    columnTitlePaddingTest(column2, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column2, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column2, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 2, Color.RED, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 9, Color.RED, color2, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 16, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+
+    // column3
+    columnTitleStyleTest(column3, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column3, 0, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK,
+        LineStyleEnum.SOLID, 2);
+    columnTitlePaddingTest(column3, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column3, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column3, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 2, Color.RED, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 9, Color.RED, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 16, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, null, true);
+
+    // subtotal1
+    subtotalStyleTest(subtotal1, 0, Color.BLACK, Color.YELLOW, TEST_FONT_NAME, 10f, true, null);
+    subtotalBorderTest(subtotal1, 0, Color.BLACK, LineStyleEnum.SOLID, 1, Color.BLACK,
+        LineStyleEnum.SOLID, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    subtotalPaddingTest(subtotal1, 0, 2, 2, 2, 2);
+
+    // title
+    styleTest("title.list1", 0, null, null, "SansSerif", null, null, null);
+    borderTest("title.list1", 0, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1, null,
+        LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1);
+    paddingTest("title.list1", 0, 0, 0, 0, 0);
+    styleTest("title.textField1", 0, Color.BLACK, null, TEST_FONT_NAME, 15f, true, null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    for (int i = 0; i < 20; i++) {
+      dataSource.add(i, i + 1, i + 2);
+    }
+    return dataSource;
+  }
+
+  private class ConditionExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = 1L;
+
+    private List<Integer> values;
+
+    private ConditionExpression(Integer... values) {
+      this.values = Arrays.asList(values);
+    }
+
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+      Integer value = (Integer) reportParameters.getValue("field1");
+      return values.contains(value);
+    }
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle2Test.java
new file mode 100644
index 0000000..eeb6708
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle2Test.java
@@ -0,0 +1,102 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+/**
+ * Template style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class TemplateStyle2Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<Integer> column1;
+  private TextColumnBuilder<String> column2;
+  private ColumnGroupBuilder group1;
+  private AggregationSubtotalBuilder<Integer> subtotal1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder textStyle = stl.style().setName("textStyle").setPadding(2);
+    StyleBuilder titleStyle = stl.style(textStyle).setName("titleStyle").bold();
+    StyleBuilder subtotalStyle =
+        stl.style(2).setName("subtotalStyle").setTopBorder(stl.pen1Point()).bold();
+    StyleBuilder boldStyle = stl.style().setName("boldStyle").bold();
+
+    ReportTemplateBuilder template =
+        template().templateStyles(textStyle, titleStyle, subtotalStyle, boldStyle);
+
+    rb.setTemplate(template).setTextStyle(stl.templateStyle("textStyle"))
+        .setColumnTitleStyle(stl.templateStyle("titleStyle"))
+        .setSubtotalStyle(stl.templateStyle("subtotalStyle"))
+        .columns(column1 = col.column("Column1", "field1", type.integerType()),
+            column2 = col.column("Column2", "field2", type.stringType())
+                .setStyle(stl.templateStyle("boldStyle")))
+        .groupBy(group1 = grp.group(column2)).subtotalsAtSummary(subtotal1 =
+            sbt.sum(column1).setLabel("total").setLabelStyle(stl.templateStyle("boldStyle")));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    // column1
+    columnTitleStyleTest(column1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitlePaddingTest(column1, 0, 2, 2, 2, 2);
+
+    columnDetailStyleTest(column1, 0, null, null, TEST_FONT_NAME, 10f, null, null);
+    columnDetailPaddingTest(column1, 0, 2, 2, 2, 2);
+
+    // column2
+    groupHeaderStyleTest(group1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+
+    // subtotal
+    subtotalLabelStyleTest(subtotal1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    subtotalLabelBorderTest(subtotal1, 0, null, LineStyleEnum.SOLID, 0, null, LineStyleEnum.SOLID,
+        0, null, LineStyleEnum.SOLID, 0, null, LineStyleEnum.SOLID, 0);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2");
+    dataSource.add(1, "1");
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle3Test.java
new file mode 100644
index 0000000..3bc0b0f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle3Test.java
@@ -0,0 +1,175 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+import java.awt.Color;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+/**
+ * Template style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class TemplateStyle3Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<Integer> column1;
+  private TextColumnBuilder<Integer> column2;
+  private TextColumnBuilder<Integer> column3;
+  private AggregationSubtotalBuilder<Integer> subtotal1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder columnStyle1 = stl.style(stl.templateStyle("columnStyle")).conditionalStyles(
+        stl.conditionalStyle(new ConditionExpression(2, 5, 6, 7)).bold(),
+        stl.conditionalStyle(new ConditionExpression(16)).setBackgroundColor(Color.ORANGE));
+    StyleBuilder columnStyle2 = stl.style(stl.templateStyle("columnStyle")).bold();
+
+    rb.addTemplateStyle(stl.loadStyles(TemplateStyle4Test.class.getResource("StyleTemplate1.jrtx")))
+        .columns(column1 = col.column("Column1", "field1", Integer.class).setStyle(columnStyle1),
+            column2 = col.column("Column2", "field2", Integer.class).setStyle(columnStyle2),
+            column3 = col.column("Column3", "field3", Integer.class)
+                .setTitleStyle(stl.templateStyle("columnTitleStyle3")))
+        .setTextStyle(stl.templateStyle("textStyle"))
+        .setColumnTitleStyle(stl.templateStyle("titleStyle"))
+        .setColumnStyle(stl.templateStyle("columnStyle"))
+        .setSubtotalStyle(stl.templateStyle("subtotalStyle")).setHighlightDetailOddRows(true)
+        .setHighlightDetailEvenRows(true).subtotalsAtSummary(subtotal1 = sbt.sum(column1))
+        .detailRowHighlighters(
+            stl.conditionalStyle(new ConditionExpression(5, 16)).setBackgroundColor(Color.RED),
+            stl.conditionalStyle(new ConditionExpression(2, 9)).setForegroundColor(Color.RED))
+        .title(cmp.horizontalList().setStyle(stl.style(stl.pen1Point()))
+            .add(cmp.text("text").setStyle(stl.templateStyle("textFieldStyle")))
+            .add(cmp.text("text")));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    final Color color1 = new Color(240, 240, 240);
+    final Color color2 = new Color(200, 200, 200);
+
+    // column1
+    columnTitleStyleTest(column1, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column1, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    columnTitlePaddingTest(column1, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column1, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column1, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 2, Color.RED, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column1, 9, Color.RED, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column1, 16, Color.BLACK, Color.ORANGE, TEST_FONT_NAME, 10f, null, true);
+
+    // column2
+    columnTitleStyleTest(column2, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column2, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    columnTitlePaddingTest(column2, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column2, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column2, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 2, Color.RED, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 9, Color.RED, color2, TEST_FONT_NAME, 10f, true, true);
+    columnDetailStyleTest(column2, 16, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, true, true);
+
+    // column3
+    columnTitleStyleTest(column3, 0, Color.BLACK, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitleBorderTest(column3, 0, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK,
+        LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK,
+        LineStyleEnum.SOLID, 2);
+    columnTitlePaddingTest(column3, 0, 2, 2, 2, 2);
+
+    columnDetailPaddingTest(column3, 0, 2, 2, 2, 2);
+    columnDetailStyleTest(column3, 0, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 1, Color.BLACK, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 2, Color.RED, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 5, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 6, Color.BLACK, color1, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 9, Color.RED, color2, TEST_FONT_NAME, 10f, null, true);
+    columnDetailStyleTest(column3, 16, Color.BLACK, Color.RED, TEST_FONT_NAME, 10f, null, true);
+
+    // subtotal1
+    subtotalStyleTest(subtotal1, 0, Color.BLACK, Color.YELLOW, TEST_FONT_NAME, 10f, true, null);
+    subtotalBorderTest(subtotal1, 0, Color.BLACK, LineStyleEnum.SOLID, 1, Color.BLACK,
+        LineStyleEnum.SOLID, 0, Color.BLACK, LineStyleEnum.SOLID, 0, Color.BLACK,
+        LineStyleEnum.SOLID, 0);
+    subtotalPaddingTest(subtotal1, 0, 2, 2, 2, 2);
+
+    // title
+    styleTest("title.list1", 0, null, null, "SansSerif", null, null, null);
+    borderTest("title.list1", 0, null, LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1, null,
+        LineStyleEnum.SOLID, 1, null, LineStyleEnum.SOLID, 1);
+    paddingTest("title.list1", 0, 0, 0, 0, 0);
+    styleTest("title.textField1", 0, Color.BLACK, null, TEST_FONT_NAME, 15f, true, null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    for (int i = 0; i < 20; i++) {
+      dataSource.add(i, i + 1, i + 2);
+    }
+    return dataSource;
+  }
+
+  private class ConditionExpression extends AbstractSimpleExpression<Boolean> {
+    private static final long serialVersionUID = 1L;
+
+    private List<Integer> values;
+
+    private ConditionExpression(Integer... values) {
+      this.values = Arrays.asList(values);
+    }
+
+    @Override
+    public Boolean evaluate(ReportParameters reportParameters) {
+      Integer value = (Integer) reportParameters.getValue("field1");
+      return values.contains(value);
+    }
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle4Test.java
new file mode 100644
index 0000000..2c71a52
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle4Test.java
@@ -0,0 +1,107 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+/**
+ * Template style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class TemplateStyle4Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private TextColumnBuilder<Integer> column1;
+  private TextColumnBuilder<String> column2;
+  private ColumnGroupBuilder group1;
+  private AggregationSubtotalBuilder<Integer> subtotal1;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder textFieldStyle1 =
+        stl.style(stl.templateStyle("boldStyle")).setName("textFieldStyle1").setFontSize(15);
+    StyleBuilder textFieldStyle2 = stl.style(stl.templateStyle("boldStyle")).setFontSize(10);
+
+    ReportTemplateBuilder template = template().addTemplateStyle(textFieldStyle1).templateStyles(
+        stl.loadStyles(TemplateStyle4Test.class.getResource("StyleTemplate2.jrtx")));
+
+    rb.setTemplate(template).setTextStyle(stl.templateStyle("textStyle"))
+        .setColumnTitleStyle(stl.templateStyle("titleStyle"))
+        .setSubtotalStyle(stl.templateStyle("subtotalStyle"))
+        .columns(column1 = col.column("Column1", "field1", type.integerType()),
+            column2 = col.column("Column2", "field2", type.stringType())
+                .setStyle(stl.templateStyle("boldStyle")))
+        .title(cmp.text("text").setStyle(stl.templateStyle("textFieldStyle1")),
+            cmp.text("text").setStyle(textFieldStyle2))
+        .groupBy(group1 = grp.group(column2)).subtotalsAtSummary(subtotal1 =
+            sbt.sum(column1).setLabel("total").setLabelStyle(stl.templateStyle("boldStyle")));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    // column1
+    columnTitleStyleTest(column1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    columnTitlePaddingTest(column1, 0, 2, 2, 2, 2);
+
+    columnDetailStyleTest(column1, 0, null, null, TEST_FONT_NAME, 10f, null, null);
+    columnDetailPaddingTest(column1, 0, 2, 2, 2, 2);
+
+    // column2
+    groupHeaderStyleTest(group1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+
+    // subtotal
+    subtotalLabelStyleTest(subtotal1, 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    subtotalLabelBorderTest(subtotal1, 0, null, LineStyleEnum.SOLID, 0, null, LineStyleEnum.SOLID,
+        0, null, LineStyleEnum.SOLID, 0, null, LineStyleEnum.SOLID, 0);
+
+    // title
+    styleTest("title.textField1", 0, null, null, TEST_FONT_NAME, 15f, true, null);
+    styleTest("title.textField2", 0, null, null, TEST_FONT_NAME, 10f, true, null);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2");
+    dataSource.add(1, "1");
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle5Test.java
new file mode 100644
index 0000000..3f8732f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle5Test.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder;
+import net.sf.dynamicreports.report.constant.WhenNoDataType;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.dynamicreports.test.jasper.templatedesign.TemplateDesign1Test;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.type.LineStyleEnum;
+
+import java.awt.Color;
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateStyle5Test extends AbstractJasperStyleTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        TemplateStylesBuilder templateStyles =
+            stl.templateStyles().loadStyles(TemplateStyle4Test.class.getResource("StyleTemplate1.jrtx")).styles(stl.style().setName("style1").setBackgroundColor(Color.RED));
+        templateStyles.getStyle("columnTitleStyle3").setBackgroundColor(Color.LIGHT_GRAY);
+        InputStream is = TemplateDesign1Test.class.getResourceAsStream("templatedesign6.jrxml");
+        rb.setTemplateDesign(is).setWhenNoDataType(WhenNoDataType.ALL_SECTIONS_NO_DETAIL).addTemplateStyle(templateStyles);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        JasperPrint jasperPrint = getJasperPrint();
+        Assertions.assertEquals("templatedesign6", jasperPrint.getName());
+
+        styleTest("templateDesign.title1", 0, Color.BLACK, Color.LIGHT_GRAY, "SansSerif", null, true, null);
+        borderTest("templateDesign.title1", 0, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 2, Color.BLACK, LineStyleEnum.SOLID, 2);
+        styleTest("templateDesign.title2", 0, null, Color.RED, "SansSerif", null, null, null);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle6Test.java
new file mode 100644
index 0000000..52ff1f3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle6Test.java
@@ -0,0 +1,68 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.style;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+
+import java.io.Serializable;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Template style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class TemplateStyle6Test extends AbstractJasperStyleTest implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    StyleBuilder textStyle = stl.style().setName("textStyle").setPadding(2);
+    StyleBuilder boldStyle = stl.style(textStyle).setName("boldStyle").bold();
+
+    ReportTemplateBuilder template = template().templateStyles(textStyle, boldStyle);
+
+    rb.setTemplate(template)
+        .title(cmp.multiPageList(cmp.text("title").setStyle(stl.templateStyle("boldStyle"))));
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(1);
+
+    styleTest("title.textField1", 0, null, null, TEST_FONT_NAME, 10f, true, null);
+    paddingTest("title.textField1", 0, 2, 2, 2, 2);
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    DRDataSource dataSource = new DRDataSource("field1", "field2");
+    dataSource.add(1, "1");
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java
new file mode 100644
index 0000000..f79af8e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java
@@ -0,0 +1,114 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperReport;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class JasperSubreport2Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder detailSubreport = cmp.subreport(detailSubreport()).setDataSource(new SubreportDataSourceExpression());
+
+        SubreportBuilder titleSubreport = cmp.subreport(titleSubreport()).setDataSource(titleSubreportDataSource());
+
+        rb.title(titleSubreport).detail(detailSubreport);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // title subreport
+        elementCountTest("detail.column_field11", 3);
+        elementValueTest("detail.column_field11", "value1", "value2", "value3");
+
+        // detail subreport
+        elementCountTest("title.textField1", 3);
+        elementValueTest("title.textField1", "Subreport1", "Subreport2", "Subreport3");
+
+        elementCountTest("detail.column_simpleExpression_0_1", 6);
+        elementValueTest("detail.column_simpleExpression_0_1", "1_1", "1_2", "2_1", "2_2", "3_1", "3_2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(3);
+    }
+
+    private JasperReport titleSubreport() {
+        try {
+            InputStream is = JasperSubreportTest.class.getResourceAsStream("titlesubreport.jrxml");
+            return JasperCompileManager.compileReport(is);
+        } catch (JRException e) {
+            e.printStackTrace();
+            Assertions.fail(e.getMessage());
+            return null;
+        }
+    }
+
+    private JasperReport detailSubreport() {
+        try {
+            InputStream is = JasperSubreportTest.class.getResourceAsStream("detailsubreport.jrxml");
+            return JasperCompileManager.compileReport(is);
+        } catch (JRException e) {
+            e.printStackTrace();
+            Assertions.fail(e.getMessage());
+            return null;
+        }
+    }
+
+    private JRDataSource titleSubreportDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add("value1");
+        dataSource.add("value2");
+        dataSource.add("value3");
+        return dataSource;
+    }
+
+    private class SubreportDataSourceExpression extends AbstractSimpleExpression<JRDataSource> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JRDataSource evaluate(ReportParameters reportParameters) {
+            return new JREmptyDataSource(2);
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreportTest.java
new file mode 100644
index 0000000..279f46d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreportTest.java
@@ -0,0 +1,157 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.component.Components;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperReport;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class JasperSubreportTest extends AbstractJasperValueTest implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final SubreportBuilder subreport =
+			Components.subreport(new SubreportExpression()).setDataSource(new SubreportDataSourceExpression());
+		
+		rb.detail(subreport);
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+		
+		this.numberOfPagesTest(1);
+		
+		// title
+		this.elementCountTest("title.textField1", 3);
+		this.elementValueTest("title.textField1", "Subreport1", "Subreport2", "Subreport3");
+		
+		// column title
+		this.elementCountTest("columnHeader.column_column1.title1", 3);
+		this.elementValueTest("columnHeader.column_column1.title1", "Column1", "Column1", "Column1");
+		
+		this.elementCountTest("columnHeader.column_column2.title1", 2);
+		this.elementValueTest("columnHeader.column_column2.title1", "Column2", "Column2");
+		
+		this.elementCountTest("columnHeader.column_column3.title1", 1);
+		this.elementValueTest("columnHeader.column_column3.title1", "Column3");
+		
+		// column detail
+		this.elementCountTest("detail.column_column11", 6);
+		this.elementValueTest(
+			"detail.column_column11",
+			"row1_column1",
+			"row1_column1",
+			"row2_column1",
+			"row1_column1",
+			"row2_column1",
+			"row3_column1");
+		
+		this.elementCountTest("detail.column_column21", 5);
+		this.elementValueTest(
+			"detail.column_column21",
+			"row1_column2",
+			"row2_column2",
+			"row1_column2",
+			"row2_column2",
+			"row3_column2");
+		
+		this.elementCountTest("detail.column_column31", 3);
+		this.elementValueTest("detail.column_column31", "row1_column3", "row2_column3", "row3_column3");
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		return new JREmptyDataSource(3);
+	}
+	
+	private class SubreportExpression extends AbstractSimpleExpression<JasperReport>
+	{
+		private static final long serialVersionUID = 1L;
+		
+		@Override
+		public JasperReport evaluate(final ReportParameters reportParameters)
+		{
+			try
+			{
+				final InputStream is = JasperSubreportTest.class.getResourceAsStream(
+					"subreport" + reportParameters.getReportRowNumber() + ".jrxml");
+				return JasperCompileManager.compileReport(is);
+			}
+			catch(final JRException e)
+			{
+				e.printStackTrace();
+				Assertions.fail(e.getMessage());
+				return null;
+			}
+		}
+	}
+	
+	
+	private class SubreportDataSourceExpression extends AbstractSimpleExpression<JRDataSource>
+	{
+		private static final long serialVersionUID = 1L;
+		
+		@Override
+		public JRDataSource evaluate(final ReportParameters reportParameters)
+		{
+			final int masterRowNumber = reportParameters.getReportRowNumber();
+			final String[] columns = new String[masterRowNumber];
+			for(int i = 1; i <= masterRowNumber; i++)
+			{
+				columns[i - 1] = "column" + i;
+			}
+			final DRDataSource dataSource = new DRDataSource(columns);
+			
+			for(int i = 1; i <= masterRowNumber; i++)
+			{
+				final Object[] values = new Object[masterRowNumber];
+				for(int j = 1; j <= masterRowNumber; j++)
+				{
+					values[j - 1] = "row" + i + "_column" + j;
+				}
+				dataSource.add(values);
+			}
+			
+			return dataSource;
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport2Test.java
new file mode 100644
index 0000000..663f18f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport2Test.java
@@ -0,0 +1,124 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Subreport2Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder detailSubreport = cmp.subreport(detailSubreport()).setDataSource(new SubreportDataSourceExpression());
+
+        rb.title(cmp.subreport(titleSubreport())).detail(detailSubreport);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // title subreport
+        columnDetailCountTest(column1, 3);
+        columnDetailValueTest(column1, "value1", "value2", "value3");
+
+        // detail subreport
+        elementCountTest("title.textField1", 3);
+        elementValueTest("title.textField1", "Subreport1", "Subreport2", "Subreport3");
+
+        columnDetailCountTest(column2, 6);
+        columnDetailValueTest(column2, "1_1", "1_2", "2_1", "2_2", "3_1", "3_2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(3);
+    }
+
+    private JasperReportBuilder titleSubreport() {
+        JasperReportBuilder report = report();
+        column1 = col.column("Column1", "field1", type.stringType());
+        report.columns(column1).setDataSource(titleSubreportDataSource());
+        return report;
+    }
+
+    private JasperReportBuilder detailSubreport() {
+        JasperReportBuilder report = report();
+        column2 = col.column(new ValueExpression());
+        report.columns(column2).title(cmp.text(new SubreportTitleExpression()));
+        return report;
+    }
+
+    private JRDataSource titleSubreportDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add("value1");
+        dataSource.add("value2");
+        dataSource.add("value3");
+        return dataSource;
+    }
+
+    private class SubreportDataSourceExpression extends AbstractSimpleExpression<JRDataSource> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JRDataSource evaluate(ReportParameters reportParameters) {
+            return new JREmptyDataSource(2);
+        }
+    }
+
+    private class SubreportTitleExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            return "Subreport" + reportParameters.getMasterParameters().getReportRowNumber();
+        }
+    }
+
+    private class ValueExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            return reportParameters.getMasterParameters().getReportRowNumber() + "_" + reportParameters.getReportRowNumber();
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport3Test.java
new file mode 100644
index 0000000..fd9524c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport3Test.java
@@ -0,0 +1,102 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Subreport3Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder subreport1 = cmp.subreport(subreport1());
+        subreport1.setDataSource(createSubreport1DataSource());
+
+        rb.fields(field("f1", Integer.class)).detail(subreport1);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementCountTest("title.textField1", 6);
+        elementValueTest("title.textField1", "1 3", "1 4", "1 5", "2 3", "2 4", "2 5");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("f1");
+        dataSource.add(1);
+        dataSource.add(2);
+        return dataSource;
+    }
+
+    private JasperReportBuilder subreport1() {
+        SubreportBuilder subreport2 = cmp.subreport(subreport2());
+
+        JasperReportBuilder report = report();
+        report.fields(field("f2", Integer.class)).setPageMargin(margin(0)).detail(subreport2);
+        return report;
+    }
+
+    public JRDataSource createSubreport1DataSource() {
+        DRDataSource dataSource = new DRDataSource("f2");
+        dataSource.add(3);
+        dataSource.add(4);
+        dataSource.add(5);
+        return dataSource;
+    }
+
+    private JasperReportBuilder subreport2() {
+        JasperReportBuilder report = report();
+        report.setPageMargin(margin(0)).title(cmp.text(new SubreportTitle()));
+        return report;
+    }
+
+    private class SubreportTitle extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            String result = "";
+            result += reportParameters.getMasterParameters().getMasterParameters().getValue("f1");
+            result += " ";
+            result += reportParameters.getMasterParameters().getValue("f2");
+            return result;
+        }
+
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport4Test.java
new file mode 100644
index 0000000..9fa3ab8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport4Test.java
@@ -0,0 +1,99 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperReport;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Subreport4Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        Map<String, Object> parameters1 = new HashMap<String, Object>();
+        parameters1.put("parameter5", "value5");
+        parameters1.put("parameter6", "value6");
+        Map<String, Object> parameters2 = new HashMap<String, Object>();
+        parameters2.put("parameter5", "value7");
+
+        SubreportBuilder subreport1 = cmp.subreport(subreport1()).setParameters(parameters1);
+        SubreportBuilder subreport2 = cmp.subreport(subreport2()).setParameters(parameters2);
+
+        rb.addParameter("parameter4", "value4").title(subreport1, subreport2);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementCountTest("title.textField1", 1);
+        elementValueTest("title.textField1", "value1");
+        elementCountTest("title.textField2", 1);
+        elementValueTest("title.textField2", "value2");
+        elementCountTest("title.textField3", 1);
+        elementValueTest("title.textField3", "value6");
+        elementCountTest("summary.textField1", 2);
+        elementValueTest("summary.textField1", "value3", "");
+        elementCountTest("summary.textField2", 2);
+        elementValueTest("summary.textField2", "value4", "value4");
+        elementCountTest("summary.textField3", 2);
+        elementValueTest("summary.textField3", "value5", "value7");
+    }
+
+    private JasperReportBuilder subreport1() throws DRException {
+        JasperReportBuilder report = report();
+        report.addParameter("parameter1", "value1")
+              .addParameter("parameter2", String.class)
+              .addParameter("parameter6", String.class)
+              .setParameter("parameter2", "value2")
+              .setParameter("parameter3", "value3")
+              .setTemplateDesign(Subreport4Test.class.getResourceAsStream("subreport4.jrxml"))
+              .title(cmp.text(exp.jasperSyntax("$P{parameter1}", String.class)), cmp.text(exp.jasperSyntax("$P{parameter2}", String.class)),
+                     cmp.text(exp.jasperSyntax("$P{parameter6}", String.class)));
+        return report;
+    }
+
+    private JasperReport subreport2() {
+        try {
+            InputStream is = Subreport4Test.class.getResourceAsStream("subreport4.jrxml");
+            return JasperCompileManager.compileReport(is);
+        } catch (JRException e) {
+            e.printStackTrace();
+            Assertions.fail(e.getMessage());
+            return null;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport5Test.java
new file mode 100644
index 0000000..963ab01
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport5Test.java
@@ -0,0 +1,107 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.Components;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.List;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Subreport5Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1 = col.column("field1", type.stringType());
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder subreport = Components.subreport(new SubreportExpression()).setDataSource(new SubreportDataSourceExpression());
+
+        rb.detail(subreport);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementCountTest("title.textField1", 3);
+        elementValueTest("title.textField1", "Subreport text1", "Subreport text2", "Subreport text3");
+
+        columnDetailCountTest(column1, 6);
+        columnDetailValueTest(column1, "text1a", "text1b", "text2a", "text2b", "text3a", "text3b");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add("text1");
+        dataSource.add("text2");
+        dataSource.add("text3");
+        return dataSource;
+    }
+
+    private class SubreportExpression extends AbstractComplexExpression<JasperReportBuilder> {
+        private static final long serialVersionUID = 1L;
+
+        public SubreportExpression() {
+            addExpression(field("field1", String.class));
+        }
+
+        @Override
+        public JasperReportBuilder evaluate(List<?> values, ReportParameters reportParameters) {
+            JasperReportBuilder report = report();
+            report.title(cmp.text("Subreport " + values.get(0))).columns(column1);
+
+            return report;
+        }
+    }
+
+    private class SubreportDataSourceExpression extends AbstractComplexExpression<JRDataSource> {
+        private static final long serialVersionUID = 1L;
+
+        public SubreportDataSourceExpression() {
+            addExpression(field("field1", String.class));
+        }
+
+        @Override
+        public JRDataSource evaluate(List<?> values, ReportParameters reportParameters) {
+            DRDataSource dataSource = new DRDataSource("field1");
+            dataSource.add(values.get(0) + "a");
+            dataSource.add(values.get(0) + "b");
+            return dataSource;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport6Test.java
new file mode 100644
index 0000000..5d58fba
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport6Test.java
@@ -0,0 +1,87 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.component.Components;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Subreport6Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder subreport = Components.subreport(new Subreport1Expression());
+
+        rb.detail(subreport);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementCountTest("title.textField1", 10);
+        elementValueTest("title.textField1", "575", "565", "575", "555", "575", "545", "575", "535", "575", "525");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(5);
+    }
+
+    private class Subreport1Expression extends AbstractSimpleExpression<JasperReportBuilder> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JasperReportBuilder evaluate(ReportParameters reportParameters) {
+            SubreportBuilder subreport = Components.subreport(new Subreport2Expression());
+
+            JasperReportBuilder report = report();
+            report.title(cmp.text(reportParameters.getSubreportWidth()), cmp.horizontalList(cmp.horizontalGap(10 * reportParameters.getReportRowNumber()), subreport));
+
+            return report;
+        }
+    }
+
+    private class Subreport2Expression extends AbstractSimpleExpression<JasperReportBuilder> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JasperReportBuilder evaluate(ReportParameters reportParameters) {
+            JasperReportBuilder report = report();
+            report.title(cmp.text(reportParameters.getSubreportWidth()));
+
+            return report;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportPositionTest.java
new file mode 100644
index 0000000..a983bb6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportPositionTest.java
@@ -0,0 +1,165 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.component.Components;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubreportPositionTest extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder subreport = Components.subreport(new SubreportExpression()).setDataSource(new SubreportDataSourceExpression());
+
+        rb.detail(subreport, cmp.filler().setFixedHeight(20)).summary(cmp.subreport(subreport2()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // elementPositionTest("detail.list1", 0, 10, 10, 575, 68);
+        // elementPositionTest("detail.subreport1", 0, 10, 10, 575, 48);
+
+        // elementPositionTest("detail.list1", 1, 10, 78, 575, 84);
+        // elementPositionTest("detail.subreport1", 1, 10, 78, 575, 64);
+
+        // elementPositionTest("detail.list1", 4, 10, 162, 575, 100);
+        // elementPositionTest("detail.subreport1", 2, 10, 162, 575, 80);
+
+        // title
+        elementPositionTest("title.textField1", 0, 10, 10, 575, 16);
+        elementPositionTest("title.textField1", 1, 10, 78, 575, 16);
+        elementPositionTest("title.textField1", 2, 10, 162, 575, 16);
+
+        // column title
+        elementPositionTest("columnHeader.column_column1.title1", 0, 10, 26, 575, 16);
+
+        elementPositionTest("columnHeader.list1", 0, 10, 94, 575, 16);
+        elementPositionTest("columnHeader.column_column1.title1", 1, 0, 0, 287, 16);
+        elementPositionTest("columnHeader.column_column2.title1", 0, 287, 0, 288, 16);
+
+        elementPositionTest("columnHeader.list1", 1, 10, 178, 575, 16);
+        elementPositionTest("columnHeader.column_column1.title1", 2, 0, 0, 191, 16);
+        elementPositionTest("columnHeader.column_column2.title1", 1, 191, 0, 192, 16);
+        elementPositionTest("columnHeader.column_column3.title1", 0, 383, 0, 192, 16);
+
+        // column detail
+        elementPositionTest("detail.column_column11", 0, 10, 42, 575, 16);
+
+        elementPositionTest("detail.list1", 0, 10, 110, 575, 16);
+        elementPositionTest("detail.column_column11", 1, 0, 0, 287, 16);
+        elementPositionTest("detail.column_column21", 0, 287, 0, 288, 16);
+
+        elementPositionTest("detail.list1", 1, 10, 126, 575, 16);
+        elementPositionTest("detail.column_column11", 2, 0, 0, 287, 16);
+        elementPositionTest("detail.column_column21", 1, 287, 0, 288, 16);
+
+        elementPositionTest("detail.list1", 2, 10, 194, 575, 16);
+        elementPositionTest("detail.column_column11", 3, 0, 0, 191, 16);
+        elementPositionTest("detail.column_column21", 2, 191, 0, 192, 16);
+        elementPositionTest("detail.column_column31", 0, 383, 0, 192, 16);
+
+        elementPositionTest("detail.list1", 3, 10, 210, 575, 16);
+        elementPositionTest("detail.column_column11", 4, 0, 0, 191, 16);
+        elementPositionTest("detail.column_column21", 3, 191, 0, 192, 16);
+        elementPositionTest("detail.column_column31", 1, 383, 0, 192, 16);
+
+        elementPositionTest("detail.list1", 4, 10, 226, 575, 16);
+        elementPositionTest("detail.column_column11", 5, 0, 0, 191, 16);
+        elementPositionTest("detail.column_column21", 4, 191, 0, 192, 16);
+        elementPositionTest("detail.column_column31", 2, 383, 0, 192, 16);
+
+        // summary
+        elementPositionTest("summary.textField1", 0, 20, 272, 555, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(3);
+    }
+
+    private JasperReportBuilder subreport2() {
+        JasperReportBuilder report = report();
+        report.setPageMargin(margin(10));
+        report.summary(cmp.text("subreport2"));
+        return report;
+    }
+
+    private class SubreportExpression extends AbstractSimpleExpression<JasperReportBuilder> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JasperReportBuilder evaluate(ReportParameters reportParameters) {
+            int masterRowNumber = reportParameters.getReportRowNumber();
+            JasperReportBuilder report = report();
+            report.title(cmp.text("Subreport" + masterRowNumber));
+
+            for (int i = 1; i <= masterRowNumber; i++) {
+                report.addColumn(col.column("Column" + i, "column" + i, type.stringType()));
+            }
+
+            return report;
+        }
+    }
+
+    private class SubreportDataSourceExpression extends AbstractSimpleExpression<JRDataSource> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JRDataSource evaluate(ReportParameters reportParameters) {
+            int masterRowNumber = reportParameters.getReportRowNumber();
+            String[] columns = new String[masterRowNumber];
+            for (int i = 1; i <= masterRowNumber; i++) {
+                columns[i - 1] = "column" + i;
+            }
+            DRDataSource dataSource = new DRDataSource(columns);
+
+            for (int i = 1; i <= masterRowNumber; i++) {
+                Object[] values = new Object[masterRowNumber];
+                for (int j = 1; j <= masterRowNumber; j++) {
+                    values[j - 1] = "row" + i + "_column" + j;
+                }
+                dataSource.add(values);
+            }
+
+            return dataSource;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportTest.java
new file mode 100644
index 0000000..aae5a79
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportTest.java
@@ -0,0 +1,154 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subreport;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.component.Components;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.parameter;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubreportTest extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        SubreportBuilder subreport = Components.subreport(new SubreportExpression()).setDataSource(new SubreportDataSourceExpression());
+
+        rb.detail(subreport);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // title
+        elementCountTest("title.textField1", 5);
+        elementValueTest("title.textField1", "Subreport1", "Subreport2", "Subreport3", "Subreport4", "Subreport5");
+
+        elementCountTest("title.textField2", 5);
+        elementValueTest("title.textField2", "Parameter1", "Parameter2", "Parameter3", "Parameter4", "Parameter5");
+
+        // column title
+        elementCountTest("columnHeader.column_column1.title1", 5);
+        elementValueTest("columnHeader.column_column1.title1", "Column1", "Column1", "Column1", "Column1", "Column1");
+
+        elementCountTest("columnHeader.column_column2.title1", 4);
+        elementValueTest("columnHeader.column_column2.title1", "Column2", "Column2", "Column2", "Column2");
+
+        elementCountTest("columnHeader.column_column3.title1", 3);
+        elementValueTest("columnHeader.column_column3.title1", "Column3", "Column3", "Column3");
+
+        elementCountTest("columnHeader.column_column4.title1", 2);
+        elementValueTest("columnHeader.column_column4.title1", "Column4", "Column4");
+
+        elementCountTest("columnHeader.column_column5.title1", 1);
+        elementValueTest("columnHeader.column_column5.title1", "Column5");
+
+        // column detail
+        elementCountTest("detail.column_column11", 15);
+        elementValueTest("detail.column_column11", "row1_column1", "row1_column1", "row2_column1", "row1_column1", "row2_column1", "row3_column1", "row1_column1", "row2_column1", "row3_column1",
+                         "row4_column1", "row1_column1", "row2_column1", "row3_column1", "row4_column1", "row5_column1");
+
+        elementCountTest("detail.column_column21", 14);
+        elementValueTest("detail.column_column21", "row1_column2", "row2_column2", "row1_column2", "row2_column2", "row3_column2", "row1_column2", "row2_column2", "row3_column2", "row4_column2",
+                         "row1_column2", "row2_column2", "row3_column2", "row4_column2", "row5_column2");
+
+        elementCountTest("detail.column_column31", 12);
+        elementValueTest("detail.column_column31", "row1_column3", "row2_column3", "row3_column3", "row1_column3", "row2_column3", "row3_column3", "row4_column3", "row1_column3", "row2_column3",
+                         "row3_column3", "row4_column3", "row5_column3");
+
+        elementCountTest("detail.column_column41", 9);
+        elementValueTest("detail.column_column41", "row1_column4", "row2_column4", "row3_column4", "row4_column4", "row1_column4", "row2_column4", "row3_column4", "row4_column4", "row5_column4");
+
+        elementCountTest("detail.column_column51", 5);
+        elementValueTest("detail.column_column51", "row1_column5", "row2_column5", "row3_column5", "row4_column5", "row5_column5");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        return new JREmptyDataSource(5);
+    }
+
+    private class SubreportExpression extends AbstractSimpleExpression<JasperReportBuilder> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JasperReportBuilder evaluate(ReportParameters reportParameters) {
+            int masterRowNumber = reportParameters.getReportRowNumber();
+            JasperReportBuilder report = report();
+            report.parameters(parameter("masterRowNumber", masterRowNumber)).title(cmp.text("Subreport" + masterRowNumber), cmp.text(new SubreportTitleExpression()));
+
+            for (int i = 1; i <= masterRowNumber; i++) {
+                report.addColumn(col.column("Column" + i, "column" + i, type.stringType()));
+            }
+
+            return report;
+        }
+    }
+
+    private class SubreportDataSourceExpression extends AbstractSimpleExpression<JRDataSource> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public JRDataSource evaluate(ReportParameters reportParameters) {
+            int masterRowNumber = reportParameters.getReportRowNumber();
+            String[] columns = new String[masterRowNumber];
+            for (int i = 1; i <= masterRowNumber; i++) {
+                columns[i - 1] = "column" + i;
+            }
+            DRDataSource dataSource = new DRDataSource(columns);
+
+            for (int i = 1; i <= masterRowNumber; i++) {
+                Object[] values = new Object[masterRowNumber];
+                for (int j = 1; j <= masterRowNumber; j++) {
+                    values[j - 1] = "row" + i + "_column" + j;
+                }
+                dataSource.add(values);
+            }
+
+            return dataSource;
+        }
+    }
+
+    private class SubreportTitleExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            return "Parameter" + reportParameters.getValue("masterRowNumber");
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java
new file mode 100644
index 0000000..c3cd3e2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java
@@ -0,0 +1,136 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.VariableBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.builder.expression.PercentageExpression;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.constant.Evaluation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.List;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.variable;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class GroupCustomSubtotal1Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<Integer> column2;
+    private VariableBuilder<Integer> variable1;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private CustomSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<Integer> subtotal3;
+    private CustomSubtotalBuilder<String> subtotal4;
+    private CustomSubtotalBuilder<String> subtotal5;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+          .groupBy(column1)
+          .subtotalsAtFirstGroupFooter(subtotal1 = sbt.sum(column2), subtotal2 = sbt.customValue(new ValueExpression(), column2))
+          .subtotalsAtLastGroupFooter(subtotal3 = sbt.sum(column2), subtotal4 = sbt.customValue(new ValueExpression2(), column2), subtotal5 = sbt.customValue(new ValueExpression3(), column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // groupFooter
+        subtotalIndexCountTest(subtotal1, 1, 2);
+        subtotalIndexValueTest(subtotal1, 1, "6", "15");
+        subtotalIndexCountTest(subtotal2, 2, 2);
+        subtotalIndexValueTest(subtotal2, 2, "6", "15");
+        subtotalIndexCountTest(subtotal3, 3, 2);
+        subtotalIndexValueTest(subtotal3, 3, "6", "15");
+        subtotalIndexCountTest(subtotal4, 4, 2);
+        subtotalIndexValueTest(subtotal4, 4, "6 (28.57%)", "15 (71.43%)");
+        subtotalIndexCountTest(subtotal5, 5, 2);
+        subtotalIndexValueTest(subtotal5, 5, "value1", "value2");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group1", i);
+        }
+        for (int i = 4; i <= 6; i++) {
+            dataSource.add("group2", i);
+        }
+        return dataSource;
+    }
+
+    private class ValueExpression extends AbstractSimpleExpression<Integer> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Integer evaluate(ReportParameters reportParameters) {
+            return reportParameters.getValue(variable1);
+        }
+    }
+
+    private class ValueExpression2 extends AbstractComplexExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        public ValueExpression2() {
+            variable1 = variable(column2, Calculation.SUM);
+            variable1.setResetType(Evaluation.LAST_GROUP);
+            VariableBuilder<Integer> variable2 = variable(column2, Calculation.SUM);
+            variable2.setResetType(Evaluation.REPORT);
+            addExpression(new PercentageExpression(variable1.getVariable(), variable2.getVariable()));
+        }
+
+        @Override
+        public String evaluate(List<?> values, ReportParameters reportParameters) {
+            String percentage = new DecimalFormat("#,##0.00%", new DecimalFormatSymbols(Locale.ENGLISH)).format(values.get(0));
+            return reportParameters.getValue(variable1) + " (" + percentage + ")";
+        }
+    }
+
+    private class ValueExpression3 extends AbstractComplexExpression<String> {
+        private static final long serialVersionUID = 1L;
+        private int count = 1;
+
+        @Override
+        public String evaluate(List<?> values, ReportParameters reportParameters) {
+            return "value" + count++;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java
new file mode 100644
index 0000000..d584d2e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java
@@ -0,0 +1,117 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class GroupCustomSubtotal2Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<Integer> column2;
+    private CustomSubtotalBuilder<Integer> subtotal1;
+    private CustomSubtotalBuilder<Integer> subtotal2;
+    private CustomSubtotalBuilder<Integer> subtotal3;
+    private CustomSubtotalBuilder<Integer> subtotal4;
+    private CustomSubtotalBuilder<Integer> subtotal5;
+    private CustomSubtotalBuilder<Integer> subtotal6;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", String.class);
+        ColumnGroupBuilder group = grp.group(column1);
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1, column2 = col.column("Column2", "field2", Integer.class))
+          .groupBy(group)
+          .subtotalsAtGroupHeader(group, subtotal1 = sbt.customValue(new ValueExpression(), column2))
+          .subtotalsAtGroupFooter(group, subtotal2 = sbt.customValue(new ValueExpression(), column2))
+          .subtotalsAtFirstGroupHeader(subtotal3 = sbt.customValue(new ValueExpression(), column2))
+          .subtotalsAtFirstGroupFooter(subtotal4 = sbt.customValue(new ValueExpression(), column2))
+          .subtotalsAtLastGroupHeader(subtotal5 = sbt.customValue(new ValueExpression(), column2))
+          .subtotalsAtLastGroupFooter(subtotal6 = sbt.customValue(new ValueExpression(), column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // groupHeader
+        subtotalIndexCountTest(subtotal1, 1, 2);
+        subtotalIndexValueTest(subtotal1, 1, "3", "6");
+        // groupFooter
+        subtotalIndexCountTest(subtotal2, 1, 2);
+        subtotalIndexValueTest(subtotal2, 1, "3", "6");
+        // first groupHeader
+        subtotalIndexCountTest(subtotal3, 1, 2);
+        subtotalIndexValueTest(subtotal3, 1, "3", "6");
+        // first groupFooter
+        subtotalIndexCountTest(subtotal4, 1, 2);
+        subtotalIndexValueTest(subtotal4, 1, "3", "6");
+        // last groupHeader
+        subtotalIndexCountTest(subtotal5, 1, 2);
+        subtotalIndexValueTest(subtotal5, 1, "3", "6");
+        // last groupFooter
+        subtotalIndexCountTest(subtotal6, 1, 2);
+        subtotalIndexValueTest(subtotal6, 1, "3", "6");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group1", i);
+        }
+        for (int i = 4; i <= 6; i++) {
+            dataSource.add("group2", i);
+        }
+        return dataSource;
+    }
+
+    private class ValueExpression extends AbstractComplexExpression<Integer> {
+        private static final long serialVersionUID = 1L;
+
+        private ValueExpression() {
+            addExpression(column2);
+        }
+
+        @Override
+        public Integer evaluate(List<?> values, ReportParameters reportParameters) {
+            return (Integer) values.get(0);
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java
new file mode 100644
index 0000000..8390b8a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java
@@ -0,0 +1,102 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class GroupSubtotal1Test extends AbstractJasperValueTest {
+    private AggregationSubtotalBuilder<Double> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<Double> subtotal3;
+    private AggregationSubtotalBuilder<Integer> subtotal4;
+    private AggregationSubtotalBuilder<Integer> subtotal5;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1, column2;
+        TextColumnBuilder<Integer> column3;
+        ColumnGroupBuilder group1, group2;
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", String.class), column3 = col.column("Column3", "field3", Integer.class))
+          .groupBy(group1 = grp.group(column1), group2 = grp.group(column2))
+          .subtotalsAtGroupHeader(group1, subtotal1 = sbt.aggregate(column3, Calculation.AVERAGE))
+          .subtotalsAtGroupFooter(group1, subtotal2 = sbt.sum(column3))
+          .subtotalsAtGroupHeader(group2, subtotal3 = sbt.aggregate(column3, Calculation.AVERAGE))
+          .subtotalsAtGroupFooter(group2, subtotal4 = sbt.sum(column3))
+          .subtotalsAtSummary(subtotal5 = sbt.sum(column3));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // groupHeader
+        subtotalCountTest(subtotal1, 2);
+        subtotalValueTest(subtotal1, "3.5", "9.5");
+        // groupFooter
+        subtotalCountTest(subtotal2, 2);
+        subtotalValueTest(subtotal2, "21", "57");
+
+        // groupHeader
+        subtotalIndexCountTest(subtotal3, 2, 4);
+        subtotalIndexValueTest(subtotal3, 2, "2", "5", "8", "11");
+        // groupFooter
+        subtotalIndexCountTest(subtotal4, 2, 4);
+        subtotalIndexValueTest(subtotal4, 2, "6", "15", "24", "33");
+
+        subtotalCountTest(subtotal5, 1);
+        subtotalValueTest(subtotal5, "78");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        int count = 1;
+        for (int i = 0; i < 3; i++) {
+            dataSource.add("group1", "group1_1", count++);
+        }
+        for (int i = 0; i < 3; i++) {
+            dataSource.add("group1", "group1_2", count++);
+        }
+        for (int i = 0; i < 3; i++) {
+            dataSource.add("group2", "group2_1", count++);
+        }
+        for (int i = 0; i < 3; i++) {
+            dataSource.add("group2", "group2_2", count++);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java
new file mode 100644
index 0000000..6dfede9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java
@@ -0,0 +1,85 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class GroupSubtotal2Test extends AbstractJasperValueTest {
+    private AggregationSubtotalBuilder<Double> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<Integer> subtotal3;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+        TextColumnBuilder<Integer> column2;
+        ColumnGroupBuilder group1;
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+          .groupBy(group1 = grp.group(column1).headerWithSubtotal())
+          .subtotalsAtFirstGroupHeader(subtotal1 = sbt.aggregate(column2, Calculation.AVERAGE))
+          .subtotalsAtGroupHeader(group1, subtotal2 = sbt.sum(column2))
+          .subtotalsAtSummary(subtotal3 = sbt.sum(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // groupHeader
+        subtotalCountTest(subtotal1, 2);
+        subtotalValueTest(subtotal1, "2", "4.5");
+        subtotalIndexCountTest(subtotal2, 2, 2);
+        subtotalIndexValueTest(subtotal2, 2, "6", "9");
+
+        subtotalCountTest(subtotal3, 1);
+        subtotalValueTest(subtotal3, "15");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        int count = 1;
+        for (int i = 0; i < 3; i++) {
+            dataSource.add("group1", count++);
+        }
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("group2", count++);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java
new file mode 100644
index 0000000..0a46c3f
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class PercentageSubtotalTest extends AbstractJasperValueTest {
+    private PercentageSubtotalBuilder subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+        TextColumnBuilder<Integer> column2;
+        ColumnGroupBuilder group1;
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+          .groupBy(group1 = grp.group(column1))
+          .subtotalsOfPercentageAtGroupFooter(group1, subtotal1 = sbt.percentage(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // groupFooter
+        subtotalCountTest(subtotal1, 2);
+        subtotalValueTest(subtotal1, "28.57%", "71.43%");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 1; i <= 3; i++) {
+            dataSource.add("group1", i);
+        }
+        for (int i = 4; i <= 6; i++) {
+            dataSource.add("group2", i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal1Test.java
new file mode 100644
index 0000000..94e54b9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal1Test.java
@@ -0,0 +1,195 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Locale;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Subtotal1Test extends AbstractJasperValueTest implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	private AggregationSubtotalBuilder<BigDecimal> subtotal1;
+	private AggregationSubtotalBuilder<BigDecimal> subtotal2;
+	private AggregationSubtotalBuilder<BigDecimal> subtotal3;
+	private AggregationSubtotalBuilder<BigDecimal> subtotal4;
+	private AggregationSubtotalBuilder<BigDecimal> subtotal5;
+	private AggregationSubtotalBuilder<BigDecimal> subtotal6;
+	private AggregationSubtotalBuilder<BigDecimal> subtotal7;
+	private AggregationSubtotalBuilder<BigDecimal> subtotal8;
+	private AggregationSubtotalBuilder<Integer> subtotal9;
+	private AggregationSubtotalBuilder<Integer> subtotal10;
+	private AggregationSubtotalBuilder<Integer> subtotal11;
+	private AggregationSubtotalBuilder<String> subtotal12;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final TextColumnBuilder<BigDecimal> column1;
+		final TextColumnBuilder<String> column2;
+		
+		rb.setLocale(Locale.ENGLISH)
+			.setPageColumnsPerPage(2)
+			.columns(
+				column1 = col.column("Column1", "field1", type.bigDecimalType()),
+				column2 = col.column("Column2", "field2", String.class).setValueFormatter(new ColumnValueFormatter()))
+			.subtotalsAtTitle(this.subtotal1 = sbt.sum(column1).setLabel("title sum"))
+			.subtotalsAtPageHeader(this.subtotal2 = sbt.sum(column1).setLabel("page header sum"))
+			.subtotalsAtPageFooter(this.subtotal3 = sbt.sum(column1).setLabel("page footer sum"))
+			.subtotalsAtColumnHeader(this.subtotal4 = sbt.sum(column1).setLabel("column header sum"))
+			.subtotalsAtColumnFooter(this.subtotal5 = sbt.sum(column1).setLabel("column footer sum"))
+			.subtotalsAtLastPageFooter(this.subtotal6 = sbt.sum(column1).setLabel("last page footer sum"))
+			.subtotalsAtSummary(
+                this.subtotal7 = sbt.sum(column1).setLabel("summary sum"),
+				(this.subtotal8 = sbt.aggregate(column1, Calculation.LOWEST)).setLabel("summary lowest"),
+                this.subtotal9 = sbt.sum(new ColumnCalculationExpression(), column2)
+					.setLabel("summary sum")
+					.setValueFormatter(new ColumnValueFormatter2()),
+                this.subtotal10 = sbt.aggregate(column1, Calculation.COUNT),
+                this.subtotal11 = sbt.aggregate(column2, Calculation.COUNT),
+                this.subtotal12 = sbt.text("total", column1));
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(2);
+		// title
+        this.subtotalLabelCountTest(this.subtotal1, 1);
+        this.subtotalLabelValueTest(this.subtotal1, "title sum");
+        this.subtotalCountTest(this.subtotal1, 1);
+        this.subtotalValueTest(this.subtotal1, "101.00");
+		// pageHeader
+        this.subtotalLabelCountTest(this.subtotal2, 2);
+        this.subtotalLabelValueTest(this.subtotal2, "page header sum", "page header sum");
+        this.subtotalCountTest(this.subtotal2, 2);
+        this.subtotalValueTest(this.subtotal2, "80.80", "20.20");
+		// pageFooter
+        this.subtotalLabelCountTest(this.subtotal3, 1);
+        this.subtotalLabelValueTest(this.subtotal3, "page footer sum");
+        this.subtotalCountTest(this.subtotal3, 1);
+        this.subtotalValueTest(this.subtotal3, "80.80");
+		// columnHeader
+        this.subtotalLabelCountTest(this.subtotal4, 3);
+        this.subtotalLabelValueTest(this.subtotal4, "column header sum", "column header sum", "column header sum");
+        this.subtotalCountTest(this.subtotal4, 3);
+        this.subtotalValueTest(this.subtotal4, "40.40", "40.40", "20.20");
+		// columnFooter
+        this.subtotalLabelCountTest(this.subtotal5, 3);
+        this.subtotalLabelValueTest(this.subtotal5, "column footer sum", "column footer sum", "column footer sum");
+        this.subtotalCountTest(this.subtotal5, 3);
+        this.subtotalValueTest(this.subtotal5, "40.40", "40.40", "20.20");
+		// lastPageFooter
+        this.subtotalLabelCountTest(this.subtotal6, 1);
+        this.subtotalLabelValueTest(this.subtotal6, "last page footer sum");
+        this.subtotalCountTest(this.subtotal6, 1);
+        this.subtotalValueTest(this.subtotal6, "101.00");
+		// summary
+        this.subtotalLabelCountTest(this.subtotal7, 1);
+        this.subtotalLabelValueTest(this.subtotal7, "summary sum");
+        this.subtotalCountTest(this.subtotal7, 1);
+        this.subtotalValueTest(this.subtotal7, "101.00");
+        
+        this.subtotalLabelIndexCountTest(this.subtotal8, 2, 1);
+        this.subtotalLabelIndexValueTest(this.subtotal8, 2, "summary lowest");
+        this.subtotalIndexCountTest(this.subtotal8, 2, 1);
+        this.subtotalIndexValueTest(this.subtotal8, 2, "1.01");
+        
+        this.subtotalIndexCountTest(this.subtotal10, 3, 1);
+        this.subtotalIndexValueTest(this.subtotal10, 3, "100");
+        
+        this.subtotalLabelCountTest(this.subtotal9, 1);
+        this.subtotalLabelValueTest(this.subtotal9, "summary sum");
+        this.subtotalCountTest(this.subtotal9, 1);
+        this.subtotalValueTest(this.subtotal9, "value = 200");
+        
+        this.subtotalIndexCountTest(this.subtotal11, 2, 1);
+        this.subtotalIndexValueTest(this.subtotal11, 2, "100");
+        
+        this.subtotalIndexCountTest(this.subtotal12, 4, 1);
+        this.subtotalIndexValueTest(this.subtotal12, 4, "total");
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1", "field2");
+		for(int i = 0; i < 100; i++)
+		{
+			dataSource.add(new BigDecimal(1.01), "v2");
+		}
+		return dataSource;
+	}
+	
+	private class ColumnValueFormatter extends AbstractValueFormatter<String, String>
+	{
+		private static final long serialVersionUID = 1L;
+		
+		@Override
+		public String format(final String value, final ReportParameters reportParameters)
+		{
+			return "value = " + value;
+		}
+	}
+	
+	
+	private class ColumnValueFormatter2 extends AbstractValueFormatter<String, Integer>
+	{
+		private static final long serialVersionUID = 1L;
+		
+		@Override
+		public String format(final Integer value, final ReportParameters reportParameters)
+		{
+			return "value = " + value;
+		}
+	}
+	
+	
+	private class ColumnCalculationExpression extends AbstractSimpleExpression<Integer>
+	{
+		private static final long serialVersionUID = 1L;
+		
+		@Override
+		public Integer evaluate(final ReportParameters reportParameters)
+		{
+			return Integer.parseInt(((String)reportParameters.getValue("field2")).substring(1));
+		}
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal2Test.java
new file mode 100644
index 0000000..1310abd
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal2Test.java
@@ -0,0 +1,173 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class Subtotal2Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private AggregationSubtotalBuilder<BigDecimal> subtotal1;
+    private AggregationSubtotalBuilder<Number> subtotal2;
+    private AggregationSubtotalBuilder<Long> subtotal3;
+    private AggregationSubtotalBuilder<Long> subtotal4;
+    private AggregationSubtotalBuilder<BigDecimal> subtotal5;
+    private AggregationSubtotalBuilder<BigDecimal> subtotal6;
+    private AggregationSubtotalBuilder<BigDecimal> subtotal7;
+    private AggregationSubtotalBuilder<Number> subtotal8;
+    private AggregationSubtotalBuilder<Number> subtotal9;
+
+    private AggregationSubtotalBuilder<Integer> subtotal10;
+    private AggregationSubtotalBuilder<Number> subtotal11;
+    private AggregationSubtotalBuilder<Long> subtotal12;
+    private AggregationSubtotalBuilder<Long> subtotal13;
+    private AggregationSubtotalBuilder<Integer> subtotal14;
+    private AggregationSubtotalBuilder<Integer> subtotal15;
+    private AggregationSubtotalBuilder<Integer> subtotal16;
+    private AggregationSubtotalBuilder<Number> subtotal17;
+    private AggregationSubtotalBuilder<Number> subtotal18;
+
+    private AggregationSubtotalBuilder<Long> subtotal19;
+    private AggregationSubtotalBuilder<Long> subtotal20;
+    private AggregationSubtotalBuilder<String> subtotal21;
+    private AggregationSubtotalBuilder<String> subtotal22;
+    private AggregationSubtotalBuilder<String> subtotal23;
+
+    private AggregationSubtotalBuilder<Long> subtotal24;
+    private AggregationSubtotalBuilder<Long> subtotal25;
+    private AggregationSubtotalBuilder<Date> subtotal26;
+    private AggregationSubtotalBuilder<Date> subtotal27;
+    private AggregationSubtotalBuilder<Date> subtotal28;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<BigDecimal> column1;
+        TextColumnBuilder<Integer> column2;
+        TextColumnBuilder<String> column3;
+        TextColumnBuilder<Date> column4;
+
+        rb.setLocale(Locale.ENGLISH)
+          .columns(column1 = col.column("Column1", "field1", type.bigDecimalType()), column2 = col.column("Column2", "field2", type.integerType()),
+                   column3 = col.column("Column2", "field3", type.stringType()), column4 = col.column("Column3", "field4", type.dateType()))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column1), subtotal2 = sbt.avg(column1), subtotal3 = sbt.count(column1), subtotal4 = sbt.distinctCount(column1), subtotal5 = sbt.first(column1),
+                              subtotal6 = sbt.min(column1), subtotal7 = sbt.max(column1), subtotal8 = sbt.stdDev(column1), subtotal9 = sbt.var(column1),
+
+                              subtotal10 = sbt.sum(column2), subtotal11 = sbt.avg(column2), subtotal12 = sbt.count(column2), subtotal13 = sbt.distinctCount(column2), subtotal14 = sbt.first(column2),
+                              subtotal15 = sbt.min(column2), subtotal16 = sbt.max(column2), subtotal17 = sbt.stdDev(column2), subtotal18 = sbt.var(column2),
+
+                              subtotal19 = sbt.count(column3), subtotal20 = sbt.distinctCount(column3), subtotal21 = sbt.first(column3), subtotal22 = sbt.min(column3), subtotal23 = sbt.max(column3),
+
+                              subtotal24 = sbt.count(column4), subtotal25 = sbt.distinctCount(column4), subtotal26 = sbt.first(column4), subtotal27 = sbt.min(column4), subtotal28 = sbt.max(column4));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // summary
+        subtotalIndexCountTest(subtotal1, 1, 1);
+        subtotalIndexValueTest(subtotal1, 1, "25.05");
+        subtotalIndexCountTest(subtotal2, 2, 1);
+        subtotalIndexValueTest(subtotal2, 2, "5");
+        subtotalIndexCountTest(subtotal3, 3, 1);
+        subtotalIndexValueTest(subtotal3, 3, "5");
+        subtotalIndexCountTest(subtotal4, 4, 1);
+        subtotalIndexValueTest(subtotal4, 4, "4");
+        subtotalIndexCountTest(subtotal5, 5, 1);
+        subtotalIndexValueTest(subtotal5, 5, "1.01");
+        subtotalIndexCountTest(subtotal6, 6, 1);
+        subtotalIndexValueTest(subtotal6, 6, "1.01");
+        subtotalIndexCountTest(subtotal7, 7, 1);
+        subtotalIndexValueTest(subtotal7, 7, "11.01");
+        subtotalIndexCountTest(subtotal8, 8, 1);
+        subtotalIndexValueTest(subtotal8, 8, "4.1");
+        subtotalIndexCountTest(subtotal9, 9, 1);
+        subtotalIndexValueTest(subtotal9, 9, "17.2");
+
+        subtotalIndexCountTest(subtotal10, 1, 1);
+        subtotalIndexValueTest(subtotal10, 1, "36");
+        subtotalIndexCountTest(subtotal11, 2, 1);
+        subtotalIndexValueTest(subtotal11, 2, "7.2");
+        subtotalIndexCountTest(subtotal12, 3, 1);
+        subtotalIndexValueTest(subtotal12, 3, "5");
+        subtotalIndexCountTest(subtotal13, 4, 1);
+        subtotalIndexValueTest(subtotal13, 4, "4");
+        subtotalIndexCountTest(subtotal14, 5, 1);
+        subtotalIndexValueTest(subtotal14, 5, "5");
+        subtotalIndexCountTest(subtotal15, 6, 1);
+        subtotalIndexValueTest(subtotal15, 6, "5");
+        subtotalIndexCountTest(subtotal16, 7, 1);
+        subtotalIndexValueTest(subtotal16, 7, "12");
+        subtotalIndexCountTest(subtotal17, 8, 1);
+        subtotalIndexValueTest(subtotal17, 8, "2.6");
+        subtotalIndexCountTest(subtotal18, 9, 1);
+        subtotalIndexValueTest(subtotal18, 9, "7");
+
+        subtotalIndexCountTest(subtotal19, 1, 1);
+        subtotalIndexValueTest(subtotal19, 1, "5");
+        subtotalIndexCountTest(subtotal20, 2, 1);
+        subtotalIndexValueTest(subtotal20, 2, "4");
+        subtotalIndexCountTest(subtotal21, 3, 1);
+        subtotalIndexValueTest(subtotal21, 3, "value8");
+        subtotalIndexCountTest(subtotal22, 4, 1);
+        subtotalIndexValueTest(subtotal22, 4, "value1");
+        subtotalIndexCountTest(subtotal23, 5, 1);
+        subtotalIndexValueTest(subtotal23, 5, "value8");
+
+        subtotalIndexCountTest(subtotal24, 1, 1);
+        subtotalIndexValueTest(subtotal24, 1, "5");
+        subtotalIndexCountTest(subtotal25, 2, 1);
+        subtotalIndexValueTest(subtotal25, 2, "4");
+        subtotalIndexCountTest(subtotal26, 3, 1);
+        subtotalIndexValueTest(subtotal26, 3, "01/01/2010");
+        subtotalIndexCountTest(subtotal27, 4, 1);
+        subtotalIndexValueTest(subtotal27, 4, "01/01/2010");
+        subtotalIndexCountTest(subtotal28, 5, 1);
+        subtotalIndexValueTest(subtotal28, 5, "04/01/2010");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4");
+        dataSource.add(new BigDecimal(1.01), 5, "value8", toDate(2010, 1, 1));
+        dataSource.add(new BigDecimal(2.01), 5, "value2", toDate(2010, 2, 1));
+        dataSource.add(new BigDecimal(9.01), 8, "value3", toDate(2010, 2, 1));
+        dataSource.add(new BigDecimal(11.01), 12, "value3", toDate(2010, 3, 1));
+        dataSource.add(new BigDecimal(2.01), 6, "value1", toDate(2010, 4, 1));
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java
new file mode 100644
index 0000000..c878378
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java
@@ -0,0 +1,61 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Calculation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubtotalPosition1Test extends AbstractJasperPositionTest {
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Double> subtotal2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<Integer> column1;
+
+        rb.columns(column1 = col.column("Column1", "field1", Integer.class).setWidth(600)).subtotalsAtSummary(subtotal1 = sbt.sum(column1), subtotal2 = sbt.aggregate(column1, Calculation.AVERAGE));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // summary
+        subtotalPositionTest(subtotal1, 0, 10, 42, 575, 16);
+        subtotalIndexPositionTest(subtotal2, 2, 0, 10, 58, 575, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add(1);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java
new file mode 100644
index 0000000..0a16741
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java
@@ -0,0 +1,108 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubtotalPosition2Test extends AbstractJasperPositionTest {
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<Integer> subtotal3;
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<String> column3;
+    private TextColumnBuilder<Integer> column4;
+    private TextColumnBuilder<Integer> column5;
+    private TextColumnBuilder<String> column6;
+    private TextColumnBuilder<Integer> column7;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        StyleBuilder textStyle = stl.style(stl.pen1Point()).setPadding(2);
+        StyleBuilder columnStyle = stl.style(textStyle).setVerticalTextAlignment(VerticalTextAlignment.MIDDLE);
+
+        rb.setTextStyle(textStyle)
+          .setColumnStyle(columnStyle)
+          .columns(column1 = col.column("", "field1", type.stringType()).setFixedWidth(200), column2 = col.column("", "field2", type.stringType()),
+                   column3 = col.column("", "field3", type.stringType()), column4 = col.column("", "field4", type.integerType()).setRows(2), column5 = col.column("", "field5", type.integerType()),
+                   column6 = col.column("", "field6", type.stringType()).setFixedColumns(3), column7 = col.column("", "field7", type.integerType()).setTitleRows(2))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column4), subtotal2 = sbt.sum(column5).setRows(2), subtotal3 = sbt.sum(column7))
+          .columnGrid(column1, column2, column3, grid.horizontalColumnGridList().add(column4).newRow().add(column5, column6, column7));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // columns
+        elementPositionTest("columnHeader.list1", 0, 10, 10, 575, 43);
+        columnTitlePositionTest(column1, 0, 0, 0, 200, 43);
+        columnTitlePositionTest(column2, 0, 200, 0, 87, 43);
+        columnTitlePositionTest(column3, 0, 287, 0, 87, 43);
+        // elementPositionTest("columnHeader.list2", 0, 374, 0, 201, 43);
+        columnTitlePositionTest(column4, 0, 374, 0, 201, 16);
+        elementPositionTest("columnHeader.list3", 0, 374, 16, 201, 27);
+        columnTitlePositionTest(column5, 0, 0, 0, 85, 27);
+        columnTitlePositionTest(column6, 0, 85, 0, 31, 27);
+        columnTitlePositionTest(column7, 0, 116, 0, 85, 27);
+
+        elementPositionTest("detail.list1", 0, 10, 53, 575, 43);
+        columnDetailPositionTest(column1, 0, 0, 0, 200, 43);
+        columnDetailPositionTest(column2, 0, 200, 0, 87, 43);
+        columnDetailPositionTest(column3, 0, 287, 0, 87, 43);
+        // elementPositionTest("detail.list2", 0, 374, 0, 201, 43);
+        columnDetailPositionTest(column4, 0, 374, 0, 201, 27);
+        elementPositionTest("detail.list3", 0, 374, 27, 201, 16);
+        columnDetailPositionTest(column5, 0, 0, 0, 85, 16);
+        columnDetailPositionTest(column6, 0, 85, 0, 31, 16);
+        columnDetailPositionTest(column7, 0, 116, 0, 85, 16);
+
+        // summary
+        elementPositionTest("summary.list1", 0, 10, 96, 575, 43);
+        // elementPositionTest("summary.list2", 0, 374, 0, 201, 43);
+        subtotalPositionTest(subtotal1, 0, 374, 0, 201, 16);
+        elementPositionTest("summary.list3", 0, 374, 16, 201, 27);
+        subtotalPositionTest(subtotal2, 0, 0, 0, 85, 27);
+        subtotalPositionTest(subtotal3, 0, 116, 0, 85, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3", "field4", "field5", "field6", "field7");
+        dataSource.add("", "", "", 1, 1, "", 1);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java
new file mode 100644
index 0000000..b182544
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java
@@ -0,0 +1,74 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubtotalPosition3Test extends AbstractJasperPositionTest {
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", type.stringType()).setFixedWidth(540), column2 = col.column("Column2", "field2", type.integerType()))
+          .groupBy(grp.group(column1).setHideColumn(false).setPadding(0).setHeaderLayout(GroupHeaderLayout.EMPTY))
+          .subtotalsAtFirstGroupFooter(subtotal1 = sbt.sum(column2))
+          .subtotalsAtSummary(subtotal2 = sbt.sum(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // columns
+        columnDetailPositionTest(column1, 0, 0, 0, 540, 26);
+        columnDetailPositionTest(column2, 0, 540, 0, 35, 26);
+
+        // summary
+        elementPositionTest("subtotalGroupFooter.list1", 0, 10, 88, 575, 26);
+        subtotalPositionTest(subtotal1, 0, 540, 0, 35, 26);
+        elementPositionTest("summary.list1", 0, 10, 114, 575, 26);
+        subtotalPositionTest(subtotal2, 0, 540, 0, 35, 26);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        dataSource.add("text", 1000000);
+        dataSource.add("text", 1000000);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java
new file mode 100644
index 0000000..7c83f08
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java
@@ -0,0 +1,84 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubtotalPosition4Test extends AbstractJasperPositionTest {
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private ColumnGroupBuilder group1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.columns(column1 = col.column("Column1", "field1", type.stringType()).setFixedWidth(540), column2 = col.column("Column2", "field2", type.integerType()))
+          .groupBy(group1 = grp.group(column1).setHeaderWithSubtotal(true))
+          .subtotalsAtFirstGroupHeader(subtotal1 = sbt.sum(column2))
+          .subtotalsAtSummary(subtotal2 = sbt.sum(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        // columns
+        columnDetailPositionTest(column2, 0, 10, 0, 565, 16);
+
+        // group
+        groupHeaderPositionTest(group1, 0, 10, 26, 575, 16);
+        groupHeaderPositionTest(group1, 1, 10, 74, 575, 16);
+
+        // group header
+        elementPositionTest("subtotalGroupHeader.list1", 0, 10, 26, 575, 16);
+        subtotalPositionTest(subtotal1, 0, 10, 0, 565, 16);
+        elementPositionTest("subtotalGroupHeader.list1", 1, 10, 74, 575, 16);
+        subtotalPositionTest(subtotal1, 0, 10, 0, 565, 16);
+
+        // summary
+        elementPositionTest("summary.list1", 0, 10, 122, 575, 16);
+        subtotalPositionTest(subtotal2, 0, 10, 0, 565, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        dataSource.add("group1", 1);
+        dataSource.add("group1", 2);
+        dataSource.add("group2", 3);
+        dataSource.add("group2", 4);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java
new file mode 100644
index 0000000..931ded4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java
@@ -0,0 +1,90 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.subtotal;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.constant.Position;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class SubtotalPosition5Test extends AbstractJasperPositionTest {
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+    private AggregationSubtotalBuilder<Integer> subtotal2;
+    private AggregationSubtotalBuilder<Integer> subtotal3;
+    private AggregationSubtotalBuilder<Integer> subtotal4;
+    private AggregationSubtotalBuilder<Integer> subtotal5;
+    private AggregationSubtotalBuilder<Integer> subtotal6;
+    private AggregationSubtotalBuilder<Integer> subtotal7;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<Integer> column1;
+
+        rb.columns(column1 = col.column("Column1", "field1", Integer.class).setWidth(600))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column1).setLabel("subtotal"), subtotal2 = sbt.sum(column1).setLabel("subtotal").setLabelPosition(Position.TOP),
+                              subtotal3 = sbt.sum(column1).setLabel("subtotal").setLabelPosition(Position.BOTTOM), subtotal4 = sbt.sum(column1).setLabel("subtotal").setLabelPosition(Position.LEFT),
+                              subtotal5 = sbt.sum(column1).setLabel("subtotal").setLabelPosition(Position.RIGHT),
+                              subtotal6 = sbt.sum(column1).setLabel("subtotal").setLabelPosition(Position.LEFT).setLabelFixedWidth(100),
+                              subtotal7 = sbt.sum(column1).setLabel("subtotal").setLabelPosition(Position.RIGHT).setLabelFixedWidth(150));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+        // summary
+        // TOP
+        subtotalIndexPositionTest(subtotal1, 1, 0, 10, 58, 575, 16);
+        subtotalLabelIndexPositionTest(subtotal1, 1, 0, 10, 42, 575, 16);
+        // TOP
+        subtotalIndexPositionTest(subtotal2, 2, 0, 10, 90, 575, 16);
+        subtotalLabelIndexPositionTest(subtotal2, 2, 0, 10, 74, 575, 16);
+        // BOTTOM
+        subtotalIndexPositionTest(subtotal3, 3, 0, 10, 106, 575, 16);
+        subtotalLabelIndexPositionTest(subtotal3, 3, 0, 10, 122, 575, 16);
+        // LEFT
+        subtotalIndexPositionTest(subtotal4, 4, 0, 287, 0, 288, 16);
+        subtotalLabelIndexPositionTest(subtotal4, 4, 0, 0, 0, 287, 16);
+        // RIGHT
+        subtotalIndexPositionTest(subtotal5, 5, 0, 0, 0, 287, 16);
+        subtotalLabelIndexPositionTest(subtotal5, 5, 0, 287, 0, 288, 16);
+        // LEFT
+        subtotalIndexPositionTest(subtotal6, 6, 0, 100, 0, 475, 16);
+        subtotalLabelIndexPositionTest(subtotal6, 6, 0, 0, 0, 100, 16);
+        // RIGHT
+        subtotalIndexPositionTest(subtotal7, 7, 0, 0, 0, 425, 16);
+        subtotalLabelIndexPositionTest(subtotal7, 7, 0, 425, 0, 150, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        dataSource.add(1);
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java
new file mode 100644
index 0000000..3aa1714
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java
@@ -0,0 +1,209 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.DefaultJasperReportsContext;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRPrintText;
+import net.sf.jasperreports.engine.util.JRStyledTextUtil;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContents1Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private TextColumnBuilder<String> column3;
+    private ColumnGroupBuilder group1;
+    private ColumnGroupBuilder group2;
+    private LabelExpression labelExpression;
+
+    @Override
+    protected void configureReport(final JasperReportBuilder rb) {
+        this.labelExpression = new LabelExpression();
+        final TableOfContentsHeadingBuilder tocHeading = tableOfContentsHeading().setLabel(this.labelExpression);
+
+        rb.tableOfContents()
+          .columns(
+              this.column1 = col.column("Column1", "field1", type.stringType()),
+              this.column2 = col.column("Column2", "field2", type.stringType()),
+              this.column3 = col.column("Column3", "field3", type.stringType()))
+          .groupBy(
+              this.group1 = grp.group(this.column1).footer(cmp.text("group footer").setTableOfContentsHeading(tocHeading)),
+              this.group2 = grp.group(this.column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+        
+        this.numberOfPagesTest(3);
+        
+        this.elementValueTest("title.textField1", "Table of contents");
+        
+        this.elementCountTest("detail.textField1", 6);
+        int index = 0;
+        for (int i = 0; i < 3; i++) {
+            String anchorName = this.group1.getGroup().getName() + "_" + i * 24;
+            
+            this.elementValueTest("detail.textField1", index, "value" + (i + 1));
+            JRPrintText text = (JRPrintText)this.getElementAt("detail.textField1", index);
+            Assertions.assertEquals("text anchor", anchorName, text.getHyperlinkAnchor());
+
+            JRPrintText dots = (JRPrintText)this.getElementAt("detail.textField2", index);
+            String value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+            Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+            Assertions.assertEquals("dots anchor", anchorName, dots.getHyperlinkAnchor());
+
+            JRPrintText pageIndex = (JRPrintText)this.getElementAt("detail.textField3", index);
+            Assertions.assertEquals("pageIndex anchor", anchorName, pageIndex.getHyperlinkAnchor());
+            index++;
+
+            anchorName = this.labelExpression.getName() + "_" + (i + 1) * 24;
+            
+            this.elementValueTest("detail.textField1", index, "group footer" + (i + 1));
+            text = (JRPrintText)this.getElementAt("detail.textField1", index);
+            Assertions.assertEquals("text anchor", anchorName, text.getHyperlinkAnchor());
+
+            dots = (JRPrintText)this.getElementAt("detail.textField2", index);
+            value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+            Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+            Assertions.assertEquals("dots anchor", anchorName, dots.getHyperlinkAnchor());
+
+            pageIndex = (JRPrintText)this.getElementAt("detail.textField3", index);
+            Assertions.assertEquals("pageIndex anchor", anchorName, pageIndex.getHyperlinkAnchor());
+            index++;
+        }
+        this.elementValueTest("detail.textField3", "1", "1", "1", "2", "2", "2");
+        
+        this.elementCountTest("detail.textField4", 9);
+        for (int i = 0; i < 9; i++) {
+            final String anchorName = this.group2.getGroup().getName() + "_" + i * 8;
+
+            final JRPrintText text = (JRPrintText)this.getElementAt("detail.textField4", i);
+            Assertions.assertEquals("text anchor", anchorName, text.getHyperlinkAnchor());
+
+            final JRPrintText dots = (JRPrintText)this.getElementAt("detail.textField5", i);
+            final String value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+            Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+            Assertions.assertEquals("dots anchor", anchorName, dots.getHyperlinkAnchor());
+
+            final JRPrintText pageIndex = (JRPrintText)this.getElementAt("detail.textField6", i);
+            Assertions.assertEquals("pageIndex anchor", anchorName, pageIndex.getHyperlinkAnchor());
+        }
+        this.elementValueTest("detail.textField4", "value1", "value2", "value3", "value1", "value2", "value3", "value1", "value2", "value3");
+        this.elementValueTest("detail.textField6", "1", "1", "1", "1", "1", "1", "2", "2", "2");
+
+        String name1 = "groupHeaderTitleAndValue.group_" + this.group1.getGroup().getName() + ".tocReference1";
+        String name2 = "groupHeaderTitleAndValue.group_" + this.group1.getGroup().getName() + "1";
+        this.elementCountTest(name1, 3);
+        for (int i = 0; i < 3; i++) {
+            final String anchorName = this.group1.getGroup().getName() + "_" + i * 24;
+            
+            this.elementValueTest(name1, i, "");
+            JRPrintText reference = (JRPrintText)this.getElementAt(name1, i);
+            Assertions.assertEquals("reference anchorName " + name1, anchorName, reference.getAnchorName());
+            
+            this.groupHeaderValueTest(this.group1, i, "value" + (i + 1));
+            reference = (JRPrintText)this.getElementAt(name2, i);
+            Assertions.assertEquals("reference anchorName " + name2, anchorName, reference.getAnchorName());
+        }
+
+        name1 = this.labelExpression.getName() + ".tocReference";
+        name2 = "groupFooter.textField1";
+        this.elementCountTest(name1, 3);
+        for (int i = 0; i < 3; i++) {
+            final String anchorName = this.labelExpression.getName() + "_" + (i + 1) * 24;
+            
+            this.elementValueTest(name1, i, "");
+            JRPrintText reference = (JRPrintText)this.getElementAt(name1, i);
+            Assertions.assertEquals("reference anchorName " + name1, anchorName, reference.getAnchorName());
+            
+            this.groupHeaderValueTest(this.group1, i, "value" + (i + 1));
+            reference = (JRPrintText)this.getElementAt(name2, i);
+            Assertions.assertEquals("reference anchorName " + name2, anchorName, reference.getAnchorName());
+        }
+
+        name1 = "groupHeaderTitleAndValue.group_" + this.group2.getGroup().getName() + ".tocReference1";
+        name2 = "groupHeaderTitleAndValue.group_" + this.group2.getGroup().getName() + "1";
+        this.elementCountTest(name1, 9);
+        for (int i = 0; i < 9; i++) {
+            final String anchorName = this.group2.getGroup().getName() + "_" + i * 8;
+            
+            this.elementValueTest(name1, i, "");
+            JRPrintText reference = (JRPrintText)this.getElementAt(name1, i);
+            Assertions.assertEquals("reference anchorName " + name1, anchorName, reference.getAnchorName());
+
+            reference = (JRPrintText)this.getElementAt(name2, i);
+            Assertions.assertEquals("reference anchorName " + name2, anchorName, reference.getAnchorName());
+        }
+        this.groupHeaderValueTest(this.group2, "value1", "value2", "value3", "value1", "value2", "value3", "value1", "value2", "value3");
+        
+        this.columnTitleCountTest(this.column3, 2);
+        this.columnTitleValueTest(this.column3, "Column3", "Column3");
+        this.columnDetailCountTest(this.column3, 72);
+        this.columnDetailValueTest(this.column3, 71, "text");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        final String[] values = new String[] {"value1", "value2", "value3"};
+        final DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        for (final String field1 : values) {
+            for (final String field2 : values) {
+                for (int i = 0; i < 8; i++) {
+                    dataSource.add(field1, field2, "text");
+                }
+            }
+        }
+        return dataSource;
+    }
+
+    private class LabelExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        private int index = 1;
+
+        @Override
+        public String evaluate(final ReportParameters reportParameters) {
+            return "group footer" + this.index++;
+        }
+
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java
new file mode 100644
index 0000000..dea0715
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java
@@ -0,0 +1,257 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.DefaultJasperReportsContext;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRPrintText;
+import net.sf.jasperreports.engine.util.JRStyledTextUtil;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContents2Test extends AbstractJasperValueTest
+{
+	private TextColumnBuilder<String> column1;
+	private DRIExpression<String> labelExpression1;
+	private DRIExpression<String> labelExpression2;
+	private DRIExpression<String> labelExpression3;
+	private DRIExpression<String> labelExpression4;
+	private DRIExpression<String> labelExpression5;
+	private DRIExpression<String> labelExpression6;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+        this.labelExpression1 = exp.text("title");
+        this.labelExpression2 = exp.text("summary");
+		final TextFieldBuilder<String> textField = cmp.text("text2");
+        this.labelExpression3 = textField.getComponent().getValueExpression();
+		final TextFieldBuilder<String> textField3 = cmp.text("text3");
+        this.labelExpression6 = textField3.getComponent().getValueExpression();
+		
+		rb.tableOfContents()
+			.title(cmp.text("text").setTableOfContentsHeading(tableOfContentsHeading().setLabel(this.labelExpression1)))
+			.columns(this.column1 = col.column("Column1", "field1", type.stringType()))
+			.summary(cmp.text("text").setTableOfContentsHeading(tableOfContentsHeading().setLabel(this.labelExpression2)),
+				textField.setTableOfContentsHeading(tableOfContentsHeading()),
+				cmp.line().setTableOfContentsHeading(tableOfContentsHeading()),
+				cmp.subreport(this.createSubreport1()),
+				textField3.setTableOfContentsHeading(tableOfContentsHeading()).setAnchorName("Custom anchor text"));
+	}
+	
+	private JasperReportBuilder createSubreport1()
+	{
+		final TextFieldBuilder<String> textField = cmp.text("text3");
+        this.labelExpression4 = textField.getComponent().getValueExpression();
+		
+		final JasperReportBuilder report = report();
+		report.title(textField.setTableOfContentsHeading(tableOfContentsHeading()));
+		report.title(cmp.subreport(this.createSubreport2()));
+		return report;
+	}
+	
+	private JasperReportBuilder createSubreport2()
+	{
+		final TextFieldBuilder<String> textField = cmp.text("text4");
+        this.labelExpression5 = textField.getComponent().getValueExpression();
+		
+		final JasperReportBuilder report = report();
+		report.title(textField.setTableOfContentsHeading(tableOfContentsHeading()));
+		return report;
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+        
+        this.numberOfPagesTest(2);
+        
+        this.elementValueTest("title.textField1", "Table of contents");
+        
+        this.elementCountTest("detail.textField1", 7);
+		
+		String anchorName = this.labelExpression1.getName() + "_0";
+        this.elementValueTest("detail.textField1", 0, "title");
+		JRPrintText text = (JRPrintText)this.getElementAt("detail.textField1", 0);
+		Assertions.assertEquals("text anchor", anchorName, text.getHyperlinkAnchor());
+		JRPrintText dots = (JRPrintText)this.getElementAt("detail.textField2", 0);
+		String value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		JRPrintText pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 0);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression2.getName() + "_8";
+        this.elementValueTest("detail.textField1", 1, "summary");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 1);
+		Assertions.assertEquals("text anchor", anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 1);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 1);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression3.getName() + "_8";
+        this.elementValueTest("detail.textField1", 2, "text2");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 2);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 2);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 2);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression4.getName() + "_0";
+        this.elementValueTest("detail.textField1", 4, "text3");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 4);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 4);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 4);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression5.getName() + "_0";
+        this.elementValueTest("detail.textField1", 5, "text4");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 5);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 5);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 5);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = "Custom anchor text";
+        this.elementValueTest("detail.textField1", 6, "text3");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 6);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 6);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 6);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+        
+        this.elementValueTest("detail.textField3", "1", "1", "1", "1", "1", "1", "1");
+		
+		String name1 = this.labelExpression1.getName() + ".tocReference";
+		String name2 = "title.textField1";
+        this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression1.getName() + "_0";
+        this.elementValueTest(name1, 0, "");
+		JRPrintText reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+        this.elementValueTest(name2, 1, "text");
+		reference = (JRPrintText)this.getElementAt(name2, 1);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression2.getName() + ".tocReference";
+		name2 = "summary.textField1";
+        this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression2.getName() + "_8";
+        this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+        this.elementValueTest(name2, 0, "text");
+		reference = (JRPrintText)this.getElementAt(name2, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression3.getName() + ".tocReference";
+		name2 = "summary.textField2";
+        this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression3.getName() + "_8";
+        this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+        this.elementValueTest(name2, 0, "text2");
+		reference = (JRPrintText)this.getElementAt(name2, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression4.getName() + ".tocReference";
+		name2 = "title.textField1";
+        this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression4.getName() + "_0";
+        this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+        this.elementValueTest(name2, 2, "text3");
+		reference = (JRPrintText)this.getElementAt(name2, 2);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression5.getName() + ".tocReference";
+		name2 = "title.textField1";
+        this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression5.getName() + "_0";
+        this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+        this.elementValueTest(name2, 3, "text4");
+		reference = (JRPrintText)this.getElementAt(name2, 3);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression6.getName() + ".tocReference";
+		name2 = "summary.textField3";
+        this.elementCountTest(name1, 1);
+		anchorName = "Custom anchor text";
+        this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+        this.elementValueTest(name2, 0, "text3");
+		reference = (JRPrintText)this.getElementAt(name2, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+        
+        this.columnTitleCountTest(this.column1, 1);
+        this.columnTitleValueTest(this.column1, "Column1");
+        this.columnDetailCountTest(this.column1, 8);
+        this.columnDetailValueTest(this.column1, 7, "text");
+	}
+	
+	@Override
+	protected JRDataSource createDataSource()
+	{
+		final DRDataSource dataSource = new DRDataSource("field1");
+		for(int i = 0; i < 8; i++)
+		{
+			dataSource.add("text");
+		}
+		return dataSource;
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java
new file mode 100644
index 0000000..92423d8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java
@@ -0,0 +1,257 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Assertions;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
+import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.DefaultJasperReportsContext;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+import net.sf.jasperreports.engine.JRPrintText;
+import net.sf.jasperreports.engine.util.JRStyledTextUtil;
+
+
+/**
+ * @author Ricardo Mariaca
+ */
+class TableOfContents3Test extends AbstractJasperValueTest
+{
+	private DRIExpression<String> labelExpression1;
+	private DRIExpression<String> labelExpression2;
+	private DRIExpression<String> labelExpression3;
+	private DRIExpression<String> labelExpression4;
+	private DRIExpression<String> labelExpression5;
+	private DRIExpression<String> labelExpression6;
+	
+	@Override
+	protected void configureReport(final JasperReportBuilder rb)
+	{
+		final TextFieldBuilder<String> textField1 = cmp.text("text1");
+		this.labelExpression1 = textField1.getComponent().getValueExpression();
+		final TextFieldBuilder<String> textField6 = cmp.text("text6");
+		this.labelExpression6 = textField6.getComponent().getValueExpression();
+		
+		rb.tableOfContents()
+			.title(
+				textField1.setTableOfContentsHeading(tableOfContentsHeading()),
+				cmp.subreport(this.createSubreport1()))
+			.summary(
+				cmp.subreport(this.createSubreport3()),
+				textField6.setTableOfContentsHeading(tableOfContentsHeading()));
+	}
+	
+	private JasperReportBuilder createSubreport1()
+	{
+		final TextFieldBuilder<String> textField2 = cmp.text("text2");
+		this.labelExpression2 = textField2.getComponent().getValueExpression();
+		final TextFieldBuilder<String> textField4 = cmp.text("text4");
+		this.labelExpression4 = textField4.getComponent().getValueExpression();
+		
+		final JasperReportBuilder report = report();
+		report.title(textField2.setTableOfContentsHeading(tableOfContentsHeading()));
+		report.title(cmp.subreport(this.createSubreport2()));
+		report.title(textField4.setTableOfContentsHeading(tableOfContentsHeading()));
+		report.detailHeader(cmp.verticalGap(10));
+		report.setDataSource(new JREmptyDataSource(50));
+		return report;
+	}
+	
+	private JasperReportBuilder createSubreport2()
+	{
+		final TextFieldBuilder<String> textField3 = cmp.text("text3");
+		this.labelExpression3 = textField3.getComponent().getValueExpression();
+		
+		final JasperReportBuilder report = report();
+		report.title(textField3.setTableOfContentsHeading(tableOfContentsHeading()));
+		report.detailHeader(cmp.verticalGap(10));
+		report.setDataSource(new JREmptyDataSource(80));
+		return report;
+	}
+	
+	private JasperReportBuilder createSubreport3()
+	{
+		final TextFieldBuilder<String> textField5 = cmp.text("text5");
+		this.labelExpression5 = textField5.getComponent().getValueExpression();
+		
+		final JasperReportBuilder report = report();
+		report.title(textField5.setTableOfContentsHeading(tableOfContentsHeading()));
+		report.detailHeader(cmp.verticalGap(10));
+		report.setDataSource(new JREmptyDataSource(50));
+		return report;
+	}
+	
+	@Override
+	protected boolean serializableTest()
+	{
+		return false;
+	}
+	
+	@Override
+	public void test()
+	{
+		super.test();
+		
+		this.numberOfPagesTest(4);
+		
+		this.elementValueTest("title.textField1", "Table of contents");
+		
+		this.elementCountTest("detail.textField1", 6);
+		
+		String anchorName = this.labelExpression1.getName() + "_0";
+		this.elementValueTest("detail.textField1", 0, "text1");
+		JRPrintText text = (JRPrintText)this.getElementAt("detail.textField1", 0);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		JRPrintText dots = (JRPrintText)this.getElementAt("detail.textField2", 0);
+		String value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		JRPrintText pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 0);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression2.getName() + "_0";
+		this.elementValueTest("detail.textField1", 1, "text2");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 1);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 1);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 1);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression3.getName() + "_0";
+		this.elementValueTest("detail.textField1", 2, "text3");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 2);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 2);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 2);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression4.getName() + "_0";
+		this.elementValueTest("detail.textField1", 3, "text4");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 3);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 3);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 3);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression5.getName() + "_0";
+		this.elementValueTest("detail.textField1", 4, "text5");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 4);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 4);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 4);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		anchorName = this.labelExpression6.getName() + "_0";
+		this.elementValueTest("detail.textField1", 5, "text6");
+		text = (JRPrintText)this.getElementAt("detail.textField1", 5);
+		Assertions.assertEquals(anchorName, text.getHyperlinkAnchor());
+		dots = (JRPrintText)this.getElementAt("detail.textField2", 5);
+		value = JRStyledTextUtil.getInstance(DefaultJasperReportsContext.getInstance()).getTruncatedText(dots);
+		Assertions.assertTrue(StringUtils.containsOnly(value, "."));
+		Assertions.assertEquals(anchorName, dots.getHyperlinkAnchor());
+		pageIndex = (JRPrintText)this.getElementAt("detail.textField3", 5);
+		Assertions.assertEquals(anchorName, pageIndex.getHyperlinkAnchor());
+		
+		this.elementValueTest("detail.textField3", "1", "1", "1", "2", "2", "3");
+		
+		String name1 = this.labelExpression1.getName() + ".tocReference";
+		String name2 = "title.textField1";
+		this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression1.getName() + "_0";
+		this.elementValueTest(name1, 0, "");
+		JRPrintText reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		this.elementValueTest(name2, 1, "text1");
+		reference = (JRPrintText)this.getElementAt(name2, 1);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression2.getName() + ".tocReference";
+		name2 = "title.textField1";
+		this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression2.getName() + "_0";
+		this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		this.elementValueTest(name2, 2, "text2");
+		reference = (JRPrintText)this.getElementAt(name2, 2);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression3.getName() + ".tocReference";
+		name2 = "title.textField1";
+		this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression3.getName() + "_0";
+		this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		this.elementValueTest(name2, 3, "text3");
+		reference = (JRPrintText)this.getElementAt(name2, 3);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression4.getName() + ".tocReference";
+		name2 = "title.textField2";
+		this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression4.getName() + "_0";
+		this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		this.elementValueTest(name2, 0, "text4");
+		reference = (JRPrintText)this.getElementAt(name2, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression5.getName() + ".tocReference";
+		name2 = "title.textField1";
+		this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression5.getName() + "_0";
+		this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		this.elementValueTest(name2, 4, "text5");
+		reference = (JRPrintText)this.getElementAt(name2, 4);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		
+		name1 = this.labelExpression6.getName() + ".tocReference";
+		name2 = "summary.textField1";
+		this.elementCountTest(name1, 1);
+		anchorName = this.labelExpression6.getName() + "_0";
+		this.elementValueTest(name1, 0, "");
+		reference = (JRPrintText)this.getElementAt(name1, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+		this.elementValueTest(name2, 0, "text6");
+		reference = (JRPrintText)this.getElementAt(name2, 0);
+		Assertions.assertEquals(anchorName, reference.getAnchorName());
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java
new file mode 100644
index 0000000..dfb788e
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java
@@ -0,0 +1,92 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.DRICustomValues;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContents4Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+
+        rb.tableOfContents()
+          .pageHeader(cmp.text(new PageHeaderExpression()))
+          .columns(column1 = col.column("Column1", "field1", type.stringType()), col.column("Column2", "field2", type.stringType()))
+          .groupBy(column1);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(4);
+
+        elementCountTest("pageHeader.textField1", 3);
+        elementValueTest("pageHeader.textField1", "value1", "value3", "value5");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        String[] values = new String[] {"value1", "value2", "value3", "value4", "value5", "value6"};
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (String value : values) {
+            for (int i = 0; i < 20; i++) {
+                dataSource.add(value, "text");
+            }
+        }
+        return dataSource;
+    }
+
+    private class PageHeaderExpression extends AbstractSimpleExpression<String> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String evaluate(ReportParameters reportParameters) {
+            DRICustomValues customValues = (DRICustomValues) reportParameters.getParameterValue(DRICustomValues.NAME);
+            Map<String, JasperTocHeading> tocHeadings = customValues.getTocHeadings();
+            if (tocHeadings.isEmpty()) {
+                return reportParameters.getValue("field1");
+            }
+            List<JasperTocHeading> headings = new ArrayList<JasperTocHeading>(tocHeadings.values());
+            JasperTocHeading jasperTocHeading = headings.get(headings.size() - 1);
+            return jasperTocHeading.getText();
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java
new file mode 100644
index 0000000..79be29a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java
@@ -0,0 +1,62 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContents5Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1;
+
+        rb.tableOfContents()
+          .columns(column1 = col.column("Column1", "field1", type.stringType()), col.column("Column2", "field2", type.stringType()))
+          .groupBy(grp.group(column1).setAddToTableOfContents(false));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 5; i++) {
+            dataSource.add("text1", "value");
+        }
+        for (int i = 0; i < 5; i++) {
+            dataSource.add("text2", "value");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java
new file mode 100644
index 0000000..0f91c33
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java
@@ -0,0 +1,171 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.component.DRTextField;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContents6Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column4;
+    private CustomGroupBuilder group1;
+    private CustomGroupBuilder group2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setTableOfContents(new CustomTableOfContentsCustomizer()).title(cmp.subreport(createSubreport1())).columns(column4 = col.column("Column4", "field4", type.stringType()));
+    }
+
+    private JasperReportBuilder createSubreport1() {
+        column1 = col.column("Column1", "field1", type.stringType());
+
+        DRTextField<String> columnComponent = (DRTextField<String>) column1.getColumn().getComponent();
+        TableOfContentsHeadingBuilder tocHeading = tableOfContentsHeading();
+        tocHeading.setCustomValue(new TocCustomValueExpression());
+        columnComponent.setTableOfContentsHeading(tocHeading.getTableOfContentsHeading());
+
+        JasperReportBuilder report = report();
+        report.columns(column1, col.column("Column2", "field2", type.stringType()), col.column("Column3", "field3", type.stringType())).setDataSource(createSubreportDataSource1());
+
+        return report;
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field4");
+        dataSource.add("detail1");
+        dataSource.add("detail2");
+        return dataSource;
+    }
+
+    private JRDataSource createSubreportDataSource1() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        dataSource.add("text1", "text1_1", "text2_1");
+        dataSource.add("text2", "text1_1", "text2_1");
+        dataSource.add("text3", "text1_2", "text2_2");
+        dataSource.add("text4", "text1_2", "text2_2");
+        return dataSource;
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        elementCountTest("detail.textField1", 8);
+        elementValueTest("detail.textField1", "text1", "text2", "text3", "text4", "text1", "text2", "text3", "text4");
+
+        columnDetailCountTest(column1, 4);
+        columnDetailValueTest(column1, "text1", "text2", "text3", "text4");
+
+        columnDetailCountTest(column4, 2);
+        columnDetailValueTest(column4, "detail1", "detail2");
+
+        groupHeaderCountTest(group1, 2);
+        groupHeaderValueTest(group1, "text1_1", "text1_2");
+
+        groupHeaderCountTest(group2, 2);
+        groupHeaderValueTest(group2, "text2_1", "text2_2");
+    }
+
+    @Override
+    protected boolean serializableTest() {
+        return false;
+    }
+
+    private class CustomTableOfContentsCustomizer extends TableOfContentsCustomizer {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public void customize() {
+            init();
+
+            group1 = grp.group(field("customValue.field2", String.class));
+            group2 = grp.group(field("customValue.field3", String.class));
+
+            report.title(cmp.subreport(createSubreport2(group1)), cmp.subreport(createSubreport2(group2)));
+        }
+
+        private JasperReportBuilder createSubreport2(CustomGroupBuilder group) {
+            JasperReportBuilder subreport = report();
+            subreport.fields(levelField, textField, referenceField, pageIndexField).groupBy(group).detail(detailComponent()).setDataSource(new JRBeanCollectionDataSource(headingList));
+
+            return subreport;
+        }
+    }
+
+    private class TocCustomValueExpression extends AbstractSimpleExpression<TocCustomValue> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public TocCustomValue evaluate(ReportParameters reportParameters) {
+            String field2 = reportParameters.getValue("field2");
+            String field3 = reportParameters.getValue("field3");
+            return new TocCustomValue(field2, field3);
+        }
+    }
+
+    public class TocCustomValue {
+        private String field2;
+        private String field3;
+
+        public TocCustomValue(String field2, String field3) {
+            this.field2 = field2;
+            this.field3 = field3;
+        }
+
+        public String getField2() {
+            return field2;
+        }
+
+        public void setField2(String field2) {
+            this.field2 = field2;
+        }
+
+        public String getField3() {
+            return field3;
+        }
+
+        public void setField3(String field3) {
+            this.field3 = field3;
+        }
+
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java
new file mode 100644
index 0000000..bdfcee4
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java
@@ -0,0 +1,72 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContents7Test extends AbstractJasperValueTest {
+    private ColumnGroupBuilder group1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", type.stringType());
+        group1 = grp.group(column1).setReprintHeaderOnEachPage(true);
+
+        rb.tableOfContents().columns(column1, col.column("Column2", "field2", type.stringType())).groupBy(group1);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+
+        elementCountTest("detail.textField1", 3);
+        elementValueTest("detail.textField1", "value1", "value2", "value3");
+
+        groupHeaderCountTest(group1, 4);
+        groupHeaderValueTest(group1, "value1", "value2", "value2", "value3");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 30; i++) {
+            dataSource.add("value1", "text");
+        }
+        for (int i = 0; i < 30; i++) {
+            dataSource.add("value2", "text");
+        }
+        for (int i = 0; i < 30; i++) {
+            dataSource.add("value3", "text");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java
new file mode 100644
index 0000000..2b38ef2
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java
@@ -0,0 +1,73 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.definition.ReportParameters;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContents8Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.tableOfContents()
+          .columns(col.column("Column1", "field1", type.stringType()))
+          .detail(cmp.text("detail").setTableOfContentsHeading("detailToc").removeLineWhenBlank().setPrintWhenExpression(new PrintWhenExpression()));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        elementCountTest("detail.textField1", 2);
+        elementValueTest("detail.textField1", "detailToc", "detail");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 5; i++) {
+            dataSource.add("text");
+        }
+        return dataSource;
+    }
+
+    private class PrintWhenExpression extends AbstractSimpleExpression<Boolean> {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Boolean evaluate(ReportParameters reportParameters) {
+            return reportParameters.getReportRowNumber() == 1;
+        }
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java
new file mode 100644
index 0000000..bb6f1e6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java
@@ -0,0 +1,66 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.util.Locale;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContents9Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TextColumnBuilder<String> column1 = col.column("Column1", "field1", type.stringType());
+
+        rb.tableOfContents().setLocale(new Locale("es")).columns(column1, col.column("Column2", "field2", type.stringType())).groupBy(grp.group(column1)).pageFooter(cmp.pageXofY());
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        elementValueTest("title.textField1", "Tabla de contenidos");
+        elementValueTest("pageFooter.textField2", " de 1");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("value1", "text");
+        }
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("value2", "text");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java
new file mode 100644
index 0000000..5297389
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java
@@ -0,0 +1,120 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContentsPosition1Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+    private ColumnGroupBuilder group1;
+    private ColumnGroupBuilder group2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.tableOfContents()
+          .columns(column1 = col.column("Column1", "field1", type.stringType()), column2 = col.column("Column2", "field2", type.stringType()), col.column("Column3", "field3", type.stringType()))
+          .groupBy(group1 = grp.group(column1), group2 = grp.group(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 575, 19);
+
+        for (int i = 0; i < 3; i++) {
+            elementPositionTest("detail.list3", i, 10, 49 + 64 * i, 575, 16);
+            elementPositionTest("detail.textField1", i, 0, 0, 276, 16);
+            elementPositionTest("detail.textField2", i, 276, 0, 277, 16);
+            elementPositionTest("detail.textField3", i, 553, 0, 22, 16);
+        }
+
+        for (int i = 0; i < 9; i++) {
+            elementPositionTest("detail.textField4", i, 10, 0, 266, 16);
+            elementPositionTest("detail.textField5", i, 286, 0, 267, 16);
+            elementPositionTest("detail.textField6", i, 553, 0, 22, 16);
+        }
+
+        for (int i = 0; i < 3; i++) {
+            elementPositionTest("detail.list5", i, 10, 65 + 16 * i, 575, 16);
+        }
+        int index = 0;
+        for (int i = 3; i < 6; i++) {
+            elementPositionTest("detail.list5", i, 10, 129 + 16 * index++, 575, 16);
+        }
+        index = 0;
+        for (int i = 6; i < 9; i++) {
+            elementPositionTest("detail.list5", i, 10, 193 + 16 * index++, 575, 16);
+        }
+
+        String name = "groupHeaderTitleAndValue.group_" + group1.getGroup().getName() + ".tocReference1";
+        for (int i = 0; i < 3; i++) {
+            elementPositionTest(name, i, 0, 0, 0, 16);
+            groupHeaderPositionTest(group1, i, 0, 0, 575, 16);
+        }
+        name = "groupHeaderTitleAndValue.list1";
+        elementPositionTest(name, 0, 10, 26, 575, 16);
+        elementPositionTest(name, 1, 10, 474, 575, 16);
+        elementPositionTest(name, 2, 10, 122, 575, 16);
+
+        name = "groupHeaderTitleAndValue.group_" + group2.getGroup().getName() + ".tocReference1";
+        for (int i = 0; i < 9; i++) {
+            elementPositionTest(name, i, 0, 0, 0, 16);
+            groupHeaderPositionTest(group2, i, 10, 0, 565, 16);
+        }
+        name = "groupHeaderTitleAndValue.list2";
+        elementPositionTest(name, 0, 10, 42, 575, 16);
+        elementPositionTest(name, 1, 10, 186, 575, 16);
+        elementPositionTest(name, 2, 10, 330, 575, 16);
+        elementPositionTest(name, 3, 10, 490, 575, 16);
+        elementPositionTest(name, 4, 10, 634, 575, 16);
+        elementPositionTest(name, 5, 10, 778, 575, 16);
+        elementPositionTest(name, 6, 10, 138, 575, 16);
+        elementPositionTest(name, 7, 10, 282, 575, 16);
+        elementPositionTest(name, 8, 10, 426, 575, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        String[] values = new String[] {"value1", "value2", "value3"};
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        for (String field1 : values) {
+            for (String field2 : values) {
+                for (int i = 0; i < 8; i++) {
+                    dataSource.add(field1, field2, "text");
+                }
+            }
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java
new file mode 100644
index 0000000..65ebcb9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java
@@ -0,0 +1,94 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContentsPosition2Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TableOfContentsCustomizerBuilder tableOfContentsCustomizer = tableOfContentsCustomizer().setTextFixedWidth(100).setPageIndexFixedWidth(30);
+
+        rb.tableOfContents(tableOfContentsCustomizer)
+          .columns(column1 = col.column("Column1", "field1", type.stringType()), column2 = col.column("Column2", "field2", type.stringType()), col.column("Column3", "field3", type.stringType()))
+          .groupBy(column1, column2);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(3);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 575, 19);
+
+        for (int i = 0; i < 3; i++) {
+            elementPositionTest("detail.list3", i, 10, 49 + 64 * i, 575, 16);
+            elementPositionTest("detail.textField1", i, 0, 0, 100, 16);
+            elementPositionTest("detail.textField2", i, 100, 0, 445, 16);
+            elementPositionTest("detail.textField3", i, 545, 0, 30, 16);
+        }
+
+        for (int i = 0; i < 9; i++) {
+            elementPositionTest("detail.textField4", i, 10, 0, 100, 16);
+            elementPositionTest("detail.textField5", i, 120, 0, 425, 16);
+            elementPositionTest("detail.textField6", i, 545, 0, 30, 16);
+        }
+
+        for (int i = 0; i < 3; i++) {
+            elementPositionTest("detail.list5", i, 10, 65 + 16 * i, 575, 16);
+        }
+        int index = 0;
+        for (int i = 3; i < 6; i++) {
+            elementPositionTest("detail.list5", i, 10, 129 + 16 * index++, 575, 16);
+        }
+        index = 0;
+        for (int i = 6; i < 9; i++) {
+            elementPositionTest("detail.list5", i, 10, 193 + 16 * index++, 575, 16);
+        }
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        String[] values = new String[] {"value1", "value2", "value3"};
+        DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+        for (String field1 : values) {
+            for (String field2 : values) {
+                for (int i = 0; i < 8; i++) {
+                    dataSource.add(field1, field2, "text");
+                }
+            }
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java
new file mode 100644
index 0000000..b507191
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java
@@ -0,0 +1,79 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContentsPosition3Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        rb.setPageFormat(PageType.A6, PageOrientation.LANDSCAPE)
+          .setPageMargin(margin(10).setLeft(30))
+          .tableOfContents()
+          .columns(column1 = col.column("Column1", "field1", type.stringType()), col.column("Column2", "field2", type.stringType()))
+          .groupBy(column1);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(5);
+
+        elementPositionTest("title.textField1", 0, 30, 10, 381, 19);
+
+        for (int i = 0; i < 14; i++) {
+            elementPositionTest("detail.list2", i, 30, 49 + 16 * i, 381, 16);
+            elementPositionTest("detail.textField1", i, 0, 0, 179, 16);
+            elementPositionTest("detail.textField2", i, 179, 0, 180, 16);
+            elementPositionTest("detail.textField3", i, 359, 0, 22, 16);
+        }
+        for (int i = 14; i < 20; i++) {
+            elementPositionTest("detail.list2", i, 30, 10 + 16 * (i - 14), 381, 16);
+            elementPositionTest("detail.textField1", i, 0, 0, 179, 16);
+            elementPositionTest("detail.textField2", i, 179, 0, 180, 16);
+            elementPositionTest("detail.textField3", i, 359, 0, 22, 16);
+        }
+
+        containsElement("title.textField1", 0);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 20; i++) {
+            dataSource.add("value" + i, "text");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java
new file mode 100644
index 0000000..58e4e97
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java
@@ -0,0 +1,75 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
+import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContentsPosition4Test extends AbstractJasperPositionTest {
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        TableOfContentsCustomizerBuilder tableOfContentsCustomizer = tableOfContentsCustomizer().setPosition(TableOfContentsPosition.BOTTOM).setTextFixedWidth(100).setPageIndexFixedWidth(30);
+
+        ReportTemplateBuilder template = template().setTableOfContents(true).setTableOfContentsCustomizer(tableOfContentsCustomizer);
+
+        rb.setTemplate(template).columns(column1 = col.column("Column1", "field1", type.stringType()), col.column("Column2", "field2", type.stringType())).groupBy(column1);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 575, 19);
+
+        for (int i = 0; i < 10; i++) {
+            elementPositionTest("detail.list2", i, 10, 49 + 16 * i, 575, 16);
+            elementPositionTest("detail.textField1", i, 0, 0, 100, 16);
+            elementPositionTest("detail.textField2", i, 100, 0, 445, 16);
+            elementPositionTest("detail.textField3", i, 545, 0, 30, 16);
+        }
+
+        containsElement("title.textField1", 1);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 10; i++) {
+            dataSource.add("value" + i, "text");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java
new file mode 100644
index 0000000..3ceeea8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java
@@ -0,0 +1,86 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TableOfContentsPosition5Test extends AbstractJasperPositionTest {
+    private TableOfContentsHeadingBuilder tocHeading1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) {
+        tocHeading1 = tableOfContentsHeading().setLabel("title2");
+
+        rb.tableOfContents().title(cmp.text("text").setTableOfContentsHeading("title1"), cmp.text("text").setTableOfContentsHeading(tocHeading1), cmp.subreport(createSubreport()));
+    }
+
+    private JasperReportBuilder createSubreport() {
+        TableOfContentsHeadingBuilder tocHeading2 = tableOfContentsHeading();
+        tocHeading2.setParentHeading(tocHeading1);
+        TableOfContentsHeadingBuilder tocHeading3 = tableOfContentsHeading();
+        tocHeading3.setParentHeading(tocHeading2);
+        JasperReportBuilder report = report();
+        report.title(cmp.text("text3").setTableOfContentsHeading(tocHeading2));
+        report.title(cmp.text("text4").setTableOfContentsHeading(tocHeading3));
+        report.title(cmp.text("text5").setTableOfContentsHeading(tableOfContentsHeading()));
+        return report;
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(2);
+
+        elementPositionTest("title.textField1", 0, 10, 10, 575, 19);
+
+        elementPositionTest("detail.list3", 0, 10, 49, 575, 16);
+        elementPositionTest("detail.textField1", 0, 0, 0, 281, 16);
+        elementPositionTest("detail.textField2", 0, 281, 0, 281, 16);
+        elementPositionTest("detail.textField3", 0, 562, 0, 13, 16);
+
+        elementPositionTest("detail.list3", 1, 10, 65, 575, 16);
+        elementPositionTest("detail.textField1", 1, 0, 0, 281, 16);
+        elementPositionTest("detail.textField2", 1, 281, 0, 281, 16);
+        elementPositionTest("detail.textField3", 1, 562, 0, 13, 16);
+
+        elementPositionTest("detail.list5", 0, 10, 81, 575, 16);
+        elementPositionTest("detail.textField4", 0, 10, 0, 271, 16);
+        elementPositionTest("detail.textField5", 0, 291, 0, 271, 16);
+        elementPositionTest("detail.textField6", 0, 562, 0, 13, 16);
+
+        elementPositionTest("detail.list7", 0, 10, 97, 575, 16);
+        elementPositionTest("detail.textField7", 0, 20, 0, 261, 16);
+        elementPositionTest("detail.textField8", 0, 301, 0, 261, 16);
+        elementPositionTest("detail.textField9", 0, 562, 0, 13, 16);
+
+        elementPositionTest("detail.list3", 2, 10, 113, 575, 16);
+        elementPositionTest("detail.textField1", 2, 0, 0, 281, 16);
+        elementPositionTest("detail.textField2", 2, 281, 0, 281, 16);
+        elementPositionTest("detail.textField3", 2, 562, 0, 13, 16);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java
new file mode 100644
index 0000000..27cf196
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java
@@ -0,0 +1,96 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.tableofcontents;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+import java.awt.Color;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.style.StyleBuilder;
+import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+/**
+ * Table of contents style tests.
+ * 
+ * @author Ricardo Mariaca
+ */
+public class TableOfContentsStyleTest extends AbstractJasperStyleTest {
+
+  @Override
+  protected void configureReport(JasperReportBuilder rb) {
+    TextColumnBuilder<String> column1 = col.column("Column1", "field1", type.stringType());
+    TextColumnBuilder<String> column2 = col.column("Column2", "field2", type.stringType());
+
+    StyleBuilder titleTocStyle = stl.style().setForegroundColor(Color.BLUE).setFontSize(18).bold()
+        .setHorizontalTextAlignment(HorizontalTextAlignment.CENTER);
+    StyleBuilder headingTocStyle = stl.style().setFontSize(12).bold();
+    StyleBuilder headingToc1Style = stl.style().italic();
+
+    TableOfContentsCustomizerBuilder tableOfContentsCustomizer =
+        tableOfContentsCustomizer().setTitleStyle(titleTocStyle).setHeadingStyle(headingTocStyle)
+            .setHeadingStyle(1, headingToc1Style);
+
+    rb.setTableOfContents(tableOfContentsCustomizer)
+        .columns(column1, column2, col.column("Column3", "field3", type.stringType()))
+        .groupBy(column1, column2);
+  }
+
+  @Override
+  public void test() {
+    super.test();
+
+    numberOfPagesTest(3);
+
+    styleTest("title.textField1", 0, Color.BLUE, null, TEST_FONT_NAME, 18f, true, null);
+
+    for (int i = 0; i < 3; i++) {
+      styleTest("detail.textField1", i, null, null, TEST_FONT_NAME, 12f, true, null);
+      styleTest("detail.textField2", i, null, null, TEST_FONT_NAME, 12f, true, null);
+      styleTest("detail.textField3", i, null, null, TEST_FONT_NAME, 12f, true, null);
+    }
+
+    for (int i = 0; i < 9; i++) {
+      styleTest("detail.textField4", i, null, null, TEST_FONT_NAME, 10f, null, true);
+      styleTest("detail.textField5", i, null, null, TEST_FONT_NAME, 10f, null, true);
+      styleTest("detail.textField6", i, null, null, TEST_FONT_NAME, 10f, null, true);
+    }
+  }
+
+  @Override
+  protected JRDataSource createDataSource() {
+    String[] values = new String[] {"value1", "value2", "value3"};
+    DRDataSource dataSource = new DRDataSource("field1", "field2", "field3");
+    for (String field1 : values) {
+      for (String field2 : values) {
+        for (int i = 0; i < 8; i++) {
+          dataSource.add(field1, field2, "text");
+        }
+      }
+    }
+    return dataSource;
+  }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java
new file mode 100644
index 0000000..736f794
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java
@@ -0,0 +1,72 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.constant.PageType;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRDefaultScriptlet;
+import net.sf.jasperreports.engine.JRScriptletException;
+import net.sf.jasperreports.engine.JasperReport;
+
+import java.util.Map;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class ReportScriptlet extends JRDefaultScriptlet {
+    private JasperReportBuilder dynamicSubreport;
+
+    @Override
+    public void beforeDetailEval() throws JRScriptletException {
+        super.beforeDetailEval();
+        dynamicSubreport = report();
+        dynamicSubreport.setPageFormat(515, PageType.A4.getHeight(), PageOrientation.PORTRAIT)
+                        .setPageMargin(margin(0))
+                        .columns(col.column("Column1", "field1", type.stringType()), col.column("Column2", "field2", type.integerType()))
+                        .title(cmp.text("dynamic subreport"));
+    }
+
+    private JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        dataSource.add("value1", 1);
+        dataSource.add("value2", 5);
+        return dataSource;
+    }
+
+    public JasperReport getDynamicSubreport() throws DRException {
+        return dynamicSubreport.toJasperReport();
+    }
+
+    public Map<String, Object> getDynamicSubreportParameters() throws DRException {
+        return dynamicSubreport.getJasperParameters();
+    }
+
+    public JRDataSource getDynamicSubreportDataSource() {
+        return createDataSource();
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java
new file mode 100644
index 0000000..dafd972
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java
@@ -0,0 +1,85 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import org.junit.jupiter.api.Assertions;
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JasperPrint;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesign1Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+    private AggregationSubtotalBuilder<Integer> subtotal1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        InputStream is = TemplateDesign1Test.class.getResourceAsStream("templatedesign1.jrxml");
+        rb.setTemplateDesign(is)
+          .addParameter("parameter", "parametertest")
+          .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+          .subtotalsAtSummary(subtotal1 = sbt.sum(column2));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        JasperPrint jasperPrint = getJasperPrint();
+        Assertions.assertEquals("templatedesign1", jasperPrint.getName());
+
+        columnTitleValueTest(column1, "Column1");
+        columnDetailValueTest(column1, "row0", "row1");
+        columnTitleValueTest(column2, "Column2");
+        columnDetailValueTest(column2, "0", "1");
+        subtotalValueTest(subtotal1, "1");
+
+        elementValueTest("templateDesign.title1", "title");
+        elementValueTest("templateDesign.title2", "parametertest");
+        elementValueTest("templateDesign.pageHeader", "pageHeader");
+        elementValueTest("templateDesign.pageFooter", "pageFooter");
+        elementValueTest("templateDesign.detail", "detail");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("row" + i, i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java
new file mode 100644
index 0000000..ba9b875
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java
@@ -0,0 +1,90 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesign2Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<String> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        SubreportBuilder titleSubreport = cmp.subreport(titleSubreport()).setDataSource(titleSubreportDataSource());
+
+        InputStream is = TemplateDesign2Test.class.getResourceAsStream("templatedesign2.jrxml");
+        rb.setTemplateDesign(is).title(titleSubreport).columns(column1 = col.column("Column1", "field1", String.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnTitleValueTest(column1, "Column1");
+        columnDetailValueTest(column1, "row0", "row1");
+        columnTitleValueTest(column2, "Column2");
+        columnDetailValueTest(column2, "value1", "value2", "value3");
+        elementValueTest("title.textField1", "subreport");
+        elementValueTest("templateDesign.pageHeader", "pageHeader");
+        elementValueTest("templateDesign.pageFooter", "pageFooter");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("row" + i, i);
+        }
+        return dataSource;
+    }
+
+    private JasperReportBuilder titleSubreport() throws DRException {
+        InputStream is = TemplateDesign2Test.class.getResourceAsStream("templatedesign3.jrxml");
+        JasperReportBuilder report = report();
+        report.setTemplateDesign(is).title(cmp.text("subreport")).columns(column2 = col.column("Column2", "field2", String.class));
+        return report;
+    }
+
+    private JRDataSource titleSubreportDataSource() {
+        DRDataSource dataSource = new DRDataSource("field2");
+        dataSource.add("value1");
+        dataSource.add("value2");
+        dataSource.add("value3");
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java
new file mode 100644
index 0000000..9c48314
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java
@@ -0,0 +1,71 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+import java.io.InputStream;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesign3Test extends AbstractJasperValueTest {
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        InputStream is = TemplateDesign3Test.class.getResourceAsStream("templatedesign4.jrxml");
+        rb.setTemplateDesign(is);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementCountTest("templateDesign.detail.text1", 2);
+        elementValueTest("templateDesign.detail.text1", "detail text 1");
+
+        elementCountTest("templateDesign.detail.text2", 2);
+        elementValueTest("templateDesign.detail.text2", "detail text 2");
+
+        elementCountTest("title.textField1", 2);
+        elementValueTest("title.textField1", "dynamic subreport", "dynamic subreport");
+
+        elementCountTest("columnHeader.column_field1.title1", 2);
+        elementValueTest("columnHeader.column_field1.title1", "Column1", "Column1");
+
+        elementCountTest("detail.column_field11", 4);
+        elementValueTest("detail.column_field11", "value1", "value2", "value1", "value2");
+
+        elementCountTest("columnHeader.column_field2.title1", 2);
+        elementValueTest("columnHeader.column_field2.title1", "Column2", "Column2");
+
+        elementCountTest("detail.column_field21", 4);
+        elementValueTest("detail.column_field21", "1", "5", "1", "5");
+    }
+
+    @Override
+    public JRDataSource createDataSource() {
+        return new JREmptyDataSource(2);
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java
new file mode 100644
index 0000000..46f26f1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java
@@ -0,0 +1,76 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesign4Test extends AbstractJasperValueTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        InputStream is = TemplateDesign4Test.class.getResourceAsStream("templatedesign1.jrxml");
+        rb.setTemplateDesign(is)
+          .ignorePageWidth()
+          .addParameter("parameter", "parametertest")
+          .columns(column1 = col.column("Column1", "field1", String.class).setFixedWidth(1000), column2 = col.column("Column2", "field2", Integer.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnTitleValueTest(column1, "Column1");
+        columnDetailValueTest(column1, "row0", "row1");
+        columnTitleValueTest(column2, "Column2");
+        columnDetailValueTest(column2, "0", "1");
+
+        elementValueTest("templateDesign.title1", "title");
+        elementValueTest("templateDesign.title2", "parametertest");
+        elementValueTest("templateDesign.pageHeader", "pageHeader");
+        elementValueTest("templateDesign.pageFooter", "pageFooter");
+        elementValueTest("templateDesign.detail", "detail");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("row" + i, i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java
new file mode 100644
index 0000000..c547045
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java
@@ -0,0 +1,85 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.constant.PageOrientation;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+
+import java.io.InputStream;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesign5Test extends AbstractJasperValueTest {
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        InputStream is = TemplateDesign5Test.class.getResourceAsStream("templatedesign5.jrxml");
+        JasperReportBuilder report = report();
+        report.setTemplateDesign(is);
+        report.addParameter("parameter", "parametertest");
+        report.setDataSource(new JREmptyDataSource(1));
+        report.setPageFormat(575, 842, PageOrientation.PORTRAIT);
+
+        rb.title(cmp.subreport(report)).columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class));
+    }
+
+    @Override
+    protected boolean serializableTest() {
+        return false;
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnTitleValueTest(column1, "Column1");
+        columnDetailValueTest(column1, "row0", "row1");
+        columnTitleValueTest(column2, "Column2");
+        columnDetailValueTest(column2, "0", "1");
+
+        elementValueTest("templateDesign.title1", "title");
+        elementValueTest("templateDesign.title2", "parametertest");
+        elementValueTest("templateDesign.pageHeader", "pageHeader");
+        elementValueTest("templateDesign.pageFooter", "pageFooter");
+        elementValueTest("templateDesign.detail", "detail");
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("row" + i, i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java
new file mode 100644
index 0000000..60d61d8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java
@@ -0,0 +1,77 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesignPosition1Test extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        InputStream is = TemplateDesignPosition1Test.class.getResourceAsStream("templatedesign1.jrxml");
+        rb.setTemplateDesign(is).columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 20, 134, 555, 16);
+        columnTitlePositionTest(column1, 0, 0, 0, 277, 16);
+        columnTitlePositionTest(column2, 0, 277, 0, 278, 16);
+        elementPositionTest("detail.list1", 0, 20, 171, 555, 16);
+        columnDetailPositionTest(column1, 0, 0, 0, 277, 16);
+        columnDetailPositionTest(column2, 0, 277, 0, 278, 16);
+        elementPositionTest("detail.list1", 1, 20, 208, 555, 16);
+        columnDetailPositionTest(column1, 1, 0, 0, 277, 16);
+        columnDetailPositionTest(column2, 1, 277, 0, 278, 16);
+
+        elementPositionTest("templateDesign.title1", 0, 146, 48, 100, 20);
+        elementPositionTest("templateDesign.pageHeader", 0, 146, 112, 100, 20);
+        elementPositionTest("templateDesign.pageFooter", 0, 146, 785, 100, 20);
+        elementPositionTest("templateDesign.detail", 0, 146, 150, 100, 20);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("row" + i, i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java
new file mode 100644
index 0000000..4977bcb
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java
@@ -0,0 +1,64 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesignPosition2Test extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        InputStream is = TemplateDesignPosition1Test.class.getResourceAsStream("templatedesign2.jrxml");
+        rb.setTemplateDesign(is).columns(column1 = col.column("Column1", "field1", String.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        columnTitlePositionTest(column1, 0, 20, 134, 555, 16);
+        columnDetailPositionTest(column1, 0, 20, 150, 555, 16);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1");
+        for (int i = 0; i < 1; i++) {
+            dataSource.add("row");
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java
new file mode 100644
index 0000000..a3ab251
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java
@@ -0,0 +1,78 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesignPosition3Test extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        InputStream is = TemplateDesignPosition3Test.class.getResourceAsStream("templatedesign1.jrxml");
+        rb.setTemplateDesign(is).setPageMargin(margin(50)).columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 50, 164, 495, 16);
+        columnTitlePositionTest(column1, 0, 0, 0, 247, 16);
+        columnTitlePositionTest(column2, 0, 247, 0, 248, 16);
+        elementPositionTest("detail.list1", 0, 50, 201, 495, 16);
+        columnDetailPositionTest(column1, 0, 0, 0, 247, 16);
+        columnDetailPositionTest(column2, 0, 247, 0, 248, 16);
+        elementPositionTest("detail.list1", 1, 50, 238, 495, 16);
+        columnDetailPositionTest(column1, 1, 0, 0, 247, 16);
+        columnDetailPositionTest(column2, 1, 247, 0, 248, 16);
+
+        elementPositionTest("templateDesign.title1", 0, 176, 78, 100, 20);
+        elementPositionTest("templateDesign.pageHeader", 0, 176, 142, 100, 20);
+        elementPositionTest("templateDesign.pageFooter", 0, 176, 755, 100, 20);
+        elementPositionTest("templateDesign.detail", 0, 176, 180, 100, 20);
+    }
+
+    @Override
+    protected JRDataSource createDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("row" + i, i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java
new file mode 100644
index 0000000..d3ead30
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java
@@ -0,0 +1,84 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sf.dynamicreports.test.jasper.templatedesign;
+
+import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
+import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
+import net.sf.dynamicreports.report.datasource.DRDataSource;
+import net.sf.dynamicreports.report.exception.DRException;
+import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import net.sf.jasperreports.engine.JRDataSource;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+
+/**
+ * @author Ricardo Mariaca
+ */
+public class TemplateDesignPosition4Test extends AbstractJasperPositionTest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private TextColumnBuilder<String> column1;
+    private TextColumnBuilder<Integer> column2;
+
+    @Override
+    protected void configureReport(JasperReportBuilder rb) throws DRException {
+        InputStream is = TemplateDesignPosition4Test.class.getResourceAsStream("templatedesign1.jrxml");
+        JasperReportBuilder report = report();
+        report.setTemplateDesign(is)
+              .setPageMargin(margin(25))
+              .columns(column1 = col.column("Column1", "field1", String.class), column2 = col.column("Column2", "field2", Integer.class))
+              .setDataSource(createSubreportDataSource());
+        rb.setPageMargin(margin(25)).title(cmp.subreport(report));
+    }
+
+    @Override
+    public void test() {
+        super.test();
+
+        numberOfPagesTest(1);
+
+        elementPositionTest("columnHeader.list1", 0, 50, 164, 495, 16);
+        columnTitlePositionTest(column1, 0, 0, 0, 247, 16);
+        columnTitlePositionTest(column2, 0, 247, 0, 248, 16);
+        elementPositionTest("detail.list1", 0, 50, 201, 495, 16);
+        columnDetailPositionTest(column1, 0, 0, 0, 247, 16);
+        columnDetailPositionTest(column2, 0, 247, 0, 248, 16);
+        elementPositionTest("detail.list1", 1, 50, 238, 495, 16);
+        columnDetailPositionTest(column1, 1, 0, 0, 247, 16);
+        columnDetailPositionTest(column2, 1, 247, 0, 248, 16);
+
+        elementPositionTest("templateDesign.title1", 0, 176, 78, 100, 20);
+        elementPositionTest("templateDesign.pageHeader", 0, 176, 142, 100, 20);
+        elementPositionTest("templateDesign.pageFooter", 0, 176, 358, 100, 20);
+        elementPositionTest("templateDesign.detail", 0, 176, 180, 100, 20);
+    }
+
+    private JRDataSource createSubreportDataSource() {
+        DRDataSource dataSource = new DRDataSource("field1", "field2");
+        for (int i = 0; i < 2; i++) {
+            dataSource.add("row" + i, i);
+        }
+        return dataSource;
+    }
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/customfonts.xml b/dynamicreports-core-for-grid-exporter/src/test/resources/customfonts.xml
new file mode 100644
index 0000000..1ccb9b0
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/customfonts.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fontFamilies>
+
+  <fontFamily name="Arimo">
+    <normal>net/sf/dynamicreports/test/fonts/Arimo-Regular.ttf</normal>
+    <bold>net/sf/dynamicreports/test/fonts/Arimo-Bold.ttf</bold>
+    <italic>net/sf/dynamicreports/test/fonts/Arimo-Italic.ttf</italic>
+    <pdfEncoding>Identity-H</pdfEncoding>
+    <pdfEmbedded>true</pdfEmbedded>
+  </fontFamily>
+
+  <fontFamily name="FreeUniversal">
+    <normal>net/sf/dynamicreports/test/fonts/FreeUniversal-Regular.ttf</normal>
+  </fontFamily>
+
+</fontFamilies>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-defaults.xml b/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-defaults.xml
new file mode 100644
index 0000000..8abb69a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-defaults.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DynamicReports>
+    <font fontName="Arimo"/>
+</DynamicReports>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-messages_es.properties b/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-messages_es.properties
new file mode 100644
index 0000000..b1eece6
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-messages_es.properties
@@ -0,0 +1,2 @@
+page_x_of_y={0} de {1}
+table_of_contents=Tabla de contenidos
\ No newline at end of file
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/jasperreports_extension.properties b/dynamicreports-core-for-grid-exporter/src/test/resources/jasperreports_extension.properties
new file mode 100644
index 0000000..c5c3fd7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/jasperreports_extension.properties
@@ -0,0 +1,3 @@
+#Font
+net.sf.jasperreports.extension.registry.factory.simple.font.families=net.sf.jasperreports.engine.fonts.SimpleFontExtensionsRegistryFactory
+net.sf.jasperreports.extension.simple.font.families.customfonts=customfonts.xml
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/base/dynamicreports-defaults.xml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/base/dynamicreports-defaults.xml
new file mode 100644
index 0000000..ea9d716
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/base/dynamicreports-defaults.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DynamicReports>
+    <!-- DEFAULT FONT -->
+    <font fontName="Arimo" fontSize="15" pdfFontName="Arimo" pdfEncoding="Identity-H" pdfEmbedded="true"/>
+
+    <!-- DEFAULT DATA TYPES -->
+    <bigDecimalType pattern="#,###.00#" horizontalAlignment="LEFT"/>
+    <bigIntegerType pattern="#,###" horizontalAlignment="LEFT"/>
+    <byteType pattern="#,###" horizontalAlignment="LEFT"/>
+    <doubleType pattern="#,###.#" horizontalAlignment="LEFT"/>
+    <floatType pattern="#,###.#" horizontalAlignment="LEFT"/>
+    <integerType pattern="#,###" horizontalAlignment="LEFT"/>
+    <longType pattern="#,###" horizontalAlignment="LEFT"/>
+    <shortType pattern="#,###" horizontalAlignment="LEFT"/>
+    <dateType pattern="MM.dd.yyyy" horizontalAlignment="LEFT"/>
+    <dateYearToMonthType pattern="MM.yyyy" horizontalAlignment="LEFT"/>
+    <dateYearToHourType pattern="MM.dd.yyyy h a" horizontalAlignment="LEFT"/>
+    <dateYearToMinuteType pattern="MM.dd.yyyy h:mm a" horizontalAlignment="LEFT"/>
+    <dateYearToSecondType pattern="MM.dd.yyyy h:mm:ss a" horizontalAlignment="LEFT"/>
+    <dateYearToFractionType pattern="MM.dd.yyyy h:mm:ss,SSS a" horizontalAlignment="LEFT"/>
+    <dateYearType pattern="yy" horizontalAlignment="LEFT"/>
+    <dateMonthType pattern="MM" horizontalAlignment="LEFT"/>
+    <dateDayType pattern="d" horizontalAlignment="LEFT"/>
+    <timeHourToMinuteType pattern="hh:mm a" horizontalAlignment="LEFT"/>
+    <timeHourToSecondType pattern="hh:mm:ss a" horizontalAlignment="LEFT"/>
+    <timeHourToFractionType pattern="hh:mm:ss,SSS a" horizontalAlignment="LEFT"/>
+    <percentageType pattern="#,###.00%" horizontalAlignment="LEFT"/>
+    <booleanType horizontalAlignment="RIGHT"/>
+    <characterType horizontalAlignment="RIGHT"/>
+    <stringType horizontalAlignment="RIGHT"/>
+</DynamicReports>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Bold.ttf b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5acaecda55779452393155416c7ebf953f9a7b03
GIT binary patch
literal 438516
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
RIlVcrL(js>@lnq-{x3q-h6Vrt

literal 0
HcmV?d00001

diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Italic.ttf b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ca6d09146180e3d36bd92d49ad1e78dd933c4b0e
GIT binary patch
literal 440740
zcmeFa3A`mmdG}vu-_Pmpv)^;iU1ni`fdNF6Q5FF~G;E5FfM`GjR|G_i8Y7EI&?Jh+
zeZd961#ve972+OL1R;PzToFwoh@zq>%k=;Id#d}~Gc$Ks{+WE<&--~(Jyq3JUHh}v
zQ+4jRjB~C_katHs?y(0RRC;1?f-8<@oy*+%xFZffa_8Wlb*?xrJNJeo9(UwZ_Rnm1
z_rMiDc9e6qCmizRBM<(o8$WlXb34Atx$5lUNAB{ldp`A_*HHIHT0L&VV-G#*h%=ve
zhjS1AgmdAWPB{7aQ_uW*b61zy^Ouy5PI$?S7f$=!3G*&<_@2&XUwzW4&p!DPwO-w2
z4xoDJGtWN$^iy5Wtz<lPGJ<En;AJPh`jo%Cz-3;(%H`*t^_*v&{L=i*4f;RmvCjSW
zL(e(!_-AGJzWxyUKbG>3cn%qjxyIj+W_)hdb54HoOF#aSPcyeH{cV5j^G|%y3vWK?
z-!F89x4qiA&h{@j<%HwAufO}3F7w1M@%>pRAOF%*n@=mek@}ZXf8mA4pM2u0c0Ax6
zu5bzSDV}iZDW|{qG2eK`FJ0l&9p|3?`%_<Z;;F}7_2aC|JmE7e=&PL8HuLC}uQ=uh
zoj-5w^?NsB8FAk@?CgJ1e8bvrfBo)H-1o-nE#<Mxx(el0gF4K9pN)sP1F9F_{fWCb
zRBv&Mu4G@5pxRTJ>LBwZ_hfgXD^fdfyEtZ@dui@sV3~2b{2MZ_cLnDP?<nl<<}xFT
zkI7x@PRd5*Lbg`SXS3N#Hvbb>jgN3IjcIyO%^!OBVTV(HA-=b8-NvV8b}#Ld`P6YP
z^Ti+E#he~hIGZ91E?;!+DwWQzpZG(w-*aEcpYGP=Pmk{`jom*MHn_#ix$axpi`{YA
zi{tgVv3qI$5_b-DR+IN!;v=%_<A0#e(fB=7k9b#n1HTS`I{te6Bk%`N{)zbQXya9C
z$Kuo7d&=|fD}@d5JLzxV!WHf`{Jwh6-{STyu6HLYt-5&^-(&fwlYg<5)%R1BmzLxG
zQPjJXI&bIwlcm?XPtx{Hyx)+&CBBjI-b7pfNc_~?m)-V^nYl3*Ki+ZPxdV7VP@Zy%
z^Y|5+D_Dyw;t}8No&HxSA5Z!CD&hlaX9eF2)O$MV4ZNSqI8I{RAH)9x{?6<ruAA++
z8?u+g$20$zGq#V~+%<1Me?KS2Pa6+k)=!O5{mRql(TRVQV)8V$$1meIkT>mb%<b;J
zM&7$U{Nf*FuX4xd4{@(&9aj{7&N}14{L7f%$MLVpKg;b`cJarH>*H?}KI5LNG=5);
zPj@@#-xbHXJKdgq`&RKS?w;&!@w>BsV0^!HCl*(`7lK<0w7nC4KiYc?>+me<?w&tA
zGfR9({^xGMcn-lA==bx<8huo-CVe6>WzO;M7{l+V|0azI_*{Yi67`=%->bFWf_Y}c
zeb>=Wn=%{l0Wdkx{ORtotkXrn^lotbbF{m=??<>Nn0OqdjBs}1HHOq1jtS53T65Yz
z6u$@lb@+3#7iZMxH}Q|d_mlY5j3>)jv-I&O;fwH+@%}=1L0g7X8hbK_eGR`n&0Ino
zd*kQudlWBmyWo$*(`J0FXn?l!8gJS*?VUy+2c$9I56nM5{x$V~D7+)RZW4>`SRai+
z^H<q4=6zq$fa2_9d<@<!QdZ@*OJl7KY4x`+eXN+olexM}8DCR0n!Uk2o$tc)4QZUL
z#hsJ*^`5qipK`Cvzup~`e~~*N_t&h^b--_<`?JEH?s3fLIOce0_BMBH`AhDwvddfm
z3k^1pl~=kU^R~j5GCjk&8{GLm&aTMckSP>C691uq>??dE`&xV7BIdiwOnl}hUskdF
z^f$HfQ1YkiZtWdp`N*`--az`<mUjc({Ra1!;IS*+mU%b+4QWjN2k|?|m)B-KS$=-z
z+R{@p2NhlB-|<h(KgK<}@EEsO{!8$xuG^or{2KW|;YaR?xz_^g+uZJ%v)pHa*Jn#z
z_p0n$;@{C$G5cM2vOMpfB0hZzk2b-%6o)pCQ+(Y#7S4bZ!kv8-3!kCW-}*RBD~`WJ
z{;Qyqd&HZqefTru7Y%{0@nuO{+ZDd)+f4B@jrAS+zmmEMEgF6f$=?JoH&2^ffwxo7
z=v1_k&R@JyJWl*ke2#Hnl$PH-o~nNz<G9gy@Kx?8XnJq_KKK*xuYi`GjQ<5??o~g<
z!`&gpue-<RX5Hh9$HaFPf9d|UxO*Hk4x?wSMd2CojfzD}Hc!tN#NRGR<!52n__tb%
z!nZxY%YQq*TePWhQSPSVMedqn&&_M?ZLH9s(cft%2lvgN<eroN$M|a2{FK~3xxMq`
z=b!3MWE}en4!Jwx_vfD(vqtWO+#B5^fy)8;H^*1!enzai&xoI2_&4{G;-lRGR!4a%
zL##ZFzxXfi()=-u@5AT<z)53~7u?I|#&0bBfHGgE%s*3R9N$;?mga&!v4`77^{ws&
zv9(o#x95N1+J(<i25)s<5x+5AkLk5w%}%qmpv~g3CaZ5MTuZ$Z+|{M0yM0T~q~Fur
zrKLXosIS+$PI(>QUmRb=9M<K}LN@N~*5rPRtb2j<1o-LM@n>_FLO+QN&WYc@Dt>q2
z6~xarygk6j=oIj6(=(7|#g9vFp+~$C*}lrXrg)*-Q2Y*Z{Eu$`!Y$}jd${d#zjl>k
zo;D7OuTfw46}h5Y%-u!bunpE19mcH{t&|Rq-(7r<^|!*tApL|f<?etU{@JaNY%POx
zg=5{*$bT)kcNBgN{xJOe@qdQjllK0Yxgs;p9+No=U(deHeHH(k?78l)?0elubGx|H
zvIo0!oQuDUU%-FQxsB-f79UC+P5E%@UHL)cRaf5>&nOn3E4~t0^Ig{HXk>8YHqh=*
zoV#y7{6G6X?)@h3d*d%BO}+b`<lMcl=6zS^?)ee#JJHrV@jt+4@*{T|v?jXSo-*X$
z$G&0Xw<!04rTX{K=H0)?vxm6%blQO<-}8Ll8Sg#sCVwOGPl-QA{XbIg<*d^l{`<XW
zk@r^o4@t8py7#sCmr?$c#E&3mJ?^dI+q_fmp0|PLM+=vM!IGTb=4t3)O4b|AJcP7p
z5j+r|?txpkq`dVZ$0<A?Al{r8r|^HEn0ci-)n>6@-*g`7xHs=-YiV%juM;mk|10>-
zcF<izyasyzka&#ISQ69DzIjjUmqC}Ovi8ttEPd=I(YW}FXq?#OAme#CW%f(Q#rwE$
zqdQVO$KLmV?<x=4#;3A(Me!ha1Z5t_w*%3ecBcKG!uyUu9&~8y#N40UZl#Lf&oK90
z4eow_(}!<gh<rJ;a7Emq{tES7{4H|gsqkd_mQJej_#>IaPLdno`6p<n1<%wT@#*57
z$c~pWrZ*QZ_iLZ%b=MPLivK0^{UZLOCilAWJ-M^vKhR!J?V}HWEq9o^0v+vdY46Y~
zd%g;5S7tu=eT$D`U0>%Gl~;P5r6u?GOX&qzAlE%?mt-<~*wf>$YyOnYr*lr%HjQn3
zE`FPM<#fMkz4Af8<~Q+w87!r%Y(bNo(iG!=G=2^**>!Z<Pa3No)^AB)-dz9KR6lui
z{@D2QxmU(-o%DYU`zUxJ{<w6Fm&WABlJ>>A+?l>_9<v@s8?4Pic*&3jy!OQd;b@Yl
z{Kph7aQjOaFnM-6aEr7Lji1Cf?V0o7`2P8<dtv_9w$|En3O?FDH}QLAZ;HRm`u;Wk
z8vMQab6gjBw;}PAWxuUDA4WHWMv4n=e{=%j`u^xapPBO4uy$Ge0DpS^Ajv?yi$9k=
za^v0E)8ZqtPvqM-;zJnU&8&ZuHmdov-NQ@=aq)%V`THn;VSdiNg82IU@p#~me=BqU
zEdF))S<-jdnhjW&i2bDI2rXxif=*og>D-%bj*`_sr2L_!=eq+-`{1uY_CLctJ@*OI
z*AFdbq16@W)?Y+E{}jDw&-lLVU$_Ro?(U9Xm-({W89$33WzTnO^Bwk--;D1xdkl6O
z*6%0y?;(3D>@!crpOwAIeH(uv^dkF;{E6~>dmH}o_(j&|&sn$k5|8oQvli@wGuoSe
zIPs?tCqBN7_h;hwWpDK^_b-g)?QT`}lkvUu^RZmu-n+R^%2OvkllP18m!J>6cQbz|
z=_lb8%O6BL2NCa)_``{J#ve?+;#K(7iC;s!3;9Zq@qPRw62B|?JMgahhfMirkgxRS
z<2WKIqrR<tQf?R0>+$=ho_xKlAB{2X?-ArHJ>6H@&U2FdN!v<qWgHv$_Eh}QNxXq_
z$MU`>{*j5-`<~=0ejNV5X-~e=XD41`mwy!bir=ugCx5y1*nA#`Q%-BSD?XjG)_Y98
z)>-Q$c%-mdMZVq-#tUw$YcM5WX|2Vfi8uI@ue?p*g3g3}bt5{|eeZ==p+m)QA$=q9
zp2TP3vCqaI#AChOcrPA(YNK?xm*UaM;<qR9(})kp?~8v1WzI!ylur46ymV0MpMOUF
zW%z4&S6k>^>L=cx_dAK_@aT7{yYYPddH9p?=z1If1&_?%cr#;t5AntLSK;48`hCQ7
zxABS8R~_odk0ri<cs2e6-d}=$8}D}$Q!hRhFMae<(v-jN3%swyqd#tBP8+4Wo`U~1
zd5818M||XzM~93Lqth|*f%vE6kHJ3`zYq1aJ{R$QJ7TSo>|%eypMgIrUj>Iwaw`j;
zcQ=%p?kvUPwZ?PLi9e9Yiv5u}{|avlknj8Eit%^yG4{K?++&Ij?5O9vUlhL{UtPR7
zz5)H^gVevUZ~}6E7@v=9IaEIX6Uu)b+s$3>#rYQ^L!RVjvOjWjdHTp-;AUu>y<j|2
zf4Ot{er|k=<h1SAyiD3qeIC01R~TEzJ)7~ZD6QxF>yV#E#plC&&o328zX-kMeXdjZ
zOV=pxhJJ99Tbchwd^_^$UF>V`VBa~J6YYF5f2lh)jmtlBr<9JS{rAw%x845L{oRX7
zStq!EKkb`!FkOo|K8m&684upLCVn0r9vI(yQZnWZrmL|>(>$cx6t*XRII`jw?$IVc
zQ{C`4?j!lXb7zzm8UH)khkcrHvmc|cQ&<<Rz3)@H75YMH9eed1+)=5{SiH*37CQ0o
z(^&dOqKAIAkVi+@9zBu$uI)L!9x7Xh>7$c2WLsxHx}-mBszdoXxC4QY>7{A=+E?3L
zh=IY|CUe(5o4qCFZEv68(E-{oYtO1ZJLUgji#XAPZGX)kmwpeUodZkfyTghfAwCm3
z)hzbtU!W&m>Rwa2k$wEv;&+#4ShI^vXFV~Gd@lUJU0S}?tpGmH!@m&!82sLN@dxE$
zS4j6*Hr8=6$EA2lul9Q-tr=snwOcMWI4{{x(>2>X77YO-t)<sTeY>Uy(*9H&Ujg2r
zr&zzTeX*b4_*KCd&mNI{bob3;+K?UW2T6Q$68C+)@kij0&Qexv9;f|mEly#$wb;+o
z?-2~&88<w}=7VnVbG1wSA4z-+<<0)~K(Y1|%-8l7#68k)Wi8%E{4C<<(%!V)E=<z<
zZI-`*em=>1otnm5+U1hHSh^=m^<r<UU$Rf9X<(&s(T~o1WJ_6xezs^fYuT;0;)Qqe
z#dF-*_)DhZb9q14^lRzZoB86Ldl~-R(#POaA9L?WW3#`>2DcSoJdb+kxpO&lI|cua
zsrU@u&tS~p%hr7^<6ee8H~$9s(Hq=5rs6YrKZAM8&b5Uvo=?B$)9=poyEEhcCgc7l
z^=0q7AFnmg{K}Ed@m$#i@7KSaeqK&LRr;w?=L7Wf0gKNjK0Ad&x}NDerE{K)JsDHl
zS6Xjt@dLq;erosU9|$h#IJO!;$aya}{&eiqF?)rlL$5z4mfi0N`~{nhUpQ6+KA*vV
zu=qRT-?<Nh|DyA=6Mru2x_i2|K4uT2GM;ZeF?XW-4E}?Z*V&f*xm(}^_F~zL(|l+a
z+qAoZeqUew5BEIL0rg}b$7i0q+!~eW2mE_{X@BhGFUMvsoA$*S&g?SJ2j<5xZk;=y
zCSFKfuT-%qyw=s}XAgMGS=bM5hhID_|7G_~^sXI{@yHR`2i@zLPb7UMzczjs<@YTV
z*#{r9G3M}c1$)lp3Quu=A<y_m_*uNxQ(otI=fDTQhrbxV7whtN#-u&lv-wuXmvigl
z%kf{}JGMvnXuNd0cc6=W9e+>a(fuqR9d9E#@O`h)Sj2mCar}wGW$}kOlh`|-iGR;L
z4ghv5^QXmk=f3V%N@g?uf6E;a|3)$-_h#%GvPXY{GG?2y^Vn5<Tg6&Dg>^YF_aQgW
zw<qBD&mT<LgU|yH;yiuK{!_Gbdi;~Zo8yhdpQc`V4t^(n-HWVVmH&Qx4K}is@X8DG
z&!!%2ppU&@dP(kAu8X~>n|q%-4*#^=HSWo|^Ud#*yUjf}_Z|1-%;SOeCG2nBPJY%s
zIe!ZAH{B7rEAfBAw$*Y+=gubYgZQ1?`#HyYPGP})89j47{wdk(8TaL!CA>1;$oId^
z4c&|6vq!j<_{H1`bh_B(vVZG#%EhjgJ;UX5+p{nJ9_?@MUTp8bj_>A<##yxWwA^Lb
zUG~5x{sZ^++^gLqbGy27_73*Qb@xKXadNI6f8WLNjhS<~gK&L(3*{DbyT+fS%nrFq
zd>wYL+bIJs+L`v}vNyOBST`p-cN%B0G-pX?o<bfF23K4LEO6w@aZbNag2Vfu<9(-e
zsM}Bq-JYd7XYrCVSAf4Rei?Ol!A2zc$8iB?GZ#7R+wS+^6t?q?UnEA4jUNxqok1P5
zDJs@EiouNYblQ-u=e_9pvfUwbH~tp<#10XkN}E69+q;Ol`w@RDS7RUe;`k@ULHtoq
zD=s4cD)1!8pB?{}w#G?&&nTRO-N<Z^@m``u@?{6Qigryu$PG5$&3E;oI~BTHqI)K?
zN10FTQSUEw+<x@6NSVvBN5+rf`v$X_Rk%O%@9s?e0l6K3=MnDlnTy<;G8e^n0rSH+
z$9yMnUyI)_@oO_TyNLHi;CE5>WOowyFvRbZJtICAya==Z=Jo;~&c>gU{gUeg<F|kp
zC-AM6d!&0F@m}}?fq5bO9=8@B0{8XV%b@KY9Q(+aecZ-diJ{$iKj8X>?2qEFf{z8-
zY=IYF;k_gs5jb7|U7sm9vnGF7j-OBGu?F`m&r_bdwRrRTo0rSIm%Yb^_-@AYm}G3a
z2lP_b-Ogl-RrV`hKgLewij4g&eB&;R?1}IpVuRB$@rT(<K8-fK4Lpg_?T-*lZO`(N
zSZnn#y!N&1+hZtU<8Am`cz-1RH@ttO^!KioyUlo+?vXTTe<&O>-h74ZneheL^&2l|
z%+lc}I<vQ%+8vQI^4EatuVOFE{Q}zk6#morC(!<{@b}@*)3^)YbWcz_#Ig^3i!uih
zvzOoaF8tr%FUP~D;}-G7{(a*M1WT<;s&^Ki>9ogxr>)mD?$q)j?o-9jgRAS^skyV<
z0(QR-$o9v2y<MLC@8NZq3E3I{oVstsv-h+Zj<E6iDUaNc-Q>Qzh+m1<_>f)ZncK!o
zfz9{v%yHuz;3{;XeQX9>Nd}f9+lbTtmT&Rdc({+|=PvMGHinIoP55{t?_b3OtBu#<
z)lU(B72j7AYpi_dULbc~e0#E|s9vn`tF4p0kNd<I;#ohnZ+)CWUHnEkUwj>Y9vc#M
zT_=BbhCQ9WVb56ao<#f_zE^W)w>$BN3dQ*Q`ESO*%smqvJH?&Hnc+d4F&vzI3$p*Q
z?%=|DcOL0Wkz=pT?;igmzqfl*;bij9gkN`%TjTiV!oKdz{D<Pp^7o>r+{~S&GPbp2
z<6q^GYpPfHp8HJU-1vLgh7ZPHDxd3Q*5|LwtS?>(f9V*#zt_Iej*Tf9%XFXCmfATJ
z`cj+Io_VO=^7DzW<9^1k{9KT~({o`SlR2d0UuNuD6RnethdH9pd_KQ7XV&s+PxB-%
z^|nro2bgp=W;SN*W@F|7-NQ1Ob?Y*-nRRO^dipv7QtLA34axJasc4*8UvKStd1f*5
z@JyzciO%1v`PR&gzO1uHZ{DrMWftYqoXqRg)~=R3NMW2+ILc&Z)yL6)u9RFAAO9lG
zWUWif%EX6QycWmHx^?ST{`{8vGH=af?#;xRI!(NFhCy3}KaeLkrldxd=~&WUd9wjn
zV$o;K_GX8An|<pn?d_t%1?t3Bi(q(GW|$cc)8vDUsqiq|P!%=gOlCJ<bNIf9EH#&o
zh}SWXrPr>pXFYi>#>(h3EH)!$idI0C&O1NTWX_g%-uZg`%q`33N2BhVOlA!*q;tWu
zs|JRdfsJL&yh`o5CX>xXnZ?~QO0Jn-BwDqS;rj7XJCh;l9c^?o>i`rZ-#OFnXEOa2
zd@&GaGHqTL@s~F<dub~AB)4NWvwlr|dkQpFw4M2m&rd_pZaG)+U|8<cHp*MOV(oe@
z?9x-oq>q+(m&wD@>dCBKBQT_ohOu%-f_A2DKvD)1H%DpVD22_<GIhhcta3UNSj}c;
z2kQoa#qeL~VU*-6O&V2l3^FiOk%^_!mPxE#xfVKG8k)eIsaWl#_+loRWK)%=T{>Q$
z*X#8%nbP$4OlBtm7B^3iD<OFAgdcMrpSNoZOERG_K%GL(nGCeMRkximapK}#Q<t%q
zt%drywQoLu8<d!g>VM{CerE_r4py^cBeQ*TvYu&w^-L6{??zGv%t=mWuv7BB337<c
zaR6YD*@4DsUVt*-CX{TbI8MQrG?GS(_TsU83|-?Ys|88OHk0<KTq}|izy!PXML0KJ
z`m%OCIN7oXsOdTVay@B@3DHq=l4tE$TRk{3Px^()Mwv)lZn)QQuS`>X8cy9izbVH5
zz;0${g}F6}OKX^LS{xb1&L=MYwq?9#&En#`vCS>NDJSh^`LE063W$D43B%PGcH7N5
z*<q=|XcoANov<KPE%cOIn0jCSHJD_t62UH#oRxe<xIomqA;FP(Ef|?H=*Qqa&eX(!
zvmoOf*_j<P72-}O)5rwyFJ1;>ecm<roHz+JT!NkJz_<CHQj<aNCc&-Z6I9&ANFrU=
zNw&44K;tQwGaV5|14obvG${sQ>!L!5grB@510bEkJcX~)dY=q39qg_)EVZ?Tqct@+
znFR0a(`rfKho5)8p^>MaEn4_*W;A!n%rN~KIA^OelL<?OO&UaKlmHhWA>8zfucIoJ
zOqi5cY7>V}o^v_ND&%q!&~8xpW$jDukL4I+M>)Qa-_cYEtNg6xK38)!!n&&yHe7?S
zX<^GXc@JDb7!uyg4n2(Tacvh7c3hjVYhllII9=_#9^t^kq3iQL;|7EyHzb_3aO_6$
zpWK|AC7gF-!Ue)VvhSZGT;b*kSMs}>Ke|<Jk#MzJ5#Pm0>Po^jZWZD77Vh9y$A54;
zy6p(py6p*fvT$d&L;QQU&h1FJi(5;$tJ{fiH@7q4!`wQ;-Q6yP4|lu9zhghB@DXk|
z!biG?5$@@BCtPpgquj%Jf3({p{;k`~J%Vs=3-@u4<b7YaCn5K`*%9w&;r?!~_zrh~
z+nb!nx_t-_w2*sD<Uh_mhVWpwAK~K(f9;;&_9y%^cL3ob?m)sr-9dzhS$Md69PdZC
zg9)GL9v}aT-Il^5-4o*5-ILv)5kAEoLdbb<{7d&#cNpPO?r_4R-4TSxSok#eMBa~e
zM-o2WJ(=(s7XG<=N_?w3&OMdzcy|=xGc7#99nGHcS?(CZ6W!AYPjbf+KHI|QxTo{}
zT=xvZ=egqupKsv{-0{4h?4C*ZLU%&^U+xqOPj%0V|I?l3P9%JhJBjdg3t#M>!}}TT
zxr8rq&nNr~3t#G95dVjJnLC;A<?e-qe`(<>+$p^Ol{=Mv_$%FMglD=J#Xoarxzh>H
zb}uG8$DKj=D)$n?zqasi++W1ExWDD6Teo04cp2fVEqsmpOWyy^y(0dp`+N6Sg#TdS
zYuzh(f1NuszS*7U&LYJ2NcaYK4&gt#SH(YZZ*+e{_$CYA?EaSbx43f&-%9vn_cjaP
z?q0+DJKWz9zSI3Z;k(>F5T0-0yWMN!AG!Cq^9bMTUQhTw!XL8Je*@wB-9Hju=-$YU
z*^4avfO`|~A9Qaa{E&Mq;fF1}*u9PSkGQw9FTBLPgYcske$2g-_m8{t2|wZ9P54O*
zKjq#N--P|)y@a1}7ZCoFdq3f4E&OM9A@7&Ei{cyI=iCPfKX2g|+y{BT%zcRPa`$1v
ze{tNRcVBcL;ePR#+$Drxb{{4DiiKZwAL9=3*WAbB8{F63CkX%5eUk7B_bI|}xK9&)
z(|v~UTkf9-uXLX!{I>h&_<DXXcPZi3?sJ6SvG5xAdET#eU%(FWZ|*X}>nyz9T^|3N
zyTN^t@Vo9ygp7soM)zgHo7`98Yu&%QuM&RW!XLP=^ZrBkuY^Bx+=g>Mw(uwJ8@%7_
zzD4*`cO~I17XHkAoA;l)tK#pt|8Q5wSG)go-y!@j3xDCR;r&*3ZG4rx&0R<MOABvz
z*Yo}>cLU+C-FFG^u<$qTd%XYF-9-31_wVty-JKTx-hH3<Ke!*nSGv30594pSKe`_g
z{>lBA@NV}L!h77!g!fu_pZh8A8{I90vHKa}|6M#?oP9N%T|8Z!eT{MUC7ynl@$|dk
z>1+79lZ87QXJ3w|i?ct>IQ#C#*&hyPzZ0IW@DXtKJK^cO5sIhZ`H*<}qu}iOIfdfs
zzu5{;|BdnV-xyE-jq&t5jHlmWJpB&i>32M6p8hN2>Ay0b{ww3@w;NBt-FW)##?x;%
zo_@O%Pru!G`t4ir^xKT5-)21hHsk5HIq~#cji=vgJpESV>9-nBztxGS-)cPlR^#cn
zZWEsVJmcvKUkYazPZwu@xpDRf;_2e-XB%ff$2j|g<LNK|Z}9ZLHlD8V&Boc^Vx0Yd
zdHVnI^#3kTztVX6mB!PrG@gE?@$@T=r(fyB)2}q1e&zo~JpE4-J^lYQPrs8><cGuG
zrKkVye)RNh$I~CYp8mf)eMwLMU!MN|hMs=C>FL*-o_@WPo_?L_>DQT_ex2#**F9)G
z{aVx0uXWPXuQfgW+W%jA`qieVUu}B&)lNM9YSYuNHa-37hp4ANbe_%`JZE;ZwN}~X
za=Co5SS@Aq`Ft^#&*h2}=ih6kQn_3zRm!<ysaPpjcq`$^E>X8o%#&R#QjOxdiYn7i
zu}~`ViKeMtqSB;Mm7DH_(yBopH3m?tl&xf;T*>A0<!Y&<&+38xDz$2{md|Bry->;)
zDNbYAJcayNa+ONO-sqRw`8)$EQ8!mEmKYD+<W;0tQFfV!9DQeiiWqgSm{)$KSk9OA
zDOa)r_LYjvigYnwuNCz$TB_Lu%MZnsYI2OUR<D*B8%>tW%qU;Ym-77cgHxw0xIG$_
zmQAjh)l`_1#;K7~%%-X0v|7jzRV$@j4Hzk%Wp$Z$g#{tbSE`kq7OYez0+t?}g0Da(
z@E5cc1s2&}fdqMgopqx3x+X0QAXx=!#WFad6)aT<s?`daH7zZ*%hrO2Xr&<B06^tp
z!B(EWa=B_n-4yb*I*>M(&4Q2uUk=OR7OuuPN}K1>>gHLbb)#X*O_s>7>()c9v0wE`
zNT2>ut@IsKE7-$43=a%mB`!YbmQ|H$`iTmAtscN)&3Ly(1BfhQrBKZ=vTOmo*UAYQ
zO8FcB1))?;ur`3OT&+gEUMVzKGkP%~)1*fcn&4{%_**U2G=%XOVmP8az^X3P2~VZS
z&&TzYfK%eikd`3<-;2d;HqYN2VttLS%lz2fJ3g^W3A6C<wfa^}xC2M2)=C924#7D?
zD|!BYQ9cX3;#4?kO3+SRCVf%7#D}c3u?Z?!H`AdtwMFhWE-{5i+xnHMf)=2QfePS@
z`XLiR2nQNzF1ZSDVWFGw(ke()g<hcr&<3*PsYCG1s^fFf5RiL>24Wg9G_02EU>JEI
znMdKAno*VtLcoNzs&ImQP(b-MB9G(bShwoDP^;8Hh%!HCH|Gbcp)NgYE_oo1rF;>W
z&j-ou5ofB{*wQWyBdIMOobcgETM&kxG%dbfFfOMY2B`<`UMOY^B?zD~a|Lrq8C?3U
zQc<c_)2QS;Vs83%lA@e%NugDv9q~vn%{+;yblT&jW>R{~+EzkP_Po!Ml}fc*7XBx$
zP%sSfjj3sUw5DLSO2AGk<vL)k6^%1OuSjO_C}F5-3okc?yDU?=szwWi>=L7@P8b1r
zhd4mqQA8ZuFCVf5bmTp+f9jy5wpqChz*HB|IC5WOF61*t>#D&h5txW><aNerz}2d_
zouK9Mm06TU-O?Z^4fQiIrXq)|%PKpeevKLNuOhe{oF%X0CC-@0^6Ug5qCuI{r2Q)#
zyR7+`OV@Wgt#`;wOg9TQO4ie&R}x@m31!iq)`?|CD0?y!?)k;dF%SP{p*V8Ml}ois
zuAtcn$)-Nr>n3p7{NtACJbyioBQ@lkcq{7<v>7JiT$+FlnWbcLN|l_`3X^5@%*cdl
zzK*IeK`URD==U|1;b&40DyAEPS7lbXKu3`7#QFC+pp*(x0a&6lpF;jiRX|_NvqVBh
zQqo6ofL4Q%kmI9t2h-X3LP3?A?u1oU4O*^)Y4xNef)aREXinpo(=h6_5`}V7j>=gu
zlP*~6CX+6UVm!&9R3=y<%(byeA<?>kvckzq2@TLV5HFxYs@#a{6cW*&uTVxLrnEV6
zRmcG@T4>aZdWv=b$tJi&`49M3s>^9k4P&xQr&5t_So69eBVu?O8E=z^S=j?VvW~gQ
z2ODRa0xJ5B0tYOBk)>Herd?%$5G)1MHz6=h=MAy~E>NnHWPZSrRTZ`|PXk!RR7t3r
zLM(X$HUvni51$2UByec|$T#FwtxA`5BQHq{wO|+tZ>Z9wR-f6DZ%j2OaYS~$-tZ7K
zK4T<ZSXMWr^XfG18R^jKmL#-=Zs^zZfkUlwx|}|y&*V|M%0&H>h&<4Iy1a&hz%pqI
zet5bR>F`Jq=MC`MqLVHnm;hN3*^b<06<IUW4OvvG8Z^+gN;yCiv>J^{p#^Nq;x_`a
zUajGxzE(<g%kh((OaxrElEP>3TktUKLd#Y@IrL*a0W$i6d^K(y)FomS(cl2KfkuR<
zZKP)wKvN(z$E%1Lu~Mwn>e6vo23UB8R!lc!W2Yw6TGA9BQYYQeWRPX3j5#p~k>2v*
z^10Kcw?T<z&}&;|F;|$Mff7(4WLPy891tQdS#y{cz>sbTc9a5uAeyd$g3tnJ<0069
zkXkjz=Y+KbS@Ap|%Ts~BYfHgLktb>%>W5xD@+d<nQwM2P)K^JSBf)ZQ+e=V4T5G*3
zRkYGbmVm0}Xy33&p_=p06sICzNR#G+jXX?U&!nb*QyH+<o^$}r#cE8qsBfOj>CI3C
zthJI!0?ua6D>q0P&wA}^wW?ITE{P<E&N1cu*EB;#Q_ik0(hk8&YItdu2ri1JJx*#S
zy=+<AO4!;hVY~*bZM+|m2!ce~l$zE@YYJc}0Y+3SO`ulyphqUdOL<HrTEj+SG&F^?
z0J(y0E2_u7QxL=EsWBZ9GLsOC;6>~Jkb{0`WGF<8M<r}E)j>%V%gSl%XBs0fyy+EX
zNE#w964eMyNp9(e3|J~U+Zy%eRS{+Zs<W7I8cL&A6wqzFG9m`4Y}<2cDGEglReWP<
z3h0IfZD84TTGzH>ylUCx3Yv6IqhKRdu1uEFukVs3qO`Rw;U<EUeAHUNGYz*`qsjVd
z<=DO>WQ}=hof4@e<I|*=g9;%t!g_U^>4pXU)nSBV0TF;An*-3M=#_JVB0vOM8hD{p
zMK=@`O1p=ga1z_Tj#aS=DlXm7CQE^$pGhOE@}n(uLUc00(XdGi<Q=*MZ8g*=ssYOi
z(*h6SN9Y4&tGMZg6lcv5a*1w8D%A~5bD&DvCUFXdB#YjqUskIPFbxi7*&r_9tfCO2
zu?SN&jB2A^qLAr^73qemiEd~E6ds7IP-V!I10f7{#!EnOY;*a%D7xx3KJ{cmQ`2E?
zKs)bsLlhX3r*v+*qBs>?l~pfmISb83Ne`nn!hWc_VOf_GQHIKmW?jmX8n2@57Hagz
z7HyhQdaXn`Vyk+X4i!ut(MQSsvY!Tp8W0?xP~gh>Mp+MOR#%*iC8<<v1vrWjm_fs0
z*m(+^EI_SFBf@w?FWZ_6&5%x2<yFzsWqK?%8(_O?ldRi|VFYbx?d!;mGPvPeG2++C
z;$&zgM5xK?A^H{~pzT9g#eAb_*d(YWy22)$Y(i~xzNKzRtCIptFVmcm+{qG6ukLd1
zTH{m~^s!g66{>uy8KTJ{Y$Xs?eyJsmpj7Z?8b5XaO>I#bR1&uF0^r%Y*K&+3hvWsp
z*naR0vI6l~P0=;QJU}4MFlaWb#Q>eav^r_&yt1HZ>!loDtAhVzDCtBzE-PO<VPa9W
zlGT#)6BL{hhjv#MF&oVRA^3hyc5bD?RnZlW&xDYZ3i?UvO*0fRtGRl;!P=Nz9Ag5l
zKwDWjIp77yan{guP(U{n3pZ)#n^tp@821z2-#1@#8<beWs%`#et10EkfQfF-Izz4o
zMj?pQ51@;U2ZShv@Ja2TrA|Q$pbga^i6(koSaTuZPb8SI$1n&^T!p_kt;sSPyW~}^
zoCiY<3)B-^R6-2TjKVP2zSxK)S9m1e@H*)zHfmButNi58996adpTayFeA0NCbDgEM
zaMG7f^*q>-X`H@{y0mUpC(#X;YC{(GEaiv*J(ts)hzo-8yLy2gw`Aj!px;#AtJRDX
zHzbkdr0Fd=|20k5>d;%_^hG))lnJVPox*RQR66Z(QZwmg%i2~#yjc2Pg7M<iO8OBY
zU}YUkn^M!-<6BbzLkaa)X#urH$)q~NftMmhe4~{1Zd2V5JgLY$!3@}T%5aP;qh2Ns
zSs>kz<17(4YwI2Am)8x^J@^PEi)5kOtk)9J6JhMqBk^c$a@0T)BQPbo^SO*emSE-)
z&Iwvx6=4>p8|GyW(%BhguOk&XF-T=6oIqnnn^6%Q3neYo>xQbUJh+SorGKUydcGn7
zHCal(zDW;sqO>}L%rr2ubo$i?uM<E5iTVf9Yn@nTSiewFlSniwx0!Be9NAUNjar^V
z7!7YrE8&(o31KZCnQn-1LpNj(gl;I+PFR<d@~g3EU@T6#mU9vyWEsIQFY#Tg<EyBG
z71w@^V$@ZJ_1o&yOgBVJL9Z<oD_Ty~_s;ew<rb$yY*6YbE}A34pH!_%wvbQEOitP>
zx}h{4a!9FLAcKV*(uZ>`IYD75#j2_XNZ$g}S~_K=GRLi8A>xIjNTtgfM!nT6w?Kw0
z<L7t7CSqVVO`{a8I^+sv<vdP+rG+vlCjd|i1utxV3R24I@GEaqD;M+uMysftW8Ah2
zt(R*BlqhLW7=XM=P+>5vy0+MbpjFmW#)KnB{fFc#EjcQ-f~J%uW{2<vw)Fx-<e1S0
zry*e+u*aCWX@+dOnG<7GmOlD%Dy64|H0Ha`7xS%(9@4C?cp$T{)*D55Tuv*7_KiMX
zGjIYW;0yC-4Va~t!mx@Aq=}$auQtl!L}i($04bJ@TD8f<(b&bKi0foGoApK&+@J<k
zWonc?QO-DcnMGuWD{K&o=5kF;j6#%FP!)7=(hU{!$1j#~@WA>OMnZJ$Wr`Y8Sjq?F
z5AKop@~b`xEA(oQEjknRPuiZ!rvRuKWtEFf7E?l4&X-ebtQjd_Znp{GRcv;0j4W3|
z(6e$N16Ws(Pz0kSZ-xC@qCCXeiGrYBidZxBV*@fxdK7^_@U>nJSl*>!`H2XZH9X<7
z)?O^q3f0TbPtik2Jz)wq$-<j@_PU|=GD@RY2r@W6iS2r3F-6<VP^^IQmYdC16{S)*
z1@8vbY<kc%vrr{Cj#G^D(6(3plLvpMW%+8#oEU_*v&)Ce=T4X21|^ozXq&$=S5{r%
z7cpzU0Y7T6>*N7a=zoxJIfopV$*)tX)!}#W>w4Af#K1&)V%V%#+6~9&^hhhk14Bdf
z$bc?ro|aX+QH5;^3p`>dQwSwwGR(DnjR-}}a7C;i6|^B0v(;$T={8K(A}ye%(kIOm
z&P@}C?N_WpSd2a5Obr{G>Uw+>Rx>o=t?}WswNzV7d+~GhTux<71Zt-Y<_g8+yf$dZ
zG|0YMt%);KBB<Am6SpLh<fMPg`S1Sgq-?X*ls@QPtEF}%gGD4Nv#C{4r6x6#UXrRr
zX>IGwq?h5pRbWrmsFCy|l5S`i0{t;8CSxD1sb-xW0oa44S_^?%t85l4hJ$2Aid3yp
z1)iZ6r#T`dUo&Bil7ki~8AKP{Nk|;urC^|MQxL8p#Q~Q^Gn5j6ZiEe*rYoXYMwx}Y
z&8~;0i9$&x*IcAi=tZI$fr;oYOE+Y|)h37tuF|bHvl+jmGb|b^jRH|bxAA&{7^Jcj
z9soZ?ZL}g16M)ThLyU(|5<_Ce;5Od0$&iGloO9#Q?Q6z*wC;X=moyQjHFwAiVlerN
zAjV;}^te@BG6-s&SY~!u##XgfiB!tLx2JeST@u;VDnWxYOxj0DnTCRuENqc8)xego
zMg7?+gd-P%fKD|Jprx}B>J&i>Dk;PIRT_CGtRZ3K#K<&pU&pGbf)$5iRFk^Ous(xs
zUAiF@(L|$4bVJqm&fBg7PKOZw^?DvI1bO&Wt>t$xNHR4CGNLJ#y$ui0s!OjMQkxoy
zIbMC+b|&dTk?0WvL%kk=X@M^(#Dyxv1`U|ZLBj}Il|Z^7ZP)CS1<sStho+eEBHa)t
zsg?Yz2zDj5$Z!+70de3%NO`iwg~$<OmAXqLf~s&%Y!7-GRr6I#+fG)BYN^U{mWxqP
z)>979h`jP^LwJxuy&A~D6M_&XE5#Jf0=gIL1<V7Ok}$}5me1Sd(FEn}GzgBHez0+-
zsTMQMgNhg=6Wx$B3cC0&v#&LpMU0iQo&r%K$_cn={|%DxR^X_8hbi~OED;OJ($#Bd
zb(kK@n5O`iltHw4>Q!h%NFhD5UTd`)&1#Kx5ssRv5v`x<m2y)yOf03c1q&O*2l9F3
zn~=E>gtdf~rMki<oNPiNfyCM*mApJS-B2KYFpt(aT}~gXPyZ;LzKgfn0}f7?*Ptpz
zwhhdSi4yu!Dg&y4F^CQHK$ZtqUv6T{hR-3}>&+U-0M-?_cq*`nq`?g->oVHsyPYts
zmpbUjwTk$S>Hu$rn2GsXuY_2Y(n(Gx0xtWKG7a<H6nl!*EBu*7|HVKg>O=_8mH;M3
z18<-e?JQIPTm^^Z_)N$*6_gMJigLU{Qy>ugre?rJFwjE$nnMXrB{(VKx}li2TC;|x
zb;BaMp;)*{L-ga+d4avPP^Gr^&F61}5}RY(HcYb&kO(T5fdWG^`dJ0zyjYeHL`ECz
zK<I{I?OpIf`^hHyfZ2(GiJl0(uG@5cPFOqmfp&$LWm#6kupy>W6?vlmHDM3%9p5Vl
z&Z1)wN@?<CxitI`dP%O3mT9sgt*}}OngM&ydX%g}if^><CqbCzF@jBqLpbTl22Nv-
zbS!q1lbZg`x)<IWANDnjAB!}mTGSWmhQ5UOwAp*0mlS(s<C8Ph25WY*Ew|5&hH>IR
zqmoN?Ltoc_P1|X-0+_XT`r_M>y~c}4FSt}X?Qv2w>1E5>R>Gu)5rZWg4OWAsACXLk
zB+{m6+CExS0HZ-k$g)w7fLg$x+r`17;iX6sX_($EqZ`7WYUs$I76v$UKVBgD7Sq9r
zbrY~;9A`oIl$AM33X$0uwX>IQ2&tNG2;G`)DB9&Tn6JD@H&g~M6q3M1bXTMsGT<7z
zwM^JzZ-z$9g6q;Orp!Uo4M}i+%!VTdsch2?mBYBqFsjzk19dN&Q{+T9RHoMrQ4dqy
zP?=nnuVH;jT)Mu~X}!a<AO@M$r2*jb-1`B`*yt|lhS-I`FxWN4L?PNjd1{aj;@>QU
zoGLX}uZG)FH)I^98|usv-B2ffC`4E$p*A*164s2nSZzu-MBwmI)Qr<U#OnAe+%OiG
zms!Y58tU_ABM<ux2lfDxR*e;ABfxTMfxN@cL|s%bsSltb9bgthi;%I2Y)Ny$P>vTM
z>2*VJ!HY#MkD@)GIKWDloS?FlLLV{Ru+a#?w9rc-1YQ$4(ZE<}$}lsazeX5TLTwbl
zTXaLCWN66ihN1#k01Ln-L62^(q6D%u0w51<6$|j8N~4TQC>}(|wrUKK??9X5T;-!a
zazBC^keJfO9^tCe4JlV@hZQ}Q&=#A;(7Hc(R}JM@+b{~4FSeBmj2qpsg<|M+Lps%v
zupr3bMhdZPmKxcV7=qUg8#YpnQw8*d%!KbDqM{Ji^^ivM7XO7hU@fI)tC8r21?h$c
zPN39mfMn7QQGT@)68B6T%xMT(jam~N0y`qMs3IR$uofVxs_b6D2#kghdo2i>ts1@h
zR-}EGbq0oO@^CK(p@xP?8m0ptv^YzqOfii3osl`|hQNt~i767BywZ7NdS7NAXmwIx
z>1FBWu;tk<z_023hgxSX?9wAq>K`q!PSpI9wxjYX0MNH^6`lOTGyK$jIkm@{0aM9y
z-86+V8|4<njVg|GY_M_&mP)l)0P*y@6Ky=Sb`n4kXTKXojdC{tWuzMdWY7Z?;lWbC
z*G4%~6UmcK#4g7&K;cQM8(NV@#ra7Jp%Pce&MWfObpv`e-B8%0G`Q+vB$5~3039eb
zMcV?buU!dRAyh156Gf#PaxR5#s2{%RXivmwPS8%AZl0S6S9*y>czLz8P(5z#o6p|{
zC6=&io4+wtmJofPJqJrE27^@vEsaMAf^G;B$eaRbD?N63Es&@M)rFYnp*`EIv{4j$
zE!PvV`5~rwAT(@LTXoFMY98{0i$kl0fM%dxLk#JCLMS1VVJ^91gN(@JioUi$S!spU
za@Y);d}$|ZVMC>Ws-#bvC!FJ;W|A+Q^xt4H%jkw4ABEtwXP3IghtmhLuxF_~No~*N
zRL1x;_{JjmV^`43TMC;^uN!Wv?=_poi9<;wIggm0=HOWNRoElf3__T-clzSD_e;8=
z46@#(J^FfSJ0YTN^V(M4bVFgh7o^zRTU=$=o(!i`?&OPxMboVYX=?~p+av)yY1Z38
ztr}vX!XaEy3%SBG`N@rhp(tybBclG)b#w)nXWPlKkls-*70ICwYR^~IpkQTsm&3-0
zVOy3vHmvHPszYZ+Dc#VliIjl1Gia|H+KWUr0u#|)DWDrR7%;lE@R@GCDuN_2-LL?s
zp)^{E>|QVdN&rtO7P=1O9bHRSiyP_AAw5m&hD;RQkU?qI{yHP#gu$@`svGOky8HEA
z(nOS2>yQ}~A{|wjhm&q7+~QJ2g7EyWOstdXh765QjIxwSrOkB1h9t6URHG*M+puMe
zYff58UeaHWZJxiCG#7z%pp4y6@>&`pivf`8d0hwASR`OziqZ`^;$wg!KP|Atc2dWx
z*tw31b7V+CoaDNnNqg9oZb%XIT9&aUc5k?9fq(C4C)40O7kR~AmE8)dW+Ormqb?U(
z=}*X5!`x9YJq?86bdmK3DcQAg5Yb|<D@Q@Uol%@PG+wR%)|<^XnAUEo9y4qPAYCi0
z10a%2str?YM>Ps@-2y{c4$PE|IA3IdIL1<7FNYWtjv88^3*~kAQa~YL>_#k*G$v1e
z>?vVSj-))sc|~@D!H&F1fo2f{Ta{gFNof|gT5DmsWdDR>T<W%~dKj(Ep}{f0LvYPn
zTaK#jPRI>1T0|I>fo)sAYN~<58l2ZZS`3Eah?ys@%AA<DAE!pDaVn)JYI0iCsI@Uj
z7NVve(m+U@j5T5NTVnq!B^nqKVS56cDDS)#bh4xCh$t-usU<*$u-Q^xs}UfU*e!Hm
zL#!8uFSL1}R--0OU_8WR*a#zF)@ZYsv|^^l3TrPAhSh+OLs3+0tvuToHpih%ul(}4
z-R1W^=ER}p%FF78taxjBUuN_}tIN>QW;Dp`9^7MyWUKDiemb;8N09p`u^<8&4<Qc%
z4W(KNW%<!Wd90kZC|$hHu@;L8N~8X@Dj{1Mc5&EjS|KNPI%?rEMS+zCGo*Xd0H+rm
z9TkTCPN!AwV<SL6HXzd|a-R@0F<)D?4pyafn(0J@%Nm;S1Z_f?&J6(~e!So(N1r%)
zVodzv3-To)MxvWP7<xoBIM}&|jTkI%uwNAv#U_ru9AAV$)hLV*^inz~YPul?e6>bB
z7|uj;E$N2*_Ry<_o_f<Z*^<j`Exf;PzRor%u?%``t1Q-$B@D%Mz@lm$5!7VCfe!=*
zuINAy%K(-Nu%k9aIY7z44iPlkK^?U5sMm#%2BG6~H4#$cT6P0SXb6ArqCL`l0C`q}
zdQdN5NTh&qnkrfk_|OJvTQV?$0*2|N5RpPda2S2C76lPnY&&QNt!lHIEJ2EIG-W)<
zaBYHx^-YLFIO)m8xGg8fs9Zd0&6L>Grs1ve;e^n{kL^iI3#TP_#pU$)p~4%hHQW9Q
z%@7;rOtmSuS`kk9azS96xUEsidBpVJ{MRTF_Q<uOcH~=9*lzoFWUuj50C6NP?J-TK
zy=+<AN|@v@y0T=e6^7cz`w?M$(QgDa0FfF^2QAXpRK&3pC1EE)lYL>m?Lm)t)NdtA
z4Jnb{nU+LDQ#cEIYGR%+HHh7y7&c-yf@!O-D$5VHpj3#2*r=eInaiP|Nr|wZBkI0l
zO-IboEq}~_H<U&+O}k2j^2i-Tvo`7%)DoE3_>k9G$AB9s<uYN5z1gUA)~`D#1vm}!
zMdXxfI#Ll&5`$E>@c=CnJc<)N1TpQS4sg`%bwd<chN406yIJ1EPwb8lkY$+sl&^^_
z^e$arn=XOUdWUC03|zS|$*K?B85C||T%W98gwV=kXptBe+F^@Nq>_wJlVT433U0b)
ztrK7iWxqlv(@?OI4_P;490<pf!#s!~lwXHx;0R}32R3;DIlwS$LBYw4LlzUT%M?-%
zt&XpvAH@Q8GYhFEOrOZlq&pk%E9W9b+D*ZcE0$PZC(gfjwUcQ!&?t~>Ay?!AQmrQ0
zLOwAw4T);d2(~I5I;NN!uw%H?ZcfbcW?&N(CVl99O*Nq4E*IFl-f)jD5_0Gmpb)Bg
zNm2R>x}7?OIKsn7<xg4asGl9cfkuc!hCwyj$;g2iQkt-!vCC%ccIO0=7Gw0Rm>gZ&
zkh)6*-zjoG0Kp&BTcs9SVWZF}DQ&nBM5yBp9j%o5-I|_SH^5{Dy(a8uiTLmTt<jZ(
zCv<ylq%JMiI4#HO+_fLLFeZ}|42k`fJsN~2C?|XbCHy!wQpQ<SN)M~V_j<P-G>Tnd
zWNCg6El$RgG{dNju~G;O42j?_0w>ykNG?JF$Ve4OxtCc1L_sGOw1Q^DIRL%)x>23=
zqMuf?&BW`pK@-qj2&CKXu-$BRSxg#04O9zSdD)q<Y1L2|bov1vNZ%<G+L&HJ-cq;E
z?|aNiSJ2BQoNPjE-LMgEak;P-rN>*7a=a}4s?1ZMR`bC;T4TTJX{bK^qa{w?rODX?
zWB|kDQE#<!Tc`DyYfKkZIfEmLIAcJJKt?PN8hJG;ptu#P$lM@8W0bO8DmIGHn^Zv9
z6syMR1xH84*_mE1sLXWGuj|f$Ort0ggxo^nYf$fDRZ1tBPDHq@;R#R7;soX~9*xNP
zDWXRRL<+ec)2N9Dh~}7?PPFPG8k}xBdIx(I-!KM&0--UQgM(`~hk2C!Pp4UJarlU?
z%XN3{KutF^>Qrk<Qy$t%@TUg|<m{7gkx-k*t%vvb&DY!pB@Bc9X9DJ0tGC)>I$#mH
zIU8^m9QeS^K@b^mpvM6F6WBBY2<)GcIAOCFp|G_)1pDZ9qsWbDArVr7w;GY?3hM2a
zwiGlUwZX86oqeH=t_Lm}Vnm!{3ZaA(<bwjrw-NDfidv0s>z$~B;jkN_iq>2FcT?t6
zRS)f3bJk>%hg}mB`cl4d(uf9(_K&yRr6v4qgy6I%yfr@TYcQ9Bf6~%6$C~GIDkDD4
zeCa`a%sX%W3pwSH3xW<V{T7DCiMtw=obL84Iencf+v#?+!<O@3^iB2}FU=s1#HBr^
z>9iMLce=Kf5HI#tO-qJh6tzGKKO!CDkw}}O=_nv=O~GnI60nn~HRv=OT@QMAG?KYd
zN=>B{_Y8IFceeb0WiThq6VeF$d7v0oqXWYhxxfdI;L<o`M&llVHhoy6_*tTCj5@jG
zAGU1%Faq>yzYXE|S??Th=%O@-PWq!N#JuQ21OgKqU!6Z><rpx60y%+Ag1!uibk>i8
zRWHJ6q;YcKtV?D#aWP0`8z)c>JPN}oYL3JNXXy4r5*;pU%SxY#Zm7>*H`J|3)CqKv
z$x^24n=Y-=dS}}XG03bg$%^A-*>H<9(*)u9-_sCUY~L~P8e2s{sU#Yq>{F9s7#Jmy
zUC`)7oMEzG5!amhY_I9B$2QO3N}5aJG8%I0kaL_m8X>w5!z9!xg2@Zpr<5B}!Rg4B
zEQGaPrqDjb*Rd+xANCi)WH_Oic2c}q$Ag84Ka#^=BVbnvVdyF<KfawfbP3qgK-e6#
z+F`LCG&&)hMp9ugAf&FCne-!VQ_!ts!vm`P<PB2c9(B1%?Eob9jZ)BWXMEB^G+x?Z
zKQ~}&JZNK&#MQ$N2IQ#QYH9pvUm8Yx&~FU5#mL`~sRue`;o<_niRv4ru<At+4p!s$
zFJLU~3B<J`yKKe|v2dBY)4{9-ztTwr9S3Z{L#9I{g3^vWq(E2>%fb%qI;2fiL)O7e
zxm8-P%na&!>I11mZ1mXbJp>0O%Yj70VUJTnsR`_5TZKxGyE9x+U_=Z~L&7*<j|QO$
z%GH?@9M_LiBh@&S(!(n8y)o#vTctsuhcp%kaYRu^yHja*+eNJy+Bcjs6gW}d!%kGh
zcEuV%7%YV@vFLIODqmYi8110Lkv_f8z=l{aEE{3a(;k;LXd+}U4Vv_N?QRebS!^Li
zD2!v1D1df&5H6h-J6ypSrpo5H*OAe(ULMQ@z*A1Ucg6gOb{RKlBStsRr`64~Nc*2#
zO+J+TdOmQdHTJ7M3F*^6w&;^oBFKOYV3<7Wu~F%nDFn1<c2>^d*x(X@_RMw22)WOi
z)w{(KAgXu3x^4h6AQ#ILi4mnl&;|(LU2T>Y#=~K|Htx4+1AYULX%t~j$ku_c?ZyzR
zQaZ(SBEn@2Pk3S$Cos>jiytreDWY2nL<%wdw`6nRpnw3;1j`im$owC*6Bvo)p?xt6
z;H>?i6iHlLZLobM+3WQKwgM;=DE-n6IhV55;4>W8O@0vIp)H74vic;a)Dj=kbw}`J
zE8+cp^L4gCi3t{M`xmBKZ-nf5+HAD|IcK*K3l0!b16xh>KUS+=K#m7s(|j{(_fX8b
zK_?h?u@i@Fibu^+uhX3Gy7?wd&5zOJ0ozstL)7esGh9cd`A!dQveW9ciapL2f~H3d
zv>woAz;%UogM3iHFrAbkA&5wq;BLRuL&Y3)1|7N`C5w^b8|_bsAk7OJt<p4c2q!(+
zz-jCeXX=3c{z*wr^$l;04=02ser!)#+W2~1T+SG#v{UK75LCmqzd|#w4R$(`d^L8F
zeVm~ZL8oJ!c%V_qdBl`TF4yS{hf`(ygTA*iDjW>d4r;b|r5*92>m)Ai(YLbH%a*mR
zf=Mr7yngbf(%o)I!jDKM!{m$Y6oO7SB5h6eI=wat*hwcG^@G-+Zu$x05y{*t2V96x
zoM)(;{DB9=SlAV{qWoY02*j^Z_oW<&X9147&I(#+5^VbG{@#{;kIJ<J^f}oV`N%bL
ze#V0K%AZB!&u7VTz~Qe+=}-FUx*K+D9Y!E9(c_TUSr>(!pw~rCU}Rv2Y-ptOd(n6a
zP6I_?&ZwZ<aIyt3N@2aAY)lu%qZmMo6FqnW4t2o)u!MtT6hGJrqe6&aRD_RkIY!O<
zp<###`Hh@+>H6A)36$15WCk&C>SmIa4vV^GAvGdcG6?n=2g@8XG_h4CQA>`lip(RS
z3q@_PGjLIJ*uh|i?kTQ0_1Rw2Uyp5`zm;@F{|_<3vEn#mZM3+_8ED{yIz_;c1)~;A
zt~5JEhyE(%31Twy5S%}$V^z5Lqr<)^EMh4Vzn77#;pOXSRfiu!a|N|Eh*;qo$LL%l
zpEz_0*wZMAI-Mx&c1q2t)dM%Xq&m?siiE-qn3?n=s_~aui#_#T;pfCKI_{*DDgm`4
zwp_kZ3Q`p3lNNGR)xu2J>5R~eMkqD7W~1H1n%y0+-(&okrZkN1XxJJF@JuKwfSK$A
z&;a@3tzsp1f$$kk!fvtAUXcwp_{K&hYC$ZODiq!7w)nAUhld{vM{K$}OoymdWEM5?
z&2Fnx=~Sp%4y#Iw7qz;5iBt?c&Fb8!si%nvM~)5LLvfv8BuB;B*<q*CjM&ex2Mr6=
zVTE6)s0$5FLy8!R9t}b#<$9XTso5&}acZO*r&4-`?TGKK(E$E3Z0jM-@1e!XAf%|<
zuXX#~q81G8JBoT8fiqyQ+Uu6EU9kqT3b%wTGH~(Q>FNlh8}&KTXSXnh4Y6KqZrjn2
zi3e?P0uZx12GVG|gQz{rVyYF{6}bsu5bZVlG}-HisMuP0ZpA~5!yd5Y-rQ&$+3gn{
z3V02{|KN9X`WW?s?lkS$_hvseVN4fK?p>u>Wxt*e9BPgIs;6NuNFQ5t1i61Cl!aI-
zp8}v`l+~&ZQU2IUu@1<0E2Y+2hG@VXGGh14nl%Q+G9W_gf?yGd8a0E8l(}xFjco|s
zn+Bk8P6*1Y7RTdmeQ~A>UN{3XO(ORRIfmkEw>2BmMDl3UtZ%|)4NrK|LNDOg&Y@vf
zx8?j4F<6S|6t+=RAYW3@93-u?;}-v8Z42XYx0}F7x*bI9nFXk-F`8qOtlb>u(dKY4
z6V<si!8SqHln}g4emjX(Smp;&jTk%5LtAh9(@K~maF$Q^-oc)5TMO^+o3FDCN~B2i
zKM*t5W~<Gf$3Vq7U)byfeN-^821s#F0PAbBh#Zd~q?JLp%l^4Jh<feWe%OHaTHT-<
z%nf_N%7I%MKw5r~ZR2@hkfGtAJ?@LCguOu+HTz*dEDhUXvu$`AHBmA^n$bY~hI~*!
zdm)Vo#ZG7l1`oj9nf?$hcBVh-fmU<LYNYr^`x7!q^SELH4ld<GT%fxiIE_8v7A`H}
z@lgm46BOPWANDnjAB!|5+)g-++!dF@63TbeFk2Yy#mBsZvzbF$;=0`#T>7ooGfq4L
zJI!%&Jmq@5+1aVGGou-AW$boU&$okt4I)t`h$C@nk7+vXWy{)DLcBN<#``~C!Jew$
zA>l`a@kK|tX;U=a?~=BrhP`2rM61*3b>@drIBJ@Hf*3|Jhn1vJN=q2(D%mtg<i|_x
zfv6R&2=g(Q1fbz?$aF-=@BvA1lnR;AI+R5jl3teQih+~}*%#}&G9U267yZ~Fr>oC8
z_vYpq$3<l7Px^7#suvC;BrwtAT4i)Y2HYMF29b;mDDQ?w%%US2FT-h|h%$fWpw&$d
z&w-~D3vTGx(4_yM&A_DSU;oVlf0PY}Zise`Hp4{OiSly{SvvjgIeuxuK)9~mnJi@j
z@(G?Ot!1tw#gOrmuSiy0v1PXwLe^+P{zHUTu?4#Z6+t^Dk^VBP$UG*+oa=&}k?RDr
z{WA7t&o!q$+iQA5c=P<Nq^k}JN5QN*?vb>@5`dNsFKU;#@?mzKCZdBA`k-HO+>+HA
zW2e;uBc#(hs?x4S82AE;>*r+@GmCfA%h&Omp6P}`Fw<s(Qsb{@nLa4ijVqVc*0|m7
zcH2?ETWYm~LAT%Tlj^o-xpIMgXa+EPsa-)(D#})ctFmcn0n8>BrO+O_ZPXFvTS3a<
ze9}U;$Fvc3yJIkIoRn;K2OJ3XX1MQx8ZU9iF#6+BK%r6r{kUB~jY44YbDTL-%+x9h
z5LCm32R-^16vZOBz7MOz`U#4#Q4IP)$umAW*4-J@T}45OS+FDTQlMMya+@$JM^&Z8
zfx<qPQp_s4YO^qI>1oaOLatRs)PG1W8q2{E=H^F8T`mW<dR=x&)%gn7TO!6}T$v%Y
z8HyeaLKBp0F(<AK`f+Nc8mCfvW_xYE2jiK3RQCV#H)(zkt^F~S)b0;!{b8@96^pt=
z*q#7q81Y6fa-;+@u?H#XteK4w+wN{((CW7bLAOos^Rt5xkfIcJ+9M_&cEAZh9JTxH
zZf7*=&$K&p=*%>Lsgd8NVBx^E20USFFvJ$z#CE|^I%enM%s@uVW_3K@)(^LF+P&kr
z-?1ERj0aJFivwiru*;NPx;bng%UaC`^JtCzs;A)~N*`NvM&O^snh0b(gggk;TTmNu
zl{9RE_UKe5fenr<A!9&{Kt}8-uwpc4N@YOQ9D;R2EQjrOE3B45JT}&nkf@LV0z9vW
z<uxnk=lhM7DCe*#12T<rT1XhRihS({a}iA>PdX9dvW6x+2{<9pRVm0pxaIs5+rWd7
zDrA2i$>v}*hn-luVIZP`?O+M?Fp>yGGxW>?1wvyq$My-O55!?FH#6JTr3p;y+}oy=
zN{gF_nEBNNd_{sq4i=s`<O@7V&N4J4b9Pxa*jlI}Tl?now?T<z&}&;|G1pemoe|Rk
zi&{~Q4R|;lbkGW+(U5xr`f~<FY+YbSuwB^e&ve?YA*Q>zVT7r#AN0arxG)-otA}p8
zu-i%`nBWbNG1GJU9L#hU24X7F0P<`N+1Zyy=z1Mv8Xb-#g%9Hy;RN}hfMGhRj%kU)
z;2Cgtb}-^3dv-V;FxG`+2~vEceQVBeZGweSd73zclb&qgH1>!y4X{}HCnY(xX?SaV
zI3YCgV|&ulHb=OyxSk%bLk8#<f$TTtWaE>QRix37zBfB-Xhkp>7$+WURC3(AH|M_(
z26J;$WoO5;+F^S)9;+SwzC`j&<@<eKH$>w39(^lIy`**f{j_#6K$z(g#t#O=VV9&I
zk&cr|s3}A-++i^6k+!BrgPA@F?H0O=qjofInN&x`X-5c>q*1kOBt}D1ILnWhy6DL8
zXU>RPoCk_gMI)voQicy8!7<r!oP`9StQqh)x8#ZerVI|4FfMA;q3(~M8|K;i+2ueE
zIN0}-sXyswx0a~^jw3K7x%n?n90Ts4TDQSf*qc{Hbh<A(F2iXkUFLRw(1Z2Jp@0>Y
zjZs)b!>recu;W1Yscxtrl5mjBo)yUf|A5=*hc40x?UJAr###-#Z`c10l!Z^%SMA9u
ztr#*xwqaH`$x4T%fa?^Zqt231Vua8t1`wpF7MesO`DK>uQ&Y>_M<RDzFPs~cu}qp>
zY#Itya@qg6VXBSIUil06rW@9<zj6<$Txqwpm&Yc?g<&{5+`>$8wQyK=E$$#NJQQ8f
zq>FN#*0CxzM1d7AhbC$4Hg3zy*M+qM{zy&*OZ#k>OPckze$ztz#8v3F9W8dds9c?4
zzl;(!V&ga@)$cA~qob~v8Qp`77?pz3NV-xjs6?<8V8?K&-R%$izDWxD?F=RpoMp<`
zSwq7ZEMW3q@Fl~bKZ5~zILlc83{t8*{S6o9q6Ka-@;79HZh;%cK@jnC90rJ!HFBs!
zfWELp4#bF1p*jKA_u(e!KYU=L2xA1KCQ+jrdR^3KIz&;4Su`Z}hhe{lfh}OyT2mTE
z9YjOylTFS5qoB5OA<z@d4_F{{*3J^yKbW`nf*chWSBwXP5S|+h`dEN#i&c(}+KkEM
zgmg~Esz-ys3S^Je!XPU7acZO*r&4+r(5*||XaR#{WudQ!bS-LYf6S6}ha(nsC<F$E
z<!*P>7dYFTV~hsnF1!_6B0M65OfY8(vBLha1O$fNQP^jZgBA0mHtU5_*zb;+c)JHq
z0AfyHy8YgGZf3UITjZ!b1lB!aT+|az1S1~ywxbRzHnt0HeTp2%Gaxf7y0EhAk1hBy
zjwfn<M7xYzm}w8E_hnWDJM1z=mu?Q*$BI_-!8}^!VL1KFwA05Hy)#UnL_`4@z>omI
zYp!8^Y~l*EXLenQZ-XN{EXL3WyhHE}Blj?vEmZ(fFaqmlu^hr7+clX>IJ5%mI9wDU
zU;&MGW$l_3D~8QA=mg!!8IWnT8)&GVpv2c<wAi7E<dN}Q--OE=p711W5_1($`ytTW
z`DwEI!O@eHRoIAlKp@*N;u0W5A{wsZ4~OY3e&m$4<i;$F(y1&rR2v*^kenOOcUyh-
z9syb)mzhi4GUcaM{NN2Is!@!SLBl)#?51uy;gp^*agGb+wie#sH(zHPlvoD6wpA8W
z4Wj-m;1`_-T)hYfEO;+MIAJ>;MEnAz9h8R6CfE_}h;lIQX%9H+Esi=ZXfGOIbzF&F
zx5KR4vCTHYj|@0t$!F_^TpL8=p0*S;KN@#?;ixm}l*hdeSSiFHgImNxDDfNeK>@?`
zaL6dc{5S&)X9wMAZZtROwB|<(BgVQaS%MVbXn#TkX&z?@70<r>H;4;#*8``qN1TZr
zWl}RGJJmP5H9njWn)tCjX=&kfH}G6eZ+@szg++jmdFL&KGc&S^G@FCLJTCn<Gh>{1
z0qiuVyFGHkm@u4~SzMedJHIfGd@-kbz8y?55Q!ui#F4nP$26VxvSn>6AzsYgb(|$<
zW@cymB>af<cS6%Ie5UEy0cmS$Ze~0~0(LU$ubS(276Q{x7!H!TQ%f49H20Np9G6bv
zEMlyWj;y_BiCazV;ovi!IT$uGC%Y#Ju44pA0N&9)u#VYp4yeM#7tVV$>bCts1un~T
z-la=x+&1P96mUY#1tR?j(q1I05ty}dA>xk}xB+%&bZfRXNLD{+r?dW$<*&eLD9w3e
zJsQAz<SIQW7N`|6BPjzORf0+J6JXA-x!9ur)`7q6#u(5mHBt7o`oX4DQ@dipg>42h
zL>KXkOdAQvCwQW?+Gg914i%IzLLgajoM;<vu||{in`0a$4&gvGu~jCK{xVDUsYx;C
zhDhX|8?+Zk6^_a5uw)tvR&tX+h&WYuE3b72g(Dp64)b8tDOb^bfLX6s=E5-Yf*W4_
z9^<aJM`gz)G9Bqj{zx;ybePn!Ds?1~6)(3rw-wIIw&>;S;!Z>9hJa+;6C9V-4OjGf
zgF&w|Gbq!+>|mxhLu$}l;2<E?4IvH0NwE|b0iiTK;Kp%q2vWAG-5bmdln>r1kQS#n
zai$wa=!T2n`C?Ks7>uMFj!iezv2?W9>&-0AM~hxJ40}aT2%3~`XlDj$mCXoSHor-b
zZdi*-JuYKZIDuj8rW>-`i)Ny7kMT)EslkJzL3f}iDoQt$iD)Jo)CM)GRyuX1S+B5-
z9fXZ`9ZjdUYBAIkE)3fpz=3A;P~4!iC<ho;tek_Tz@sq~v^vH5BEK``S{@@}a2isN
zq3F>dI6b!~WKLmJ^yAb>HBP1UEDU;lj~2%>=!OG5q-#+}yId%_H#6ISqZGAbok5vh
z^q?znb~yJKmQiO|1I(B#1^j`y4Ji(0bOb%qn~nNCEXgYuX4|Y+7i8<r0kw7?oB+g~
z?hKHgn?v~YSM+Ixs(o4t+O{tUN8v1JIGW|2Kp-~CFDAK{J2%pSc2HYf)l2jaln4L^
zg)gfcA`fS#_hm*u;q2@(bhH@_R{VNCa0nh1{i>&-M5%vl(J}J)M+O@qmdd997?@~|
z>T?(dF|!NhlTvC8R72>o9~jJ_8?x>*!MMoX#1a;nXlBfLd=F@vZpfhvSSO0*uLgnV
z&30v{?N_dxX>C70170`-GEMeEHQWhHe4U9_bZ8=Zj3R_Q;If7%Jh9VAF#wNS&QB5Z
zH%<}`ka5LAx}n`0z-$4_)Xu_m!<hs|Fj$%Wq#Lqx6Q!r(RBiAB36k@33%wR9FwDy9
zhWr|dUr$Om<X+<Px*?y;x+76m)sW2DO&M%ia$APW=T4W~1|^n3uWgmZRKsY1J)Hdq
zbkDEt!eM(>x*_bI%>%zm;TClX8xPnKt?dkF=K8&G%#LiuEV>~l_c~KuJvZv?ICg8<
zc_q5x0KKs1b;DrDiSjD!{WL$CLpPl5&UVXleYSV#o<fWfhuA_W@tZlWH%LDf8=OH~
z_4g;}5+*r6J3s8S7G@VmjCFOg1S!7J{)7zDydJvYG;!z>xF;JpjXkp?J!wskk3w*m
zpzzlCu&-hK*mT3Rw1$q&)VQ49#HTyZ3X5PzBSN$EL>J`-HylbE6h_F6Mk~zeJW<Xg
zCialY*Qv4#iwinOmK%*07u60%e(_4XqJteQacPgfm8D*M-Ras^!K9Zk-m5L6(ReKN
z&yQ$IH`K6bdUnW1YifQpHzEN$84Xs?_d1JSs-qkBFuB%xJ+*0W8Ql=wZ!i|MayOCd
zBYjz5!p=O?!I9k;UBe6NyboYx=!3G^6}XD3eV{G^wYcX{@95_O{AR^;L#UUZbMlue
z_`{1_DdRuNLnYINHqM_Bn4JG2uh9($qyF3&ZimqaGpnJIY^|t+iEhXryn)n*($<)D
zg&Ppk4Y@L4JPPHsTMA(iI_Ac}%Ae+)(hV6zq8p+*rn;f=6@JP$@P8wOh4<_0VW&AO
ztr#-vA>&Kzxsa?lejQ`D#Trd$ejcG!iXcc+Eto{7+4CQZ%wtl_!C#TUZrE8dE8Wn3
z5w)3I;)jb{<V-cN<tvxOO*d?~E*H<b6#$L8#d$)d!DWBYza0%^!)|nDD~=;RcmRw5
zO2@GaN$RLdztQ71n2J}R8;WW30l8bBt9P4q@OXYVyEw#n-Q>?>aVkG?)hc+~T|FF*
zMnleXtL<SI(LWrM8Vy%sqmxa!%N-7kgVJ8h?ed%|^K1Gprj~ZZPc?hg9*)K%-zWts
zit|Yexv9}@bo!&wYA|i}c!cC)#4~eTE|^{H_v<i7*{K-Dc=gIIg-T^6G}H|o*@(+E
zzTng<Cj^Kw{aDSc5A{ZuOLzUKI_kndxg|m_+r93%%XP3355IfH42tn=q^MhF7TkCo
zQDDR`0;yW<H<Z>swTm4D0}$74+Kug3xAnAFaU_hJ>8E7>pyE+)wHy_<TeD(z7CpO-
zFyMATV<o>cZS)$9h{0({Lx!S9gYbX6tI8q|nRnTbQzO+lmD00vX2|#M>cw%tx^hMj
z>3X-PT`sd9j^~@>g|Q5*z_2<T&W#3uv)3OE=Vz;&Yj(>Wj+nchay#k}v+c*yKwf7&
zobSxA$n7<&=6i$Da4;mff{FKNgC<7(!5B!dSTVOanAwiSq=D{`7Q*h3>fQESdmd{&
zhoYQ*%wnhHf&|LTiutb4x3PNrVe;!i{Z$A-k3X=oj9Wd|8&B`ctO%_xQ*`N9W%iNT
zJ-A2f>{mSv=X&X5i{2k6kA$)iOXX7ljEu56%@sp2lo1o}CZ*IG)>#gKMu2w=onqu3
zM~h{Uu^i2VbqoI=Z*KzU$Wh;mS4%TH_h@D`x?AdQ^&zPxwWO9t(rBc)G@6~=Irf-c
zJZmrOU9&dE*x29$0tsI8Fqj1c217_lf}N0XJiud4LpYpp1wz0fzysFUi$hokV%8zR
zOJd^ve}C1|?yzeI@_FW8rEYa~S5^P2en(aP>Q~hv5NgQlAM6L=iHHUJ4Vni*FVolW
z@%I<9i9~cHt42{0#*vIH(eC3M@b=<q)Mo^cMcZ?ZAmRZn6L>@?uyyr?VA8~?E9zrT
z5iyw!hc`hlF@g>Q*mE4V2E@{|`ou>}<MaDOSUWln!%s9iXcH)61d?{#X%}JmL8CdS
z!oBgh78-??1HA*7yCWB@nZYuAzJLr<dz=|5GmP!qZrBY`&$T=J2H4(ld?6K#*~ndZ
ze(Jkh<2?g0o`Srdsaq(kcRUOuQbGk#J{%YqQQ<(M7d+}m{}1BX+Z%;a7WQs=zZg}(
z({e}(8FFA$!cdInR8w)upOabM525Bj7KUA72uFa((5Hlx(Dx&INePC$Qa}py$3sK~
zH0Hq#%wrNkk-WiukN}N-2qJXspq4~dP<@1as-(ioQIm8jIvz>2tDr+~$p0)Gbnam;
zp?@oL(DbImHjuX5$GGdHbm)-?9H0^1ayjgz;PRMQ<E*qJnhtp#DMwe1KGD~Y=}OFr
zI1Vz7J5m9Wg|`ORc@~Qq+|ekC9CWi=oFo~BrV;g!i)p&%%s@w@v6!x_aA**q+y#R`
z{{mCsw(GpH6Yjj_!qhwl$>I>Fcpi+!WI2MM0})LpBR~MqOOUlJBFwXjOYs;25GPW^
zR6_yX%ljv2hC@)f4z)9-oH>iZlx_>nV%{R65XZyP3RX?9T!fqnsC;QQ^c}!HhAQY(
z41=K~h>MN`^&Pei!cYc1D6(T4p?P{g*%o6VEH*P3AnWwu9xPsjO$n5Y*h~(K8|cD^
z`DZkk*uc=&kG>%Q4#gEE1X?BW#-TzfBIBt3en=W{M86lS&qdTMicPI`FWts!EiR+5
ziY3sC=`~ocW2qI;#y7Boks*55kV>$j#C!*KPavJ8v$6s<kN^Zr`6B48IL@hGzBrX?
zmsV=hLe=q6v|=GJoXA^Nys&qiTeJp7LhbG!;8n+n!XU1B*8+v`kF<M)y(q_)YK~Hi
z%tXH-^<$chPxEiZ0+0DCn`LiF`!tu>;hu~Qu_6WPL9o{#ti^ya^niwguvPWK`ZPl0
zlwrTr&%Cft#Vs_}RKXFbu-a*Ol3`3v@#y`2v@}$D(k(jet67z?Nja7$1#}UNF%p6z
zc<`JG41EcRCsPz*cM(=%13odJ#uQOOC?+OhsEf4Y5N4z|Lo%4i_NkN_v=HzCnO>~@
z4k5J|Q({i8T){@vdhR6<L`V?`OOiP}955A$Kk~&?Y>z4Hm<yn3;&6b#P|Re&#0r-_
zG+Sa1R*6AJjBRByq!c5q*Z{O~kOLqHr-ea&eWEYy9f$=mQbzv=_rcKtB`_fRV(@se
zi0Padii5vEA4)MA3&ap1HXIv9(!sEY!Zf8ARMa3QelYpx^H`>jyf5X<G9dl`#7QBO
z9O^cmNyxHaL{CbVyy0F?dN_oktp^YRI08uoDC7wU+Aoj14`uQN`W!e3Qi790<dc$!
z=K)h!!h=bPJi^0)5J@sril}HKil+2Yg@t1SqNv6qKxYW^7^*w~-4*J9Ob`RGcE(h5
zAP8cSls;fU5!FBpmF&x=)KDabu|9$c6g(6KO#sE=h$2d2A`#ak(R4Hb%_4d}NIo8n
z5=MP0e9*6IVae~4LBkNLP&*rHU>t86HnSq|Nse}fz>+*HxO^(!FykR*EAR0*epP*n
zxaU@t@rQ#>eg670)v;6SopU_Y@x0O_O52nAg$Rq{cMuTcoD~>JL}}(3WRKDzj^Dv#
zK*BgA5CeJ@@F^_a6`$TW2o(7=P@N`90Zg@oh6h1-GGd{DMt^|jp#!iU8LSpF8O2*n
zDxeF-kqpuheFSFM*N3M{APucjr-&Fd4|3uGEfaV|CjqF1#1MKJ4s9`~h?w3X6wx_0
z1~EeH=>yM!rD^p^keCL`G-aiYqhSmgX;~xqI2Zt_0@sefRS4^t+CVU2q(pBFlaJ#V
z?_i-@AJ)v!GJIM<2K7w{lcd}cwjJl`!Xw^-Q+NokcN||xg$YY?7oMN`?$&tEK#Zp#
zuV?BOis}o*bf7;7Dnj2p?3aTYx?rFgF&vTtFwzbB`p}Mxpr%SlR*b0V)1zuMt%b)`
zNeRdyIh0GNp|Z{@AqX`GvKS`rL>ys|p%m1kmP$e;tQrx~uSK-TKq4CUM}wR&{3>ke
zh@gl{aUUeWDIK9s$4>O?k{C#;2{}BT($cCDkaF!R=+GPTKg$N4dtx9A8a#I&%ms2M
z4@tv4NhVe8#OSabr6(Ee$YCc1m&e2!XQdsN>pn-yQ5?tgBQPi-cT$s(6GcZiNID@{
zCdo-Sq6l*Fc$zy<C3j>SNX~hxs_Aqp<y<3f(oFLC9-QKF)1-W$>cUhV+9Nncanhc9
z<Jpw$w_KQ-ryyA@at`1LFs9OC2s#jvG7$lKLSUgVnv5{dDxn&21Rze-SS~4sO<#yG
zf(_EqGKW3wOets1Vp!JJMi~8x;9H$IejJ7-K5vxFf_&j5L_dw&AiB|lqgxn4@53(z
zeX!}r@Q>D`!Xy>_)DcV!c_XBV#da0wy^eGb`Dnk7QSdmH!ej0UQ`GoS9!$(}0YepP
zFo&`G8@^Y|q?j5tbX^3kLcBShD%f_$h`R?NX}}SKm~alrRI@1cV3c<(V7(0~Lsc<`
zb*m(#pvuH&7O+~CHlV>eH;kgtTSP%=^)~O9Vtoyjb`Vy0BO?m>BCslOTpQ&aca$fE
z=^t!{NqrwIvZ!T+gM|X8t+6PtUdoOo0Y_f|3<**M*<qO9S+(DXa_}h5Nud^*$)Suo
zi1||L_O{n$Z;A6O8zOGG|1_5)3^j(vafF3otq~a*79&s{V$3*z$tScISWh6)IAtWH
z4KN>UQlY>S!Re$Pg6_&m!;?fu&;s%310g@OJaCBM5AzpW4HcW@42^`tDG3XBV2X-0
zNau84Lqq6lhI5hxy9-fMh5}O9P&7$HNRcv<B+|Gc>_PtFFp|MUw%?$)djeR>7WW7I
zSoa!1Y6;yDCs(duL#iz=!7Kt6gN4As7AVcq6f_&*P(U%DKvq+t=!qbRGFXzNS?Mq$
z_4lE>DD`5N1)WB0{R;r$C|3*#!8I7GVEjVAk#Ij+TR)a|Vx)|j0BFTAP7G_|Aqip+
zEo#Ukg{80(Rp>9=k5XV(TR{ZHqj->XNF1Rsjm*PZA{-tUM`IXP+g5;lARDI%5fSPC
zCoV2p<RB4pc~ez`F?18uI5fZ`Sr1G=#1TLQ;0PoMppYjZoXxw2P|4^%hx;8k2~vWS
zLgX`XXauCNmD0qaOq@Kzp0G&6V{o#hCC2om)=w2CDnl3<D=|W+h%0qSLZi?h3PVPO
zVC@WPL0Z9(qTyahlM*2Xl^lS2DuVioNg-J>MMa6opb4N@jOxI&Y3iw%oI_;>1EH`?
zIfP{-4+o5Z0c!*!5se1}YA77WkN}D;(+I=3J}_e061v6Yu+=JX2V%Tn8$%*lOBeO%
z`AicujPq|H++MHQd4kgYW}fQVsrAko?`(UjVm;dNq<$g7qWB#ID4erGqoy1olQ0xK
zOmTt^Cc|-zBVfjaeqbydM!jo+WIu?pKac>`C8aoqNCD9^1j17h3oRsuEMW}g!mu70
zYE%maZM=#;ffQyO$si3WKwyf2emvE}c@ebU_M9V#ctFbp9??l?9RHv^PF-4<IYpE>
zU*b(LjT%R{5$qYFo-0_IR-c54X|PNa9ectI9EOaTDuPWoMN}ZaX#fYO;VLx5`;}=k
zEBO?RJ^WY>NefW0W(Ldf`)C0fU#Rco1cB4O@Qilh5pTiy9qK=F2U9M%r#t_5&zv;R
zK#UF%{TBXF)<8%}k<bCE0wU&a)kwks5+TjSNE{2^!;wHg^j8vuXg#88rYxbwG2~oA
z^nv%nYDA3`O+%bYvU&tU%>hyg$3S$kAoL&pcsM272@)!zk%~#dL^Kf{GUaGc4l5xg
zBn1tbh{j40m6|X+L?00ZLlDVr9k~>QYBHQL(yHjoCUS-riWl3p(V;iwf0hk8_aqpx
zY-J8G7s#DFq%HR(nGB<o(xFEpa0o%7TP}y46kHw?Yn+vKT&@SWl=Dk|Jcpcyq#nY2
zM!(bGfXO62OQVxkWPDszGjN?}hLPirH0<Qa#_*h@r`aq~4>>(!Wk}~pPS-8V$p=;;
zU=naaNYgqgJ8$fSJ8yB)ZcWW&kSvxs#q*%9CzA?-4n(x44FUuJy#!e&RfKs~X~WbJ
zfH*OfQd$zN03S7Dy`>Z#j*hf5rJOm7VY+k+`AXq{k|K`B{4<7fa)bnxn1;Z{tAY^S
z)Ph3=19S6`g19tqfNo-s2fHDm?}$mEv2p0KM<Ot|#Fk`O8xnw(F{Y#YMtnioD$^PP
zY^nmwBp9cJu~7yZOwV9%c&M+7#T7#~Qz;B<Ah#T#8A_pGo*_I0Ndt};3ZP%0qGnO-
z@Q}<q7TBT_B8Dny9P3sgq(bQLVS{}vZlDQaOeCWZ4GkCO$uR;&mzuhcj`{5nmn$0j
zBIvC+&Z%E$vD=Qqbm>DYhRVUL8?~%({h?8!KXF_>r<6zoj{Yzh5~PSn=(KlM?f0V`
zTdG+Lp#^5Dm`@DB0*~*Av=s|H=C5psxFzk=T#hktI2y-M78SkW=%5GMFc=_7@*vEC
zF~+0WI~j0~iHSiLh(yC!(}2c0OhY8-o7-t9i98mIiah$D7!(l=Q?oE=aN1Y9X<(D`
z;W1InC}0e4l$K-DFvfAv!XhtQQPAa*654P`5lt<jBoNY+JUWa>3t@(xSTIHr#eVGC
z5AB{984V4KAuWhb)X*rpO`4)5G$%(ybcQodke|sGZZrZ8wns-Jc0xmcRE&hQ)UbEV
zKnHX*iXfUZfRV6sqKz*_4M6Lw^kS7*C?sNIAv}Sj@lhg?0M|g@jqwXc52K^v03=^v
zNE0Cf#VG76JW$w)32|5nY4CV4)Sx1Dckw3<pcLbps3C$js*NJ)urx+tqK#<6jEer4
zR}n*F6+1*eRM4U^OfX=k<$vO|m|cLw0HZiz83q)0;gF&Gu}C?Gb*5vnF+c?12qXod
zkS8E$15Wt<5Xux12OKyFQi790<n!oT4=AFYNl3$ajXc7mVvH1(s1+q)dXwn{6s&RJ
z5W`PXlY!0{djF;|40|JS07e6t&xExzrkX)7k%*QU00t6@8BtNmp^1VSm8lDkpe1Qq
zG!B{oiX}OzXmQI*W)!uEsd9Aa#W?ylK@kCvh#4}2(Xg48bd(kyYRs6yuFy(}K`f3L
zwaanflN^11gOo?(TSvKP*~Cu8lJeP5`yy<b=ifs3+^RDEaM-EOUw@`Lc51zIPQ^N&
zsyHckJhiJtSi=Jjh8z^o+ag{I%Z#EykUdJLgyP{i$D^pz`!%390eXWFN`x{4AjW}^
z393sgIy&2-*yu0_57SwgH^k&321fpnIOK~CHyaZZ34a590!3sT$;ea*5tveF08bNQ
zNdm36J?97_9?&v@MsyPK<3EOuJw-~0%qgP6`4Vq}`q&?kz`lT+x{y#?Kpig<(_opV
zk!a%xON!8wcZ3C46@7njB)J4(-2=i2g{*8L9#9QA7KE&)uMuF)4A$UtBVoQ!-$6G7
zPWxhX4ByCrQ7|0c@z5LycYGlgCM?Nacz)`;TjM<gF*pVNc1|d2D57OZ=m1qA$%_Ga
z)HLH_9L*&rFR?yEjD`jhen0fe;#|x~WK{(%PAXnZO9AknXvB<I#Y)9yGi)vfq2|B|
zJckugM$;7y>S9(cn<P{uGb_i#X*n$qTj=Y>xzLD*%{bA6ogtdQeUJbV3_+wqDM>ya
z&VY9FX3mfT1+!=-M7`RskPf{ef1VwuwX;+x4R2)*+J?ko8%SI3NivzBe#blXNCXZx
zA-d&qxXoxJkGb!}CYn}4T*?KZc7>?tt@to1VSrD&;-n}k?no;FD;^^c2g>Fyl`3*a
zb57*EUMJPLr-cGh54lv{&ZB+dE}67#$_F-cQ0{_3U;qMhkGAW)vHcRU^Og%!^8~#0
z;yloXDV^33bReR+F$4$zvX?^EX#-)Nm6ggS5r8-`waJ_!*&(j6f;FNdd8APV2Jvmj
zSq#&qTPPUKn3f@q4`Rth$R9^10W6<`z{ab>5mCi+bTDGxkQmYUH57QT<sZe~N$5mi
zu5#Q@cAGJ5SAiW<#<z`xut66#yXzlAw+>sQdHvY>gjNdRLd04|G?=49y&^v3&2-I-
zqi?MMO%QKRS0svtJK{y>0FnkAf%!(SXrN}%Qiw3np^gRYa3Nx-lKcUA0Ml!*PQpGo
z{r%{L!eP5y^r4|tKtVAQMVFdZ*Eu$rFkk|h3G_uqJ6Lk+moHAG+NG76v`{sIVY`CL
z88CRuiWd$<yhLRZ>ga6!<<MviU=mJ5!;43l>i4&Mg#9ST*=UR<B6%&&j9AHp!5;da
zkjY!Iz+?W(hKO6zKFy_<fy2=_dZB;yiSp10v|-p$DIOp4Dp9l-utL>g@E7vN%pnFN
zGRS~%Jfey;M8YVforWjzq6Om7hhi8*ktHl5gdGE|@=^+$lzY6fSY87jeKK~<KsU7G
zJRaEF#>$$8E|+2^JP|FHO_-XAP(mxA!-%w@*cjFy#9~M`0NaoZr5%fSVv$4`YuSd!
zWTe&-X2Qu65fK&63Gy@6FT}>8N-|jnrIk&CZbl=C3|3{Q&;cF8<QgU|2@JDbj3LtC
zKny*WK6IlZkr+&4C-^9ea)poq*T52<o6};f5F6AY3N7u#EDG#6K+D-|HfF{=S|kCF
z7i%#smWU_lFE)r$_!F@NA|%EVV@T>zycFiN0X;}8sEk7s;+-l-$VVoUFi^&@E$$3{
zf5US^DNn#bCR8R1sZ<oJJ0huM5Q~&6qnJ8UynqP65l9+9Ax}U+2}^z;f-*&7gASYo
zDZxo0@+I`G2enu^Zz`Trf;_@wF&V|qqV!tY@}+a;Ak~<X!0<DhP=QVvz5i^=qe(&3
zffNbFqJwxvBp8F@0e#{@V8GO@sG(tNlG=nNs|iij5VVy<Le@bOK(V5xfoa=L=T*I;
z!wLbltHahOjQKLSNG6hn#wu&YlPE1Z)Y$F@c7=s3CZn++rCif!Qy)0`{05;9o9{h^
zD`%8+{QUc3HhcapgxfaxohKfrK7ak0>e#9E&N-uWJXLWz-tjawM}*}WbTH(gfL<6K
zw{;m~Z;(Aohd82x$yh?g1W*F#HPsk2w&-x@20@I25ern8(?F<NL>?n`NeZzrd945u
z*f}IN?3X=D^OKWiaK31QE*M8LNJEPdm`Y?2Pt90WK^AS#If94>v`nB8okWB9r;fct
zTg)k<#`zL&f@xF`llH`(7_xvPXgBM@7%@#uilt2O9Cv7^(0zv`K1EDm=m3r+XA;&&
zKsb?zU6{~9MoN{#koEL6f-w<RM40A=c{yLG-_8mmyzR!j@rY(|$e;<!<2ugAFP`p9
z51;OtbN?BL(IKMW!aqtHi6!zRbbzXeG9HhnBr6O2pwU<4WX$gcOAeaBAgCj@D5uPV
zp+$0fR<Bq}2)q|d$tk&RXXRFoEy@sT4v>kM3Zhfdbjh$a%o|hC_apmkUe(b3v*I3G
zkBd4N8k(5Zi5|*%qEZ`Xhf0J9h9J_Rlq8Q~XHtt5v&EDWny@NaGnTBkYokMN$e(A&
zY3(c(DxR&(LEDfxYy(NdeKteBlhUC_B5(*nqFXM9ofKRib4_9=Hqo>e;Zly2oDlWo
zV;)oj8J2UWX{6!HWSp7ARH_6As^u<|sc;AC<PN%7?wqIDY^5?W(T*C+l*%REjm0UG
zDVHf9Nuqsjz#wp@>7>Q<R{M=-Q?}o7Vd^%35XPM1d4fzPmrEe%Ktyw62+$KW>yQqa
zTnb^Hm7OhQ5P&$zCK^ReDMw_&$l#!;#Yf`acBYgwXECr<8)5XPfp7D~@i0sDV=aqJ
zf=VeuV1r#?L}uVQIv5HTFGUml8p}Mx;l45KorF$=F9=&!6~j20Z$2}EwILBqP5XSX
zHb%D&%Nt==jSuBv^IPn37Q;pvXfVfy`(pTBElVb{dLf_JfF_7Hrz;|%;f{`@a{x&L
zj__d3R4nDxY|Nua2I)48Qn`$Z1w-+{2zElCX>RP$O?#_hMGE#wiNG!rKwv`>SlNzJ
z*Kv%SGkUmOG0_(p>tLyka*jKyUJBDc*bI~Uk--#iS@FWb=r~cCf;u`|e?>G}gE259
z8eTk#MC4%GtZ4w{I2(;YzM=(YDY=^UU=KN(xomF{vn9?`e${Ks^Ybo!3>=QeahyRt
z7>f^&YU*$lvv&G0%z@)d1nUVBI^gyx)-a2}CN++SQE)mOREJI)Cy7suD?IuzmY0!I
zF-p2cr+uxhW*B6=PnJsw44MLQEUg@&1z3(78KJzU5(#v<)T}uYO~`pOo5&($CaQ^q
zinI|Kf<7u^g}OX66dlS@N^f*Tj;6$D1p5NTkvd^!O(#c0L{vB@$j<?s$0gWy)Ie!9
zC#Dol<zZZqEvc$Ej_0Z@*T4d`id@4Amq9riP4r`xSTrhQ%RxW_N4cU61J_^!H%I&6
z9hZj^Q8nT*Wz3?;@i>eoFxr!|GR(nDcz~La6Ebyo@h1<V6aiB<5yAADUL+k+eH13)
zsALO@98&#;937vjMaf4e&A1v@)s*H8O@G6)sn#applY0IOk^^W5syVP>9987t9oJH
ztoi^EfFqC+0EIjO(fQOs6lIFam=Yp52~vWSLgcF{%oZi&S}CiJR8!;;_R1=aa#1M>
zs}Qj4>=0F$YK|lldD9?ts<_IGB+!lw$x1XLOG9`?G%Q2$Ae-4CU?7_)$SG8Ebb7K7
z*Uf~HKyU&Dk0(JBK(VS@!1P2pS2U7S=rhMqyU7Ubs+A<6Ihu=NzB86DXlW^$kzi&S
zjbhSsA}<p$kJn}rw5bmqw&BMPVc0G4g7FpcNG+#Yo%NAtc_x<6pS?bJac)%^zc=F4
z=dV9gJv+7DIp@@lrz*Dej;E<PA}osEL4YaK+hqSlG9HOXK=#CYkgg6UWz&!`p91t|
z4H+6+H5)Asff$FP1z^)ofKY)=?+6GlgIH=*Re=cDbjqG!d}MWdqmd17uVg_Nj3XKN
zPech!H9CZ+S-FlG$4(JBM{o)OH3LAR6FG!`P#&kQtjwGuCOBW>O|qPV5-UdR8P#yY
z2a|v#g_uT;%b9E&M_Bw5rDcuaV?_q30@oy1qESe2Ssn%9M5E=2Y9f-#paX&}L+B$X
z-Wc}P7=%?i<TT_8n2|f$w9Rq8ZrH$c?GA;{3UN#pl6$)IfA`Eu^9;n`6!hCUp{P+A
zia0r|fQq83Uz0LQArB-%n#1G``w~KI4`svQL`s%d)J(RNOhk)`d~(XxBH%rl=2T}V
z^6JhaTTvm@95_?5Az|Q#rYjyvE2Y#7^!>;_U(yq?f?m)^CeYVQDx5H4`6LldtwdCc
z`w=Zl9Zn*SWZQxw5i6z>awT8RXpzanR35O-wJW4UZ^-{F8+7g^WOZaKbAY)(?&Kk9
zxX<UvcT#p(j?$A1cI2>=g3DuKjkD5@XgU$)QjV0I5cTBckrZ<0>NuPd31{9I9UZt#
zrV0nj<}RO~;*P8@$U!&D-MOdd;^wMTRkSbM<#M$ebt<9c$GYbsl8+dDpZ`WD7g_GS
z<-*iF1<B$B=K!7{m$PjXK?fqNK*GvHK9*9jG#Z7mGYIpn%K3>L0uU#8bH0*LYfh^^
zG!#of-8$aRlyc@Q22;8=!sssnzAX{QM<PR*&q>BfP^lFNY_JQMIEfY<9SqeUh3OFH
z3$e8h?XJ`3g*j|QjQYt~2KI`+IJT=mH!RRI7R3f#FjF4zMI_iN`>-)LK9mO|MqJ2V
zA2pa>><o-=K(Vx$Pfiqzn23YiYIj8xG~BWuodZZ3aKuOyfeh6wN<ET{4$<u>+6*qK
zLJ@r^I*K*~`QsBH*m@Zb-yOtw65T=AP-4CVU20lg=d7$4@xj8)kEML3w}U08ejVIV
z#Z#F6!)V1&IYSxVvf_n9vY)6-3nkAfB`PA(FT^!S5o8yQs-d=7(-6wBrJA$UBD0KI
zFN|PGd6Z`1w_<_E^j>ghO9mHS`k6w;hRn}2DD`!Z7uI4h@k%5;0VA%dQ8_M|Npy1k
zYQe)|uus+TPy(mJVHDC%LrIbWLsNNl4^$SIai?(&CQ<o2n+I$L(h2H%JqyMNC!qiJ
zI_4R4MqeV4(3{z8KA%mM^4@q>ujWhH5<>axY&M%hT1m&M+c@Ity2lguR4AQ4?$zUk
zIF`<h`V&Z<&6o0YpGTx@x4uM=;C@g`6$%S}zus)eRPvRvP_S4}rTht9*HSuxQEJZU
zO+QTAbtRr1z(U`6T=#nXcmhYcVkk#_Abd=S9L~BY8&652c|8l*6PTCrLo(<k-J6Z)
z;Q?wE1Ms|=r$60;Qbh849ue~XydO!usUU?@Qc5yPRYQ*^Lul=SJDPFw@%cg`nMfvc
zrXzlS!*e0ooQH!g^TPIqZEKliJZ=|asiEM!ALh-;ARq#81X32DkS8FV?Ona7<SfeV
zao{9K2~G-;pDkqZTyNG(Der87Ji>lGNfHsI&rVE+Cu$`RRahzy5mU{lONDGQg{z`B
zYeZ28MqJW0Ph8RCG2Kvfy-@N1L#1q0%b}9v+vg_}={&~z2sTpre8K`v6tekLdLmoM
zPEVJoGFHpd4HZc(SPIC7#W7!rSL23Soiq!oV#8u5q{K0ZYE*PNt}B7&jw~(QhNE3P
zvD5(zE-z#Y#+v2S#8%$papKj^^w!oS=T?>RyI!Y0fBl*2*{Su;xt!{Fs^ST=<3Uv9
zff)xw4hraPTBu=B^9Hhy>l8<IFsT<ZdPdI!y%QN-&q9l#OnE?z9%T|#SIZXkY&M?s
zdqH?b#7f1{_eKWMxIQW-ya)Df-(HICohgAX7)LTlBO50$Q*jTTmh@H%wBGidBZzoF
z%LE$Hi5|s2#xR_^N;-3jm<1;QQab0NQVQ&g5O@wOO`mo&h-vhMUM#h7<kz$~CTXxf
zPd9XsD#6HIiSif+;l$(9jk&Cpv(rfh;~m;*)gQ+fFJWCsTVhdj=%5<{r+wiMZu1AA
znt<bXAf_A_=6_FjriV}W%(?#z#Mnw#&+s+M8rSnvK)(T0#Zw_uEhZ+bKw=y`nzVHh
zM!InibX{3c(?!W*sh-Qmr>v^gnoLR6LP;+si^-kSmE^Og*hNVQH3z`Fo&nLN)f9S&
zwo%XRsFF}gRqN@jI+>nKdmEOiS_UT!wQ3R3H0wmA4VWFK;&h*g!-Afkd{&(*WcAtV
zOfe<RPcBqTdSSU;6CHX({z&Bb&b_Rj@@{1gFc-+3JR}YG)e8Aex(>@xdQP`o4m&Bh
zJSNsSEA6;kk2_M1;*gw9NxB!KS5IdWhqQm>Xy_7+7K^iRplt3cl?CoVo!o^&PO5WH
z=jPf`^~&tREa?i#mCMa0<zpC8=xaPAAN5k{{5PIW*?x<Yc57;$f@E=)Q#?;lsnlwD
z1RaR50!c)Go)}oZfx^^^2=lC_D~&P&5GU3A%1k!Zj3)^r_;^m%95(~)Oets1V%RgY
zjWGJl>Po&&+$u{RF&?uLB&bp|5ZGWB+|Ho|M_(ZoitAdzQ1Te`Vfs!U@W(<rI&9%6
zCL`0(#U_22&-7v;rBA_bXs}is3QA-`AHr5?_yjI?v<OARx<5z_rhjxm$M<SkAz!r`
zQ&U;cD#V+kW}~@&EriYiBn>#i8`nd6k!lvDhJlWUZo@K%%P2i6r9C91U^5rSgf_O<
zgTtpfusIyowqX4O#<bWO1)I@?9P?W*mn$XoMPOCnxHif;?x=bxO#fiBY*vqZio9jT
z3q4wh(^k|vrx2V`h<?G4AVrW}Jf4hZoXYi}99ycnL@hEaCR<f6R3UsoycG*PrvHLF
zTQa!tGR)8oMdKJ^W>VD6QGX@_)uEQPM#GtenTlgQLBRst;pF5fiziIo#6!(8$c_!&
z!*&`<Vudqiibo$!swwI?YSe#p+SlcyRcuo3i<oB99tILK*g3#Q{Y%IBe9*<4%eGxE
z+g7dYGi<X_uGuw&%J!0NTS%+Ij?6SntU`i4n=v{~DMN<OG|Gmd!ayK{)ONX6c5*~S
zM1^yL{7klR;iOfmtb{_T<ysjn7a*RP_KA^N)3QPt+^|dnqqe-=Tn+_CJSp9<hp^Ds
zFihWQaEDEfa;?>B<#O2vl7TrbJ}DG3M{UDWy=Bt|?3h;wg=c1F%$n)50bkiLQz6^5
z&2p|xf95Dkfm!V`B9uer5R&?=2!$=xQq#4Ww5eppLduBjT{g%YJIXX6lAXxW9Pw}L
zD%s_oaF7VAyIR$1vXC{5Y6TkL$Z{|niDV;y2*43YHb5ayKsfu1`B2F=%0249Nstnp
z6e7P=w(;CtZq_W{Qkgu$Av23&&tTYWPt8Q@bG1>bFstmd?MAr(bY?Bvo}TpCX~i6c
zL5pgpMh!h>#LYAmgO%DS5K^;eQWL0TWB1OPOulRvYy?|YxtuA2CV*lqU$-m8R;xZ=
zD6JNuY1UI_Ni|K?EF!sSOdB&sIx#()t0eSl5(aEK8O|(Bn<`AIL(6;Y6d%}!ux|o7
z4?!%rypSyzTW)0QTX~PiF=l3-BJR0WW&EMfsn1`3rh0a2y>o74JD#ezp6_@N6?tIB
z!H|OjdRt0tl`?8ZEu-Kj;uI4_jz_anFbifG=$!(e+Ll$*=SM+|qxuY}ZqBZlwrylX
zJ`mm{Vp)a-gH+Q{4AU!Rd`A!N+Er5yZm)qZ7)LTPwG9H(GDh*VX0BPF^|t36LBs=E
zCeVmZQVRaFS&LIw&16myZO)f?lW9&U=rDjiQwDerER9K;QFD44e4Q~TYv4KVl1T#t
zajegyh-Cw7k{y9tGYpL8Ksbi6xUj=kC#w0ZhGn5JN*@Us;o%6r;!Rs((Ij6xE3ENr
zyGTzEyIql^8^N<$_$a@6x-&g|x@XS)XCTH?kk>PH3q>_j<#`f1K$T&Mx#VPeX1Zt=
z4e)5TYGQ*D*qGH6#fA{QEIV0SDA~q*ak{uVYpK(fnmL)7%&fPjvxn!|WmyO{2ePtR
zNZ2NZZXm;Ix;e3ThJ=bW-OLvgv-#P)uT{!{DrwYHOiUMvXqKBKZ(1dYJA(*@AVSB^
zAYV+(S8Q|p%;Kb_?wnbfuB9sb+Evh@H{_2*j_=&FP0P2HIlx>Xck+<7+&8AlchWiZ
zNCXZcNOa5Pu#<wzV`7c7(vHh@!;x|nhvc-Snm$y*sIvk&ora9#&e0c5PA<Xmb_b_M
zV}-kpU7jd9shsE2)2pjHb`bTDYb>oSp?%@5(O6!le9~!Hg@8%G1*ux?{5PKemJ3t!
z6eNpbyAH<_G#YbrWdt0Uu!Dt+00BUYrcs!=NrZV;t?7jZ0uU$D<^9`jYuVtYHLyms
zbN*boohf2tLm)UzA8(;q+tkZV;&@dZ#mrSPLxRfM?kvDgKy;%8$NYkY#Y@Qw;$rzU
z`eoW+C@!L}p+^;LR)#t0NQUoJ=#TaV^#IwHVeP02(}fteT8j1!lR*rYYMP-4HJBmq
zpy~5$W0mrBabbSm2AUw=oK9654R;EL%|1vPaD>l*7J3pjn?j}dO1xtcGNO<&R7r}O
zA2s}D3bv6kbfTm9+Adb4V6BI)W045#n1(%A8;_moV5`kdEPN5nZA5G6i-bB@>foHJ
zmK=rYKaT#2Z5pGKyk*4;M^hrFEv4A*{-GAP>qNg`NRT4P&M>k{!KvI)lw(UZ*QiBi
zli9TyAB^=412TCl7I@6i1$VY&aN%W?fy2=_iYy0>eBK)@6ui(-6-(Y|A(OL=R3=%W
zaY{5h>t#kJ2N{6DW67ie60}$CG?b(iE#xd7-J4BVIa+y-2+16O=lZqN3<jrB%i3AN
z)=zStmfY|~wEPqZpc8EEt5oXsN^!0pFe}zVeXcTxP`$FdQYj*B!osRs)50nw3uX{w
zElMbw0n4mY7u7H3k-Ac!t2?<OBBH`ML4H<nmb1m_>3yPTt+!*QrWOKHY<6d{DCR9I
zTePh8N@Z?+%~}`3BO_MItPEqJuW4F=u`r&%QLb}ybM<;XfX{V__+k43Yph}xlm5C@
z0qpsFM2xjsEo;sSQ~+Nc(1;bQV%1A^`m@GR3Z-t<5uq;DMI;RrqZFo*d2X(ivou>O
zTW0i<b(6fgrw#*U+ny>pQxm`8xnZyGg@Z)cf6>bHbf%1M!gNC~jzo7y>}b@E0wMrM
zAXNYgc><#IF#r=~GOaNOPJ)!+q!9Vt^$MO_>pSO)f!%fT2#c1DVz*$#TbWyw=a**3
zDj2F4>j8|L>t&$RE><e7nLs6{p$>A85!o>_l{IxMpR}^|xiMg9uCkb&LM59Udlw56
z^-8&d8UB^x)Kp;-GyxPBC*~{l>dI<!XSue2(#oY%mNl8MtVC{-&}_EgbLrOhQX`X^
z&RCX|GGPg`(!xwM7No3ST+Nb|F?J@Wy<A}ptvGudoW~pMO?!Ugyn8I&YMp-z;kHeF
z=Sje+&tHG0dUk5Pb8gxlPgOiW(eWTE^1zIPAqNHY!mPA1Sx6KTAbZn7oNBtt@n|*5
zR@tfpy>n&DsuYWJsU2e=#<A2QsBWp!z!1r_#Q+Fz2C>jVKrh?EP|otl^MPwG-`JSb
zFJGGjT`-PhWLhx^%%VAlr*qb`ilFtj=Ny4&M9Tyk(MeXTTUFaGa_XA1m{Y_G=S#c^
zomCAT24YVWJO`F03&R{Sjg_}%=fHE^VaSN#7d9uda>VIalg!&SbB^)|f^bZ8b$L(K
zn3|p_B(W?M#>`_86Ej7yC8aH~AXhpI0%&6n$HjWVpERu_Q#j1^DRkn-vQK;d|0PC;
zh<*$ID5_~q?U=IWazK??luDVI{9>zWRnw5Lg=s4u!*&K^&|g)iEbHpR%-nLVV(yr1
zP43@bOtk8A)=XihaB!t%U$ui>U4T$?fSj_*nF@{~$Z$Hhvv%<!36)}NXStf*KCyiw
zurgUnPv(d)s_E7w5zYEek~b@pG?JOJ01<o*dV2EJ^v*`b+SOW{DJJ$T?rY6ijf3sl
z=+GPTM`n)i+^bl{z*gp<rKS$sK+<r(&?4VS*I_wI&*_%S;Wnd@Jm$U=o6B|6k#ZD=
z<a9A<1yBiNok^UIZjiJhnl>}D8xEAs-NM2??m(T~Ns^PwdD?32-@j*1JF2y?d*5!f
zFWfbo>+8GVayd;SCZRZUbLYSDY|8dqE=<i+@YaiS08g;6u(VW1(18d$Sf~il6Eww;
z4hu^&2=lB~Tgy!ZAWmBKLu-}dy2<+|*dV=93YMak3L-j=vlv!bY$0DPUaIdTZcQY{
z;-)@XAVF1J!(bG{wlw4b_&S+L*pg{w>bX?iFp|2SN)Cy-gd{0h!;}(iF{6brCVlbU
zivDmaMEiBbV0o5_=}Ju2WPAb_D+MG?w!|nkn4)jk!Zy~dQEyGI?ATEOnjqesp?)3>
zcUD5@0FnkA5il*;nxUG_;oc<gScot@;4;e65))%)(82-$?52wqmiUk^R-|C9M+yoC
z07099V!9tz&oL1bu#5#_G&enmzKGbtQXAzQcT~L;rhfzdm5ODK&G42LFC5ECoVK*d
zb4rP|6e!H9pi$;x6~lb3-6I@BIkr^u99rZmo3Wp@7|=#WOcOGBD;9Xnr~GommORe8
zlo>j2*r-ZkC0n&7{E<o-s>4im(l3|urJ@Nd)W#&>mhDA9GxH@2c5BtlWR6Bi&^J42
zc#=uETq^SDemhev(SRKhG9~`PgD-0_OyMZS;@$@Ad$clk4hTC-x9A)WqZ3>_*l5hp
zH>ykXVXIMGnO|xwAvE9EXf&!wn=VSlqJ_A{;`q2VzDnsND_pdo@=IeIhB8t&=9lK_
zK95M*Zhc8n$9=6(ZMB{)NyURsOglTjf_;>?@2ys)a?vhSiv-5f!HbFqC48Qwn6(<7
zq6AVZVq2MK^Kl{NilH1PYq5R;_E5CoMk<asAo*av-vI38GVFO*S67Qm#c;!#hX<&Q
zVxu@;o2S3xI7*?<7v~XSUYeJXG+b3EjHW$ZT3Rg?la+YAXepN;w8&c*&y}m?YIUyG
zVf)|czgaza2^=Qs4jtLoY8C30oYiWkCP$Tvv6euoDu4*U5l9VyLY{!Y1~c4SD3etj
zpD#9@M;uOyKz^gy!1Ln4y-U^bMw2|kQn7+!uVRXzv13i!v3vV?17r2-d>G^A`TA0`
zQK{l;G2AF6Q3n%Nx@eDES=&k#C$dGmxik(8Ej8Bcxdyfpy6ob$@>H`?Zy>m@IzL~Y
z0ZlX;^VO*xjpp?J{X6&8XAjL3VR%q1&ZLXQbZLfTe$`sFCh{w5lMDH5t57VemW4ef
z_N^4tRxv9bJUVTYy@MoSt5pm?qcOd`7ss!1#=+(4j@qx@Vl211dj2hh9UJGf55i7;
z{`xc3vQz7w^K!N0sfu^hIvzwt9++`3<e-4wXsi2X%IR_%WN#G_XF5O4kyUKgi}m6>
z(7RMG78}*-lC@_X#5kT^1J&(rG>Z*%52Y{&ZxON3L8t=PxujJL8s+fIt~+vMDRtdN
zOP~wJk&H|m7J*r{#_@Eic<Cf)z3n+i;2F^}fkyOfC!uiy<#Fm-Dl(^t4R8V=rSn`8
z9R`vC)+A2j<MjES5;0A&TwGiN&v92MSXh991#rbu5u}>4Y!a)MwUo;hixCixW$j--
zFm2AYrYhM2mU1GOSWX^Oup>Hci3Pb*Zf8Zij5sddhxPJ&!9RsXQm1gI{<mj(_*;*0
zmWrPF3l!BV&hG*GOF)%XRVNFJ6Kku}#c4?MYNb`g1|<{L_!2Z%pr)5p7MIp%8`hqg
zm6=1ks_B*HQgN}oSiWNaO68_K>?IWlH3!D|Vm;p|PUWj0!-dk`*`uo@RI01%Q`7mi
z+FC8VZ>E-?DG^~z=T~QlXb$crd9!bZMly7th+{TOy~HU{@ZN<+abxvai`DeSYtLR;
zDmI_nu8a=7A%7%teCJ-HSPgGw4lozUojfEB_baR9JLx(sN9j4;ayjgz;PRMQBixD2
z<+|laIf_Gax|%MAo5-C{yW&JTK60cLNhTK;H{d|o+$}FZn>$b^cdF`4{y0xpRt_Dy
z_~Lfd;_}9`H%M1VZs*Q}2PvOYDVZcDp*TxR=fCl6%Jy5Fv|Cg26ukA~9KaJSFYn$x
zkDvn)tV|OK(31(6=%FyX77^xI?O$2ni2%gO>im@#HL3@#3Sne?Jm08AYI38&Go=$}
zF|1N;BaHqU;M={#@#*xqVWnouB&ezvVK9oRM=<d$T5zb?s;X5iG)vienl~`B8IP1w
zvCFEZCQU6h1zl{JFEEa115pdx++jL;OiAaJlpa@;Dn4@t%OqSBC50MHDc~vMn`CTZ
zesyNwo;?lFD#V*J)Sp1ZZL8=UK+=FC!d6i&E>g{waBqfpEF=pZaW1Kn>DsszDcacQ
z3yYh*8osE8Z+>A_GxaO6`W1^#vFR9X$Pjm|=fZ$Y)t1l~kvdpvqnzW8s+Yp_Z=%0~
z${BBg{?O2(m9kY%TgjPo3c-uAM89B2kRr$qo%YVktnuc2b4xWZp+%l%t;(gV;Ux7v
zA(OXafyaExFE?z-<Gf3iq4S2uQDwDCqF4*Y8uefyUznZ=YW4DD)w0Wl<}7-^YGp0R
za^+gFhKGgOQWFmPW+x3#GNaWet2}zJlCRci(iss7PWyWF)@6o~g;uQ|Xu?P{QNzvw
zB3h2N6GcR=9&I+4(D<({iFUKPzO>d{LujdaxY=wVZLX?Rt9G@DWPZQxM`x~DRcx_p
zW2QHUT@-3a-CSB*a<W83M1^yL{7klRY8f1SITr37U0cF9s#+;*-wQj$)dP)&0;}IL
zT2X+pcJxs7s3QBuD+Rkbif)u`S4F>!CvcSO+S(epMpWcDEgwc3RP{IQMlQTmh2p1L
ztD)&xUth1TRmCRe#FuQ$<Tk6#>e9>-{Z;)aMRKXSga}K@l7ggSL#1#d*T_w-?VGG-
z>iS&8R<Ai~leaJ1UaQyY_3bm;|0ixo{pfSxFu=Itc?Xx5C+4S$_VSKQ!>c|=uB&QY
z1w;UjKxzUM@&tsld6$SvZlc_N2Tp>N;G_`w!#kRIUOjqXtsx%XK^|eHT1T<h!O6{C
z`xCn^TJ=+fHI_t-f0yQf&Uyn^D`ImpQ}tISZL3=L+l7jqtxgsyl^tt-AY`q%ue=?V
zY(M|9eN(eb&ADcIv3anuv^3QMO#sD>+1<?@&4UN`9GGieu~4m+3YBULeVbghh2&Lx
zuf5NnEUoXK-Z@cNo~TwaV+Ko@OV+D7yIP1Jy}DU;W_|oHIELy-NuJv=U<-2`-BaIn
z!31(~eSJ%m&Ltl(b^=f%I`#SM&s5J&t#{6Q>K#v2ylbZ8+uB56#=($-0(xcHIM|xX
zP34wQ@G5B?OAaQhJLal$)g_>JZLV5vHqhbT@Piorh5ewqi<&#C&8A&fL=fHzVl^-y
z23!|2b~T);iMPJ=s;kyAFFmvdx?mj1AdRL?U^Z+&o~~7&I}KWId(II=JfLL)jp(G3
z!G9ecdxy4|Q^Y3cOT4LCUCdb1MX+bZrY@x4uK`I_Vw!5Ly1E9Q<8ETYj!IEzG$`Vd
zU9>B_|7Nchp@EKqaBTb8mmFzY+m~mj3KRGw4{}k8s#o)k!`xrfAXhL+${j>_+i87r
zT;p@obVH{8BX`Dsd!~oK^%&>K=o!C4QSHjo1_>RY%5E6b6Dzg->%dPDJX&9_m|C@F
z``0p=CWPoKrdHN2ZZ++Vh4t1I&uUofJJzZzQ!7)~9$c><+hDJlf>3inT&m7ZG^?`{
z4Qnd5bMnCAHTy`YG}bSkYnJxU?4J=2wq{DL>QZH?(k!jFh#rm}ASylBLQ`lH!4O2P
z!mLfcSvs(@S-o`q&`QI)Z2#r!Yn2_>w(FupZ^$2s9N)RutTx20%mL;Cxs!*q<$irH
z`A#~A9*Mvq1c`3B9Bwlj$z$$2vAJBg9Vtg~NKQ9$RdEM$r{#X+n$11jkya#=Sy?#@
z$J-s8_U^rcJ5VQghT)`fp0BT8amA4%T&;)Gp2L?PM*G6uo;^p8Qa+QDw6=we*ejK_
zH7D)4H=h5N3sdtHB#WDz1$crzdoH?Y2|))Unj1rafS8=DR8W{_tsu;^I=Ftx9t0px
z)|Xy*sM$DbPZ367jo6%t&ZzB7DQC`N*fz0^F#2m&?WF_6@j1(%va_uz5>$;t5ZKs6
zqgbgfq6LS_u3^}f@{Vd@iIxpy3;7WxYhY&5HZs_(Y!)4^DGAy|EDar$ZESOg<q6|z
zZUQFsx{)yky{g79s)|YtCN?mvisQX(=hAxXl8ucfXcgkk>59-?e;J0&A|wqsLbR(!
zbp<tBL8XW-+fTRc1f&dAQpTF`+tF$T`+Oy_&2vJfMaBWFGq#~%z`9BpL*uIt*qIJp
zQ*MJP0x~19hQ5f>!BQLL{tkXAOxIcTS5P_rW!|#lh5oX^X)Dt@r<6EUAo>MEqTvPE
z*>*iM=TxpA<=9fqYt$mM<@%NTL@XP!ZOG)USl}_03+`;m;KECTfy1GEG}sI#7iYrq
z{9JgVG_lYMC+2I@4ZAWmv7?1fu2J6~X2se}Wd;u?TGbtJuq<=Z@FcCo{B(my57$eL
z85$QM!o=D3RbXx=0DwW()xV7~;Z6j4*q!X<f+XaGn}yd4ZxY@i+%0@S*c84ZJSaRY
z{D*MHCA$<?+EsDQxpuiWTnAk5cirRqyz5J@|Ks|e>nE-=?ml<it-5!)FLht*zR~@1
z_i^{@+;4Kf&3(7~FWj5%kGMbM{(}3f?q77VuEDOMu3cTbyAF0;+Vy)~uj=}<uJ?ES
zW!G1`zSDK8>z})R-gTzi)9vk!c7L(^N8LY*UKM?Q^s~_~N6*A=j@=r2d+bkQ{~G(Z
z*ndbq=m}fWs&tWbK)OVFw)A__ho#R+{~(=^PD?+No|Fe<57t>4a$YXUHMuTN%M0=$
z`C9o#`6cqr@}2TW<j0k6#f#lru`j1$DQn6;<&g49<t@s)<F5F&xF<dq_rVlag57C4
zz7#(azg%@;#hjuu-K7ueBl@_GUBq+^D-B9|UB6mCroU3ZO@E#KX8mscefkIWPw1c2
zKc|01|C;_C{f9=~m^J2&!^U%rD~#tG*JiHHT$6dR6?m8OuGc;8dc6Db;U`>Al%J?S
zG5y5c6AMr5dQv^}%QI(yC7InN$U<H?CcHs-vv8O2r@}qLy~5uK-xE#>|LJ1DO5Bxk
zRbBJ0-N4Glt`E32U0-m0+4XJLL$1?q=I#epH1}@zVfPL0m%3jGti0a+X7?Ys|IGa^
z_r30qy6<;?(fxq?|8@z$$}q69r|a2Whr3?h_3Ey7c734hlU-ly`fk^wT|esjMK|jn
z=?-__(fvU8<532zTpj&f^vM{D9gDpRSh*|q)7Z}>2EDN?ElIoESh-X>CVf=;g7huv
zd(uy(U&u@zl*ee@u58PbXR&gXe1rUAVC9YSU2UxR+gMpu)|E?ul{cQn$|$fB!YX|S
zD~IDpIacJS!OHHlSb3v<m;T<fSot!r@@-(Hb`~p_8&?4<hk=zB0xN-c-S)Tutn@!2
zJQ01O3ardN(R^a@Ntv*6<{yEV{{_xDjpH$4RQR#bCH%8+lkgqkyJt=a-{}6R@DGe_
zo8R_;aG&56KGvNTK7yDZ#PPnapD^Z9&wSj46>zRG7vItG$>%<K1!GSh#c>&qOL1I6
zDV|ITcRiUD4m}BrXkoXo2j>MGkXJ(G$y)`CzJ+X8xNFh<bN6HJM}PFhkB5J({`jgN
zR~}vX$Agbf|L6-pSbpU3AM7~w-BaH_^{rFiIQ8{Ye}C$MQ(rsv)l*+N^|z<KeClsb
zeeu-iPkrvu=RNX9#!kKxWnw4)*U5kX{<}`z^yq6CdnEKo@Z?7y-C*p|8&AIG<nJ=}
z@Kq1L<mAUs{pkDGpS=ClM;?CH!*6-$tq<M(&}$ic=+7zj!~Tb^d*~2C`G;m6vL8|(
zY(2Q};M9ZF2PYo1AIv?Nd{B8X{Gj(icH*%UKRR*h#1Bq<pHiLp{E1JW_|%Dy;_7oJ
z-g)8!Cl*f3otQnLo={H6C!*g!^x$_N{13*y`(27V@~P2NV|RCdYWS~)?;rlm@TZ4A
zHT=oGdt4tTc_zFGHTrtS+->VSivO$5eV)yNTSjb+;&jruxt;*rf>Pt|VH{WDxEjZc
zaD%yDN@vHpUqSzLcHf8Nf%e^pod5s#v-{o1^$YH=pUcVpmCm*MtIn1Cr=2_J|GOVV
z>IdCzXxzN^&X4odVfP2!AMQMHZ+5OO{CEE$-tbN;`_no%`&0HxcB|{P?5*sd*sIv<
z*=yM!v3IjS!=lUM><oD5&FnOLoZZfTpWOx&o?t&=f6U&)e#-up{TsWR{crX~_IdU`
zb{TsPdm}r_zQitPUtoX3{*HZ_{Vn?n`yso6J;1)ozQ*3qp35F%cd&n8f6u<ou4Iq0
zAF<c4tJw3{^Vv1*YW4#54t6bjA-j&fh+WTaWH+#z*o)aI_7e6|_B-rl?DyF3vX8R6
z*v;(a>=?U+{WJS9yH9wF@K!+(T!LHZV*kmW5Pn~HoA3w1AF^Mv{}Q@|Z9)%wQh2-Y
zN5UTqe}WeCE}>WG6Z(Y#w4Hy-e$IZu{xAE6@EYN`@FC&D!bgOU3Lg^&g(1j<j|;<s
zM;H-C*~9FlFa{a%3E?k=alt3NR`{gwDdE$?XN3EOzY_dHfPH}7BLszz@Ylj;g|HA2
zL?J4CPWU|gclICb`|J@RhE`h^6yXcP7lpqOz9f8E_*=Bve<#ERRnP=o_^R+V;Q`_A
zg|9;<eOxevgpd?c>>t?=gm1W?k9PWI_UCAmg)Uc@8(%2y?%LMX)AQ|~@AQ1P=Ns&s
z?4hogvH!!q&A!9F%f83H#U6Bh$MxOrgzK-mlijIqvpe0Las6e_PkK)GJl^xKJwNUF
zx1OK%{Ji&-y|?zhs`u5sxApv@=l}Nnd-p5*<UXY@&SH?3KM_s~Cxpj^e-(ZznCMyj
zr|^XEOCjyr=IU|v3K=2m^18+aOUSv7yCfI2d<B;x*ggNz^Pjyp^}e|GCB3idJ>L7;
z-q&@%ulpX?D_yttUE2Na?(cMexBEo*gWccjeyICl*Q;Ewc3<S)=swx~efI(P#odo|
z|D*d7_d)lw-G{n=(EU%{KkPn*e#&9@5%*>8=eUo$FLz(j{nPG$>;75y&)v^;U+I3H
z`>H;5Ti>>R?5;hyZD`x@HqW*Z)YjF#xA(q&TY6ijPwUhBjJ`x)vM<$p1>0ozx^8p7
zS17U%vyZU97Jk4!$UekA+xuMh3U)txwd*d|-L7}K{?zqny)R;)6J96W-g~9%U9NY#
z-s5_&>(5<((ev4!&-Hws{Y>~_&lh^WD3p8trsqq2-*bJQ{bkRWd;YfPD?Q)r`Bv{^
zy+7$a-TS!fHN7{oKVbjD{))Ymy-Ap6ZxCjM8-+Itcc9mH6Z@F(vYxN@J-6@5zUTFA
z?_28I(YLd2xo@R!wQsHO1%21{UDx-*z8CfF>f7CSecx4m&+ogs?;6Htw_kGcfsOt9
z*7xq&y=!fCWqIe0rR|HYh35R+?96ndK2@8nR>~8Fe9p>dk_kiCun~?F93RDZ5{Cx*
z`+9q}b$7X40?Wvo!r|7YTbD-{kEkv6$Wk^Vw}MwLWHT*w@$ja6MBc<-m!U4<32v!J
zHs!<erh&gBTW%lToJGtl&Wkzg#GE}FQy7u!tWK{`<;}laQ04oCi}!5c`t}9&fV}w_
zzh33nT?P*fA)qKo!J#5(<<{onO;;Xo9R`fTy#xJCwRw4eHpA}iAHd}Rt~QhEb@vL%
zX@Ot3lC9dkF4j9luSH2)M~-gp-m}qKz}|BQvY8#5!zyyZBi7_uZf<LC_V6s_=b==a
z?6vZ}nfs5w?!FOr+2QoyQT6DNgBzRfBS?GP-8z2!)tjT~&6K*ZnR@9Df~cd*H#6!&
zYcox`F7G}2p5=3|6gIo{5mi3^bB5xmkNpeEvE|N@_ML6|$j=!)+;lZJg}oaJxyT~0
za{TzBDlZ;CeEi6LXO3N_$|LIWdj|)PU)Mr)v)vn;0`7m}wUN!m*B#g#Ieev11E{>{
zi+h(hy?ZX%*mUWO@|8zW8TiepN;RU4o{fVHp87FEwV-lP!!lLl?v3Me>-cLIu!mo3
z0jZVEV|zBJdR}{<%r1+3kj>`O2R2=Y>B;?_C%*mk<XGp46MYsHs{+T%>l?>6yYwAL
z)fQ_0wMRCOT?Q(<iV&oZY!3e-qNvBmM&-#I-iEjY#g3!TlQ+AK&25xwYXZ<FB{_~0
zP&51s=kKuyUSN!l$&)Iwp?q3u>u~#b)0IKIQAUL?r5%FUx3M|9fSQ{<(k7PHz4;tc
z961ccJ&*9aXJa#`Ubi`}&O6kE8@zI!x4yxXICoo{<IPQW_&M!Vo4FR!f(2T~iQ)(Z
z%1hm|@o`o>bMoGj9QjZY6AuR#aC_6=1hpBh;~Ph>*pv=Oj)MQLkT)XA=IjAr`hdD|
z`2iw7)KKaqUI&L_foAq?EU&A}doJDpc9jGC2|b|fy7bn0*{B;4CmRsrX0P5WZ@41v
z1Bf_+8}cG9)cHEjn>~6jjuBKize@x>Uzaz82<yZK7@H}%b@@U&9)*7;Qv}?4bE%Wt
zHVPu2=2Aoft8<slxbRqRzZl7TiQ-5b12S>pTE^pE&?)o?bc^aTNW?F1sF$k;)GOu9
z+1(pdMN~b!mfMxV>)gT0^1h9&p)Hk#YGMi=^O|c{=H_DhY#mbNZf@scRH?k_+NW-^
zec-EOsQ2BQ0@eN{oM9uNr2~;)y^mW?PXB${$mWg<lkRX{N-2-`s>|!g3BhU`PKF8@
z#j)cmRK+@I_wZ9a0LjiCX+MyUt2>S!SJyZ2Jr?8%arJwVm*Qe`j4cbx`{uKmdtJi(
zy{d5Ao_lA7+tx4MfFzy&_y`8Mx9!{bpi6Ky56>UCSHts-kIQJ6_+1y>rJEE*rU2!(
z7lB?LKl1Te#*Xo)UHk?QKj%Jy@q11r+!NSy?sGZ!MtHn?4gR88=E9RM=gDj*hc4Xf
zb?zPG_YRP|ml3k46et!NHgE*mo0fc(2;_GUTzUNP0b(-dN4?<(1&TV2dQ_+H6<pf}
zH~ZDg=Qjt`dAdJC_h+2@+vt9eI=_h?ACmtn-oc7;_)C%FBacy49)K`8KJri5xhm@u
zW|$yMvi;}<IREp)EcUsRggN|UC@xH~B1Vh*g)06Lj~x>{sD{V+c^A(2;Bc|iJnTH1
z;n$3xXVJeEkPDsPA#}~|74H8p;hz5z(E07(^@JclA^d!IQu^s)QhIzbEnRy0=F=|E
z>0PHUJ^hB$_nht?_@^Jlq<?&5QSv+@%s#T{m%e{;QToiuubq7Oq<i*cvAlS4F(`dn
z5LpA<zF!FAKQz0s|0j=~ksfnBy8mC6e!TxjHrxNtk3PEpQGxA0wZ!)Ske!jf*LZmU
z!-9MNLk;)-2i<2R&o>3nH_v?2b>^GGJH8?O!`JK5XZ~9FtKEil_|w;Y`q-!4v-cgo
z@4EZk_no<a_P~8(_M+!wGaqw#J~Z>8(;ss89p1cd)Ah#9yEZpB-N)Yl#`nAKdjID8
zT{r)4;jZ^?zSos|&$aJydET?@J@0tW!|&-Dxa%EhY4#m`ql@hBk-J^B*}He&?b^Ki
z{<|Nzo98ayEo+N^@^(%7V;p~kWB1#Iw_Us>{r+1u>4CSNe5(r}eE6+Hql=#Vg#OuQ
z37)sy{1(@xcV2tv*Y14y&MwcL(w#To`Gz~s+}Zu+H`S%tHwB`Lvv2AfT=d)_Tzbbl
z?zrcU&)jkPjx%>`o4rHS7w>w*<{Mo1zu|#5oP2}(^|vod`P*l2cOAQ3xc1Y+Adq#E
z&S&ly250|pcyv)do<Huo^_7d#E!Uipj-krFcH_f0p1#q2`bOb~>u03vQCBZooRD6K
zWA-{DvnXGezs_|nLNCA(7J~aj#o+#)qI>@~q<z;lLh2gfYFr(;G$$RtbY8j?=?`6O
zO9vMV(j_SG#rXHyWBa>-q%PaN|5~@;anC?8c&+<pclTQl2%CHF-}}H`s<RL6&6XAk
zGjHFEx;wq+%pTY5o{8$>>>fS2__f`Fyq3x>_O40s#lF?hs%vR=WA)pskFNgvYWLe#
zh2V;oT@0>7<;AzHynDs9yjYQTEJF1Jpts|=XHj@~@${nW*rMRKefviR&;AkHvmc$*
z{Q?v4k)RpRrJkET`1V%Lv&(a>=MA2RJ!d>UGq`u!<Gz*&yO?myk5S%z!W-}1x1LTf
z-`8^n9iE=umuw2RZR+cEp51ft=C<25+5U?!*|=8_UVq@$+iz#{(dA7W^73%>!1Cr%
z5}b5#3>PEOd;M(w!1Xs=f5VM@4V2(qu=MrmG{3w7|M&^lv+F5_fP?Xv*W)%1-{9Q1
z9x(;Pz5WJ<OXo*<Tz@^?O*0<-`Wp`+m}ZBrzd^VjS>nBikP&5%Q=0BLaPU{0eL?!r
z^>_&-qPJgvJ<=cvWdL_WCrR)S>;6jjL+tmuZ^2Ti-{EJr)pgY%i(bswnSY_X=gv=F
zv^CcM`*p9A#fRCa*gY7*e~aA<9m2bzad<Vm4Ws$Hpg(B4?ym?k`waUm^a_l9lD!>z
zhxc}#ZT;`QMHpirM{X~|IPN{rjQ;_20#D(1ysMyf_yERzm#`IR6^=p&cnkCn_u;K?
zVaJ8b*)O0Kh+|~<7<3AsWq%HsPC#GrC0tLkG@#q!gzpPqVs8TM&&T;=IKQ19x_-)z
zyWYfJ;QE&P7QEv%NCO=kM&;z*DO`fkEAVD=hoB$nOyBVvINgR){yDT9$2vEj{HN|)
z&ior2`sIh9f1#&ug_h)n-CtpzU&hY-l$E-E$cCQ$2K$U#LfIL{v*d2!XPkPL+*i3i
z>T><pn-RDJT9-T65#c+4@^<$eW5T-75`G`rh2QD=d-vb>B%VCY*6@ytpu2fL@bh8!
zL2T3i61?SY3|h|riQ9Hd*OhF%>u-sY&iuoZHv{(X0ehc7ZG5er&rbYrJ^lpY9|1C(
zF*o#rU2kQq`>%2QjC8X&aIa?!$E$FBgR$OW9Md?i#_{j?*eq(fe~_^O+#k3L(<KNG
zWpLbyZw){j>RG|@N6<<3<G2n7G;X8FcMNkX-Vei=tBM2qIUnGly(j!{f?YWB3*66G
za1F<wVsnWkj!)qDB|ebzavZ<F9MEmp5FPQNUuG<J1B_vxh2y=9$tZ^mSmSXV?}HK1
zI1a#}ejOVjb>Tof4e!-{z?g1gBFVzmbRrID=#t1gHH+f`?6C`7VEQFEe!^Jh1y~Ga
z;J68<xR)`OM?U$tGFI4tA#4f9M;R;P9VNh1`U}P;f-r)B-mg-_@omN?k#7xUuc3@n
zZ)B{FchmuM{gXHVM`H{J?loS7<DEDF>omgw*rpHTcs-8$aXiY{j337W4#b^7+!??+
z^GoysQAe|YXBK6jMfqkQVQg*$$2<<adk*iO`wEW#WNbcz18_Dq#ujA8TBxf<z_XnW
zlzZu~K_Y-@`D(^i_ThLNjvp|#iagc;%P!=%`*V!#!Ta`ngR#B48Cyr5`)wS6<ypsY
z;9VD?5E~0PzRuWz<BVMl_%C^gv4fk8J$o3(6*z#uLk}=^_!T&Q%GeRq+hrvjsNc)*
zj>~?=*mD5i(QS-fF5<Wn$A=la0(JA;2N`=F^113L4&?LvG7da{KJs`z^1Q}{1JABO
zd9FdZu0j4U!1cBLI93>YA?osaz;*-T-H^wDy1wB}I8fI&{DiR^!#H;0cnJ>F*NrIa
zO^ACF;@)%!$LnxB!q|%u|94Q%myY1Lim{gg_TNRE-vyj6$9rD>3C3=I1-jpZIFRNT
z!pBe-x8VJ^Al)r^_KMw@ETQA&INrzDE9;EiiZb7dGTr(ojJ@iIjJ^7u?Ej<eOyHX;
zy1##B=4MZmG)dE@>5}e+LQ~q(0wP32EQ?SUfv^=25D?jAlYJA}ci99)L_{{RA|kSj
zh-@O@0s<l;Dk38AAkfSEo13!u{QbY5_w{+cB)yqAbLPz4nKNf5H}q;dFcEA5zY<Me
z4`7EWsMC~c0Cku$32Xt#Gt~|15KY7NX*0oca1^LS(^CQJHy!nx4%yS8?{vtTp@3X~
zJTs<)Z2)D>guXLtg3bVTnz<9ePP5`bV=x-52aquv`pkyzv%3JKoxKJi{cNP41G~;a
zxpRgCq@Qz+Xs!d)0=>W@fNS&c+581WueBpu09_YcCt3(ui<|)ZEDnO!L`zWDrKsc5
z`2cB_6@gVm%l%+8(HkuR?7m_n(VID7I@pbA0Ww#P1*PBu(Oa1S<-dh;-?~P$3Nlxr
zyjACk-p&Qk<?Sm(t5L7jc)uEH-suQ-60Jd<*1+y-E)l(pdc3=qXss1=1ILKg)d0(h
z)}zez&}IEqq78k)8KR9SXX8Gi_woVcZi3#Mp!fT*5mcknYycaSB46ot03EiVPCHQV
zeTTtqqR-L+u6;HhYz5F`e@}3L=yT*ffO>o}k?0`wI)pkO?hI6-BglWW8kkS?r5iw>
zFK-eZvw@nR7l6zYi-=A_-;*fw<V8%Zu;bSw0d)B$0W<=`z-n-k=vxKAX5V%M)4?|I
zD|V=2Ks_)JtN=&BEo^E)|5GghbUWRQ=zIMAy?osaE?~E;2q4dyZvgZ@n+lNr>^1Di
z#ezBjbv=i_f56{A;O`$$|MR&3*M5Xee{2kfgEin7xJ`5+6SM@UiGG?3c7v-#7g48+
zsMEz^0Cl>EaxbFXpR+*+FcoaYt{?Qcw4LaeVlW!42WK#)S^@O?bv!5q=ZSuE0O<AG
zK(G=(hs)6Qas#5@@%I&!cLn8LL3vkT!#@<z4J;wL3VBy+0MzN~B5(k}Zhu1mKcWAh
zlL4;(xrXRkD#!<Q0d%<51)$7p$H4_~o#-#<`qxZw4xql*@%i=fU@llmbfX>7O~}64
z8bJ2VE#M;2e>?zn_|FicTS#;3JEFhm6Wy)_VCOr{0P1zO7f~7Vm#x4K?QDS8dyTQ|
z;$RR~;%=~)7+(pF6BBxn4?2UHU^g*k1vpAfw;F5#`@t<@dLy_%%&?xAu^pHSwh}WT
zzo{<x4*Uvk6EklDkYzbc%({<QL^Cj&m@O5o1>3+ua2i|&cd@Luf;a&AjzwS%u}D9_
z-_A^cJTAy_sl?oqiAD7y=BWWtrUzxhcVRJeiFsQPi;V>piTQE}t9al5h(yGlAr{|}
zSOWA&SP4prCE7p&$OcH0*qE4qIG9Q-sUA2+EE#2|>?D@jj#wH8<B6q1P6o=zI8H1R
zcFep<tOClfI1E6)EXaT#!?ILjm5`?LQexToEE{&sK1nQq@^c_7r!~O)DjSLALVn%_
zV)@WJ|0uDllfWfn1;}5R3m~&_FR^M)&>3teRy_tlm+I%S{SJL=EC;YTetVcb1{*!L
z9-JXo6E>*X5<ridDF1Okz~_(eCRWP^YJ!0Pdepj3tabt@0)vP>0UOuZMC{4l*ycys
zbq|AU#GdkiS^&B{1zn#)S@j4YU%f>Db$J>(J-r%i1$T)R<pbzZzX3pb^`TFF)T#bu
zV(@=hgK7Zz8^A6NN{Kau-tdW7!~Mh>rGn95HdqNZ19|;BV$Yxro`LLVmH_DS%ua9&
zK!;~;5^HP(v7i!w&W(!!(ls%I?f^P8L7j?`rnnC150-=D#F`>+(;5JJG{v>1klPe>
zX_gJ3XS1;Yx-`3lWkwum3~;SE^ly%9Eg-W+UC<lM2ipPai{n!4*&;9qtO2KqwX}gC
zK>00E$Cf9FwL<x=azQ&V86a<KH>e4^fT>_BKv^Nk3^f8H0opQjo>&{CZG(1bGX$&v
z2f=M(Z8HJ%Z#xM<|F##1wL{u=(6wDJFc)kCxZd6gpjUg;q5Tp78SU>9>re@_15*Lg
zc0k$^E64|pz%Z~HpdK9+fa@JQgXzRN5y%F}-wE~Vv;|xt))_K8BTeU3;54!4kmk8A
z0CKt{fK9}@)&Y>&4P|uOOYC{j9p(4vPOK-&hi}SWfDL*<?_RL&i@5gUKw`b2L+_=;
z`aq99`-$~MntrftKh(e9K4SeR5*tthTq8CRwt8tcu|d7SEn<U_ehB)_Q0OppE3siS
ziM`wcK)2yWFqhZ}ydRkg<`Wx*_oHqS8-0P;7|0ph5%dKIiH(CU<72@fViVE<<WGc6
zCPKG~>xsRBdQ5Ty*yL4Qo7|Y#6r_WH$)-T&RHT^(`O}UOn?4rYCN^U?v6;9w^D?nn
z3vleD030VaXA-fwXuG*6W8OJp^O5&8q+4JE_<Z4LfNKj;=S66TMT@{*aD~|77?1;s
z0Q6rx1fbrFSA#9!DzPPKizTJt60z4&=Ih<STw+VXGPKFEUx_V;oaObvKrj`o1c$*b
zVsD^cZ?piY#~Ud7jZFaU_Xg^;A`_sFZ=&2cSApZiR_Z}D&>hSN`vKCzmt=3X1e3s4
zaEaI|4=4h|z-n-k*xN=>19S(-|Mq@>{Hrqo@~=jpSdFq)L%-G6iM<1T)(isBc@1=V
zw<nHEfpyS%-8aP6cL37?>bf5Kt%v<LBm>xMqYVVXB(ND=Acj~Qd#@RQ-QQbJY||QI
z?{^_q>L>Pr0%jB241GUrM{Eo7ZaGKnBb4*eC1P7Q68ji(wv8wDiJ91Tl(Rh-;PV}@
z-_9Y#c3Hu8V!M|R+Y<wz`yR;H+n3m<ZZMqKz9M3uRV20_<$Vr0pYJDjU^2K%><i@o
z;#Xn^QO+UgeMlvCcp$MO(EAA5?r07``9~r1OO$sE`M-jkuaM?=99T~5M1KHTCz0;!
zj>Nvn2X(;`V&5YFx6tpqSg?)QsnNtvXA}D#dA~>f&eQ`ZiJgTF&cYVwx)A#TpPxrL
z=TY8|6#?4k$BV=+K<}TH61#}9e@2;?juQJdmDq2Y#Ng+#-@6mL0v-Nn2@Vpw3i*Eq
zK{I042teMo$>18XzwrLL5iBBh19@+toEtTW-C9BHF7n@917M3X<Sj!vDz4#t98(8@
z&EO`2+v%VUm<~`kL>D>vK{K!j93al{H%>%wwhgGnc?&QWoFp!)fy2ZV1(bq)0M~VH
z&>3t5$fK_XAVUusdZahR5I2tmr-@r?fCb<xacf<$0$d{=(Euy~(8(4AD~a0)v;??r
z|CP7{avjTwN8$iyWCySs+{A&vB7pQRq<6Igkm<Ta+>P{Zq>sY&C|r-)1a1-cAiZY|
z@n}7018_Yi77PLViF={1w>#KLJT?<d2Um#uYJ$n&9PzjySWX;Y%;E8{Up(p*k2DFz
z0P+%@05THSgX_fou%mw~@gzS$IY|eIC&z(d;4}_5=75O+G7yvEsjzSAZQ^MS0Ln>6
zozuI3y~Hy-0QJd$y)#ix=0I?gc!g|$_Z4;%ub2SFgNwwoV27-k;0*CfD5nzMSAyLt
z7X#R;GTvvm1e=KmjGzP9PCN&?=8Of$iC2Mrs-XNTke!<Vpm*+3;&~p>5o{%%kL&rP
z!FR-~!fsW2f}O+*P|pHfFE~lOFctI$s7Ez7=nr6v>X2W(FE~uR2I^5`Dp(3oUJcaY
zu{xj|SOl&U#{(#MP2{Z!yVrysk3$xGM*jFF0NIbDtXjBMD;=PowT6M!0M~1CfX`~T
z1e3rPaEo{l`Ug9JRRC@BL_VkoS_9POiMar})`5O?f?zn<j?GO4bOaN@8gK#JBwiPF
zs#^<m1E>#tQ~nfz0<aWZB3`cuAYVP`UGEIIO8jZ)_cY3UdI><DA_ssTMSTJC)JM4u
zGC^lBllU{J$1|k>Wj0O+)j$J)&l;})_^e4BfZk0O0O(kZGK!rb6~K<gtH5`}o8}O2
zmP@=j^lH8z{7Sq<0zlqpk-nuFY#|PRkHgpFt=AI|L3RjbwLzXXD68#s;_Xn!_I~0W
ztY8!I64a+7>fR}tcxRN|`5^J<Rub=mx^xYKE5y4Y-}5m5dUW3ic7mhe9Pu85i1$R<
zJ*$De;2QB4{KR|Z1N{Bs5aPY-67N%qcwaq0z5C(we%}!9Ka%(We1^Cl9|)aaLi)jt
zi4QqWd??Bv<{|zv>NXtthK~l<iI0GNN1%=)yAU7MhWO|j#K)lgv1qq(&}TgCJiY}O
zOMHSGtRg;fAlOIzm1NKXEFeB<H}T1^!Q_*~r>rMFwKanNC~I0Nj@_cZGoZ&z=rt>b
z_-xpI_9fzTP{!P905+Oe3&4K!ClP-Qby!eLd|^xCi%`!+H;FIqNqh;)f`7wbhy10@
zfJ%JX1>(z5_8ZV=#ZCY_uE6y-k?&2UT?u{PY6S3p6=c5+TfM!O`0APf_J3z2@ilml
z_!WN_y1iQu3<F5>?ly1`+$O#@6SM(S!FF(!_&U@d{s&*L2e9pW=)Jx_SP5W<4Y1<|
z$llN!EC<I3M@>L3=m=(my#V!l5AxrG{P!ULJ;;9#@;7w{Lx{f*8KrRm={`XE%`=IA
zh;p~Yg71ibG?w^Q)N5-F2!f-;KR!czTP?7J_$LL#w-Z3!wr?T61Lf~PSv$sqP2f1V
zOMGW4Xaoj=rC>imnY&<@U68vA`s_m4yC7rNIpVvG0A=oO4JLzQ#P=uwGWI~m9+bTY
z`tG?*e6I&U#$MQBFRt%B0B#ZgG##KW@Q3)PE5S+P`(U?yeozf`1e3r<fX_a&0@UL(
z$p35wfSk{+5#JA6?5_iQg4tjjxJdkS8^{Ok0POTR<a`d>9DtkyH9%)D8K6!Fkp2s#
z|DphN029G_fN~F_t_N}L;9TN|IDky}W&F@q;)jvva81w)ECTz%P2xwAK?BeqECH~^
z5!m9W8`J@P!2+-oTqpizCTIhug53c2IhGE(f$3l~fbL)EK{jX!MuRl~w*Trj@#84-
zILbUe9P9&kiJw4OCs5Xjr2yAXTp@lk4j|o0=yno1pM=gQq4U?!;cMvd^(27uzP>>G
z8z-m%I)lkz6Znq!x3J;2wE$#)3)$Zu1h<KQ2N~bB1JL<9)a|=##80IH=nFrSpMt)p
zP7^<k{HKxsbZ@X693%cc0o3jL4gmSTNB-}T{|xGNrWqIypx2p8#LvcpA}|Q72GHpo
zWS)b}bN#_8aFX~Bu-6ahOF#4kOTb~`=TXl2T!3=UqfY0yf?tXM2$?@N0K>o<0GSue
zpeBHx7og{bW5j<_Kmq6iW`n)pCh?1?`^7e3BG?4Z6aU!>&<600`OnDzGs?e&@-O8A
z<i9i@><71r|56dacE6zRzw888i2oV~8iUaQGJm~5{5KCk-G3VdR)UknFB<{sdAU1S
z1kfIrA@lc4&;pDF=>NZ;A$|pRx`MP<x`DZ1H@Hgtj|9*NpsYVi0m{Fc4q&IN(DUkH
z;(x-Pe<JUnJps!8^EB~m(B~R-yfz6y*0o#2|H=l?<*yY0X|5y9^=4o?*auYNHz4N*
z>~do*xJdk_AHaS$X9A@84}ltBAXpDB5x<oTS_8<rwV(Lk93ai#kn=a>{0%v`-JlK_
z1eSoK0Oj4u1)afcuoGM+e%A>)f-S_$P+l48rJ~K%AV4`P%2Bt0YsBxN?0dyvG=M($
zPLiNTU>^xK608BZ#<RghunAlwA)Fux`huk-6gQYeLf04!2gs*aKnE}tYz3D{7!m;F
z8-@X-F?>V9Xav2%F%l-cH`M|y0rHuU&vcc98Trh}XNGJu@|ls=g0z-4B&;<^M06)%
zYfZx5jD!PeA~%w7Ilx*H?s_DmE|Bn`teBf5yp=#lupFEx5nBY7kno{?aqCIMpC*wo
ziA3Uf5`M@}f}EtgB$BIvfuIyzCy@dfDgD7ga0WonR1Tnj>JYF6+#-<%JEcLVv~NhH
zL+5nplfD$7><lNU1LgwMDbo$AfervR!Ctn=JV&C!Y!Vf3lgPRRAhS|85|uq*CW-9U
z0D1>vKqgp0A}1Z7J~{KjDiT#t=PG+i<f5EBq|Jvu`M;8=+5+q&QGmJ>Tp>{iT?>l=
z-dEd1qPk=^fNs^HZw<(N4CU3d0i>&md^M4#Cel2P_m6)^q84P-g1u`)w_pRXg~Stn
zfV_1Q0PI?4D~TtQ!BhbI)rG9Or6dsl6;DCudic8@WIkO4@OP0Oj3!aP8wtd5MT46p
z8lkR@4wHDMCyB-mfPT@WJBeb*Ext~oX&r!T&2X(b2ZI3ewP*%5l6V$%fA%<umT2Ra
z`$@E#3C@#fJ)1-b<%c>0l|-BEB-+*kD7P)jY75)JR~GGBf}JGVqm9}lZ~GMhw&+j|
zEdBqdWC@9qwIn*iRvlN9=mgz6A0zP`+M)~e?TTygwZ-#hfcM=|Mvo!@oA<PV4kTV6
zfbw4$f-iE_1*l`MUH~@lb&<r24M_AJMxqb$_g#rEdgYK9P>008{v=*PeFqhg7@SXH
zNRY%(=rPO+`jU7Vbsat#ECSGL#1;}GN0S%@TZ|q=VoVnjV=Iyv*OSC}H<(Cb0_rod
zBZ*gvNlY?=yCh!SM`AL{nSwO%tHo5*ZQ3~!)6bKbv75xq10-f0CNUfJo`Z6+mn`O9
zA~A0p3B(x1YpBm__<X@C5(}r2SOmQm9Vf9E*B3*F#YnpZ`Ig}GC8tTe9t0OjU|(4*
zg>9Fjyk*~zSdMzU(E!{gu>$(MsRw&WtXx6jEi*vcRbxrKT^DR5u{smLZmS{lo!%tY
zq=Vfg-t7jqlUN%A){t1IfSCYt)|G;N0OhUwmBf0~a|6<Dgbwea4x1_h$lP>*#QU+J
zC%8bO6zy1wJRdXz%K_4Ft_dcS_>cqS`S2QvEl9s*D~XTHpbc0<Vrwc`O5$Va^YLsF
z@R`N7%OpOTL}EL1-hPtAj)^38;{8tOwyO?_-4y}k?Sbq)2TAO`OXAa2B=({F&nl6C
zFDmx$CGmMTaErtNlzHF)I1g@<_yXmB0a*u!lQ;xfhmMgr+#TSvBlzqH@*mkv;wbVT
zoev=ED9ZaX8Q|KNE5LOU$I`(t5?|r(;|g$t??{}ONCLi{_?o~`65kd8<o^z7;fIM+
zn@F6l3$~H?J{RD#GpP5O$t2)UiL+zDc7QU@`9TM;2%rsqm`>t6bcU}aeryJi=YkFF
zB=J)Yfb5I7ei3^A+!(-?m+AmqyVM!<2ax{@KKrF3iC>}julV~n==0kZ67XNd<<VdZ
zxJu%8<o$gvxJKei3$Pi$rhh=*A8ScmML)ZW&;EprYfi9)#9ye(U&!;<B@)+Ruj@BS
z+(3CZR+6|0Tfnan|Iq`K`JYk}w@~L>u-UEaB>qO5{EcgWpC)m;J3yY>$4J~kId|HD
zUI2Byi}ZI<ZdoI+37jFJT0u=P73>BoiF=T7ZwOceE|5ZTU^OXB54w}WtAX{Th?<};
zI6#Wh3=9LSz!_3>9)LW$%cSUSAQ!X&W5HH%jTA!-&>O5E#fY!$8S}wLQcMY82{=uP
zxd`+J$4IeM0?2E*L<;-?#k!W12<R3uo)jBiZS?@kwBs}Td{P|H*Rg<<NXU+ajL0jb
zIBS9Pq`10+(Ey*jP^Rk}Qru3k6X1PRI%o;Hfk9v*fXt{>U^CbUPJ)Z1c%YZ3E@%U0
zgZ<zfxJ62|A5;Uwz*4XqKz=lIiO~b(jcEa(OAK_6ISQ_m;<W<U!`ltux);~IkQbW?
zia~dPJh2M^^!LSr2B0&T2(|*)%=arPaU7s-aWzPZuL!o0k^mnb-#R5-F3!0MGEibL
zg6nlc5ARGT6kMu(C~zp!$*Nb6%!|yclH*E>OmamgMIKVR-dWs89MX-sJxW*gPPFn1
zyidY2FL_$Iq>4c|Qxu~KhXx#i>4J*x^|lI!z(5wo#yAd_bZ9T-N}(*pmB$M646Od#
zwR_df%-xx6nz(*@)aRc==EwN1a7ww%q@YdFG18IIq@&S#DJ?JdQ0^o8X`&#Ge>6R~
zMNOMldyCk|K31P%A4~o4eRJg%-B9x3TLdSAW4#`H3m^gC3r$G$DEgS_Xq`UF8E22T
z87&r@-Km(}E|<xyHz)ax2E}5tYzQU9Gh1RD*`4+cA+IOOnP@Aqal1{v^sy;cyR(Ut
z*Es9^!^s2A+W2FJ^Q==R-)wLSXD}zP$mX;;burOym)>mB>tdik9!UzE)$v8EtoHr-
zcWB?CeZNRt$%-WW`^dX+BjAcNT5Am1Ao%znf5Vm{DJn^%xFji6^FWd-Pe}4`J;^1O
zHfD<YQ|sO>)p;#?xA^>r#&?-B)Vno%p>^-pUzG)mS<lAeC3QwGwL4oN>Bai>3cpjk
z_fluDei#j|-y5jR#yy=(nG~Q8gFPxZGa}M${z{3Jz4(>TO121{G^bt>LZ_#c6uncJ
z;^X3~m~s*;dnykIrTcA_238thiC1t|@>7al@3F`CiRUJP-{<i}M|*-MN0BEZLLV_8
zMCM|1N3$@S^*VG*&0vAZyg++to|r&Z9{$J+XniTVdV6UQ`9UPpY*TJ1?fpN@6z<E+
zt>_FXh3V-Tg&t3|E1OrvFZ1Ey=LY;`NY4-+k0Bo~smzT}^?D^o{awA6*x&#8SH3sB
zvnF<&H>=UuU*>rG`<8qZyQK22mV38;)OA!FR;%oKn=wsiEoSe0^p)|AH*KZM(gqAN
zv)?PU9n+!jTOl^?RoDENE5GeipRT%PR^zUjYL!S4e6nRGTc+!eu08wSb^WKhX}I;A
z=%v|&Uu6tdjluU@5)AoST+~QO5m^Ri*Vla9AJ`nq^lxdKS%6osHFk4Iv2JOrxbSM=
zdV;NL*T&&@ijn`~9(lCe$lER{h2^E?dZOGmo|2qiHQ!kfoowS#?!4RrXVrZ6zkl-1
zTgr;J?;Ia7v7q;?(C|s^H;#F-WiV^xv%PDI3jcCZH^#bje$SuZe)g>eb6EV`UbQBi
zd}jMZX6(3GZSlW+fZ8YByR2N&y-I16LyuFx;1lkwJb$J&nH$rxvm>kE;dg07ah^z}
zR&9S)awgZMyYuh^fazZEV@*Rlz0B^d?M09BT6O8R^rj)R&4ZgwyQyMif9VH{Q1zGq
zZampd{$U+lz>UPw5AdWggFYoW1HeE9h4P;~X&Al1;E6_WVY#yZ==FF|n9ChqOH|EI
zPf6A*=cX*k?1~@wh^YC*ykVPu`sBN<f5m;fdGfk9kBw+Fy=MQ$W!>MLTz_Jv)#F~h
z>uNIj`N!JU?>mgIRX=?ry@KNv&#<wduX+7Y`@wzI9i2I7;M(T7=l0aywz_O;*ETms
z*O}G3&v>z-ahLe~V6z%eG=GJN(E$u{yR<PfIw%KR1*4-J9AmYi`@s;~s(d&^j*e<;
z(F$kd&4inc8w?h!;v+(jc`znZq{EfMBOR0`T9s`-vi>B#!yd0YsEV>e^=0*IeA|9L
z8_2tzM)~)utF3v?Kcx`{*@w~uq=`Hyr0G86bs$VVuKuXDW@Y?yHi1=8zfpUtQ_B{e
zhGs+fCeZ?QvC$L3bhDjvhcJ<qSxtIju^5`@N_3-iGjxhB=<ybjj_GzrXccXr)jqd+
zAi8?^X2<>Slx>(6t&27Ykx`gds1tcSkr^wi7e5+2f63ra)Jv6_#X3o8^ZfYww~H9R
zM@6^lPkaH-5MVTxN|mn4QnJvK!E}=z4ws0qzQdWY^AgUjdd#FcWnIX0(!dH0uNb&N
z_dYsT`}X1fh2B+CKDR*|Xc3tbnN&3igHBQu|6~rTy?PE?%{!_s*xK1_t=eL?Y{NA5
zHfxCQP?#t+=+p}x;X67OvyN7`RdkEnDiqM};qW{xC*qWX!W4{Edj0a3hj?38+~arF
zQE$IG;?(Mr`H<Fw9p%G$U))ED!AL<mh0({MWq4!)58%lU6wvxVW_1WEOfvLHWY-hf
z(dEmLvlz<Mf*yjRgJuEOKq0ocEusATT_X?07H93rI(166{nUGx`7daDH1TEu&yWZ=
zT5XKLxm9uuEDwET$I`O8Zr!=te$2oj+|`|R^U=C-lo@o#n$7VpArcJs0U?8zJQ(i{
zR9hRev@zTn_78B!Ik=LNj1k)DED+lGB=0i}Rvv!(!y`-7^9MgT99s5U)7N(NAKXj+
zqnm&8^gU9O{$~8gQZ|q|rrrMKINR~@;w8t`C-5(7T9vTyK~FPNelX6+xy5SaW<D@v
zj?pbsSOujzo*khW1e#yY&;c}WZEbQX_geA_lU%yOG)%6BstN4*qv~rZZ0M@%tX0B7
zCHrjYPj_M#O8Z=g&+#m3?59S-3JGM6c0@)-CyHdEB)fyz9f=NZ6Ap*ljmge!V0iA(
zz>plfwFxf#uQpyudpwx=tK_5<)-r?#8$$-3h_8)Fdh`ZElEE5NIBD*}86!FrjOh8|
zinKKaw?5wdW4A+x=X{XOzm6Z(e)izbZQFDk+Nkr;!GqJ*yuWuz&)u8GwqH=R5H`s{
z`*eb~Su{FWoE~j5`x6t*6<yJ~O3<;gD+|B5GBA{t<%{s8psoB4f6!m-SL7Q%-YoZT
z^k4NGBK&@z*KT5VQ=$o#GnpbH^aDZ>vSqbdTMoaq^8ybCVQnl9H~9TY3b##e!Gj8>
zJ{WZ6*ege4ZPLa}C6lBS@`4XP7}|C4yUCksFw4guf3s@?8#jCCPYXxy9phb@u<_+-
z%jS<6o*;a)r?&4ktdDK$2V0ge+!d|FzW(xvJukF=<HekT)8>ur`!b@f6oK|i*Lp<+
z6$dl$P%jI{N4*{o@nBrxHaj}GRY7%(Iy^+f%H&5(`X#mD#9=zQ@4Csm<)NR3X+|3g
zq-R#h;EWjrOA?K1mDVa7;1hYDZP^xgwCo-B6|1f8VzsA=&37A37xl`D(1R!&Z88KJ
z#ZiY~t_Sy|66dhn<H)Swktz5QG=srA08_ppf+AdK6#O2d)}tc4i1maBy;t5(nv+yM
z=V`-KOyD0qO4BaMkR-}G6D9ct+@f*|CmT{&E0GjmHm-l}%;sCptLIczo!0uz#HBB-
zDxEy=&A}UWV-~7URLnV1dQ-i`>Sy)u^YPkYGrPi`1EBo?^r%>P-%WxQlcIf*B3fix
z%;pO2)B&MLyCu<rdD?ApTgYIrVH_|}0;=J?KMr7;#yl<W0q89qJI$8b$g0yu1lc*@
zuwg*p_qFGGIBoZJM+13woqwApe=>hp$|`UFrYkSz*Zi>G+T#;`Q-@CKKV{3{zU^Oc
z=VsP#{$yXPGbW`rZLOYGZ?-8pwt9hjZzlU_+*?1a9q`Jta?Ci6-mwX7VI!<>Fw^So
zI{b9733uMWkU`Jnjhh=DB_3!h9jyYVlO<uGMZ>W7w^exiZx(y^cD&dXcXrLBo=pz2
zzN{y!vv9V0`}ENh*k2J;0INN(n+GeTQ59+ttQ0Q-=9K6P4o9?GZ`S3;3z4VC?<S|m
zrVj|k#-iyfp-Xzn|L6#+IXK~aE9??K7(cYuzVFB2mcrPo`8QS5@sjGgf9GL%jZT)n
zP1uxt=Z;J3=CIx`sTck}@yq57ZM!gK)5Lk>MopOiYW$LS=Z>HI;X>WK4;N3}>rs*x
z^*(z2z^3^}GL-b!o_}wD+58z3I=?t^)boR<teW3<)Y>_HM#vReJ=C*4dWR1yiKf9y
zaTJlP_e4eMBSggtJPnoM<Z*b=KRn#SU1k@0y31=$91t=;m?s|g59$0rbmZjBtBn-W
zt=Gm64oA1VS36yrqZY1OffzgS(4f-J<Nuhu_f*4?%eQt?4>nvHGpOy-v&|>JICsm)
zULD?Q$=81I{FZ(T%4Vvk7ONX>ztMn2RerV|OX6*Z&i>|;VH3Npk@abc8}?_V23pWS
z89^6b5Opva72T4ym>QR~#TU@!?HHa+wc$a|z*zc%I~Dd+Q0L$u@xqZKcjp~B0(t51
z3a&$*3FA^hFh0U89Roew9<#99EaoL`E%tx72-4Yq#0IjRA9@P1pf{wqkhv$pS*J?o
zo=oX699dE_U#X1J7`}VBNa?1mkz+<M1NRUDG>XwsTR%!aLof6>yf24a$r;&|+Dac~
z8J?jB@4y>qpO<&2{UOceL6x*S(^VA@ePU7L#E*AZi8lPPLu|z&b+$TdA?h@iwN|={
z%bJbq1}g{yVn48v^r-B*M4fc;j_6Q99i9M0>q5nN%oDeVy_WV5Vh6I8;qetUteO<X
zz*v+PFMbrQ=gw7W?p!%`{-Z{E9am7ke5_B7(pMRcCqvc7ld)z%6FZI^_2J9-5w7F1
zMzTJr$^9~5#=@$Mp;F^S8`S8>MGILU)_alK0l^cFXK<17B6@K=B~i;@j$2r)N%+M|
ztH6EbCcBkI3Tt98A@TLL33mLRO(3=;R*4Y!q5(y}5kge$;k@`raOBZNiJT3!g_@k<
zQ)=<TT5yG=2ZYH#RiIh<C!hZIc&DK?M|HMsh^W_NV$XKjvj<Myoc>mA7P&WLPlj&(
z{?|Lb+O<JSQQx}7gF7^;*}O~b&O@dS%iQzv?VehkWw-j1VFvuTT8QH83C33_tY<g)
ze6^!vl8AC*?1j3<O&m=arzY&VCh|M(t=bi7uMLXBuQi_xzXl4m*WlyH6^ram5}O=p
za<+-$67lt|^-qS3iWPAIm#fanP?XDVO|){02v}V%Ye3*P{nAc`@MMR|CqsFs9uEG|
za`4wy_~p|U`j_^OVMfrt;2n0i!;XXOefL-QT;Bav3lUz>MmHx0foS-y0s|VxGk6Xh
z&wEnfLpqf_e;T3{Daon4s>7L@l&d&(nt8)xUoCE!G2qasu04gm&Ypg+uN!k|+Noyx
zj3oopnijv(c#(Q$_ce9u@z+^}eXKf5E}W&VTYptuxchHB{ml6%>+n(8it)X>zTT$f
zx#HQqYx2Lgs$Z>a`)s|JUq1N3N*23n^Kw<cGSp%6wK?yzsCg&V7jN%Uzg@bbZ>zT3
zS?7y*M%saUAE=wpcN;P4!ssEBS}*<-J?`FO^telyhYT1Of<eE<3Qyf&u-ovgGaKU;
zUJ|leEJj4~1Uy(o5^6{1!ilXO&@89TqF5loP?$?GKM6#O;Hopd9!`mp*05~M)uW>L
zTb8P}jL1>fb9*<oMC~GDeafG)Ez36Y3UZFBjm3cjIz*5gJ-;}ZWs8jRnj)2`hzLb*
zQW6vN@itq0NyrxOs&BJlii#=;ML5Y_5|Ww2PJVcb3eQmwhwkv=ElIllI***5l9E`G
zKQccFnuh15Bs@1#{qj$B-Q)%8e)YGqb*vq0$evTLs~>#L`X1Y}Y@Rw>H)h>D^~cAe
z-yC$}yr{_dwma|5nf^jwj0*kkUDh4L{TfF_!AdrdfeZ=p7H3H)5f4q^cDn_!ZbzIy
zt~hRH-10cRRm8;!;VlUX*CTf-JSqgC!UF`BI;_0=<U8SxC}DR*_AN}EsknDWsymN=
zpx&5rjJ<U6Tb7kmntJ55E$XHD-|fOvYCE&0+uoVQtQ&8#>EC{^vas*?_tYK7_WwKw
zCkZqwPk@z8<dQ2UyD%GtG0JUnm4r;fXf6pE(Yocvd@v$1KSjE+VoE|dFgF#^95~7R
z6063#9#%)(z#-(wsw{2~tGMj$kJof#)DP9Om(``8>&D!PS<F&)pSlhk$=2<GaxL_9
zFq4~zBCI-NNocE%y{cnFbj+?}Mxn!O#FUZ{6J$cOKGZ~pR&amfKg~vway6L8q<<L(
z!;<1nxVx&gNJzMQzC?^m(2ZH5)?B1UNiR#5{iIgsqF@EabvnJ?Xf|48Np@D7HDSUc
zSTHiah%p`9#gY(KX*v`x7ii%gCC3KMzm=U__Hh^jg{MFT_GdQ{mw5L=?;RMH|4LAP
zD!ab4>{Apk=ZmiB89$(BBvRdAsyEIlggG`&N%F^``QzfGgIW?o7(yZR<(T+*v`Ot;
zxE-2<eZTAn^KX?L9opevdIX}3@CI>ef?rgRs2h*5F}KdJxWZj&yXWmx&n~+B_2j$l
z^VGI}{%n`2>K-@R&HFcd_3PCu3kD2WtL{1a)z3|yQJ1TcLwZY{rM1v@XsK4gXah3|
zli7@MAi`=k2}H3l78ng%?)?z-xatozylUWf12bYpBgY2IgR!AHmSgR+!b5CrZQ?_l
zJs2QlI2o%Jgprvj8&$?e?O@Iw1NpsyTh%LkTG;^In6kCJ#qCkh1|ASkhBkr<gC;}|
zHtKfjxK7R(=@pCQYtSB(QdC>V96E-GilzX@CWg|p;6k9O@-P%Ng?#mj9C1*?dw1X^
z%8@1#F`;Cuu-IIPEIaKsGFuEb3q~0DStX$$p7JYCzRNbjy%~0e2-9fw@PLQ<K)NpZ
z{?f4!OEENpo{d=cdF<-wzFm5ZO?X}XK7swPE9-)L>w8Hr4WG4KR9<p7{hW++Xm)-B
zT3F$aS1iPG&|*O?t%$Xv_hGjLOGQ}T#+kvQ$ml-ot61edfu9!9g8Z1G9;^!FETt`E
zq<U~KsC^PMXhz2JkTLAQWp3|@9=c=FRKD;=nUh!ME5?+ag`uAr!*k0f-@OsmNL+wM
zI!X#+T}nE=0Vc)Kf(N(aeHTWvDsBPXcRT*#`*FA3@s;0c`ZbUc%~FCD@T1HggWeV8
zV#45JR+l3x%HuFcMA&V%7(~OpeZ8!Ow~Lp1Wor%{UL;?GPYxVhG}Fu6-n!lv-htln
zULAQ^kE>pm>dnWMF1WVWd%<fsj(_+@FXKUPvA3glrgynlH`BY(d(<m5In9e27L|DW
zc;SBey+N<24iOu?EC*@(dPjSe<=&m%b6!!~JHyKzUiOEV?ewxy-eq2%gXA2G1`Lg6
zhh4Z3o3%w_yt2s=AuoVlj2{oeJ6Ig=(9znr@7J$i|Nhu(LDaBciF_}Is;sPj*m;rb
zOU;Q5w~*#sg!5vebQKip4J<{-kgsekmnXWAB{Ajq($x621!bp)f22<_ReXO9i@f}a
zF{V4Oz)1Z=EdOZ0CvERG5~cBXYTmosM>pnfAY;`D@ws-t$h&txS|Ea|1!D<a$D-(T
zR-4t13EaT+BEpENUK`v{6*-Bc4);ek?0jkSH`8lfhZPjc8}wA!?;iID(BU}u#JWCM
ztNx*EeYfM?rfBmgJ}D7z%6p1apL>_}gpn>nuDyb8uW(|QB|gr8fz99|40D=aTE3pR
z?`g|<g=1a`4{Ony_atXHIm6&Np;7D!-AQ%oW%Yu(?<+R!r~T?Lb5DHnDT`Y8t!}=$
zPyG+(=b^{hW6bjhoAvFYP3qDQzC5*#wb^y#O!-V#AC@rVo~ag$v)GJA6QW1L<u>3R
zHyDg&Gv;VBwkH2E)IV_2VGQXfE1JK6)^R1lWk^p+5-omaHjJ~k)YkHjDq!Q-$fb+a
zH+5r<esKCu*(uypkFmnRBc)Zksv~qaVU-w4$M}_yD)791r@<<8nHf$$lyJK2=8hpd
zVLB+c4?K26SL7@g_CTQmtfS}3!|j9gjC5@p_%C}c*X*@P{q%5Tm*;9c;cV3YwH482
z>V<!`+;w&4Ip5Ge5feRY_eHV-X87MMI7#bE9%>$};6da!f>|T1F&K&>O^PWx#>%;;
zB*Z!CbZBU8h>CbHL_L_mu!DAg<x@UL$-(NrqbU6{Y=E%x03AF=-(Tv}{a{+&<)r$}
zSInyR{b0+yx$3iBdHu2vbz=^$+IBj=Y!yHE+N*tsl--hJX${P?LD)HyItQzJW6bFZ
zPC2Bf$0!vm1QVD$fmsq*bu+V@S%i{cj-sfzjv=o%O8NJJK2I*F5hn_}9C9UkKaMEJ
zR$X$c+~NxdG14>SMxXTYH75-}&xGy11bAu+@BX*?d-8j}t(#9Bs4?~3ci(A+kywA4
znUmKgy*pE#l=ss5J@2+v54hj^AZ^URaj!ht^og9nb5lESKC)nTUXL!9Yc{GLDCjby
z$Kf-whFfr7w?kVPWTZ$&4l(DN5WCaCiP2#ZUEYVW$s4|#wON2^@xdg6Xmfr0bu}(Q
znF#;nj!*e%iRPUwgw?);%qXfFjD<Xl5S~b<GaAFUMMOrz)0g+H^inm4M6Qq?8PGIC
z$XzUK25So&zYFhh0(JT?>UFzu{*D!q8(wFlpIN<qO@X@6{pYbtFQ*Cp-49w-o3wz<
z7hUeoQvXnYlXZI!b-MvQj2Jnb*pC-jHJc1ZquIc*YS(I39&ic|9B2c%+33PxnaAJS
zrykqAFJ%I+dlVy~|L?!WxpJAtY{>Mo>cMmJ*}D;u4unkHZp^AmY>e0I8|q`e(L+WR
z{o-S%eC&{qee7fJ_}F4x4)*R>^q8-qk5|ASJ{I9)J=kx)J3fBa$G-5f4Za;d?hCf-
zTomvzi_hodcYN%RhaW-23?F-03aa0z=$?FivR=_Ld1;D|_t9k9eXP30cgpvhPfYQ>
z>-$)HtMdgb=M|0eF<#r(#8=`I0qv!aZ-(!P@1D;<KIV;y!J5e7fHUTfz+ldpK^wp1
zFpmGp8A?ts+QfvpC`%pzkpE@1$8@Cq*S~)jCaeDC?zHwHKGPaj_Htwn|6dwe@C<E&
zk~335L3o0auey<EpSJNvkE!j?PXDxtRcZ1(oAhBrY&_)DWP3grqnNA8XCv;8L4%B0
zykpx1QT^_mMaNPGOco!ZZSH-G_MVTnu~36xrd~%Di`jrpM!hg1wtp{zaUrZGqmh{r
z$bsL3KP?Xil|1apg=eh1aA&+fOeQgw!lbVw-JPG+FUzif#iy%lKf^P`PkmLkn)T%!
z%2x1S`D<n0@{F=}Wht_koPZ|s4lq*npidEUlS~MNUkzqNMubtvIm0-@uw8|z67l%3
zX~S;UgMw3B;bQsn?E}=&ds!~eIawCuMWT9H2fpI&XQ=TvC?^i(m@o_Y6cZkHp|`-}
zGh?9v?@BMQ8-T@-?CKBqX|z(p_nRCm5$Bg7UzViQxU<x!B$SB+@vHC7dGXQ=rR9<-
zcUEbZRa^1%h`Jc4QqY5gK%C=b3mKVmBZNxmZiFy9m#^-m>ll_^B?p@ah{)#|GFX51
zn)erV$1h&BmEol^e@`1Dtu*`IW%iA>CntAz<$f@PY1?ub*0m8)<hfXI{oGCAeK~fo
z74+z+=>cCrhXdSt6XIn2M#$jPiyI+5wuZwFbyy2I86fP$QVNsUJKjs|iC?_zHFcWW
zYK(rsm|Ih%4w?K7aRL_9Q(iC@`;T0}t0XMslF{6FGQ8GM@L2=70l9S=ZlVXng^8nj
zOjJ?7P!F$QeZOG+@u=~kWv}paWqxV5j`#H9_Pu8Czp+cn(F-tCd<2tW9)N~YJp%%Q
z%auj98#R*Jj8)!a|IuC0JY_c{y#eP;+uCt>MFs%>z-4TS$~jzHDk2!`G9cn{QFr7G
zfsCGb^#`}~4&+WuWu-AyphD^x%+Ikz$5gZ{{tSPNMX6TZmen+*7;QG6u{fI9<&Yd5
z?en>dLq11FTAnelI7G&WhY%jd{N$<!8%OtD2-#)Bv(_WQtJE|+sQiA!4}mPq!03uH
zkc9&Z!eA5Sk?caTto^e(ee+Etr*6PQ`;#xZdUhB*%(toX*=_HB=4xPR>PxcKDgA8l
zq=s3Yp6Rrto5TD}qu|J{tH*w{T@jt*+qQbPRs5U@%U=n$S10CV);IKZ@MJ}#Rc}?R
zVTa}upMeeHVS{}1lvr5dg`g`#MElLc=EhMeo84|SM-<@+n74uz<QscdMSE6aRv-(@
zb+?P`wkWgHAB`#8kWw5nc*qBfIPP~WCn3@&chR(23w|y3yERj2n-<csL!GsdUIrq1
zh7=sWkn@-Uzo8vIwj$?u>4)-5uWxwy?7Ej1`Gp~wuhYfbZ<IDS#wzt!Jo((T&ecZs
z8$PpH2c_{RZ+)ST+tR&5+GJs$*g*MR4P|#IX*s3on>RX*nDQE{|MJVj(Qlr-cUk;`
z7LP%sC^OoKk<DQ@+P$$>S8*uO!5j{&gSdlt<iaL60u@vo!kNd1ZTo1HsJva%atot*
zQux5lgPkjEWjol3LoJpJRk!RsJnN73?|f>0Pv5KU$R#a@U96&h^4+KVS?f2~%=LEa
z@rwH04D|+D;;DPTDes^qqT#DH4pvAN?s&9>(-sjCiPL5ona;>4MBU^?1i1XLxPxL~
zaj9PU+PK`}<<6eeuiV&JB+K(aQoX#enN#v*AT=ZRe&AV#w%Dw&r5F2kam`9^#GBSe
z>FTej6SnfO=`A}%!N_a`jJ$%qdB-)aS>B5eEIdp7a11OgYjIi0&@AkyP%zu?C9-=x
zm{>e^{8$dYFoGCLaVWwc@8@pC??<pWzBuG^SaroA>myYO$D7JM*oWS$Rws-GSRrY<
zScTE|qru@VWkW_`_^!g3ASO)gw6xOX`adlH{Ookb-#Bz3W|=Z(=)@1x*nd(QPnh1Z
zdF^pS&K~%j)qd~rwjNz37Y!f(?(66yPhn{I746`Wkyy7LPekSs(Gf8Qmql-J6o)K`
zmFh*)kXvu(EK1ubzCUM3mo+?IVN{m)y!8KYssrJD#HtM$83^zjusO8pqtcHS#4d=A
zZaBPCgWTB4*|nc^yS|DQAKtAmJ{&i!Z=dScSM~gf=Q@p(qm-hyQaUNmPzvSZ4t-4U
z)X4aRge+rHQY067`INsgpGOLRl2K4Xyxo-L6&{->yEx==2w@{zMsdg%MKJHfsYi>c
zX|Xk}$DoshZ&J<u(7LszydPdRZo<OClm{ou!d(dWYMue(Rr#*07LQDp`{vWsbp>yx
zd^UZFKbhAm8T`z`j~kBNI%??KG2D=<d)JllM$RpDNsn&5Hg+1_x6P1d)znsZE51Hw
z_4-ibil48V!151v>fa`9imBQ3yPsY=DH4W`dYw7vj+oM5srt7Z^>N5Ti9*YG>8W5!
zgr1xpH{t{?x8CiG^+b`=V)QB)narjrVJ{Ae^05d@Y}7Cu1Pl9D;YARdr$E+64!tQZ
z499Z+MGM)$<r>xe?E!P=MUDDkr1SleJN<*+Xa3TL&Ui6qKxp>lV3)E1d_wD5Z|_`L
zwgP9UMs|@q<4I8Q2DFoVg$;rhoR~J^cPw_AxJkxUk^=al*YFvN8Kz~X4W>WvyB!EL
z*$qk*qvp~*2)p^=5fhFhwA7jbwq_U_Sz>Z&vfB7q=~p`c+O@aO!41K;((d`xR_vx$
zY9xH9c(PitrgdSmvMW}TEyAvtibIO;(Gs-9gtNM{ywM*Pl3d>2ava9aK~iZ_*=N=2
zN9QL#Rx|SF(%%!O%7Xtcv`sR$Xs5h&C%AM%d7HFE`BoYhe5M*N;=GVO%~~;0%~E7(
zZ4uRZea>sJ2CNMeT=p3mT4NUIX;Fk0V5@Cwg7damLLpdUGTY&gYJoP~TH!!jZMdB5
zQD3us9+7i9!F@&q=pV5*{-t_-b&+ha_YbljXUeW%Z{g-}b)xRz-50jAr_?~%YtZ{)
zYvl)%;kPKdjyg6PKN`lH=vbmIpj)QfpxdFlr^B|XzzPlL02ty-{mWZL1~rpVgnCwY
z@HU=iBKxMkA@0)3tYh$w(_}Xz%4W7y@(NLz(((Jt7Lgs8jl)`_1FS`0V1WAr%pHC^
zKCm)S8aN)f9x!C#M_V}s90C6P^#D5;V8;V&V}R8~hPg<kI08(O7q18S#{o7lz}f~_
zPJpEb;3+ZWI2vGk1MFSxqmBWVA7~NamH;cnN2da8Zh*ZIV8t?hUF~{{z<90X3lONc
z1hNABPJmqqu*HEd0z51|KfoLTe*h7N0OFZ(6^cV~4zJTxiKQl4otX1IdO6V8?8zx9
zW{ah=W+;S5WrVbRfQih*9=04`O2SJWX~gh<;e`>dK3EuO*X3n-r380C*vH3^6#l=w
zap8)~n^oH_mG^C79)cI}8sy~m&-*!?gwGxBZPaq$I^Ur8SGiqlq70(`oNhy>+nT@8
z{gqi!qc&-uu8kYShmEMxu*tsVWh+JVl1Y{c75cXs+;42R^1EI8aL@9xH|~!^9<;R&
zdnsumCemm#W0p3VV-RpNvRF%`4gn5~xKR$=fIhP+Y!$3v?wceWjgcd*7BeodQh5CN
zM~&pz#1EB^L8ayTmk&)3Mxb(i?~hD!&VZkz<U&JvE-yFevs09jj0y3S;7H(!!WxOm
z)}e#<pgA|vd${kVmCsx7%(PwB0?lbKIG|d1^Q#tDa*OAEGkNa?W$LXDkDb|i>y<a#
zj2`y<hz^hOcgLzf@9A{;i-WA@ic_DlgemI9@pBhHHRl2}x_1b(SQYpMUc`u=45p@g
zJQXV#67Bd3X$6577rA0JKfq!)7=4ud(6NCFdEabU3PekjmAlg!DQ-k<|I1#8-fO3x
z<;<nIj}>2rKNH#E{lBBFZ$~I_8wX1-C;g%C=<eRZ(o2og>HGBd^@%QN8TKT_*Z*)G
zrDua0bcIc0aPp}n=tvVTr_-L`w&4hwJ+ndu8AM0$K)wcj(Q!pCr_XM)M<r<PT9W3j
zc^}qFdN%hRWO)*_e5EAKUtYTh4x5~9<;3Lrzj|yIzkXeG#Ve)H`X746|M1xgMq3(x
zd#8YXIQzeyw(#i1|3K?F>G5EqRcA5aJQsWwr_1Tq8Lh&hcktp6f*y8*UUPXKX_4~q
zdid64_isyi?q0hoqxs=V**)G#=v}(P>s*tf)EV6(yNXy7ar*7DgQC{t{@+jNWs~=m
z4xaf*r6FwFI9So3_q!t~*6Ss=UdgNw;m6V|zG;YJ`^MsgL2PWaLztT)ge>IxD;%+v
z+mo8R_~<zcZT@u2p8POisKpBl^8DdFT^Tr&@j@}>*01XiRhW}B<)s;OyS+7fblpo|
z;n8z%dWJned_u)0Ge(UmVvn!b@Y2X?t&2Oguhl%SV(|-4&wBlyw@JMwMHOpQuAJFS
z?nJl8>Dke`O6ViCgGpAC2^)^ySc-MTa<{PKm%5sUtk_dB*$K<Y`<}b}&V%$I%Wpw#
ztkd?js^%AJ-Xkn&NO`b2WUgmB*+-6u9o1t<V1MlX5!N;pYq*|scWY7Dkk1%*?b^7q
zmusf9woQnUR&9CjcclT&8~M<#2_nWAX~NFEHd4jKN0tv#9$S>jL^#NVmAlri(t@%-
zJ~BQbV4|I}xW9P7VdZkiyU@j!{rmW&)F^vd^O1OmyX&+OH9SJ`X;QPkm~uNqGb_~$
z`sE=c9J`LNSgkg{EodvYjmFn+<c5jBGpWkGY@EfEQ8jskXt#@YqaZ{kV`I^UIJ=+6
z?wr{CaaWUBiLHzuBHarGf^`R0t=geA-;ENxVTP`X65Xsyu)u{qb6W(~n-&DRjBuBX
zk%~LY;ARoR?a_NYo_d}^o{66M9{oiR`^fXThj;NXkG!`tdh{wXdD!!wVCSwygFGzc
zVS1#-GX+?IryFvd^eCz2X`gtisA!?*9b^|1J*=)wneHj@h{AU~zj*k353BB}?+JN^
zdK8a`{q12VJr_N^2mXH5BMPKYtwd{7Ownu)Tn7&eUr4mritL`+9&W%g-G~M?Mp}f$
zU^2p1SQ*JX6sD2^Gqj?NMQZU#+#e;FgtaiFoM^S_SN?_fS@=*+yODV^#*ArKGc)qZ
z|6{KoX2up7cFMv*UzaBeK}e<2mudQh9ChQ-cAGK{P1&=%D(REh_>Fw)<%a#rJTQOK
zzU}<yGH<VDO+-sXdDf%NYoY}#^jt8>NERI6LZlJFB!k(a$3Az2Bf=lSgAv6M=ORRe
zG`6SmV?}5n9nQwequV;W7K?n~8iw5i^a||zp{C{Tf~>RDS!e-CEjY+`f2ofDj9pf5
zeX@&nIIL#jmkPJ3b@7X|HvER^TV>bFjzPbv7~!9Xe$iAfnCf(!>=v`#?22)D3453r
zc;tX@!Zo+)9}6nY(z0(#+m%o0VY9jJyVQlUmxe>Q%*Gu>H4`iQOJ>#cefwcwdn_~i
z*$1DMP4Dx{9JQ5gqH*-FfRbIdruYM&Cn)@P_U&5y4DJ|t@?2bib|y9`=tpeAh_I}I
z$UM-(p0qT#JZBO47M5aRSO+o7mU|R54;WfB+rma`e+Gk|7yB0ZEjbpB&&k4iT(huq
z<sUho>sB<^!p2${gmt`sv2BMUw*{w<*mVm#uU#A+bT@BVG}bcP!jZ7Eh1IpRuy7O>
z3_1{L52rhBVLQu3q(4!&D4ei`h1Ibzw<Xn*ZxIk#{k-Lxg(K<ia=~eV{Gyf?mT#$R
z;mH;T4ILKF{g$Amqh+~er{$dGDrO})$wqmL<SV=yXHjjfDkh=Fjs?6KJ40v$BP%+{
z{WW=bT$P)_CH+fePru*uWk??XX}1IZDUZtIV|icTBV>?XsO(HyzmjM4%Ok)BYc#)D
zcEBqfF=es*MenO3eafqMztiHRQEDsk1lB{9sY|dRQ+OSf9Pz@U%XYg1Ng0*Au~G5y
zR->>~wpwn49CmBaS*yrubyuof=|-rs&mDCmgvjKBfDWP{S%{ozdts6C<O5c1;RwV1
z;5U<zokGna&M1^IG`PT+E#yiTQMD*}+A91G;S#JPd-oY<u4Zcgthe{*=z4LlO@GB(
zJJc!WDc896Pc_v)t~0Qwp2<PzdBRJz3Rz;Mq~`UNQObaqSkD>r$8;E~E-87%!y~&i
z_W9LaF-;@&)t(xIarJ~+gT1V+K;0i|3n?sRDe&N%M=n_K#45FhVfL-w=*687nVxpv
zJ`S%w#S)+5Ronr0c1BXAcxi@MZ+uj|#bI|_E!G<$VXSPCMzUC<DwAfP@(4PDtXZ%|
z*f?-P9=z8gFc0kWAhe1z<**2>g6|i|s0J)msGW}vzr%t8?VJDqVjtZ>X&?26tmJb0
zsPi@ZurB5HiA!X)AKGUaub}i68R(SVf+nXi+Cz?YAtQQlX?o2fBgrlecTv6uE1BFy
z6m$kF)GTsZEV^}}L`xIPGK=VA8HJY(mLrxwEcb951Wge|76ixfwI7Oc?9Gb(J}YZ)
z`4@^1)_}XC`C(PDD2mp;^%jNQl%7w`sz0XnlLMdVv!L6AIjvI1_OCgBSEv+Qxk6w@
zi|jmiyLlDU3BMY>4x{vK{U)AHsZL@BzJNWC2K8<h+@?zxd<)AhbvhJ78q2C$l_bcc
zonO@7k$Esw8R$E<j3!a#V3gn~LhyNR*4)kV+|2D}IyZi+D5lhH(?rNyusvkp=iecR
z`l+qtNj}I)*W{dH6H&J9BXpc0rKx^{O_qvu@{~mn{Z*vPl<D|9_65?pf)<AF2eK<x
z{9c$$3H78@?M#M2kJMGP)C<}4^3<pi+Z>&&vp$kqJ4vC{KUYh=fML-`(ZLA8<D>y5
z`Qg()T6@y=akU)P%5xxaCv$M-(WP_tVr-0X{v$^|)@OOT3(%;pUfOFKdoipLuNIlk
zPgHx%lJST}|DF0t_Ut36J5;avFR8zJAo~QvX+LQjULCUg)T;I`sb7AOdO9<Qbr(_<
z!C$FaBb@$zTa(nLp6-(eIZiSRS(<#Q``lo||0!QT;6du|7$PNMYd$9BzjI%o2lAi9
z2#Odza@3R7#CO*o^nvlE{y3vuS_ZAEMVd7m%CFT(8+I$#BMEwZk(6rpJYvKDPW>dS
z_(<xU<g|ZDEo~T<eF7(?!*xuC?5-I}|B_nTFr0cieiypDj!;GLUTG=e^bhJ7!jkx`
zru%W|uBU0O!o63COlKz*!#{d2(z3rEN&Dp8hiT(<#($)(0l8o4q~2k<Cw>p7)j@7g
zGfvAtViBpsF`d*poOU{5tXiLi5}Zvp>cgoY=q#hJPiyUtGl8)8N%-Yq>2Z+0HZ@?5
zc|>}B^pa|t*3HU$`2E(2hxlFbek1)~Qa{P^%k3>w=On;e{2!@hEyJ=;AfBjc!V{3X
zOG^B|q?Yvzr=CuDv{twWLb%{BCMAZ`Kd5O~ciF?kIZomivcvMFHa*jF{vlsmV`(*Q
zUEU9Ij8hwnq+LFWON=o;qWgcRev;LBBz1PY|6fwenucYcz%OlwWkVCzF*)vEQp=i#
zQ%`4+NUgOgRN<_@KOvkxTvN>5-`pFdw8m^~!AZ;%hBGZD!u}%;J6X-<2%ILx@s?d7
zdHB(w+uau367#xrtR6hhKyJ=Hm}(KC&=u+sJx(+5(|-;4OkM0}Z7P4=l|Anlm+nkg
z`ukSKvmxrF_>~Z}7r%4Oabm~<Z@Wqm55{onN$-sjQ5$faoJHdlfC&#}FonMs<k%Zt
z-9J1Ktu5-q-`>Wz`r+?{H%u{}3>x&#+e3!D{o?Zt8$REoeuM7H(7~%#zx2}TRf8LK
z@7bV1&mL$bT6*sXrLJxa&IQj1X6lSChtZLM(~?+ScoHlgOOoFai*F`5@MSO>5L)io
z=-BBH4mm>y5|WFM*chqr6U`jaEIK+8_lbiC@l~3cd^y(_WAkt(-^q`{BjtL0>ka41
z<+mfTB@PcoJ`_S4F#Oe~@bXN0nDR6Eipg7UCx)M6AR|E7eJOu{fvhBU6?qPJ6$h$c
z`G+UZTh?go)(LUL<HyZ0mTxXH4|W$1+TUL1IkA2ci`@3Se!)`L%Fz$E8N=%cWf3f&
zPGf^l#kqZMSAxlBO((LNgyM2#ChHU>Bhi?gV6vKC3i%>p9abw2yhP*MTW*J2ez(u<
zFzAw%<bff3I!jMi<hLcupWuKu_v0|yck#8rhOC=BXQ0(H+*``)jOxN4OOlSO{PweS
zUhjYR53U+ccuSWJUlAx&^3wLtFRL5h>7|&st=_GLnLlisyCZs~yKnveqhhMD1zxqg
z&pjf<jy^vomK7{mx+weg;WNjum_s{8^vDg?9WX*YH)c+swH2T3h(Yh(nR_ji$I<I6
zV&8vtFg?qY=8IISP?Fz|N2_>r)e-!v=H}U%-l~pl=E(ME2eU=C^wTmb70K6Nbzee}
zy=v{MJV{gy26BtCt7cbCi%c*ir2HS=-UPm>YHJ%m`wW@Wv`LeubDK^nr2~{1p#dsH
z3YM`FP$-BpDl_OsrA(p%LKy@>5D^DJMQtes2PP*(6cuL?ucG%lT;VF$tF$?M&)Vmt
z4d{K}@B6*)|KB!Ea?U>c?6Zfp)?UN228S{;(*$D-lvUWcOt;op<qYd;>|GG;USkB+
zM06EJYjcM#O?KtskOkCjd>6|*in=RmH>>Hf6bSQI=(4iO|BFKXxIQb3yx$=3DfmwT
zF&xT3`dR&H$#4JI{kC6IZcW~%zOZuH-QR!0Mz(!4|FHV=l+6w6!oK+%mOR*X>b-MT
zh>v{PW9W(&Rae<{?Z*H0*41glSCF=A{iB_$+IM|;%+-^Ml$%DBR&?_lrqX&E%WB0H
z(u-Kl?*$$<2sZmQcJ`~Cowl=k?d)dzT)UWTFR*vFV~@`!erspT?VIi5opv_LKE*Cp
z+F7oh{cdNU*?+K$FWFDn#oczc(!K@q6KMn>d3|YT2klI-SKC+Hx7p<`&q70R-Y%`O
zvl1MeZkMLx@UwOaRb|-Od0tvS<FGU1D!33yC2(Xy6tfvaZ~|5%uKv)pAKc==cYC^N
zf}bOG2&OLPXcVy#S3EIu+N0a2&w5<kHD||;IkO&qn4W*N`kUMl^u!?)1pqrEG6yqQ
z<k&dC7|DB}sD!2oCK@OT;LyUoF<Xcxzy#=*wsD<GGu=}C^iO6ydF0in#Zo2t_tS=~
z-%m>~@87la;LW&;@6y+D4d!i$Fd|TrWwUwnOG<>)xO}5A4j6&$Q*Fg8Uy<YEp-Fdm
zk<QfXjrYiHVgJJwq%+YBjFA<JCPevFasmXma#ttalFmUe5?ZGm_Dq;jc@$CF2@5u2
zf$_aj%#_cc`(Sf*_nwt2K0aLaXi1mZi*B78=zmS`fdhv0z3t}O9T~65(my`me%FRc
zy?SQ*hhMXJ#lz2MB&_Om<ESnZdX-J-I$&mDNvPY^BOZRVnKqC@*`@Q!H=s}s(C0#-
zlki|*q}P;Dn2B9-Y-v_jc2Rz;AmnG8<j!3jUD!aWOQ3RmurMPdyKSbg)b~axr~R>z
zBRf5NTDEkilvS4kjUhG%ge$u=C#N(Up8dA?H$pa9PI)6F>)w^L6rqpTLepl<z*;0W
z2ip}Xmq@P@wHkF=tu0EzF+iA^78T+&MhBt6k6MvvaCHw`mqeRP=%zX;-yBx=9DY@O
z`h_EG(BUI&@S*E>s-NwAQvLkNoy@m$7t4849rF4k3s~v>8zv4v{qUH<yBY=!6OYnW
z$JjvVum&ADsy=_@NtU&9r~3I5c;UjV-`ODbS*h%<X*bVzsoTXtR|nPihr@aq-Je~A
zM*^u{Q*l<uPMz}o=tqB+N$%Rs(GC6Bjry@85xBlKN3dhZj0|*SZrfv_%KS0;)AFVK
z{9H!{b7Z7vT*{C#0?@w*xv{y^b8B)}=PG6?BR3=WKlN=S=9`l^FbnElC^s(aTjCG+
zr3Lq2_bOL<(B76uiR-MNTtWUX`Zc`n#glKmbfJ1?#_RzLmfe5nwX^)QdhYyhyH*W<
z_15vz?`B?I{>awNyDJ7~-98bVM0ipBi!l-FJ`Q%RdjoJJ7vijNb9cqZnd7CTWJhv3
zcOaF=IPgwRq-T<q$Va*5L$Txp*?u!*hv6H0wfKzqLGd;5a(n`~BXp3K1Pmeci!>i&
z-@2hanZ;Wy2IOBFJvn**!F3o4TO+0(>1$nZ-X$Uf4?4qU)6Y{M9Vphke8$oL$;KxC
z-Iv7s#J`ABJmKAJ%iG!E{gN?!qRk<;rTKSpV|b#taoRMZZ+qnD#CszCb|Pd%MTEZ{
ztmI{YZ#k#HQL5G7&V?Hq*&ZqUiK5;oKNru^Q`PU$SNF<C#ZQ#^+&>~a5Nm*cgaH3Y
z2Jn}a<b59%%-HJrkO}ceG-o}X6@EW!PnLYN5kF{8FQK!Xt;E7N`qn@%XH2Xy&H$$Z
zs|_NoEQ_`n1P#O*O=i>6Au=s+beA{-S@p*#)08u4uia*~3^JcIi#kU@bZ}|u+vr=q
z?sfV0GWtjq8&eZPE@5y100x3CVRIo?`OwDN4gX-BUskPRk4>vKGPk<@pqR==sApK_
zIyQA30xv&br&0v7cxeyZL0z0v#0wh(LtUa2C*hwG7YF&v4pT&YY^+_d#J~vxI9iwx
z?l@Dd5?dV-Sv(sPa>bi%h}tu=d(G@NawkF5Uc5OTky(fh7!!gEEqqw<6p$}Krg)$&
zsWY+KA}`I88w-t7G_n!2k4T^R9J}n$Au>m2LU-O8-p8`w_bQDU9R92N-Erxl{8(Bz
zb%gjtS~xTYk<j6S4fm)oBcm`6D%HdO<exrPlYuSv#--zi&B_7rpEMy)7#=8brTR>=
zIX>Q+k_m4fi#s0%F~2V*GgbCv$03-(WEEVpAwEtvWFsWf0Q#)O<Dt14k>;|b)_$~{
zV>@}=6vg7pGiK$0JyFPJLg!M5sIXZluv}M%JO*<xsPU=^Jf5Zb!AD+V@&p8C{Pf#H
zPaJA)rofgW>E>I0ENb2~sgVL)<h`|UBSCb_9b44(XDB#h!J{uzfXh8&q#>i#p-V?M
zKRXJcE||@egyYIIKwQQP8A4m(&A=u+sMVSY`?_E#D%?}V97X9x#YJO^78I>2dbr5w
zC@L$e<X`s`9V~jM=v<Mx+qt4kMPgClhOxn-K-I|L$s(knD?{-;Me>-UX(%M|5;#tk
zh}CqSxxdV2*)hrI+ORf?H#1h2%1j4MVwtJZB$@&a<XnMMGotF=i8&V|#RQVFgE6Es
zEd3nX?HTP8x}Lb9eJox)fC@-;GYbkpN@mQA5EEVQA%&?XoV0g2A)V(ywH%4PPza<$
zC%?+HXO|scQufTq<<C5K&#{_ShgR%V>-x^?QaW$o&|7X%OH1cnJ8aU#>-yd%Ui<iI
zmb75~`_JzFSp9~%KOB13qMDl88B^9?tf^T$ZTkIpfmZZ_7?3R=g*@rNoM~^3F*AhV
z*dY+c$Z@eY`_myCvgJ5ikefC_v_7Y>K}wCX4L&>o%p!cBRsbgrp`mr}frlf$tfM$F
zP)6~N2$B<F4v0^xbJ+4)cAq-8Haw!XmS{b+h-lM0@PM|!?;~Hv2kezCuwB`VAT-8G
z!x)aM5J0LA4Od~1Tq6UbpaoH(6(@oi9eFkDxC#my&`ZNsXimo6=bd27H>ppmPd@mg
zc5kgeTJ9|xU<)!DTJLQDAS2yPk}Hw1nh+4E4e;7&!9HlcH*Lh|-Z}yTJ$x?>1%aOY
z#|PO6He!=H=S28kx;KLaCMXG@SRP?<;Oe+|Aac9h9*5QClwxAc7!$M6VlkQFFk*IE
zW$Zq@MvL7tCj>-<n7EiZuxG?o$1!`HJ<jBDyPO8INkiAsK@wpx<D^Nmfk)}?xhz2P
zK+CVT)@fHrl!=gc_%EU&5Qg#{>*ZA!rXhq-UD*Bk?&{)1c4vmV(8~hq*N1;)7fy(;
z-nnUk`YtP8u<1_m#qjOoGVFyf!Qyu{Y-$;7Yrva`*hpBQeL^|{sYGlBMaBdn(?_<n
z*xPG@U-{TcA3Ne>^*+WACQhFnZ13ys8{(6)eN6N@ed6RVedm25&IannPYB|@Cg7;P
zF-T>^5?scwtO=M$j0zs{y~j(U#E{{^nLakmH{K`q)=RYSKQQ>M?^hr4D6rRj?0Fws
z;#=q2;ghO-H~Z%Lq;enY<YP{s&nL=0*6nBgvUVN21RwA{?h|MGmiWYRKE_IX0pB2>
zB>Uoh**@vKkDc<J^@)f0Q*7f`9SZbF%?cL#SgensuCu-i{Jgl@x6SvgPg>xEqKQ@d
zu>W8dDbAPz3!5j!lb#5M3t^DlO5xg6jIeACkdMru^aFn{Y_GU|4b(-mz3Ce(I!z}E
zW{^3K6CQ4JBTf|=Z;UpkDc2f+?@9<)2BqPK8~qc9^2_a*#ka%~V>x^8wr-#PSjyb`
zE#|Jaww_>V|DNK)`ko^bM#HM`b$Cc1=h>GZ6~{GylAj+mEsP&~{Y!0f)D*1jE|<QM
z4k)j}SE`NBCy<qGN`)YoV3G>j+A;=*95$Phl#q~=1fPv0L4iMQi`NtvV$n(xU9`Ov
zTF>QI4XmQY=bEdijGZB~IwejtHE*g;PU%2!?T1Sqd1}GicMV&bA<K&vcDTJ=_KfLA
z-+4doma7Nfeci|**Df0)?b@m?Q@>ezy#8_4bH|Ot=DhN5UiR9a>fggnBW5j8o0iPF
zdjoW!Kn_&9!jF+6dj<yb3>H%8nPo^E769H!Mj27nCU`A-;M;DNC2WN$%AbNPAdEv^
z=s{aUZ8f$$4UGq<Q$!~a<CE!rQ=A`OFZXVKUJQnxl(wr~Z;`r7ohEN=zS#WJMzo;`
zZFmuFFbdhgszZ2y3`tBu*g70P(H062q26jycmaMEq&QBIn;Q<wht;lz$A2Gb4F1*#
z+H+~E+ErYqd=1)@ABc}fAh3kc<pl1A4VNKUdeM09{7woJK3&jOUtUMB`;HPe)a?`8
zoJGaO8?q}qU)A*~@tMc3Yum2((9kn#SJztack;VWH8|HL&zsp)_|!h4@*#1#RHSSK
zPE(06JJ3hYZ4(=t6z^^W`(u)n)h?@jOzzoGOpGbP5&v+!=#k<BF>%58_=E)K*-*k4
znT4jpZ?NB9ZDOlTEW=a{R!po2;-%Kf{C}~wql5u7ir(?|lePiew#B=KhlynQ01LzS
zkT74i#E9_yIjslr{oeg#x%Z;Vn{H=Q>zoTVW-RH(<ORzu9StS%UPsQl<@0apRvKCp
zC)Rdv=O2Fc^fA9H^2mgnm&JWH<@&rr^&jb;&ZdcWHcgfWRup%+b2xh8CiFrl^a7l)
z5Sy6hRFq_|#gbx-IU6#5A;h0W@+r1TU>QO+3iAhS9R^)^=Z0yg)@)INdpKXcq&Hw|
zYq!|T*%11FcFfeC+s58ncAdC<%l+N2X5;9;x>ejh=IyHb8$TR6dLU*L^y$h0=mWB_
zI<pNnZ<_3OxHBDyCC*HivvX`-uPHex8AuLEP5~jsdL*w74@&(S2_Mxs2;zC;MI-Fw
z?#zzdN019K&IEkLgvkYF3^GqJIM;sk?xs!`!gX~o{PgjsKOLwK*Inqe>Ey?36oQ|h
zQ$IbXJ~hkw(3fLaYUAHk_3!)CudBa&$U1`!f0O01N-$_412Ng}!K<!VxJoD&)&xpR
z9Dq$LH}vS(qb(vLpsncW@%Y+GeXs77mXkIpM9~rDh>j>PPfTn#81b>r{Jh3Xe-9*^
zV}f}(gEE;T6P`+$nK`ja7iSkJd2CK{fYYZISG|Ir7C@%gmNfor@EKU&t(~9|Sgk8A
z52MKAvK}O8Ej$U`qJa@6U?Gtr$e3d!Kv^s<C~R}|NDJw-L7IR2bt~K6*YDK&4KHVn
zJ%9h0RRf^_Yx9%q<Q)rApD+H~(Jv<4ar)@T4pZ~2x7R*0@P=z|+C3{)ROPwT=0EAv
zf-y#oC|fdbMa}Ys1MVHZ|0M;nOV1A*fzYL`TTdP+neR)N<xW#72VNg~u<8}WY3$mH
z-fes7Q@LKgUf)^V8Yp-95@}~)w#2*Lf;ZD@G35K>J@MXbuW0bH)Xc(6C;-ukN@Awh
zCub+eWuwdaZX?cPjx`{B$)JY}l%aRD%?1b}`7L|Nok15LdCx)V%6((8&oGjY1tNg3
z`(U))K(~oG+Loh}^Vk6Llifb4?-OhKC*7*{+B9*{6AUn@DP<GkI4j-}6Fyru>7LD@
z+FKqYx7j{Jc20O?@~vuGztQZqYdVRuI>L!|S?|*D%Fas}m=Yvo^)cBYcjwqt;{)B|
zC7U%pBPlsK!wMFk6%Q>wp;Ki9GBdV}%5;$HVMbCQX;6~V0#G$gV1uxzXw_=e2+s)3
zU<AbbGOZvnGg`=isKSt!#)vHw0O}Um1-NDQ&&!djCS6~wBUP#YJOZRD^)ZfARpHZ-
zs=5yy*IP%bQXb$)RRQ&Y=*1IJ+(d^!686FX;4r~QlEq4bAz(CY8D)e$9~Ri+=ypbN
zkWxf#P*YNXH_ko=-njTovrSou+L<sO*suM>pAiz+1r{!d<1j3UPltkJb!FcQzX~Gq
zfIcYfL}ECUmg=ycFy4?{B0Q>HNe<sA0K@Sa3D~1gtqGGiVd<rx<#C2#JaRP!(MB+l
z87W>B-f9*_+!IO%sG9;bNmBbF8j#c@WGv%W9!;)+k7pJmT>_-nTPLgEG_aVT*)t1c
zB=4N?wF;zDmZEl%vy^8r!}kY<85O``#DEQX5@Hid5&{X;3DXm561F8gn{YDW%Y^d@
zu%xvfKA&K`I)fLgL4iX!Z4~e|^2IP6N5uqE^%YhQ364o%fdrPGzz})vmdpUFn1i*T
z2o8!PaR8@Jgc#&vE~|x}29LtY3g%7MuAKPjA|LjZw1vduk=zD4L(_-W14TXISrK1a
zig^SgE6b(buL`)5-cS5MRqL6!F?mC3`ue4neU%JH|Izm@zW9>TXYs}d7a(_%Fn|q`
z1JVWbLIG<V$T6om^V9O%7RDELC>&NOoiAi(3)#s+7GKDA6xJ7>D!foA7t(|E7&0oj
zx)9T*FrzR~SY0^1u%^&ZrhTp{+*Wv~@MNJea<ZmSp^sk{N^mO9eL9qe8tSvI3Z{_<
zCi&;^_t<#;9`KoMK~KO>emefl%;cv-(=riJ5}OGh!AxtQ#lI)-3jdxuT+jV{GI0H6
zem)Mk_K4O1?gNK67x(Rfp|Hibhn#z8fxd+<zv3`;J@q;qJ9*Ru_U|o{)t~zT{rS<W
z;2pGdSlP^eGuKa8GIeGNc?S*W$1d|2nj`*NkW`pcx_Vf#KVvjJhSZU5lZx|;S8@-c
zwS_rEqrBKDzXb_U!A=?R)+Rv`4Q8M|A?cG1)@8{oGlV06QS0&6rI0>pQ>s%~E^(H2
zgg>vFAu<|}X{Rr+ufsdWsc%Xh)Yod|^G(jR@<sKB=6%vNbiV<@N_mR(6xL##FeFff
zm2EP~adBq5%_bod2li{p3E9(S28}s4%I1)YrD@Uv>7aB5k$j*kn#kK~bBkJ~B>d(u
z_!a{n!<ZTQAhlQjWn-JR8q}NNa1>sw{@cbjZZW8nm|1}<PZ^t)qpnbE6Zpqm`skr{
zDrjep-p*?RZ4e=3w#3>H5hWm&+Q@7c+3B*N)VWbHq+6W^-RePTD-jVDX=79ukzmey
zDhHGgA<hgyHu?v#W~-5Hf=TKjX0bJ|*rt8i%8a&^dB8cG?N(QoscTz4qE`;UH+nxu
zi8f;IP!#Z3ks^U?F(%1oHzVAfZ3fsM3GbSMv}LTQe@I6gc`0ud94TntS8%AHc`wJ5
z{tQ2@US;I5rFoUDWALuxUPJJ~690|#4BVqk^VlLEGzGYhEu|l1qfy#jPcCTiK<iWw
z?3JkU8u|?{ulZ~}$PVkZ!(~g{n^U5BY*FnPhnp__3LWeUP?StzYM=)kd=bRqbjj)I
ziV`0y*?hJv2js{D4tB4D-R58p2ehofkrR>=W2}JWFk2<B$0Y!=tz`yt%ows5Iirx$
zh~RUfL6aQNQ-&-EpPGV_bQszT5yUP~Ne(Y3-8o>E`mK8S12*r++ty2y(!$+Fi1($1
z=Z--_yrwM+hkP*X-lOVw>p!yqMa=OlTYAc>D_m=>a)tFN^{Io$KO)%^{!YeTkUcY@
zzv(DU3v~CzBnlmsBER2Nln&uD-Id;{GYOm>DIB+BYDa|QcI+6N&^|i>Vo^$BLafpz
zwhdxOZL!fZrnXe{ht&B1CWA(DXiDlDSzRm0<8w3e44DujNM6cF;3j?uOgUOiQ7mLh
zXGD~g)2&PIuHIaDU;i(+s23)!Rlj@vjJ*7}29|i!fVXdd>nm?_<!{Tjhkk>+BzfgK
z|H4CgOM5Q8fAsLOrE?Fz`1d#8WIY}|bi;Ux=dEXHE7flosUJdcny1J1UiyU{l^2Ku
z&_C@0K2afj^8>)3gTE$F=;UI&O=El582}K#Eg%Tq4Wh~!H>SA+^apzqyja-Ld+){G
z6m^;G|D(E0z!RamL}8uOh@>hSDqwMd(nEmzTHNt*uwiT+<pS2v&QUQ~klLPx#5UgP
zp#9*mTr@)r92Ox7Y4nMGnd0o#<uAa7%?<yY;_TDq_S+Lfxl-er8y+aX_s*khs@Gh-
zY{5}l3-?Nm;;-7B*-Zh@4e~AWKjg5Cs1as^Nkt-4iklp~ufMY<Sng)I?oMtIA*(;T
z*(vu~w|K<O*131M>)q1bZZ_UM+b#BX4{?hfs3ePbGttc^Qo##uslol4TioGhYus$Q
zyGAQG&Ml!RZg41&b=}C|S8i7Ce#L#tEj>>4vPEt-%uTgQo!ouhBFfbSX7%eId;nE_
z=>FC%&vvtMZq~tF?jGjG=Gf!TbxU17akJN`B1Q)~xvSiFyB}~r?l$(tNBYp<{?%=0
z?`AB+&FJyOZD?n}O^sUZmK|<HIwCQRymgcn#CRv{T+toRWt}nLwH#<n52MiB$VsCG
zeHQ&hDZ028jJPr}ZyK)_sDGv9lX&gzG*(AaoMq~Kg7nQjn&Rv&HDau4Z&-5;y^UE9
zsq=NIk$p#_#f)`8%Yz?0w1;=p1i!ViSFES3;`5p}eFH$;#_5jru4yxa9$+n6*)3<S
z7p&rY`ti7%Ck5wP@3xA=tmCa>Z~bV>4b`aZSF2cWr3$6Tt!#;PomHF(mwdWgUFA^j
zeP35`Exp$S+`an;xzj#5>|+zsLxdA9`RCVly-F)t(oyr*&-VF))2xg_5CU*5gICNp
z?$xgt0Rgsk6isoO;RQSv5j_dDAQyKE3N+UYt}5g`3(*KY3F<={^p-jQdh|TkCpZ%h
zp~t@BJyuXBTP<i=AP|Edqo+G-mHwo|2DEk<4^q&3V!M^C<{=W)U$d<edaMIQM>wrM
ztHgWuLo0jUdc-R3u(Fv}3X+g`mj!I-GZ}d3;sw2voqZ~T*%Ud!gB*G+(K;;P>2OtW
zx|Q+qs7K>2SS8$%`ZAE5ni(viL8J%@X$c>jvsM|UDf$9&GO*VZ@_MlqN)ej5G;e9z
zYQ2fTAKKAqQ4S<Rf~rOPyJ!=ZcdOQ`t#g!hpFb}tG9B-^<5il6k}yO#BX^YN;1kIU
z?E+~g^D}@$8DtXel1UB__A?Wn301O(8PHs?sd^hG|Hu}z0BfLQDTjFG@8_NjzaV`b
zKJcXU^1glQ_BCtN1^c)z4#K2tRkmRfnrUY!lM@Y4Y(x{xE|4d!28UDzaneL`2_z(L
z7}OZ9zWK-`L?W{+28O7e*|8z)xEiBwW#d>ifT7<Fw-Y;tkB5(lJxM;{u|M1!_IfBD
zjl%uHCy*ex@1&P}Cs(H=i7xWvZ1EE1*hSpy`zpEue)56H6=nz>0BW;JQC{)_3%?J7
z`vc~pB%}mv@HOOUtFYz3AVL{7IQt}d3RpSn)Cc9eHlZvNT$g@=G)*}ib_B*NmV7xM
zqKeO$Zcec!CZ?qOT#CP~ztEPLk~k-1PBEtY(qVk@m8DdsyptkLOIeU2I(+HARlYqw
z*@3q+zH>eRg{JsYe4d<~f?1*b{2ZeP2|EO5wNrFDJ(|xV>GL8mY#Lnu42rShtfxg@
z);n8kczdF87+R?M$UwvYaZ8~F(jn$y_Xqxj|IX~r+|4gfD!KXYTXNaSUg{8+fxXj9
zohmN9WAf5A8?XB7!>@lO?+#1{)byHOGp=QMCw81j+1=@RMXK1ca6xtX!p6gs#+Izv
zz+!(}*nWy}0b>{0=Ji=GLPkZ@qp(ukz~yYrOqw$g{!I)xswDpZLHfsxkEnK{g?%<g
zlj_YR)r*=`?<Y|nc>(})vr-%qxdS1%Lw*Nzl^F?MaEB{p_sj2q9?<0VXSSM1N|zpD
z<|x6OJliqvi{R&#D`0zr6*fTZDo`B5mB%aTI9gMFX_h<^<=w)JKu?3&8Y4Rt2U+TX
zvMS5Kv|&!!V>BipqQ>QP9S$M#(HZMJGAb51d$B$bBh>+Xe#Ik5OQQu&X(~l*%eWpf
z@-0ePje*B-bK85w<u^xy-*1lY11$Da*JiMBUH638v<&s3kvZ&^40UU_JtNiH3^qO_
z{k_E%I9Y8__v4#-54$aOM>6Y&=Xs31%+`v?^C%Pskme5l8<exA7-s^>1=u)Ks-Qp&
z_R^5g;513y%bha_5dSgkI@rsfe~x~+bWv?)DZ;Cu9^QZr#Gi<wtbo<fb#xKfM+*y{
z6QOgx)Mlb{H#`7ujs5CH>_LvA1{bRd{P+jyNOs4>#Mijl5cfFuOt+NnCP_r{aIq&M
zAsr%#XS@4(w?u->61UXeO(GHsLpXA}#mmH_?V4<~+AUETNJsH*suZFP`_;{^6pwIc
zy019Q&A5Ez)8&~9Bmj|oB;D)Ac8^uNnSN6ecd{WO9dom}ToRHX(~;EF$t^*uBRNfs
zh+6P-&BzI&PA0fx-QsySBgyQnTUw2lS95VmN_Q8#MZt~zQAAdv4vvX<^ANevltZLN
z<#>3o1xCq75Sb!B{CJe)#E;X4;=dA{*j>8d6j!GHB_cTWqC5ykYe%i^&*i5FXbqKK
zx?nu6tQ2B6(p5+3;|B@D*s;K+%C19)UDK;WTB1~x>#`0WGQ^rIrS%%t)l@ZnNfnz?
z#RgTe@+wwP#p0`2Qx!W~#g138`YN`$iml=W##FID73)yNVyl>3#U@@+2(^r=no=c3
zS8}TAY?b&z728q8mRGUaR6?&Knb+|{6+2bMS_&+vVii@aq>5!%fw}?Dql$f2#a^jm
zyQ|o`DmK50jprrGcnND2(+V7lv~vk>=ddc)y^3W-J;>&&<AGjPqIMdOQO=(ek0IhN
zMro*Fu(zTltE3@xb(`ci4WUlSS;_lG^~_2%xf{Uk_l*)9cqbQqo|cZY1sZXBdCSUZ
z;Az;kpU5!dT_5S_d4Mv1S|D1E)=NYjR5Y#=VVaCA6go~(CqRg`+ME9KndoeJS6oAI
zb>Vq;beOR6+SxV3cg-GL-DSqL<2tY}|9DI+_~WtPH&RYLW#yuI*Bw~e@9z0?zq)hk
z4X<8v|AeFc?g{Vwv!hf0>>$vE7Pds>sV&-&2iRcHeP}}*TpMDK1k;gd5{Y-4WT5hX
zE}1+4KP4?{#Ey8k^-lQCv__=p@qVqEne`0t*sZ#j1@$p;m+4xx*gJ|3)N0?zYv+;@
zg6~B3SZvG{kwe-Qt<iexSX;e46s<Si9vj^rLL8UMd2Am_!R=@LSZWPG4|5SXm|lNH
zbQG0N;?Js;e&A*8Nfi`dcSXb#m9=t-O)I<c6<xwZ-6GrhhlnSX7l*a9#3-)2G+%Ew
zHD=@$u~%B$AU&m~gIX^_e&rf2(m{QblHRI=0x#D}(->)`A7JbC(y1tYi!bF*O1IX%
zjtz{e8&N}-mDb`BsdN`U{_7b+#;7F}j>um2035n?{PpNXYKd0*0k%{xoq*C~QapcB
zy0z|gEEHAuRS8M0rNOUpj-7#jjRcg30@5cclw%^GkfYXWD1`aPYJ4GB`IE|d#SGVZ
z9c~F&4>LggNyAtQU(3*Y_3v}cD<%wtH|n>_`{2sY1_mndD1sUnsF4hNBX%BJB7tu)
zDf~jYH5QxAK~{-&or4gO@ugL1Jxg&J#-3Dy0yVZ-6~1qscZarby=jWJZ_TO-1^3Xt
zm99rT$0~|BFTrQPAWA^@S~m(gW;Ewj&g!(SYeXxr1(0)t2t5hxRC!qnB*0SfTlx9}
zqWbUIGD~|)el>pQ&UhAs?h-o6&q?i-mjn;%7MKPU-UO%1<(=(i9&cao&0gs>?}y%R
zy;8lGJ>Y%ZD=zV}o4s?rVzze}nK?aPanc1ZqaxxfUiP@R!7Hxuvf17xUU8h4_4QVH
z#ST<gu2+=3>{l;4>t*kG8Ok<znU{9-eFqH<R^d)!xtHa7J9));FN6IQMZcnQr@Z3x
zUVu?}S9`a4rSWK)ILOO7c+0(FhL_3Sc(2&?Jg@3dU5Cy=RCy?1&ubSv<UQ#X#b@<1
zo@DKe!xkHKc+<V2Q?b^>0?q&$W~2ayS0Y91LkSSkq;N*USwzI6sD+C}ctk7QJMBV>
zkOh@sB}?0<0ez2bmtyBO1FjCFk8d-w`1YY~2VC7V?I!>AS%H!Ab2)`M^ES?=|F_(P
z5K1Q8FP{?MR)%8U?g`vP5VT4O{A$E9=;TEuaNGP~hC&%LCKE*188|@8)tJs8$LWgr
zFfhZ!3_h`^V`3{Pc7_ho97hS(bq}r(2T^srJlqx!!B$A!l$w|te22;g6uNX9uAs}2
zTTWcT!B90(itpojzi7Nv+t71K2@ejRII%wbX_A;LpISiA0<2UiS@~A53CLiDN8zAr
zfUX8&s$g7&6-vS|6pGyb!Iv9MzImmzb%Qd|z;-QtM4T;67+M#YQ+iN-Zufn|uYGjg
zBdD2GDH&p0>^meD7f6MiuE>c>SLGT7NetK##Bq!D3R|OW=lLRP0@hn*1x3ZFh*Rik
z;RAQm<lrmHDgA65(40Fc<<xZ`_3`@Afq<LXq0}qlYK4_6<CWRU5=AaiSiF*rMW?VO
z3Y|TroK-F;hUp5+Mh(MI4jUiT0zpY(JYfYd&->WhwjJde6{}lF4u%S-Z*;QGo2;d@
zh=EU!*6|T!KI(aj&l(d2AfX8?np%p-Z;_xAAz84<7+Dn{`v^1-de&p|YVm2qENDv-
zfN<2_X)t(gh^jX`R)k8-tlIpn`Meq7NyxAWAQVY*uL#9T8B##P-?P$r35hj|XUyal
zK~jq8N@?BICMrHDIv7%X`u_3b@4tWijjN^(=+=F}fbQJ}D2wR8O)FN8?>3;abLS!C
z2+$7*f?pC17kUT$E~gQgMQ&udS`iW`Z!-W!9L{tnTIEzMD?%Aq2!|ACE?@;l-ZQj?
zoJ}GdT$r>8aRR;&oyke0V+SljSf+Xo9<09GzKgrWKdNG0+nAfCR4c*mhmE5QZ3}})
zIgj2+z#I)Igy#$VkwA(87$FLdTO}Jz752_NKuoc_DQ1k6kTdQGa(I};sndfW+S%)N
z_PD*lE-tfgu!}s}3}=NvDjY9eb|%}|*Y;oRqHxH5(k?!4XY1@c>>`z@!|cL)AkcQ;
zkl<N6d(X}e*%?Z#Ml_i?&OXz=$S#%JhuOsvfMVO7cAs79i3@51sU3UJji0w4v5QOW
zRG~E2&c@r>5IbYML`+^m@Ra?m{eoRWoj7zT&@Isy6o7Ff>c_WHQy~7-*hR70&K&k)
zdzl^fXOl?L703j4S$GAPsyPABNFk^|0XbFT2k1SKA4+-wx~Zd?z_pT2k&N7;sv(sr
z1!xcutPz2>&F?7cy08?cw@9>x9<xDnV>p~65Y+-5UlQOdk&_Cr{w{|h-GCWk5bT%{
zm_n_yp+%QMet0}o3?ziR48dLV_Yos!j#_%dcz<rEs~mmQ;iLNxU71yKXPK|qGbtI>
z+=E%*<9z+0z;p(3A}L6T1Q#9RxUrn6uLcy%Nw94b7<&d-_DSOC8e{&_DxV`A?IEjJ
ztX&{>Ica6ntW1{y&TuT8bPi85Mq}cl30{$c3>HqDr**g5LRhiXKxsL+kY?i|9-bw2
zE~V6Ch)j8FuRQj3v3a@-T<I9%;Y4vk3MJAx+u?-?<Yc2PBbphuHh2}sIApugA}bEG
z3a~I%1-fsnZ6u>2TR7?5phV+g8#G{=VXeigmIJk#%h(wM2UUy0lEgRCn{S`=XzFA4
z9h}43r>k#2^pKb|eCu%WSopDZTgYC3mavPU&{kxtO~ri~yw+iFM!3Aqo{sq@a*TJ;
z6e~7fIv=pWTTvuDcxaNyr<YpNr3)GY)GZ=4Ee!#lHg82|K(J*@T9$tIgY`@9OTX_f
zF|B-SxfB~75q!8`_%D!hd0q%Eop(Y@jN%5?ohS_?(R|33FBY_uqA>#q1MVx1UQk7)
zg)f9ddTBqR-JfVvVn}S2TQy8~UUv_@ZafyR+k(2^u{oI`s`Pgllka)mHz3sx)%`}K
zH0plA<`k4jY4q9$YFA*|oB;nf3hn?>xWt46gdWgTFFOHxhuMuqCE@kK<BvZs9+fQ3
zzc$U4tVrX7t9@XF5AyL(7H$f3Pk={FT#TG-O19gb$o7?*5{J-gq&affDs2mFlEYSJ
z+haRpgRT?kt#&&+8KFgo0Xixbn4W-ZhNgPGY+i7&lKV8uS(yYF=W=novYsd`Q*5S0
zVXvx-e+hqf=ccqxbFX0!q^XmuS&5c0OueY34EtW){D!z}lUN<zwn=qv))I%|Y5H9H
zr<{g4lqM7bf7qW2?X_Y8a9UQDvmg=XkKz(f`k+vvCk4i2*^nw|2|iPa;<@0s=t=dY
zA`4qC+!Z~*2u25%atB~74Qy*{C0EErPclYANJ0)WvpaR9@CYO#;+mDtF22PFo8b`F
zx#EoK8=oCm$&9X@bH*<`f8_PQF8uN7%GxYfsGEAuz2&xzgYKF$dQqrDuenOe$liHn
zH&5-eT>XB>d+GzbzdE#yxmI>Bn(<2S8Mmo7Pyb=sq7~&UzZ%kcTsPWHYkGd#@o0Mf
z_3U|l=0MHQs?2b#j?A1EI|3oQT+iq5N(L6nXC=%C?0avrW<}6F5ol+ejG1CX^w8DF
zPHc|{tpMnq2m>&pcibL3qP=9K*mGdHigrX3i#)=sjFu)vQED?GdTBy)fslFV`Q%K9
zf*Cwzj!OBx+OdBBU?webPFicyoaVRof8Ml#C(O}NIx*ISK@QrL9Ut$vBR4Hl^_VFk
zNS>5xm*RvtAcw{w0|tyS$pVnbTaXMdgX)Zs3jkMvXaa&9K<|i4Bu9Q7ua$=N&(Jz8
zt|4`7mX7j1?~ibuRio9AagK)Y{^w|&$P_A8%QwUCPZB(o_nb1O!zKkwl-6fh!0=~B
zK2x!J%^D1p@RaaZxra>hSq}2Gn`8@-P77T6>^6bo_7jU|wD2~19v5`@j3vM;h_R>G
zICa}ZHkyr|q;6-`H>(e;4*~HQcBTpH!)(kXb%(lb5*w=$x_A$<RJ;o#Zed<{Mp2gX
z<u<m!#s=A{ZDI#oxlN3<W!OX;Eg##Q+k%H|Y=^C$9{~Cq@}dm0u@W21N3t#6mTi+J
zqGV0OxCy~{8>5Trt{)rZ7sm{)3f9=zFxz<BY@5Un^+Har^ENiyw$8T0_KNM4?X1mE
zO+{L36ua!UF&Pz8Q`XrODtW;sp_F)1yFnlaUTO~87~3>Ve8?&m@odO)Mk$jkWnh)Z
z!o!k~`aUPWWJ0~rlB{#_`37z=*JTwFUkWtIg@dh;Fs<+Qp~ffvLRqzY#J@lHo1}lt
zU;U9=ES(~by>Ico;nXQKUf9$@2e1+m;v)hbQw2wC8oahM%pOms*(Ffo$1=wr$3e$C
z4uiu%UnM(vGP-PML#{7`)New<8I9j^T_wq}{O+wjU^K+QZI8~(imfDhK_fXd*|yT0
zX#=mHxOi|ud9S|XWA03S<gR(EdQ4e6_NF9uC|)d`P*T~q=fLuc;?m%?WsaG1ZyQs7
z>*%U31M_B3>pO~h;>T!xF6$dOpOS2``aB+It~FW71JZ_nr+>fym|xoBXUqMpufNJa
z*Dsm<Z2B?(cmCh~(hGj}xS!qbzt{huU#jqr@=x(gJ^YOMYhb*e?`M_%G5%?OsXM>i
zPbqL@f4skgU+UT9XQ%vZv!5+NZGKknALbwLmy-Pj{_cK&*fO!kzuNz-|BzpH_|yHB
ze(9k9oL?0D)qaTLPS6CzK2T8p7-1UHAVZ&%XirQ(8xr6E%QI}&q{t~LiKo*o#g;P5
z9?L<?I~Ie(LSNDSK$Ni?&xY(@&>E!ZZ|Za~1KP|){7LyIF62Urg=EWr2%8eKBO>i;
z6X*(=mhtTd_chJa#z_OegTqxT^lMfY8_;#^#NJ)Y$GYz9(>!g(r`L>pzE*9@UT7ZG
zziP~gfj#8Jp}~@}zP%DZo-wknt!N)petYfrvBCbK0iAjiFDQne+zhPVT;Zpm1tCv3
zAlWgTM&X>aJp8s`d|q_Gmdkap)hJn_mCVvgg4RO<S}Bc2Npqbf#!*pT_8wjqvq3mN
z^p9md0h=TidRdvDo%1t)+zm4{xHNX@T`1H(#69AKI|D)NcTF)?1JJu14hy97Sj5%Z
zVq;x4r^y;)tqv(MF-UyFQ*NeH0_IihARL{}F$Hc4%<OPL21Uj_GsMuAw3{?Q`q*f4
z2e(mk??~OrRJQ?gs1_1Bc)A0KAMBski+j?;gY(&%MD^BA^_})4?l~gOPm{k@v$uS(
zQ2mZ2ER??6j2^v-GIScg2fqX!7y4(j=+yaT2Ds}>S#6|f^dz1OLHQP?`}2PPSomEl
zEtbMazrIrsF|Cys^W2r!8XiY!()Su+(f0|Ta$ZdO+nq9yd!kBrLzEbDn4vV6RfW$O
z_`QZbx3<2dttP3W#R~ArfK-ffnw0t(;w|-Zd+Un}G#M4;cvf1jJqET8o@~8{!6i*L
z6uhjF<=3a`cy_who^q3%<2X`%d23g4+&z+&6CpYLn5ZM4>7}*WNo%XszJWcd^#rf}
zm2`w^L_HhT{Tr8lwYt9$KGaK7-RqMxHB>cSDnTX^B@R+R415RI2Chj<PE^_`{`B;W
zj7)!?&FRd`lzc_L;yk}QJ2@>GkT;IB;<U1~O2p+L|Enh>T}bkHOe7b?dNMrIJvE-y
z9&G73n62HD8uY}r!F(fuP$vatTz$f=Mijh)d8gZuxK^rV>xwmx&v3}SENw{w?KAb{
zCOjro$4fS9IZoKC8q_y|VYhEdaMD#hmB`wr)~7B>Tylsqod7j^u7>!nr7~F_$#uet
z7q4BrxH(@-cLJ;OIpvIe2R#3wrVb$P9x(-MPY4>|h@T)sSh0LZ(=2(Va%K+Z!D(2t
zkHea65Ds?%4bia@X~t*sd9j(j#OH<X+uFZA&U=}?g=Z<^bH1F<i;pprxkSma0-x;O
zI~s5A(q?ryWs;86E}RD476fa9h}3I>2BL;G6{%w=^ASpEb)FXU;j4{OzOu5cEIx5i
ziloz}e210CTe^XD)bAV*8$~T7evX5v&q$gzuVdEa3jKKLHPT_BLU1CVQ(HmoUQiID
zO~^9B?$dWj@O}A~dp4A*!znv4+T-WXcv`#>cjCB@H`Kda7ES|j-PP(O$}WR)kgCxS
zr&(7>&M1dO81;U?*-TB>TOMrz+rVH%;wzslPRC;qR}i&2G;BaZS<`C$f?=OWrA0y#
z+?JJp8QLFuMLNsZHMjw-YXRQMylw;PUW-gya#Y=!C~Y&Aq3%kQhBYg{l3TMxq5<wJ
zty!pB#(n^$wYt}cZqyxL2S-d4UsP|j>6P<dq`E!4$Ej|kxQ4}QJ&wpu*3$&(k~f5x
z<*jb5S@?uihVRFSGu2?y>qNhyMv-!uXssoRc}y$S2Cy1hZF=v%!F!;c)&pW3S_#TV
zaGH%wfyMALL`_gAIf+xY!Pr6*QsWZ6#|R<s5-elUS^%1LZ}3^C)xLo(*Gp6Nuf}@*
zP<I<n*|fU9KxlzB8dUd7Y1x<6ty$gviT-WRTfRvwKxx=6b!^Y?Q*ty*T8oz#Wl~tq
z+dhP@5I$!Wkt;ZQ;ESobSD*({`|shsgVjRwgB{UYB*LC1ewdIX^I58|8mt7VC$E1v
zuYaY`pts+J_8)V3jM26_t!|?FTHPBW=z+ZMhZ58OQ1@isH&nMl_yW_L_zBg#&YgT&
z&6=i$cDbDUq1APIJ4jP=E??(=daFrO^C54w#sgPk9cp!xrsi*coeS!v8^KwTI}>$x
zMkzw{JjPdj46uNKmXG7t;kZHg>~)f{8qt5(^YKS%^xuXS%tI4eQelaeqx3q2xG(ME
zGZuC5HLycp18D;5mzrv~x2^$h7d5WJ{kWwQD7B~I9|ZYIWQmf<Zj6{ZxqO9|aI8j-
zT{?n~&8G+#(=Ep7<P$hHg1^`@TQtin%`bijaTEJ@<O+@i+vrKx?4vDL&^;dEJ*nN}
zb55yRF&ke@$%)2n1poLL{gcAym!|hx&$i(nSbe1SYGkSP7W-wIuM0%4_#JNGPq8vW
z#hC?T^|i&`s`+ZEon$6nJLtrXy39n?@3Pqbr0%y+TC4jL0Wv9{V^sHJ7F%oG*!7eN
zO#Vb!1TBANAQnD(222J$Fr3t%BzHo>)QuV>O`>>Oxbp>QFO)?OHIbqOT$dz9%IPZ!
zaoCCs4FDSeI;NOZV~jB)Q$RXL2S}}md<McEZ1SK~!!|{>BEzrMB}1u(7<8^^ZQXQ`
zj2nqy&|DZH$}(uw2vi1dh}XD0)vuT;R-}jbvhDv>hGZ#eo0Rh3BuU0I+;!<+h8vaT
zP@$xQ_ss}&LpB3{dWOYl%<y|;WM(j#5YC#NoE(#loOEsST^_%uIz&Z`8Py?+(T`t~
zJKhB~GWDRQKEBLPGwRt|^hC6KqF=~TK41t6nWW7wC9RP`&dNe8B|&5(RJ%aZ@Lfv9
znjavv_hWI7WbMmr_dWBjSI^aLE85rg)E&n@dUoU0`|mjR;j<6){aF3@67x4SG=K6$
z^U|-szW?o`+xEPDc-wQN743`sc88EZB}K>=dIz#%>;PYtjG38UySEK=O9gIZ5sY&q
z8wH|0krPg$T!I|PsEnc>H0vZ(Nt*i)wD52tC4bUVgJ_IR$ja>qBnShCssU;y{C^Or
zjA!VKC}nZzq9@&=tyk8IT^{qLJm-`{duKlUTyW{ZWwUDszi{hY0dclGux3`y;x0qg
zl{3`?FOFOryJ7y@FE3(kj*VTiMSXSgzrTO0;xV$~5jR)@YGcJ{T^A^E7|IMHY^rfF
z$@Ubp*P8+y$+V2L%oJOy4S6DC3<f_y(hLaJbwk{Bleo))nJ5)v#O4|$-3kzVNxG$;
z&*KSqSRT>_Kusp|2NQB6%0PPQu|s9o{(9zKHg#k8*3imJ!Xt0~o%xtQoFJY~n(_Ce
zlN!fYs{cB&XpQ`lNquqocXJ+Bn^%7I^0zE7hz*?w*2{n-_@nd?#v+f91k>VjES5NX
zhO8v`6Oe2rGXv>rGBV<Yc*^MLt?`OBf)a#v9-|^5=@U5ybN67hS6@c_Ey_WZKZfS`
z%dJ42Ic^{nC@q+6nMO^4%W5Y-(s#t@x9@%I<>ywj5jUNDdD&APmgP^YxN#N>CcpIP
zzzMSll}{QyeEU7~cf^Q^w+&jcdFY5?WnHcxxNT+I>i!jQZ4%)D`=jE5pGh3F)X0Js
zALFs5Ahkq{WJ)(>SS<<01f+{`2+merC3XMhy9+(%3ecmFj5Uv<x<xrJBd$YUmX=V6
zegFEIEv)Es(VtYih7DMzUV4np&Kr9B{)OG|ivQ}wYpm0wiw*L&M~<i;J+f5na^I2x
z559l%a?<%#ptmWnM553p;I?CHlw?YdM~1q1j|JS2w@g!sTt)y9HjCH>G$ykJ^&!hg
zVE^pe!4IS)Cr{}tmM5tvml}gvS2>3EtG6tX_9etDx5X_E56wy$;<(#$xMQLCBzgxH
zUinvf2v%Mm;v?IbEg4BpSo1u&xkwc##pL^wgv>-MvJ;uC9*a5InM&&qfMm1)H6#I|
zEYxG5&8_4l64k~X>_jNVu>Hp{#|oVjI7~nS@LaJFjZ#k$nV6(^@7p|h>)*Fm?y5ZS
z9&`VcGH*-eoVn8r_N=;QRML!T8z*#?2fb3aQvLMA%?ezuH<*5Uo5ixJ*-KN_UA*JI
zhmB(Sr!OpBv>XU^RnIcVgb%>0s#P1$8k;BdhCE?_goAgXd!RrVgE%hn9fto4m{`fi
zz{{CYI3<$1jUhJ<p5cwWG02cjKON}}iWP8ucveaO0ISIbjs!_7GJ6B>Ot@Y&if_qV
z1TV7&QYCkc*=%uJk`g;4l_!l)l0Hjfa#DO!ha_oo5~*Ql&I$7OF*ot|fH`!1@XMt0
zNg^E$B*5}qle9WXl#|%(q$Nr9Nv|ZGN>cc_ya9uPgOaL~M5<ZL(CQVtc0jRpD0ntW
z8HOA3dg^lgTJ4D$S;3|xb}ETklaiAvk~SyFrUd4Nik|M4fph_aGsX!Zn+oSB=X~dK
zr(EnTbBf7M=5R7-T#C6(846oM7%Tw7VArl3AQk3h%>jora6s$f_T(90(L{(j|6r7R
zf<nA8_{2jZ@qH5e*EQA~gOi;7YQ`tbixoSM?=$!YYlUcJb4zoo$B$Omu}jORUDG~v
zeRfY3d|ei<z4W802K{anGT`YxNZ1q@mXn>`qohrrKAk(6($ZqQeT537|Mhk%QHBgw
z`U6l#sTepA8m)m+g|khM%+k_sgF@h3o=pFsP)-iC63|VgIowFv>Goup0w(KVz~2xJ
zMkw_OO$gv*Oe1ETgdt}w7NL%s(Ha-PA2#w2yoZ21rP7R?=)_E%MC%!wln9~I0C}&(
z?FEb~P*ihZqRAqINPAhDuys?HsiWCl?8ug+EdwmU)G}AupuwXpl@pVujlY$Bw{mOz
zHtXPu?Sp3BG4qZ6Yqn=T=o&F%;`sD_x16mHuYpnL--{;iWpN+;jm1d6%)2XmYQ|!9
zZc)LIn7iELsycLFn->54w>i~`ZMs#pZJ(SrGqmWQQMYvH-lbEwRDXJEx9xLlUirK!
z{F$=wBxX9>E{r#f7RzD3P7T<t2%oT%0VT!(Q%LcN7Apw4!2`aV*OA8@0zqwI*Pg)z
zt5z)t_UtO1X8C;<t-mJwn)QqN&=!HkUOFnCmlvQ;<d|0sHiQ-1k!2S_wPw*?gJqa>
z;w{WNy>?9uGZ?9E4={Z4;<DHWtrbe!T5r{yb!CeMs|fq5)gU`!Z1yW!%x#Kp$~W9O
zv!k*gx*E2i^#*@vu|cuhZDs`RIAW;!8UwoGbkdbA&gs;d>PDY<65>k5g4PPRx86xQ
z9o@$X<dtOunh^CfQeVa=I01tW0VArX^_3Rg+fmOE-S48>dY`BfXlY0Eb0r9U0vU!l
z#Tn<cC72x|K#Xh-InirNh;i3A12iyvT<9T_E_+tAN2dUo1JQ#N_4rZ4)pGafVGE0`
zEd>Y1{0Q>-ApuXU7uqFw%^r)}&Rniow<p<aNJ))Nb|!jY&VvU9bS%ZxtkYkdh>aQp
zzCa;bfs+HP%JrXG7R$a=GhS_JRm+EogX9sdjk>IXjBUgQwOW21dl&aUBwqrI2t1Vd
z7!fT*Ka|E1KGw$3^5mv2^6O0-5U|de=aMS#0?w&R_$u&})#8GZ%^ly}&5GSD+077X
z`h&a4Ev|F3Den1hvC_?~?qqj?Te{^1_i^_RZV6{9D2$fJfYeiP#uWOh#k<NsPz)|x
z?q&<9x&n8Fdz5>MTS2wm-GNSBgXic&1rE)3FL&>Df95t8BXR?$i`|v(X>Q3KNY4to
z15S4k5giUha?nxP=pg?PMAV%i7C;<;W4GycI~ZcfD5HJDmlkG#PLJ!rslUe!KraoH
zKaP23zq@Gh`|~EevTgezQ4}6Hw{*$R>r?>0zI^tpBP#9Z#tRqZe)1rEqFBQIfkK4M
zK_z9B?d1Fgiv<Tl*rU7yoCIRn84Tb;>A+_?!w}Ua6vIey0^Iuq6vsrIXgDwt$bJV4
zFQJyvYdp{ufo@1I>BV*H!d=#_W8*m@tFQ&kr?b2e9LNmX6el9x7<^z1a0{|nMH4v&
zooK0;&wLtgh>k2SClmj-uoLV=bAxzMU92t^=Zl8$#qiQ0BK#&*<UEVQpK<S#8InmO
zRXrxJ-cX=0(zJ=A<~>s{_FSV5LqwJ@yh(b`unU`pq<{sp$OLL)1qefN@rlS2V#1-1
zb&DjBPr*^(YiDqad)GdBS6M}APMSS7H#0WdYzS{MR=x6TS&6@c#ndJ*FKZIbOC`KX
z+>1NJ(;W~XC%8Sh10MCVJCp)8jdL~JC&828p*^AKTl?se?$@@@&P=kTr^luy7<T>k
z<k5fiD9-B`E9d8wE`WyoS20J~D>mRky?a5^V0v$4;`1SRp=$yz`cJ}`Sd@ce4#${e
zABWe9lZ-)J;R%=#87V80DqN(nNDQdHyt3HGwYA3JuNCN_mEpDg4vLT+KrAtoTg<4a
z0%Cn}AA#-z#vY|ipgzum?ad#aR4X>rHc=+3U&CvqG_;b}0puQ7@(r>IM^LIm{6igR
zF{ZUe^4Fr#7f;J;a9439Jt^9)2tKr%$bt;IfEwzl26}*Kl?Epf;>ucaL-WVRVAHL&
zT3<<Nyaqf8YJhIvAYJ?~TTvQk5jRjP<TV$GmuS6#I*dXAat=Wdhh1JW8?|R?ZAny@
zv{EeU7BmR`!dukZGkSdv)Q5!!Uk`(db{Q}0ot7@9`ly3Ssf*A!t#!Xv@Lr;x=A&g4
z+6El55i3CA^^rdnuTPs96g0&5`ML^-<_Pa|<sc0krb^STs8F9@ynUz-BL~T!aF8!5
z?7yoI4aB^o-rK<YPagwnAL_FLtp@o{O`_E*0JC4PS@6gvN^r--x{yM1LbpprwG*@^
z^6YwZdG%V0<u$kiZ?$;oS2jc0D^2Eft_VIUMkHH7T&g1T>7s-qZEw<Mucq=qgZ0%y
zR17QTVlS+kPikw`jT{-4eS%s19@<XSGb0cq0v49gvy74|)BJ-MpH6D@A&0mLSqc@f
ziP~y1?`>UCXq_2-5MzW(q5#hhgVn6cH01RmIUHGCk@jiRNz>Qy%JKO08(C<4Qc06*
zKdNo^5zRqM`78kMMmrI<p_suAt$+qH;0}93=4RQXYFa?e8@*M=;M0JR^p(A8Dk|hl
znEF=9BH4l0jJ7Kn!L9*2;C`S?7Hy&lf&!}E7czvct<*tpzou=BmSlL_0dR>YV4p~z
zH}6FsiL-G-JjBHV@-*!^G`bP#DY$AI3|1h0Sxl;d$WMI;Y0&7dpdn#>B(Ll#Ol<nq
z)=GF1ND7;Qr@ELgeWBB(_du7-LP;PFy(A(g#tJ`8+~AMvMN?sD+c9k#Qa2Hu`keYn
zqf~qX!bC<C@4eQ3k_2+CwJVCnX3_e|5*CdrpODXol>gXIs6MkJ*bg2-dat&5uQ<C_
zO+|>n<cs-AU;Y%eoGQ_L$ILVXLDB{)0#zm+0*OAgUJ6I(WRpfG(MdGrqvjJQmo%ev
z3Z;?FW*;7m&nKPsnn6`;W^igzku9>-MC7+2B$}E90~P>RTyU*2-?ByoHCk6vuUhtX
zb9U`VoboAIpnaH2daL!hgw+oxT^Z0!b`z0-`jDxKH+(OK*PyL1;x&<`Uv?8+Cj6vU
zs%Xx}dIN~n3S;o%fm-DwJO!SCXacAHeAO9%9%r^f4zU<7{y)zp&J@CvKzsOHlD@c@
zuX7io4ty>d!C4Rh$1qos;13K>o28s96YafxE|D3VdI|mX9$NpkHl1kEfd+GG#_5jU
zPr&m4q?etUfnuf4r6$>MF>()mCH%>nqnl)6q-icSXG;~es<Ae_f_;srQ2I7;>7a$b
zS%KjP{${b7Y_iF2RsXB06uss^LA9ZXkSEUYbf(AW6HzFgj-a<l4lND1L?CQi4OZC(
zmu;&mn6Bi?m|B{M!3VwNCZHZ5v3zoYb`YJ`IV-2Ml18mK#ip#wR|jHk4hNjjnamIx
zXOFWv_%yRMal#9|ksP*&7tM^5Ms(nnlZ`V7tj1Cor(75?S}~JrYd_+&i%+`nTJv5^
zyJnwxFHJmM_CXu0LN{b$5aB9h2j&s@UG&VO`F=SSBeth4P?E1BWK3uJeDXzR->(&*
zWje*td$e7^i4c5)#Q>Kno7JF#VP7FmT;8D(u9`)ioMpib<UEV>ZIUdMEHEx)7~oW`
zr9XR;E!PHz<2bv~js&ZChJ7JNShA`SHq(UkmYmI?C;vDhi97P?=+X#WFV1RdM&bjg
z90{Q2y_lFpt+9srGjhI8v*xOR9r6vl>P0(Ng4u+-V+74j25{pDf2Xy;U0rmdq4y|%
zT;e@(tRv_2kRZa7l!I6Z7&z$*;@8^9aV}~VItAj5pr^p{5a5MoGgwq0v_)>BFY3su
zj$(5Wsfu$6<)Fq-b=iuqZQi5&iD+%}8EQs;T>xClHe;Maj&;P~u^K{-Cgckvme&w6
z$YHBKLA6KI$RU5S2u0-Gi3~@?U4gWV8A{!$O;U08#a`e|U(k~(AK^JUec{|g?^R98
z!z_hnC(^6oXo-)w)qm<$z9x9Da?wl|p`<Uc7PuJIDpB%Y)p)Lj;chmgbP@1(|5v@L
z5lfOUIk9A4>k=lH0coB_aTeaIib%4hWC2dT1z|xnRU1O~uwv#E6fDfr)XKt$K>tav
z^3|?QSb9KCb;2v~R5WANROO&Ch^LgNVZws2YCK1mc3rRqcw^0Wy9>M^hQ(Oi$j#~m
z1+W483T@dJGAm87+Kj3T*%{`oF8xLc!Js}7g24COtuz56t&v;W5OCU{y<uAG97?CW
zAQX{#jaBRtDg!Ad1yYaA=5UEltYp|d-SF6n#Yos=?7U@8F{YVlGO>5wnm<f*eKew|
zGM9_MXXs3XI)8*oNTa1wXpOsJUj<P>khOga+C=Lh4nFat176YLP;3dX$y#kzyTvXg
zT0C9_C}U_<z#0-gO@i~HBQk(COE}J`HBy_KTo~cPt=?}~9QeflMR*i4Mxl}VLeUr_
z$tmF#)Yiy?(Fd3h?!^Pz!r@d2!zGBfD7!g5bYgQ0_q2=99B3OB+#@qCQ`voSxUyTk
zMgELRV>aM3_7BbmNfF`9h6WcC$)&DqDIH!be;O&x>vrwa>qhZER!$5Dqe``lAM*0p
z*9%}V)SAc@1m8t>5I+pJ!HX_o;s?|o{SJs$QliT1#g*MH#o;qLA^b08x8YH~{~>DS
z!Z;<vI-3PsR{^}JO5t<T9lij4;FVSZ$AF>mH5mm5<{O0x!W6hM&l2Vd^MwV%VquxE
z9G;wOg$=@H;bGxX;R!Z%?-Q$*FI%##kx31qM<?7kW#SZk3|K<j##c`qGwQlw*J)p`
zA2ICVp_LWE3hnDdg9Zfql=Um`r+p1vRld1<=hBi=?d!%a9ZCxFirW@zU;Wu_H>4+L
zWn^hz*QIzf5?l@v0_aBZv9`5VBM7|qbu}pb;sx_>n@?ZMLN#~X<{8G4gDkO}C6}<|
zwk$q_O&k_1FKL@$6K=aruw}F@DGv^tXqmcW#XZSOx-StOO8{oHWZtZ4Q>UShy3p+D
zQxUtaFClWgq(n$CNh1-O{=>~<kt`iFRkgzOi6-^`_z15AbIn!i&dSkWO4Mg#)aU<n
zJRz#g|7&>`b?ud(<8bcE*Mx}^*;c%^O_&g_#rwnB>zxS`)ar>7)o~Li%67bu)n4zk
zmd3|FIr<;!pzHLSn~$`9Zu+IQK59klkK!9gKVz#~e{O93Sgn5^OF!dA)6Y2mSu0}v
z2fvtQ@vrKcaq5|B^)&v*s$YyX{!}dt!%F`DY@G?a;i*$6>=RxP4hlzw*M;N4JHq?I
zNAMFnBYZ9VP541LC;WmOyiLL-00JAa8+I@kVsDb62F_x6tN_a3QiS7l2YzQCIH^>y
zN@-V}*nZsOjm*-ZeE6YMdgBv~Fx$G7kJ7Ha|CwKvFTO~xT(#%l${9nao3}Tzm<Hv&
z_l%t<Jle<{DD=K>$X(B0RKEHuYv_WyCgp2Ox5--@nX^H8`)zCYDGxU?7Ye<TTeYY`
zRlfZ;@4ChNE-8PD>3Qp>M&@Zy-h9(hHf?hwOW3O%Z!_}l1H{&q@4qh?wd@5fxxLB{
z&fYU0Xk<wZ%4@H=`pnwU$ddOeuNRHJ@8w2jXi$Fosd&utgN@9%S2^eDJ9kYZOKVV$
z97*UmZ*4CZO9wMLiu?jatP|_W`hy1d#cv)upfeu60^j?wegXT@bFcq!{BQ4k{r;Jc
zY@ao<-htSp{(sr^v-0Vu$rbZ=|Dt^MSuZCWgw88K$8|@x0tFq{hxu3=)}D1^*W!C`
z{0^@F{L8a{|FMyk*BL(k>|;2r?hT#!`fop+Yh?Wz44=s+TWowI%cujgGZc9^X|y_A
z35_hP!62n%Wc%ATvg|s8H`&Wirf209fa>Kn7?L}5xhhcJ$ozGNlF|}>vUB&cJ|LI{
z4TjPIgNBW`zLB-9Gaz1xpR62u-Ka5*thm8YF@ECI>9ZSINu2?6nxC97W!kKHjjXi6
zaN`{{OYT|G$U4*+ZkvA_Ke=G>vgNB9S?31B{MG9=KD4cob*VG#cwz@Xxpu?mhcV>c
z8w^i8^=y6Pi;e86I>VE@pX4X^)a`o#!%)^>*nQ}gH{Lqg$O3hSQy-n;Cy%~<{GIn3
zS)V|H;Ug)zwBpA3Pwf8aquo!;zp<h;Su%h2ORxB-Ia(<gFlSA8xrGq3!L1>ld07e@
zfa9jRUoQOCd;kc`G7Huj&i`^AH>eB!yXn#aKG!RrH~a$6t^^{s38miHR}v^pnLfQ1
zMWy5P^Z#q_;QtAr?Fk_7kq_jkq#yg=eA6g@XHeQJUqtP%JVxLDH;?CBaS!@V_2>P`
zi#W@lwI|_E%F^}!sXTF+Kda|I9VgC6b<utPt9Rm5R2Ccx>;r!%`5!(st(Y(Y42u4=
zqZ1}HkNh8$Vq2qYIx=B`^w{M$#BC=0;g(vvS{n7IWtx8Z!)1TcQteXIhnxJ#e>$e~
zL(bPO<BCyCF~Sw25An~@oU@wqN$sD;IXU~(`KNX~x&ob-YB$z7s&*cHmDn>?ju+T4
zeMNB;5+I+FB>sWnQD8m}MC8(NU?<%mj1_J|e!*LW8NwXlcHvH8p|DiAS6C_33hRXj
zVYz%ncnqm4o)(@H_6qxjmxRMWJ3J<wfEVru@ZCQx{8jiy_)hqT@K51ih?EL5SpJ}*
zv$HsOt|qcnmdSEhJ}YGHSVz{C^<cf&)$AHJkPVg|3{0MQ$IibeDaVd+qOM4l)7I~~
zpuF?WfT=5<`dxWz{DQ~MrYWz!I_b{Gze`qL8#-%M-FfBx_Xka1^X$KrlhunK`O>Ex
zK73Qn_HWXaBiGH_u<u9ZqmPEoUS0oB<<#}dwtSwey!6u8C0qZRrM%qqGDu@Gc+nv6
zo$jE=BW~N+_z&gdgP@u5XkQR=K7eyr*L^qKv*~o6a^O<0RFKz9aJ>OIQO3%IW{}ks
z))v5M3cCuVG=b%?as;d^c(9ImWWZ6gYp@|uSf_oQ`6$6)FIYZ7i_=&M8;BDD{B~kj
z1yT-t{PL+ICtrI@va!AuQ<m@kO*wvCG27$ZPz3Zcvmxk1FIeT(*j*@Km+kkp@6@el
zZ>4YFMmF^Mci#VKKM5lBLBnx&9JIVXL_BmqD<|^q?C->(fGc$EkgAJnXG4E*wx&y6
z3>9(MJD}*OF*i=wPjr8;A@2I>@e}vsQA~A)n8{GNfGgZObMAg-VKIBV8zzJ4?I%g7
z{wl*1JN6~Gdj4ID?%of{$g|gAzXP0aKYA~r&S1IE!mqx6-2?ks63f_IX1H(F`VITh
z<(c&X!*cU-e)U7!c09SCWi$U?gL%s%kL}#gFgNN9hFvhv;NH(X->@IzLDAkmhF#!|
z`$_7mFE{K~cJr%W1e4s)I<PK#4a!T0Up=;;W>lR)d=qf}xccq)KHLw%qGuqhpW)5^
zag*)$nRh`_Qg)f|vrmreZ)U%7d7;GM{o&j%`$>YUFE#wz^KV=nhzlj9`EuJ78IW7>
zx4>r*K=zZES7&hlhJ80G|MC2V{S0YB>N*&HYvq;X<khvfl`#_UY~9y@m2p1$KYiCK
z`Tvt$V#{3G5!;eKyh`1rfK~ppSC$)U%|E`_6@?Q}CNJt`yyCoqbDg7(Dfpa;m$74(
zI|uJByk|wduDt%gJs)*%Y6rXWyMFITJ0tZQ^>$Hv5^#TdQ9B~%Blm6juGj0*-<1z8
z7EEsanKBu_^b>jKU-0kZ`qo1qPMPxI<jEi4Pd^s^ezIP^dDj$HHsymUY`1nHKO9xp
z<=<N>5<RGL3a+C+@dv85<p%gTWwKg@Gap2*Zh5Ch;6}J8yq5XK(qC3J%N)o5G|r>{
zKismf!`5yzHh6}~k@JT%e$~n;4@J%#jeMxCR?kFuVGAQ{J=9Xna6+$(`ScIiP2z`c
z!MCS}=$lsUVXBZ<rd32|s(A(cVrY=&3v=X=GDTa)?d6a_<Oah{+7KL}Jen_^Y0i{~
zHD{8x37HNBaU#k(8>p;6Q6-wkOuG`K7|b*Yzu|lsSqj-!_*o2)pMiHYMR76_s%$3c
z#VN)#lc9__LadUXX&Qp^wU@pzjFc$`09rLB$%5!=ts55FTKQO0XZfk{*6?Pk9i<1z
zYf(B8UL6cb%n})x=#s9~db$HrrVa@23O^~YZ5o1xTzL->m+%YphXv0zjHFvMbro+y
zWx^A}cDYE-ht4ZqNDJ6v1urac8JY366d5i{pGQ1}NRQ`=IA#I801iF5o#Qz$H^mvi
zZOCAF;<k5h|I2%~-~R6Wznr|SYTOeyj@vnY-0pE>ca9Us)A9Fl>bBcX{$<?GvDLfA
z;mo+5)Pj5{NuQDzqrYABoRSSbQ}OOth6udk6Q`*G^qkOP#<44Im@hAGmggRyH}}Nc
zxo_eB9C>lmono)KZ_UML9Gv$Sd4@&TpT%Q_QfzX(V93si_2N-6;Kip;za4w}?dUsQ
z@u+!!a_7P0c8wj2=ivVb{;?S?=TIWLNeX)o<9a)0fmQG#dbdRACd>--F33qtPw&<#
zN4B|ag3BNnuIlbjL4b6}b`#sN5MWo@vBY-l|FHHRfKgT1|M<J_y(yXACzDK)nM`^i
zkU&BiVCbQT&VUd~s47U44xvcz2m+#@hzb@I0wRi_B33LYDt296SHG*U>h8KgUVfi*
z-%JX+-+xUYlXB<2bKAM6eol*$*4FgO^y%r6zI6n+IO(m^TLY3Jfh8cQ5$i<(Y`C5P
z*k!xGOOTOW*mj|qFF$=B$GwHo)FtTBg>0nl1O#16A)5lfT!Ob)U=8tF9!;a~sr)sP
zF%T!Fov-Y=QLF4>Y#d_ZMK*4P^7hA{+_Re%e|(uWuN~Pe5GX7R1e&q;3j%?nqClXa
z_QyWkxAy5U?%8L@iRB7_P1wZRYiz2r<3E=n{Os9%`D5j6hKqk_pjrIQ{8c%#c5Ud?
zDQpq;9%gMfpEWP+vW3E^NNbZLHBm^+$p8*sv!bBenrzK2oLtDFg{*fWYhTC;^Ro!I
zqtZIvD(m}aRb~M}$eIPniK4eS^bKa|?S@%;n`Ws#9ih?eXw)!7Ua~N=(f52pviXGU
zzG*^gh4?TU&B2p2{0@D#Ztv4{4i>1h6@N!F<+D?#LR8U(b+4PHwV<k99_-IcB3)Y9
zj5>pum*?>{%SulPg?t97P3!zTG0%ij;pr`W9-lrl&zhR<%S-q9((@$dw}0uqf)Z`n
zTFPPA44IIMKmjcyZl2{KxD@zdyMPUY2t|Aon+3J@8toZ;V7rvKJsxkFSBHctH!yg-
zx@;8k!ws30t;;S0EKjSF(z5I_Z)q8_HB_uN;tbN-&Yj1HPZgdVs{QCA$fqq%Wc2FL
zs`LD+=krhWvwifDsiG$5^t2gi>tB3%?fNm}&&lmBYqJYa6rP+hyTjr!Xq1#^(_g-9
z?^#oLvTAXM>Pqy`*WCX6nl<Ofj$OCrJTb&igbF!JUWU_@E!+|*$*>t67K>X*L4i2I
zDCOoj+=<pi%N3yx+$N9~C<=&)fy96=f?9OG2$COsIvkz+B7hJQ9+K_CjN<s2q1`|e
zz-Iw-&`d<cJ%uq+9m|+w3VxP)6sa=K48_m-+}icYnRgBvx@9WEQ+p{26GN?UX|r(P
zuy*a+j6$81J_~v;IXHCCg4-W7Kiplp#<bnVt*t8C44vPh{ouBhEooE(glqB<jH&=x
zpdBK?<^^(^lwIlyW(V7}ElA5N5i+VX#Eil%DDGj+WBNRbVSQ^<j0MEbI~n1NK{rno
zC@U?Y=u5m5yXmZZy{Lr?KF+h0h@-1xLq?Taos(9tZhO97tJMd)wi}+CVYX>)CRw&P
zGc(LT4L&k^_7jH|^cb`!x@gI;=z>MEke{zH>l0+zZZ=tx!{hpu1QN8`P9utc9&r2O
zCl4%`cQ`+=AX<6n;^D&<;hqJC8(f6%2th<B`5b<u*Q(We{Ze`;!Rkx%75OB+&u6D#
z(l!_v_*SFx3Jg0D|A;qbr;1*0une_CTeXUf0r^g1z&GZejoroN!|od|^*^vuf8%f3
zMUM{~aX7j>I)431`JFL`)-PGvV@&m#eGiXL$jlu3_*ToA>RX~~2F?YqVT93zng_26
zEfFh{B3fJK<fJBA<yNH``T8PPKt_!e<^X6JbRW>CZX25E1}bs&2g^E0t+Lgt5;I$d
zqOd$+gX90`N@*GRKBB8MJ5}<^-EW-Gubx}kN^Em9+ILy^ZKFC=W!a4n&X~Qw+hCg~
zdrH@yduO-4v$DOW#qCRHhLTI??dVf9@6J9;`p&wam2}F<%$mP*|E)vE<w*K|eP+)-
z*ka(6CA;Ufa?^Mw*8KqaXFg6yV#FYroo1cnO9IFX7lLS$BkmehWY_1{#S(A`rAQp-
z8Tr(R-lgj&4BMQQzG?W_&BLc}Smqsi;_nNqmUX^$?aX;|=d2kw^o6y@F5yX?>%NyR
zV&+UjTEt{PsE}Z`0JH~5x>!hG5zP>tDPkxd!K)Q?Sz=apsUYggS;B&@%G-l7pS^p?
zY=}m$E>`YY+g+J*cMqmHGjS~eL^I)>kRr8{mmvqPSp;#6qQ&BK`7}~;62LD3jp*h3
zg<`nzjHWxL#7&cpj1BDS?8Xtv?1w(PZy#OMW@cpjt!>&a?pM%EURL$u_QN~pSI?Vw
zKf;3+-c#DF?`$Vdq^<6fd_`W347dRJj4Rb-5>l+zBzF?hyV8Req=}>8<5yIlkqSRX
zTzX@9YO3E6NKQ`k8v=k$loOF81vWeC0=#8JA)%hC-_`GK?lDy*EcHCvHTC3ri@o+t
zmf1=pUnyPKvrU@?{hH_1ezJB}o3@Mk7Z!@AYPX14wV$xA{bmd<EgCT0!Oreb?woUP
ztHM6>B&T@ws4{8CoL!WiHUOE9KWivE4VX5FR4Qa}pX2vIpwc|g^WgjN-}hx;u=srm
z&gv%Ke!x7!FF0N|3x5ZqL=cD)b()$$pguz$t8_wIz)qpHB)FatWMnv;Wl*S-F2Enm
zi!A|p@<im^{n7$aSNk9Ij`ot3dS@HxscZuS(f}gZR@D8beN(dmwH8uw-?tU3B6TUL
z$^JI!C3$w6C?zH&NVdFmf2uCrF0I*#Xm;Akk=d>A>Pyik10`Ck6%YxbJvq|sIuX^`
znbD4Do`Nt-4l{F@l__ENbC`V*W^aVqsW5vi%=U!Yx-eT9X19geEn(It%-V-pVVEU_
znLf;Z53?V_?2|BiGv0o0m~9BNMZA4^n6(MB#4t+;v;Xjxm&5FJ-g0M{tq!wEVU`nS
zKHfk#CCo;InfjhQ{#yfo+iPL=OqlHovo&EhKg`f98fLwC*Zj>9xT3;r>a{TYDa<|(
zv$w<Sg)lo5W=A;n`@(E(m~9TTC1Ex#%tnV<zcA~_A6&$VOXH8X^1;+`DzES%eaX8z
z9cE94+5KU*Da@Ag9xB7EKkot4mLFz*K6%D4yB=nL53^6h?5!}vyPk-@YcYS<$S~^}
zW^MUflEch|?<pzyrjHqa_CZ-8fBb0r-q`yZ|FUUUH+MiS5#)hu1gVD<-c!^OA@%im
z!*sdFKf#tr##L_;6%I(JYB#tOoe1iZ8dZpJATgD4RFTnu)KvEHo>t4UpIW?jXVvqY
z7TzPS*YxQ$dPeuY{i%q<`o*hCr)`ZcS~KdYWnG3w@|O&m78VyB@-15R`28E0XXmCl
z#=aFZuTPvfv38|qS?zE4@0|MmBSQ}E+Rjq$zOBPuANGA=71NJ70lA>=*Sf!pUut#;
zK^P)?MNoAqGtHKk>hoxlb0w)Txga%5@N0cSa<VfW_(&$FFC7QG<AsjI7K!8Fy1HP8
z$Vb5$^@zSSZpu~GkzfEJfwJ-9*C}NXmpNluxHQr%vAAN?-_91Ao2RuMn$@jr&G<35
z>qF(`)&U)62DdC}(a|?{=fOP9j;h<<RW??A*Qu<1>EzoV-F(}$#O_ZAeLYhFeDKif
zK4YpCYm}9qj&vg}5Eq2}j{G`!hK}@58Eimc`UDMhWU$OesWYm=?u0t1C1tsf+=A=O
zi?6>Uw*c?Coh=ooNDI*qY5G9#2BuP6dFNpwQxuuqfG~W6p4!lwKUIfV5#+HXAcuqA
z#+A=_R5ZO=!c#@wK_6u=^`TS%v=K%CCL9&k$|30*G7}M_VnCWB62(ci9994DV#>i6
zLg@n7dZ{>d+U1#w^2`ZEnf{S<ZT2TqpMj7low)7NT%v0hyGtA|%|UNInhlHK(h0ic
zB(G#g?c}CfxvH(jWH(O}<nHnJjO}_y*X<J~_2|`SV)yP7$Mx!4DK5TsW2c$jCT;E2
zV^a5t6TA1AFr^+%>H#2dWMD8l;Ujho?%VoGscALVrqw%CG^s&o-!;}A$zFum!O^7F
zw`tcHO)7?A)_^j$lf|))Qh^3?ZwR0pnLu2M;k*#a*bj|R#x4ops(rI0pn*(E^EIH1
z;qFio%pL|MS)7u~qB({%LI7!xr=<N!--I;MU2Tnc02OJ3aDE>2B{%7taB`+-X;yM#
zqr8Y&A?zE%e|p@Edg6`fR`H)`P5_X@=McgVpA*7=T9}@3GyW6$Cj2hmw|Fl*7^8&x
z-Um>#oBPh^=v`{x9|NPQq3=gC^8ci7niG}o%j}uhoKW8nVLRR2ceaM+MD6=B!&&5X
zXMpal!BCUF2{+|yj;o_0?d@boVsr=5_q|zxKSA0fOe_^??~?FytnZfSdq|s-CP;f~
z-$Xa>TeuAT6%}cZQ2d?<r2k3ZM7P@aW#)_ZU5dURDQVTTZ>5dqYmUpO(!GKGfYuxv
z>|jkWOYIr^iDLt51K3TxS8+Sbj`i9az3yt$vPrMBLtf{zkxy$b?qr+P){JW8>~@&s
z#<+tB50@wD`hsGF9P`#j#FEi|N(PWuT_DL-k4Xd`&;ho^mXL}l7Hxhc>~Oj)SQe+n
zYcL?A5x_TzW{AHQGh&2AuUHv%LBMrr^cq0dn2dTaJ`Kn#LBVP=NER0tA#9NJTN1wM
z5+t#cUhTLJc?3GaGQcd*rkF!Bl5lD#3#K!M$B49iD$h*0>VzL6-B?n~mYjJNP|yWu
z3dFjCQw6(Icfab-t!23gwVx%kJ%7c=p6hi|;RhdJxB`vd4B0X$Op3Jin*~QwQlii2
zbeXj-ZF)!ol0~XJ(LErVoCvEOl`W90iR?;ZT_Pks$a+4(>2etofGH09MM+0h>6$SL
zG}9=MZ65>QQAfaOXE7~?Pz50O$M6N<HK(!Yf=F>=a|b;#>+T)yxySEx99wcWFzwin
zD|{;e=*J3u%KQ0#jTD^~-L@`LReP^EYIui7&OTK8hJ1pc{64$gh21g$q|W0NqajD*
z(%AhrKRH0r%t8@>#Kz~W?iVojE1J{TSs%PkI9eZ`7KGlYNMz6Q6VyXiRyn;!@`J&0
ze<URZUlJ4X#p}fvmkVE<PJD4V@Wp7v7lWZ3GED3v#yg1~k#j7f2Yg&;8RJ+)(WA%<
zY<%)5U11CAlf)_d=%qMC2{DT3l~a^J6eSQv2}Dr>QItRwB@jgkL{Y+jrKl6<bLtG;
z3pPzVp6Gc_*OU_xJs+XQNSvOJpO4eyh|xo@oE`_!;~;t*M2~~$aS%NYq6c~BMtu2`
z8LB(03=z{c%WwwO8T!0#K29tU>;xkU@o;vI`)~y+768Ext@`kJ{Jf4(JPH5MiqZw~
zR@Z^!vz?#*LTZK6Uxrq|&~jpMCt0VOM2A#=vq5r822$C5yfT4T=o(3PIh|0*ecD8~
z0mTqxy;gtsNKqScIjsg921ByWPMM#SUy$@RuPVTgq$;=38HLOSh?x+t1H@v*G6>Zl
zD*Jtnsshy>Zr#({GOb<M{(a3)X&d52f_`6VS)(6(i+u2U<o>%z$Lk0V`2e4pW_&ao
z*c6P0bI9Q}7N^R|&@NqRBM;?s(@$;3(YkoM+4b#W=Y1&fYD|z)GXOn^d<`x55%OS=
zC}IH=xCSsDI-{i3Siz-C$WxASDb)m9&y+}&r%#-Ca;VT@E|F0Bh%xa!<+n%6k6o;p
z@D`i$MeWasMf=wxWtH5vw)O?qO)09qCpIo1m(hx=Xowrgv!IUa!+I!0toidm>sQxY
z#X;OqR~2t}z6QnxftEcsPp|R*TEymQM!a3$8mmji6-2u%%u|v~+@50!iW?f{X-iE?
zdJItzcxJd!t0B*4Ba0^^*##qRVj=*nf<eh6<>V$KJ-RZQCMQZBhoA%S8192OpcQA|
zal2Uk6cI*xnTKR}lG<Cf48k=-ljfwF-lZ8O0lP~FCZUxEPrt8VV|rz2`RGoWJuS-5
zbHCZ`dg9CnZBCj}<grYDAG_Dyz2(#=T*JEF*1SWHy{FiM?xo*Md3wT)yX3B{{mA`y
ztyAvpJ5t%H{Ok2fT5sS3d4L9$DfEnF`D`AC$L+Q|jDdjUkg~FU4wy$OqA50y+iG{X
z1r0!ylGV&cTuewx09s1D#io8N4coebe?v8a@wKF$w`04P$9MQP&c*MndD!JV>_+K9
z&fNE;p)4=o?BZ3Ghd(F{s$65dD_7<1H-5VRF07Y|>PXTaM|BiF61^(#6shvs#+0U&
z*9gO_SVPjDis<-}0E9d)H3863oRk_+@f>4(S?!yoJ>EC)iA}NA)c1k3tR|J$)V}{(
z-*<zwM}0pO$Zpa%o!d2hKemeP$93v{6zf*iB&MiXj@aLCDs99o9Q72|6>zH!+=j!?
z?FThpua4Irz&vmaM;$6ZsThvJC3YP3REcNjfvs&V%KbyNjSsoBu3|V|LhP-|;d3ET
zPj8mfP;CQy<Rs)JU^v3t*g2A}(J~kYO_B|Tl8h)NLPZL62JCVCT4M%Z;Ano(SYtPQ
zQ>ZO)KLU)##zuhx`md8l3}?Pn<@?1iELMI<W!~Y6KUH3pDu1Vh_tefuQ3`f$?_LaD
z@IiwHVkE41gClufNEOL8n_w`=!E|g{SCZXj2jUNMX&{T(Y$$kZ)rl2RLM-FVxG_Ph
z@T7_!DwhIR&V)e#b!xaly^JaqQ#p;8=mhaer)BODd2OBJdkq<D&0FkS+-`Bw(kb(b
zUQ2qd-D|$rb4>3Kx7?LDad27h&sMPJD}MQ9h4Su-i(#yciae>s%CzPyxSQP_n`^4b
zw=ONOp=uslbKFVIX|x_rt%VPnHP)JRotYU$Dk5ZThpL#9d*gjW1N<GKPPFRO_Y7~-
zYJY0qwENY*KVpVPeNRqF`;)$D_p5Z@%f4?!ceM{3qLCh@_D#EA?fYY>(dv#Ox|gJ7
zHSHUizwcp3#nCuF=XEvQ&kDJa6j0l~oSjZdQF(Vh-3CK}Y}`w3Ti^TV>@0ex`#(KB
zhAoU%Pa_7P8Nb=v@|oT#jzTNk?8$Vq*VWbpk`fwKkr5_BR&T{m!3aLrm)Ij}dk;uH
zS@&yAvRm(JG{#Ff2k-IzAy;t8p#tq`wh158WKH;!Y9ORV-J<pmtw?Q6xZ4X-6B|_n
zVUVu{@hIeMi%=X%g34gE*=)>eV+M(t;aX3qz#U@Yx2?)`+i;|Ok}a@zOJL`LUqY8f
z4t<>z{4r(A%I?h*^K)}b0=B=(HG3DC*6LH*_PstKW;M8?PXS%98sPr=gxx2s!Dx1f
zCRQlSjg-q&2|yf^b4QLCA^3kGr+JR}RL<2LaX-ofh+A^@=ZL&XMNV~&SV2vi=R|VE
z0JXE_1aib2NeoHyN%qo-tX$w(ONayW)E6pk1)BlD?^WzIvM!PtkfX1WePX5VASi=<
zf>Y+=^SpySfEdR+B3<OC2A&-#ZW*|Lpm@i?>Vaa#z%c{G<^v-GMPVR&ci`25Vnc)K
zfvjTS(t%=NVDo{ZZ6F&ciS6uJAnMkLxndA39g_G!ht{gagGfSk_c%$aT@q459kgV<
zljE&!Q7MtgssRg&8yCPycCE&p*aVR_Q1^H3MUJ<+kFWVg5vm345UCpwFRykh_Y^ej
zr@Ghb-qha9d*7<|E<(dZ?^2E?3t2z*nw)%tyP>^MQ1^*k!+YPa_8zZBBLR6=`aCD!
zU9Y!-UpA?v4LJ_=H`%?>BK+n5K_%__Q$^^&>Z!Urj`*C!Pt~cK<kUYoRa6B>Jyl&e
z-@qw!^HcR<4gB4WPnCLV8~WcN#;rT_fTc+(|7-6X@f`J3QTMamiGR{J)vHx$-z82*
zYmTss&P4`CkJ>w5f8sPMPgqz_{U-9IsPDi7M3(FGs!ynYhsqU*ew8cS&7ctx*P#+Y
zC+q$OOx{1?3k_9*x*$qd9RXDdD)9N6@P%4zgujDRnm|K>38qE3?@jQ_T;Qf)o<^q&
zky{ujsBl-Zzh@2C6)z0xGc?Oy$;=#mOU1CXZZ9Cm@?*`v#EVUl>z|L_gj_FPtksIw
zH2)fn_K=I@dx5lDAiNb>8cI(~^?E&-`gCK^lxl?zM#c(_?C~_qg~zopQ*YGIiP9gf
zra6G!Lxr<CBdat{H*PlWGk$5*1dJ>VWhborkkT0o?VulySam3T81W>P8?8obq0^Z(
zE9&(+b(&l`cXrfP5GW7}3S`vEfb)&SW++v_q=d}bCK1sxa8Asa3HC8FZW7^=H5tgc
zB&sSTF*Sq~5k6U3Z72xCI9>4kKNm=2z@$2|FYr%r(O_|zT$26D?%M7tFBNJ|`A#L{
zzc1&j)0@xw4_asUnz=MFneFx|latvle3cy4QTFlq5>|T8zC9!V?pwBD+447EoIAa^
zZLe92*Wo9}?a$^O2a^|u*L@)`lFMNqN}~vYM3c*%W|n2QNeTwcMQJQ8P4Me&ZWq(K
zn9EM}l_(~NI|8^_Iu_l)y}#*M6xsmZk2+aFJ69jb4+4;HTm?G2c<cRF?^^Zmox6Tr
zb>o%d14C9m+pm1wXFEzB9CmC@`c|g9@8P;Fn-t}svbVJRZA<d*T_CPw?pB@VC_myP
zv<EtIKYmC5jQxpvC*prNm)asttGyr?Yh>W2gSb{|9g_~cHLqim@LyWDZfHF|-nY2P
z{a;!aHMCxY)@_LraWl+oM9HBTB_raLq{do<yA4*lvcJ_GhW#uf;xMCRp<Z&jjMKGC
zwW7A#3RiAP(p#hAK|}DM^TIv|NhpKzrB<zE!BJE9u5VZDYM$}%+<Z%mp?!OdpROIF
zog5Lz;K9NV@=Ib^t3x`L6F^r$gR6$i0FF|UDB<Yf#T9?hE_p|%)X6UeSw^Pv6>`9D
z$WMvuwVm*;1RUeyh)1R@bF&rE78WCb1B7bG)mrpajL#&BUyd92xGo**Sjvo<^e*Z)
zJg2*%d>P!C&N`>>OqZVuvO6-ByVD-W2RNBpYeKUed<pkFGUtA(djvJCUB^Tl?qlWm
z8oOPimc8pp`Y|jf+HsoYnB5$ztHRrl=k0+i2{tyg#%g7V3g?$M+V@2JS9$w<L5Z~=
z)2Ka^YHQ>E(O%N<_65l6Q~Qs#*Q)*NP))18|GIzUCJloBK=(p;CsA)vsZRy<b(3oR
zezh<JHXx`0kJe4%y@%P(Snr>!)KK+=x+iN)rkDkY+T$I9<|pc1G^VJ%d(_ss)VgyG
zu+r2@7`*ppIJT#?oy06L5q)df&rk=GBUZr1n{e-nY^5Vn!*Ts_6d*>BEEAjkWvFt2
z*~jz9=4^w$r-i1C?g+_UeiwUM1F5bwlEef=T^OKL$+A_82npE&waS4c1+e<!Vh(Qr
zu135K1{LCIWJfAtFz#kb2>;N*C@NmL%=G^287XqgV^){7O*=)aS$5sDaidil-Djse
zaOe0N55*~=dK+5uGk{W1qVe;e+t*Y2I{z8gaZo-0<dW@8OSZSzNXX)(6)-QjDIP@n
z+IN_HgFw+82|#?41-(gcG@wcpu)TR?t!l{T18AT>GXx6*2#0@G{_f?Mowm+hYM*^u
zsyNT2ug30LGvh`;vrK)S_Aq~5^ZMtLB}Xf?!1E=t&;r<(;uZ)mq9W2l0>+JuWio3`
zMg#2X#{R~oM#*aIXgq?u2%zvrqe;+0W7RqcGM=WGRKytcE8Qvtwm`Nk3Sniq5on(I
z|17yp>h)Kp)oIt4r^#bdZ#<K#S+@83GpN0J*PcC~m0Jwpuh5dk0GxtW{cX^u6Hr+W
z_A)&K7E%oMUgj2ls)wj9D=~C#w`V~n)&5$`eg*cuyjb~J{^~kr;@Z;K-1p>TM{Eb?
z{u=t1(7#FO5y^mk2=}lAyjG1xAfZFX7!yzlL_mDALBLed6V-c^^aj<DK&UQ!sI;qE
zG)H-I2CW=J#=x~falH~vk-ks8@gu5!*B+C`r#&WiWB=K;S1FrS`|DoX4<|tbtOFP`
z?5Oye%R~HU$V1p)m+|+V{Aa5F$%J>oIbH(I0kSYU0|6T_`VBsS-X{f<($kQXGbZY^
z*$_six7+nnfX@={eLMcej0!YiGypJh8iqP?s^U(DRC0w=)p#$rrQsI@wJUBMRPx>L
z#t~;m*zUWp^?_#(Oq_FnrGLbkam|$v6lKaF_Sjo5BUtwxrEpAO-V&+jjc3H(yYFW2
zE1G})RT)Bbr(qoLa*otHk{d`uX;+)q8?wo=G31xCbIeIesVV-H%BbH#1wK(!)QJg?
z7aZXGi)YN&o6BO`t6289ZGxt>ggiCePY)#y;R!%Xhvx?2XSm@V8PfdY%(hMWRQd5>
zv65PQEdL+Be|mn`Z>yJWF0B1L_03k#Jb3gJ>#y0l>iQw&s<Lsoaqm}sS(oq6f4M=a
zed@sXgTC5p9Ki~oeVcVVN^68OEjhF#7voIB1G4MQn2ZYpzsR1_$Esu9B;!(hRmR=L
zB3Mf<M?=a5A2b8FlbCn?J2>J$uEs3rl$^t|D!c=lkeCNCdRAUxqP~%4!!hZ3>!Mg|
zhuRu7&rtUTdXTqqYqD8VYta*HeGghg;znf-Sn$m?Y3YXKM(uG5#XER=m4E-#QkA#C
zz1by`Rps3=i^^o^pdQZap^@Vd{LH4JZ<X6aJ_om-mYU(>g+=1r9^CwGP&5YGy9aUW
zBO=WL2}vQXl<mq!Iq!Tp!17$qWNk($162+(GE72JiU}a=Rue+$U{6I=RBoYC?ZS|3
zRYs%&OvTte<=+y==dy|}7LtJIT>$=tP#^<dH!k}j$RmU}N{aQkdg#>$*3H<ceD~|b
zhs(59O^;*DJBsa9Zgjf8_2WGse&*g4{@r)qrg`hwwk>a^BtJ3#Gv#{gtV!w0PR(9+
zd82al#%GyjPv19t!zTAVca4~YsSu_s!{xE?3|N61m1;?l!9=ZAlPuZ5<n75av&t+%
zwz!Qtv;cNI%9Nt|G-qvbNt{MNH4UJqlrT_US|+iAnOb}E9&FZ2wMS<SI@5l}1^59*
zW$rGzW1)EP`t^5|Utaj9Ogd|OWt*IU84d}ZA_248tqEw7(~~pO0<aPVSb8XZKr|sy
zljxT0A;AvJ6Fy@!rRuF2pGS2X0YeEaUc{oN;-Ep+&*pQ+<0u7IR)&KoC-@#zUQ+%i
zchKC~RV66}-6s~Mk6QoG2BZ?UImDh+E+uK+TDn`gq*Oi7ymL`{piRHBf{NY)%gcKB
z3&Nqi&C{M?$g$g{)vf^TaT|Lod<9v0gUjKt+Y<~zs+63ZYLL<bi7=}t+T6wzrq|ek
zAmb(*d&iQF-Zpe8)yEhTpT;<75*yjoX|+)-*WF-R7Z<!2GpOIIhx6uPYs{j45u3DG
z+?4LloM1QJnGjyATGOw;fol++e7PI9K~Y7LjuDg!aHph*0L?T614+&S(Imu7>fq&q
zRTV`Q;yX8XaT2MjYy!4SRKjI}a6ZnL9gb3|*x?Lnks*>UN<qFwKW4X2c;Kt;k3Tng
z|7Uk@eIZ=?UJ`q5%gGL6^W@Q*x0Ke0mCnj%8?OK55PO=XtiN^;8IAs(bCgfzPn3Tv
z-`s!4=5?4`oNaahyV8hw<N(lPP3CGU_1@pisK)g^^AYnI^A&TQS*N$6o>s?>4CW?&
zZ2*2(Rhqf;?YF}7e&fNKhZENK>Xb92Wjm?gjYGt^1nBaz>JRH2ffkEdYU~eFePJ4S
z#jJ>0Ctp|*T~&O;tG7Bf9RK`(<p;wJe*m0%1=hp?#HK>6T@Y+$tHo?_*&Pli=u5M8
zw26X^A*ND*q0nG)I4o|13`b;~tsr{L+lI&S#pDc55nZ5IB5Zl+iP-*Box>TDSV%0e
zC$;UGl9T8e8JaXb^X-~Niu)Dm()jx)8kXyAThCu#FDkVno?LfHnJag~%%=)NBKeY!
z;yqK7l9R0g1GYE315or0k{|3LDamHFT9S1hzHw*~IKQKbqEkxqgu9&N!q|1L?jKUq
z)v_+xcmbc|S33o{(Irpy7#te8^RnTC=eT82KkzuPG8UU&o%UeLyyFKwj+8aNJ8$Vy
zmRO_=*SuW2sD0@h#}9~8ZXCIF39agQ%<8Y8-3HXQAVAH`kO#rHB)cO3S9FD=+93;8
zv&9X<by~199=w3FN5#-pZU&O!Gobp@boj8*5n)ln9yq$cx8-Taye~d`^u+TIzxC_a
zi`um>>AFh!i}J>gcpRQwrfieG!g{vAtQ88Gi8jd=l=LWZkXax#D{fX&lv7YxFd%A5
zPDkFDjG_g}iIOC_3IW#)riPr>HvG7$CJ$Ah<^-u!VM$4F(8?qP{V97ZYsI6*!Q@cs
z2NE7a=C&O1J*w2MYRc*!*vyK4U$XPiqpZi7UP<DD#H%06?MF<ouW-+J?DjuldAaw@
zeStYLH15r#Cv6D=&VI$><du*#xK|ARR4sYjVmIYbxgTael{mS}>X!iW6+nGhizUrs
zPDWJ}9ZF1t!`N{*q6$faXdb%}v0Gv~1V+olABo4{E`(Fbp`mIN{4R9RE%@jwKWtL=
zj=!(7>>O0{auqwU`r)h&EgtMM<H1p@<$k}ueN1`jsV;pMB7XX3G2yP4&MPl>9K4=+
zm+sm}Yt;p7^#y3n5F(KfQtiAb$mA8I%q(YmTDnz2^=@NDw0XiE3DpS_SOAD6JC%@F
zr0$Uh&P`c(4)u_68$F44e_Wj|;~xCH`nH{|*Hqjw<>ajV5w|zGc@Au3z1Fbo&*pdT
zdE3-O%E!A}m6xR5bnE0k0Ghe{f~|&ZtB754>CG;4qR);C#*TtBbTRWQMdj0&KefD!
z1C?(0E>>#|q0G$w`IZaE&!#^g+@jPz`PfUgS-6(B_iTNMjc1+K-@SD2FUpE@r=I9K
zSnLl@a4RH(`9N{^kT2Zf^tcn;A|g3mveTK!MA7T8f)eC{nM}HhsLAF*`i1H{_M+rQ
z?EHgg)~{+NR6=OAoHKzjfiqFuKuFXpIj@LgC*_vrxB}?|!r}7L&=5A`MMck~nk&H4
zZNrAGuP`l2DVR7<xhy8v_PFs8X5>y(pnE_QM*KhY4Z&neGMil*ms6v4YEx4E$w0V9
z?1qqJNven%EhxH<yElf_26H2VmelMAm5<l!8#wvIhG2}vuFJ5aGLNcwc%3EU-<ID!
z)VJis;`H@DKaYwx${^dF#~0YvZu;r)TozujSX@=R=&_e>Valy+hs=gXD#WVVjTOyi
zREqK|eAgke;F{bY+I2-Fr@)<`kROmTbQ#GybF#Upxhp?E(I90fW@AMYJpsVYRYcPa
zwDnZQPF3n05F>9c*F(}54-&@7pil!aE%o5QB&wECE%VB%_5>aaE0b0lIjqmbwF90h
z-gRi{=X>U^ama0-T(tYh>MIWzm0!x8BZp1enA+mu7DhI7^4!%dbjLqCtWW;+%tOjE
zhnB5fyX@l^&am*Q#Pw~JyC?Ksu=vTnH*Q2o_aJF}w+0q=)tVw~Ivdj@AdZWy+GdH_
zQpl7-?fH)8?YTrQY!aaHtGWjSa*<W}lVb9C{2iR<ki4&Y`Pomb8t)+8gFNvcr!@8Q
zs}etH6RO1j6T4k)&Bz{qHZfW4J*FR^Z_PEXOT?^d;>=j<BDDT%QE{?bbP#qjb*zXN
zCA|r@7Wmk9G5ADO+7Z+#vV*o*ES0J^VYi-y-D?E2<1ArZq>KduL7!HeWeJ8f**WO~
zGzdhM_$5EQ?Prk{C?P-xB2R`C2s%utZx^vLh~x-0QTY(|F>VYpXf*Q0H|9!A%24x~
za1U?`C`_POdM*uz(oxHuyXoPg@5<8lzI@)0nSJuHmv66b87=HT!kaDX=guFl{MLWl
z3%}O;?Dx03e^;Ak=iWH9a$Z^fnAxuz+S><41CCmg{2jdbd`3{%PkU9!VtIT<cCb5R
z^G6j_zt$$mJYt7t8?!;NrAMK2rwO-4I{8ylJPz3@8w19m!wtg@$`~DSNKVP&5cGO0
zMNp=hM6+Zv0V)qQ|C;+F{tAD!|E&LAzt->PAvl~rV|p+tF|n0@#|;WN;xH-Tm}t^7
zxYCW{JgR3v=1u`M!rrTu#Yc`R*VetmrvK$5mQ_@f@y6YsD({wxb5m+JiyuC}<LAkn
z7b)jlTbbeLzuCsi#~&&~L7s2-l)v`<>b=qD578{}Xbo;BD&;nln{8~QpBo$N=jUR(
zhU@2tZr0E1D5g!dE<$L<ExWz$s@{cNlmz*8EcTJjk(`{A>hUDmBz=ZHl$2Z<b);8D
zuTl-Dr4G@9DYPXy>^2*#jM^k)f)*AGE%uShQ`E2ORzflcaqO5BM3NiWN>Jj0J~yG4
zI-CeT4bsId2NB>ApmHEVd8tw|Z`Favm$Xevb!POOy)OE&)M6Iv_HCVVS*fi(@CCb*
z&A4Z~@`(JkvPG#<9^GizrQ6B|LFQL#A3s;~&R_3gt{L+&HsT*TviCVKx=E2T;ML1U
zr&EvOFjg44lKm8;mc&r73soQWS9Q#)TdKndA>U~=Xsg;~$Ph*`dQ>zq27Rb1i#)D2
zenz-tN+VS5awSp_Y(6%$%-F~z!;;$HmYiYsGqXg~tTVHiTOE_~G{D(tNFPyPEwV!%
z7Y8>P36HDMW?>|WREbZI{q8iGv`C`!C0T6_#1~?Z>jgu^Pyxd*vhh$Cg`f&x7{<}3
z=wQA)Bn>6f5aJg=BaIP+t0y=pm8ubB^&z$5B=yuDORc@q_4-b>)HvmZsfND}{31#x
zRoUN8d84$f_Ag?nu=&HOt~f9Akhfaw96PxPg(a&C3PQu`VyJO>osDcdb+tIVuj*Q&
zJ-piBeOuXU0Ij2F33|i*-ZaS?x6$CFcT^^8-oRWKp?9WfM56%ActM0Zr`PFZ0PO?e
zy)tS*(6qxyE)v|#@$sq`v?~Ad-RKNLRlrJ7n%l(+fV|qz{35YmPAONElnP}s+Xb_D
zn*8;(rOITCtEr_P`>O*qKFYE)LFDcc$(2$3$)*?eCdutFnKAh;oEx%sES0gVp!LDh
z*T{<8a7yBvNIfBldAj*bunOt^)Y{+>)-`qt4t^Ft1+XeB<qf+&c9Ycm58`|jR(CD&
zQJnZLn7_%OnqovoMvB}Cb|gATBJ?m(Fehld&~H38yV+hDwU{Nh75Oq6JqDw3P{k1V
zfmIEMpMetcv(k5}!Wf@f^{i)>(4~O?CH$Z>d=K46zVpcRnu_bcRUDhPW&D$)AC?@-
z;P;i@^KRMKe}C<3Y?m@wY(1WhVF9LK>O0|x|DZfPCcdlcy%CTlpTOy+EX0toHqy<I
zkeZz0NKe;FvNe?A_lFWBjW;ndQ`TrQ620C8Fsy`RZK|Y|tU(C3W1@~Cx&dW`(5Ht&
zGA;}a&O4XlU_Mq4yLwJyvZfjdMmtE=LhCcD@OK=3-U|E;>IFp7tZb>onJSWLnJmj>
z!y@Meu1+Z=jY}UMsD1Z;#QTayz4y|#{(Xk@o_A(mdF9kyO#imBd(%KR;eF-(^r`tv
z&WhWu*4qA(F83L>M|tOwsk!2<wL7xMJ<VDuV;^pFqgFg_a@F37BO^G$)z2cvG*?&{
z=`B<4Z?-cS%+9bRN!q;p46DUz854zDZo2AMM_MaVutoj_=)@6+x7_E$omm-8L1Gr9
z1Gz#Lv0*6`RlNr}V^<yN;37rj_-Gu^sjfI~LlPGu8IXAqeslF3C|cQwOXc}dT5gh*
z#oTw4f3<(K-H{DXpTGa$cz=&eFK(E%?WGP6SFq#{t1nD@_Tb!Y%3H3(N4xKsy>sJ~
z#dj}TH+uTq>h^~oAHHYo_7@V}kIa1gAH)k_X@8ENz=}w7lLpDiM(k2cH{%eh$lx|+
z8YLrXu1rEog{hZjghn)Ik~Dd6g>b$&YDUc8gk3#q247k%CHI+?kQG6Pr9;I+fQQ*1
zKL$nny)Tq2hmW_u(OR?YM%DV&@{`w=N{=enN5uE%bDWDsVqENBF)l{AB2NR1gxkGi
z@(NMz0p(7LQ8Zf24zo#wp~mEN!AR;hT12~O9}_JC`i6*W(rj{oyOB*P7DJ7Vh*jW=
zpxQ<1x2b9pp+v@;cOI+w!#;Zt`)tu!Tscj))j@2lg*ai54Nwh}XlxVl0|d=x2c)&#
z?Ql8>5v?+6w@F%K?E0rGl5di@?oHE3&;)<D@mWZISTWsv#Sc)focfa+J?_i;gI}+)
z-?51=Eye-iOB1!C%w;B;>v~@p{?2pCxJ;GB|K7weg>m!yh>yE_B*S3y`pazwGmyNE
zE|{v^W;n>0N3t0N3xeLYaNUsjL*vI9;C97XAQll@kP;!kMRPCM0tF4ID}p^`5x?v>
zFMr6O^0Gmd8<fTGBBv(tqZ_|ZUAxtl7h2mcZ_;V$@f%kq+x631S9HLtFF;&_NwXfh
zdH`n}^`DLUKrk^E5D&RQy=*`|)&!t;_%r?1Oc+V>^IYCs@0e&}ZXl=+j)8EKi_Zj)
z+X;5Zbyg5ZnL?a(t6v*gWVxfPsoa)H^`CKu>kB}m*6^PefFAaVQhP7+9j(fEK9un-
zllCazADde6e8Hu@uY7%AUD>nkKl<!})onih{lkNG>rb5c_42_wVFM~ae{g#5vA18m
zuZC{fo4tT^-@_}Y-uJlS1*8{1d^4FbXvk@(D8k*Bkk=U9PU<$~H`C4ceI{K<>WwdH
z2GKP{!q_k3g<nqn!Y?27y1$+V&Vpz>%>+EvgUFjyq-D8K0mtidA?3#kanWJ5>XD6w
z3=g%UcKphyzYJ;jt4xu_EhS(lu(gre1c4(Y{SK6zS6($tePODo|JTsJ4c`8Oa^(ef
zgKI@%sP=Q{Lyx67#ow->RvMRNNAWr65(&^8K$xI%9GC(Ivjp)s`YogjBj;<hu=P_A
zzqDdI5<#G`IUvagobAjn>?h0seNnE&r+}m$x>+#$x*R;&N;U?a46iW&A1ng==61v&
zn9Uk>6)4I}U5EHGs3bHYqNG94AyKFCa*(*J{SHfVt&kJ+J`r^B=5>+3#@dM7kNg{G
zY9e>(P3*tOU6RQm36&^Htsc|=CU=$nQSK5~D6LY(b+cGTOzt}WDI3Z~^;aSLHj&XK
zp3kR%DhZO6hivdNG;9ar8@%A*i6&^BGA`J&GV3q1F9|FH1S4n0fl0*rsj>(3O>$M^
zenl1C#%zSE7G&Fsi-xp>s=}mch8a_?TtCtv9Wuw6e>Mn+xT6Y5Ld4Q~xN4+It|vjO
z0lTF$Y+Xj9-XiN|r%Qls;HrQ~@}&Y~R>ZV|W9Y%-^>H;QK6?!=9In>Il(+_}*k0Bq
zHfc|Ba&G1GcJwAvu)|!C{(D1nPeDX+FNn!@Taq^+0p{-1G+!cAbzeu{5g&ASpU<o{
zL!=h$HhaKcVc&1pn1J};v`T4GorLPM63H=CX$y;u!i=g)%4HTzYf~*=-H14$_(xJ3
zBos$507E3zP>%^QLK$>Y6o!{f_k9*VbeKH{A8(7Z%KpE7rhL=t$-MKszhZ@<+D*yg
zcqF!8yK7#UjZ)4kKi^R1zW>6Bws&n{#vk|eIenS*(7M0t{*Dp4pkw!pWZPlE_8H)b
zHCUujh8<}UcDu!9mCP204)z+IQ-C_xI37S1M{(KLJNP)&pjQOFc)`{sr$^8sXwqde
z8J84ikX2iA6xgW6nm3huzfyix-j|fmRP~dkbZ0x5`&p%S!-Z!6H@@*r%}(V!d}aSs
z=3fE;r?*1YLxG&$YtK{4zLOt*_#_*7=H1Upe>e!vcqjG_GU0`2q`<_O*=V#_^bQD&
zdVQi9_6H<TyD=<eTi`c{PePqRFe}cPC{HzJPvOk6UY?F~Ol*G|9fW9vsb&O&kiUZ1
z_9|#maHN>GYCXVSTZto-D`#dXb82tM4yEe(m+rlrtr90Re`VRF_pU7!d)7W9|84Px
zMJsUI^IUf1#b|k~xF}44to*#@3!Kty?ERq0ktO;ZzO<aQT!4w8c)iu?O-l<5jHWR!
zjL=?$3pO|wc%5@Pmz<ZXn<o&ngp!9RD_eClXhS%gu;XWB!ovd7uS49Sd{SXrIe+x3
zk;MyopL(tLmUq`FV+JjJ4wz^=(_U2$-cwZ`*d#4g4is1H+}(ZC<-u$2TKW15bClmt
zj%2l)Sk*UMMwC6^3wNIO)Fzey9+QnM`m1tR%&8w1z-Xi>E6tfEB<f%okO5bdlPzWW
zv-|_1)+|{5va$>|TY5#*W^=+;0L!`oqvF%wIGE`VB0YEfAs36w>}2-i$papOMT<%J
z0TT3adUVp&%`4c%1$94sePMRN5AQv7=0@GT*{k<1y6e?1nE#er7O(N^rSjW0dvvzN
zqaHn)D^C6HtCcriaaG+`F?#vgPJQm)k_%2yfH9qeJv$4hB-7)~KoYdw@0Yy^7*2*=
z>+^V!Ph1g2eP24{6;UlYeQ?tO??Zjz%W~5x;o1l1nsDF8&^!?N8su<TrDc58#4ghp
zr0wj-Mjw5#eDC3!TU-8R!J4$~{gfRqUmW_>lk--zzD;_m+koc3Zdx{A=CI;crCm#Q
z_Zr;#*KM0eEUzpIwCPaNu`}75$eLWBxd3Yu<@#l&89bSiWcL7}OcxvwHCT1bPsSzW
zcn^reC7TSlRny(2+GgSdz$rkkA7Xk+p*wlOiDGUJuqniVW)mohEfxX9{{HGW%l>*#
z)zd}NlMnRjkvDAYKN$<OQU3GMqJ4ep=G`-BiR-7=_OZ;p1G@A)_r8B&P`RkQxAi&Y
z3+2bVR<qPfW>~1y&Rw&W^q6iKMK(V#<**m9x)V6>Z^BQMF06}`+hJ*e*UXy|ut*7h
ze=_`BnxtgeD|<7*x<g)%M-NY^K1q`zA~rFALpC64FGAfQG}l{$>FF@L`DF>NU1Gie
ztEwH7qwx|qA;z3#Jk~Bfu4f}MgX`HHM6PDTHO<v*act{+rTR7YaaPGaM<%pr)w1B0
znp;wux9-C%XO&-OwECY@r)(9z${O~aOVNqLvSza0S7r_ku}_pNYrzoKOL=Z}M(qi9
zO=nS(X%>LWB2~k~mxcO1#WsIJ2IOs1Aj7Z8fz2s9U`BddMbvEe2`HTGl-zE0r`iN9
z(s5*3=HeoijnH-_Eddv)df>RS5I3FhC0BI?I$FRz<0mZUc;_J~craes(nGH$KbrIU
zjD_3o_doY&)xc*84rZNuV&9AX)(x4w=m*z=l?4w?9y@B(s&Qkwb>HGzwrta!es}gt
zkWK5y>^X*2=2=+ClhRTaR{UoT<#6F=Zi7RBF}J}{R@St%?1ro?oYZt!z7nt}9Kx_j
zfem_)S+v`s!a7V&sIL@qV1f#36Kw-j71nHWbN!XviYih;z4FS<sErgRZdidE6bfty
z5dx}KM@tIB$!|5cWVP=Ry%t-((``oIQX{ujvRo}ISxIcUesL=yTCMxBhohXn))7Cm
zi#EH>m5|_MAPM`?X4PS_bV#_RI1E*HBL-5>*txXj48l}RT#svR2uYE|izk(1tE<ON
zAJ(-X5X>kUJnxwJ&_(GPWvX)Gp&pLq*14=qOumi~V?INgA)p{psEXKuxoSt4gJ4ba
zx%5nLGy+B}l4-P;+mI*^e7{7yV6(adCR;g5Z=>Y5+hDLlXtX3)`9UE89-k<)O~y=m
z#Se`HFcM*)+H{c0pjS`;gfkcmp3)4t_{0X(!?J1>!;W=Q>eeSOvV_4#b6F2oDYw0T
zUi`olj<omO=pjAhd#2V0*X^mE-$w3PE$)boLGFk#7{QMbGb$l$3(z-Eg%b=q3}Zl4
zEMoXDXf<ve0;;PNw@yHURj-%EE>R4D2qjTpH4L&xqwFuynu|4+N=jwTMJ#41d*k|f
z_LJh2+hR{PjR;V8T?F*#5W(X`@G3x5p?;wTI3kQtkDTm0e7@pJVEq)S^Fy{sIdZY)
zq~bqGPrH6zdgew?dQ#m51U$9iJZ}&`4S2Hj1OK@@{~7yT+ndKGRM5|LNH~@!@zaBh
zJ>16KlwsOwh}FmvS_xf*36Zi+9&6haDQF2=LIp;o#GBJgBq`k^b?cfQOhyn%X_2m|
zA{t6DSYc(;+1h6daMLD{y_(--uq9CV2G3)GK_z}8;Fp9!NX(+i-B3bK<#<?E%vbB8
zeGt-WvvG{nTbcwzh`OqL$m2)ZtWEo8zxBY(Eh!rRz?x}d*X>g`?VEXF|IE!P8vE#D
zGc?_H=0}$dFPU96eQEE((vx@IGjPt>Y1O?3yPtpf0$Xx?^5_TIf!YgWhMYe5wzBHv
z<k8046u;PW+@SRXA5jJ^UcW;*xn$uYsqYTugSE?7-NSm%U$_Xf_awMSn9trwx?zN<
zGFk46bxi>`DU^~dX1z1PW-}T|XiS0{;7ss(5trcgn2`Jfk;ZMdBtz{?Y1nY;{jUm^
zvDu;{Q?K#Hq8CW@mT32dkN}0biA4gl2baXc;GW$+<v_&_cRaIvDGtO!9tS6mzR|Px
zJGQGnsa)Jhl&{6&*Mf2{a3qr@m&IT(x{QfFi`@>sZ?~JwZll5AZJ?8QKKM+%v4tN9
z9)_$2D}|g5L~ZV3>f5jN>`@bNK%xV83|zj!(iKPK(bC*bVF#{P9Fz-r1$WJF-5wPY
zKnpm!76fzT+~!$nK30(6Fd&@Df-KpBG^tsU53-^^w<7BIctD-UW3jqJ>FFS_Fis$6
z%?;viJYm0nDq|<O5y4tr!&GM1)2>E1a8rkDUgYaDboLX;cOHu+?f2Y1asDPt#e-8<
zZ*?y{%K!Sf|4z*Gs<~yo`=8%0-g4s!p1nVF#M~K6rw}>|{9^o%FYgx#iD0NQS-Tb^
zEds7`*lSBO_?s1GOYocL=jY_+7W!>+^A?58l5=x%oT(`(2FZ-D4YLo|vqzUfe7_)H
z$j8ORxxaeI_|+UU;c;$DEaZ<HiH|>6zjtmLuxi?=kBh)o)6rhjIIy3}cgF|4lMnil
z*%&h){LEv1OpSv!9yZsEkxj?EhlU&*`~jMoD%ypRH9O;mtHvCdvG;(-;1moNi$<pr
zBwwNd5tjyoq}S^7I>fr_trmoiRYWyXgV3+qsmLAJSgQn^<dCbBZ7)IQY!LM2>VN;^
zn+r9{!6eZdJ$d=_+G3LK7q5Jk^?%|-uJqsvrF5I}2*ml}L%|KRpwXWKZ4&mC53w}a
zOmxd8cwiD_5m=r!ht2^V#D~~56HCx}us=m+mDI~P9zO@*O!cJ1B_s7tE|Fp+;v6?2
zu;s;?i^?UU^6i=?6cV53RLYr+h{OznO6fGHG~&Ufkz~67|AEHq(F3ALua^+aXR=6^
zo2E?_+G4@0_0x3|Ez;>fA>)rEFd+dH90j6=Usx3BZ%FVZ*_=)&3`q%cN~#m0lhp~`
z&FMrWEs!+?gUv9;aEGDVaMtjy;VWQ784NlPxp3a`ed&`8aO2pVaN|Jzj)lX~_3^)%
zKS-wFS8^;gE+DDSo0#2$Ya69v=<GY|emSTdEIjC(SGoG3fHKp^)@tY6`f=$aq3`9s
zAHMOna^eu{>c4$j&FK}xSKW0kuz3$=7jgQUa~PXT2tqq;jzDFb-imY@lU|TQ=?>87
zuq7C*h5=FN3m7JBWfrs5XmV>(G3PP0NHu&kc&r<5R+V%_CUGua1_6<Hy91h@F0K{f
zKsq$%dTn^^u4gYvUqiyEiGDJP?R)v+>CYEz?LTAMy!HLX$5tpmygcrwH+qrG0r}(e
z%dfN4P09}|x9?p;AZ%jYySS}Vuum*FX@erUf+RtmLE@@YXVm$~v<HKq7aE<{%Zx_r
zfT+=GB8y&J65&EVoikWun_Bd6J@M&>XHdnRCIQ6>jgAaBLDX2^^$uI!Vno{?eq}`Z
zn6K|!HDLhLvNu5HN0$DxdOUIvTl)?6kMXzl8d<NoQT&qt&5h|0|MU;sugJZSL_pL@
z;%%8Rthf3YB8oRB%&vT4a-?0F&u;fPj9HGXf<nL3;~W4@JA|E=hIg?mo;r^xglwTe
z2&oF5kSFBu3V#54;eG|I7kp`4d}(sqVa4dat4A_|YD2aIx{ez`cE!aQ9VA(?hYI}C
z&av*lz;~$#FxwgsU|zc!#VdyI<pv0nh`lICOEupjm(B>e+;qms?l7`<jaN}&myoAS
z`OV6Y7}*$Ob?g^uNh#&fYf-rl6@|@KJ))=eMomNmEdp`eT#dzbi5fCrTp*o}3`4}P
zgnZa<XUv?5(Q*WnGRPe|COLe{_GfC|JucN=)+p=bwkt^boa<s~Dawy@gOk+xC3MVG
zVR@u8oNKZ-DG8QP*(L|lyh-2(*kO{_t3_BM%vAO?dy)Me`<M1Bc5Q-Wk64}MFo)X6
zFhclhqC}WlE?7kIdctBS%P3s{V5}5*O5cFw*zQ!nYhqr^ghb*MxtXLfPAbJW(FSGj
zjagf~XO{Bpb8oNx`RPYqHaxApb@=*y*=&1~GD|yg!5w$DQeOP{)iZ3w;X^xoW2PQD
zwxVTGHR14RFv<_*-q1XUa@m?<>3-v~^9QdHZrbJ71mTls!5q&XYu&n>BbAkvsjsD_
z>T9c3>TAoE>T5}f`dVD9zP4zgzBX^Jz7`d!ufSmAh-bOLU~7zc_Furxn1CR=v&Zmm
zdW~e@?Ls6y9bW<gd;vn45b-79i_=psu#MOz9DU6m!)$BSipAmE8ogo$^1)UPXcj_S
z_~0Uqc+(q#FydLkjA!8yW_ng@P-vznm<a>TOc-cp!ay?<2AY{L(9DE^W+n_Ykuc^&
zwy{a9SEENm;s!Dq`xh|1w5S?JJPrD>_FeF_Bt$Haj5H4j-sEJB4!JUdlm(O&Zw9e5
z$qfvANDx4DG9kp;<VjAEkd4$>j^G<fJ>*=Lh#!FZt0g8++^k7Axx2ORs=`G@Q`K71
zHo3=Rl15WqyXlRNJ4c(1Q8}SWR7G0)G|c647|7giF=(W;)D)x1ZW<6pC>y|{CA%G-
zEbL@GvJDJ+53V6+Tn>)gM&ZQe@lr8MbzBWo9i&`#$3S3=A=4-^Zwe-o>aC-)g9boj
z8>#f-w+}lWm1BYvT{hb`LwI5z$8MfCZuC|KC~yL@uc%mx(;^-H=HyhtA-j^2e1H!7
z{~u71FBbR~H}{s3u@OM(7|oya=l@TTigZhH+Yw=th~xMzwGrr3s-+2F1nh#-<7gZk
z#x-qjmx88Eb}3YQRa;Zc?S09iMi>|(G=tfM{sYM~4N<YhI={({JQq7|X+L<Q#cv4&
z-Lh{fV*&#!2U1kThp1?u2NxOKaA|UV0!JgRPNuq;#zq>YI$IPL4;7p)Y&9^RtCo$m
zp;n0W7EL`449kiumrX#+mUdN6vT}JzgMO(hJ?eF(YL^|6FMU+!hrOdX;)8iZk8!{z
zu9M*&!u6<eh?OwEP{ogU9C}Q^;9>=KBRs53da|NsTI~}^5w>fVv3n6?b=|M2R`-}R
z4}6zfQ!pQT#7ZTg91=p7ap)xxkzd?A7V{Itg%|3(ge*+h>>t)#WOw&HFiBY~w`JRE
z|A*|P>}9=K?1L3(5lI&{h~*bfMXhiob!7dST!feD><If3)$t-(`Q;!!Kb}P0qPc`L
z6LXSYNM<jiI*Ls7g!Lme<WaTbPAmYfPy4j2yih2^qsz<pBVH|ECuC>~o8{-_Wy*;s
zqDIGws8vprX_AbxQOF8pqB_zTq@NXJhte{5d>8Cz+z?AhsEC1}i;wshVWc)3Z>%x?
zikL`39U~Kb8OfD66`};#B<{o~yDWook{oZ07N2R#{Nh6YwXOG=yRw1w_1ntZI_w`i
zt>ds8y%e{{b$mawzrlV^avpzBxw35=%fD|^yKZb8eO2xkAFO<PXwCQ!2aWD~qeMRS
z*q9pw;I8d-x>7oz`r$`Ho?eKZolZHGrT{FgfYnM3rDg=oo)pi3XbPe3HNi3CHWAgP
zsp?RTkjrRu2DJ#s3za&`${>UxlDi~`#3Zfs_wrEKI;cmDVTCfSFgmv6`RF~_)&V>H
z$;r2t$(cz%uGGCb(7MX=Vs0Dp(I1uPl^<uFXP4fp@LJZJ>?>*qg&<{Z6uy>I<ypv0
z%x30DE5DF#5iB{mgL7FVm$l4gfm|l%x^l&<x$N6q_HHhFD7Pl}T&`4|yCqkgoy*4L
zvRt|Z4Y%J>F67z}_QrqgIbmw~mRz<nm)()ex}v+PTnSyda+#3JKFIwx_qSZ>sa%GN
zQ+MQw?IO7qxnpwo=gJYhJeB)y?pL{2bG7f{i%7j4>p7&Hzjp1RzP69>*GQnWP5Hju
zBe`dCrQ8TiwCLL)xznDCx^)p<=2KDBlHn5HTls{m1z8FoK$aOjs&WP-KK_B~O!+Y|
z{2BB?n~B&4CHL?WI!M;0LOa+{sIo)1hYl5XP;M*cS4-C(>{m5;{LBq&XO5jbrea{#
z#0fLkZoYlW#EJd(JTzzK!v|;0c}RSG-OQ><69!g{oib+5YJ5LsLcfYBQzp*bF!SLD
z@0@+`5uEVhK)jq-cRx@>(jzvlhG`5&S)NX=eL-UoY+t-JikBHvd6^SQwvfXSEq7tg
zO#AS_%PxBtrOkxsBU6XX!5gy067eF=BBch6h_tX+jlh`H!3@kqGhzi3YzcNjvPj=W
z&3cU$`B|bRVsVt?j3WN-GbVls$rHwF(w|YANHsr@u%J#1zff@lk-Qv&`UziliB1AM
znN#c-S`kuib+d0DxNWg#=WYLF=8ocbM~_Yy3u`aU5WTCFuUThY3_?FK8|b^saPyCh
z6nhPl;7>u!XNq8uQMxlN1(*Tf0)0?t7R;`1V<7|x8L*o_7eKS{nd;;%X^@B;NNj9?
za6<ak#jZ%wJK-CsUo>6lU+h0_Wo8%e(C{5=9@;hio}|_0VUYoY`gR!FeUWC_jNd)k
zE2r-~IDJA=$MSKb2K1r?dEtQAQc42dCLu540vFbpL8V2n(Q3YnV&ZVy#iF+xbVtk*
zjxC2o1mH@?yHZbotK@mav95tT=M52C?q;1Cn=xVR@ng?|bM_W<#IH0PVTZ{?CLvZX
z*B0^?0YAp+wP}h|B&kFTFr}=dtZ$>HB!3cEXHpU-so>ivrY3-?`l5;dJ3c|!&fI4c
zpB&J{C82s>F~^uvGYFmWFi;3v@!C<GeSSJ?+ti^f+~@J#EAE~#u`K++^e+9nbnf1}
zTpBvGN1uw({WKeI8$EcgNwSaVv3T3O+eR&Mir$g!r_NLE>D{YUyWXAKbeuS*Z=2pD
zhPH(W!GzZGQ&MZqkFbelMNE<f+BiTTg=#^EO#i2G3&aj?aS>P4Xt&j`AYmb~1FMdf
zY|ooLeAK4QNjaD0r{*kaKYno4sEj4MsQ2Gxzo^AZB?xKIsKNUUTIAFS)f&X^B)x@`
z#P>5{YGZj~M~U5Df0kr_>?|>sB0neQYXj&BP|p%jG8xV#?qom%)%Qc)5TGm0Lun~H
zQQwU=5bFkeWw_>=NEtF3p&*h>abUWA;t}zTD2df)k?;%qXh)$E_b4QUQArn6^_2Pr
zFpyU#E>=F(yz_*lxpq0_8`^m$^!Ar{Zvt+D|C_y)WtQkP%p@_*I~rxb=9=r96ol|G
z;bqM==@zYmQ8thGwXy*yjM6^+5d_FrYtAxA1SAYpqI4~hR|5Kq)fprTW4Ol%A-_eg
zJc~Ty88S<JOKWkhU++SAlJF1oy*}Qzs5R*IM%_N?2$bIc>%K$T7(N9uiu2xjP9AkZ
z{MT$*bM1<I{dza}+`rLt5A9K$9Gwt|SV{F4^<o062K&TR7L~;5<lHKTuq4h6JrSyX
zKXfFdxpopCpzsOwb6BT^&8RezhTvn!?Jl27lV)a5na?8cT(X)e?OZZD^yKv^z5ts^
zF`of2NiM&oHxtP`5+Zg3A9rzCiA5BT<n`&+F|An#UscikK?Qxfc1RtWJ24a)p}CgR
zBBx#VU9<7B?Dh$5F_IaeV3GD8+}6=Nk|JRwri28uzJ8Bro9vL{`W2v&IVr7AQ^LQ_
zkiNjm9<7zWq!%pkUs67y{}|<R%~dH``y;qlPQ(QtpbGs=D{%(tX4L>sD5~$beq01X
z0Io?DNZ8@K9uQ|slLj4&%xQT>b9LSHcBL~HR6~yZP`M)H0nZ#+^rujo$qu2vs3YjI
zhwOQSHM;-&O`C{T0krx`vkJDktO(sTfX7FCLV^yg{S<=O7~V(l2;@zRUBDqb?pl<w
z!~Ki9H*fILvO|Yr|CS>9F<M>r=p(HUA8!4~qh&adtnMS_3Oj};7zEb|aAwE?D0ED{
zzNM}bdJBQ3V0IZh_GQ`1-v_c@E6e0VpO!7YcDv@A#jVkY(g#%L#QG3{eX9d>6z}64
z@56}>Kno}e<_!FOW!abL2LT9IG}{-KefoLp#c?X+_pp|>rv(fRxq#}>)ENo7^9Hfc
z<mL3p{`ADYcw#PZZ+{*lIL#izn=lnPT&;p2Sn10?8ze99e=SwBoyO_FJAT%zfL+Xc
zJOKbxOhXeWsZYTS;z2Y{j1=&3!Jp3!KF2;&=CJkBd)HItZ`jfP3Q7MBy(At5#u9ar
z!0bn<uqmDm0RTci-p(mNXFs#`=;JeVCZ{oXf2AMw)tDLt%NzsfS7Tae6T~P{sfbfR
zb`3j5aRoE2#d`Trrv)M|^qTl|^Bt&;gl4-eTj$Li{K}OpuMA$YWC`Y5bNutqj~|~g
z<BmonF$+n@v_gWJhGJ|o6a=?RD42|~pk5+P&Cln~vBY!rgW3Cs(O88*4Nkk!N}Zv+
zdJXy1X=dPU!rT<q_lW))_4(Pk`c5&+v0lacxt6eIiO(V?-F{rsNO}RlrCg2Wi%qjl
zRc(mC`&e7$`~aG6nr-Dib~HBOtj>mcyNcD<2&SV_e7g8VOF=1b@Ok#tdCU*uK$LBm
z8@2U1%(C+sZa<lZ6WfomBMP+`@49+5wl>cyxSvIw>0v^iE}QdK*9oYZqBdDL2`hU?
zK)@6gse4&H;e!Y3vTwAOUc2@?eZ@2Fc<&Xw*C_aoA^2E>x78#tM))Vl#DueswpJ^?
z9(?w$yz&bB;+0pFVSV+bef$3VjlSrEp8r?$Aq(bbaVl(2ON5?+$LcUUe|>(icHTq3
zuh74XmPs*65oUc<jMJ#n2cGe~F8kljb&DUOol1RPMV~-tJI3UAQ`%%$!k|6xyn-kG
zdue}k3ycDM=mpJ-Xidm|cH9mrLJ*Q!u23X&LamTtxUZ)QcQS2ct>n@MbpcDRH3tZm
zIf&$UX+7ylg@vKyf*BKT9n-gB$dFN^x>xiX-nnH-+m3*7M%KR9+c8|yxmWiw6ABD-
z9gcZ@hum_@kRd%rb?-i|tY!1&v&RkY(PMJE4jraV9*57lIRRI*W^-AxDZ?1@6eMSa
z3JO9Q$+AB?&6)48qJ*H&rkDMc@kL&_5)$BvlNRBFxT*R{e?Yk@UU-D!ROmmortcu`
zm!KXMzt@Qa({J&w(Pzw_qW&eurQ?4Ft3rM5RzVH;1;dG8^crl1(&Z@m4MxO&j{ROk
zr?4cmUY=`(gIR*QdYLfJp-BKnIz%x_2&uwP#opK}v#DW#FnKjDtfUvJzGPi$UsO)B
zE@H>3s_V<?J9&w6`pc^SbosJM{hoEXcA%<CN~OP1+o~@$!l+93t){%@#Ra3^s8TlH
zyBWcnseSv6pLkz%XdrN;Xu^b+?O#+P%H<u~w(Y!o+l=TfV}^~mWmHsN@?}+3)r}>r
z3;VR{TF0s{<s=Y*Z`h}-%Z(*fc;c6TshsQR-L*?4`({M#tIHSt<F@%y{<*Fb?Z#VK
zsB;@d`L<gx<rCIL8FAtArPp7-^w{n_ho9Vc599!3$LIzj`Zx)@EF4MAwg$XbZ=Nn8
zA>Rzt2N&|hT?pEe1Z4W+WT??lY9vLI%p$A?lAMvjqAH1`y^2~MeGJesi1o3!5*~Lf
z9sZ6rZ#H?1ZFuNqPs)}Znps~cZyr~^RnEW97JRqkyZzBiZ@$9ZyDw{Ye)3AuZRL+l
zU3<7=ap0)({6DH$JLb8<wqD*d?yU0F>i0f<f{l3boi8vBct<p2;ZgMBymX2L;AFF=
zN<cU;AZ$0=iK>^V$pvHvolOWf3apGd^<$!C!`5mPSy?|Mz<z33gYys(h5vKz+cmYP
zUj4$bCW(fUw0x;{@ZA@g{`b`fMpQ4Dw0Lwo*N+!Yu^xwBJ<+rJk*P}_ZM#5GYDS1>
zSn7J^uPg7qx7+q_!6gXUT~`F%A(i4pl5KW_WS7$1UT+{7F=)soLLE&cjMgU-L12Mm
z%oQwEK?XlTavfQ1VxbiQlzWis2}fF{xan`ouil+!9<(31k5%`5^o4%^$^psljJKZc
zRiZrQy83=}mZZILd|2x>yVy>tO1Zu0^dl3VK9#C0MQHf<pb_yS8aSndEMS<VOCh7)
z?e_aZa<<KG&q>I#1`vT0@EF}GlFjF~+USZQ=qz==sI>AU&Slp|HqnM1qlLMtK6Zk}
z!uG{YqZL)_Ttsc?rAG@(^$n#R8VBGg6O$K@d}P9*S2Dg=uJ&mhh{KexwA+PIy7stP
z3`a%CZNOLs2M%SIj9PyE8}0VPScBS5+U?3=e)|}XO4ZOhs0~9K<?!<F(dcfpc}8oj
z)9F&1_QR0OsVsQ;v)NiBb1FZfFQt!mW8H5$%FHqx6{?YTM14smn$WM`E1xXab$D7}
zH(u9nRA$`VhM`UEx_Bczu|1xMOsb|m!K4^civOWJwpABW{)Sek<->KuwI;+{+KyXI
zK&Lg6u2{^$vs#8=y;J=Vgw)ePRE}(~G!#ylw|d${;~l<0>sFenZL|{;`gH0#$W%N}
zG6rY_N!rPE`*dZvlWZr9R#DPbo2W~Y{Ux|%d6%$Hp~I5m8{=9H68p|PcTzjbY?+{a
zH`Ch5Hh6$B4fg5(!`XMhM^$D2zx&>snM@|rd!}S2ZBij5kkA>LQUoE?NJm79Qbh!%
zOK%DaB25qk0TCfmM6rMcd+%*mUEN(>-Jf+O^YZ_m``#oIV0YdBXV=7xckVs+-gD1A
z_muBRRO`M`zBBatgOqi<h%){DODL;bp`W0bFHae}n6ku-v6a=ACk=Bf)AtnqWhjFg
z+aFJNA|%GV(Ctpc(&2&vY%b7q!2tBULfA5YkB~(tKOeJK%3Sk@bgYV3`a1;{mmbUR
z+CHl|(8sRtIdxVj$2H_jPqy8ONTds&>booZ3?=^`BV73O@*{Ll9ihIyu0&T?UuZyX
zmGJI`Us-Qx99wng#FqLqcyrkvMGi^wkyTFm6X<VvTb*t4v^tl3TA_!Jb^jDY`eV>R
zEVZ(6A=N^}`<oVn-rd;pstPeAPunW)Um<_BN3U}Y7~ndL?=j_k{fG6lz^iGGKp;0K
zp2st>KCd=UIS(jdNth1A<6`&}!a@;HX~xB?vh)tCB`>TCx?n)2H*kr*ncUptDf8KE
zZhI^m6wCm#mEuNg4+upm-7Yzcn;|y76O;$8X~044ZBqdikF*A|uq5?}WEdo6RjaZ5
zI0JasgJD4v>?X+Gg&l^9br4Dkp3-`%CnBC`Ic@Mwvuhrl-FHNY72o2x#WmkG+%bHa
z**sIuP<AXIHY>if|D+D@h_5;l<ziK@j;j_f_}6XSyL>VH`s;@$`gI=GzT<)iu76|1
zfr)P`El0qg)d5v($3V8{^V)a7oJMXjMPK|Ntpw(@;iy>P2lOy`z6#KCDQt21!uPO-
zP|G5%<wI)A4!k8ecdL9r=&5^#O9i$N_3Tyo!gBWgpnP$s?imOLoV}CszWSlM$9Ss-
zsmI`oNSu89OXU}N9~W0lc~RacWM143mOtlA2(@IZx(DO~N?02+MLtRuO8CyN|0y3}
zKFlF0H;`NVIC<}r=O2F)#sj->Uf)yMz|WlHxHDZ^sGhgyGCz3^ci80*+lBL&KMG9`
zo4|hmS>H2p=6~z^_n-e@-$&5*od2=!BY&*#x|#CX`u4g5kP?4*P3mS|wr}}ts(7IF
zJ}946Zu;N)zHsml_B|PWxBMUbp8QAphFo(f=j;AnKMQZba|xIy>gzA;z$dfSPwKYQ
zC%-Go`3vu<pIk`rHh)H&(^{K9@iwQ>W`ow|BynKkH+@EZAKa)q+|5!_7ho{@IStD9
zzsfHyll2+Dhm-_tp2}R@sStV>wWVksoibN`^i`emu|C7aq!8efnb1mpL@L)kfou-c
zY)x}|oj!-ow9v+_TrhK~<~#01=eE0xOm|f<-Nm!U6<xzEcilUNuPYc1%bom4UTNO!
zdv2niWVpNB+SDyn&L?WrStgK{i*vVGIj>ApKT$UEPd>pX$F)yBrcdfJuv%Yf-vSm2
zK3R)?#%rIf;h)UGC)L^~x6mgS9>KR(sh`vx;cY6>#;Uae*b>_GL7RN7%~iDOb?N%s
zl;;gsVr?A9T_$Ov$7sQ=l6vkvm)x>->8{%bMVsYxEBAE>EG&Jvuv>Y!IJ1vcf7`fm
z>9&aVsuw7fdH{NNLaKcHzn#uH=VdwZqAMIHXfr4u_&-v9Ve=oP{K7q;e9Zqw`GtG_
z807+78ptH3Xb0yBK}0QND|zfY@n8ii^;03$yjlAe1;Ap@>bENA<!^M0L=EL%JSU#O
z&Y?b-SpP+>#fIuTYW=%rXjh8d2d(xm+VxAeyQ8*sTeS`j^@kXhZw$Q}`a7+2vyMRd
z;pNm$vXQlRuiB@EhsN_T^%)KQo|Y$~U&30u0^v)~wd<_*thT1!b+v}#WbekCB=Ei9
zKQ4(V$3kU-cGYHD)&3ihq%i`bB=VCZ7;h85(!SG;!XHmELv6P<S{)w@(}=#GGR`bM
z4v(4S1HA)q!lroD>O2}pnJ0dVQTR775lO6Q7r%52UH_CZZf=-Mo;sIlwRu|o<<z;z
zpXg^b%w@j#V{(+MX_S9mt?fke8`^#}uGnlo3XEKsc(>ZZ9BmrVLudw9>A!F2dx7{x
zvhO(ceK0=c;u#R{@OoCcXc+@fAPX4LIGb31{GE18^6K)jqSQBW53iKfjas6*oP)PK
zCwAs7#SV70<t6mqLc*HwFi@X}=-##7tjnzZFkS}<y)%Pxp$J7tUHgti`Rkpv%GCdM
zRpvCTy*5g(%a773Wt2rC9`PxoobKG?;`QNYp>gf!N`&=C+?u7%r9*9Y(PidR&bdOJ
z%VP2C<S4ypE+_j8{4b;2DlOJVv8baAuFY<KnNbF&?DY~6_oh0R{xr(@fqgC>h3_?G
z0_LJ+43(>)*<r6$d69NZ#9*m={TG#wu-CkfA#X_%11(!?dkqwc^SX&#_7rG+5f!{P
z;jOjFdez{b?iibLPqheUj7eO>Wz?M7WTk4f>jddAk;@*nztcK1WDg;RQ6;FeNSjNo
zgUd5ox#a1=M?Wo(Mz17!fW#=)<`y-nfUWkO1{!$ZsH^uW-d#yFvL{?Xph%*T5yg}(
zt2>jVSa=sP*T7>!->8o$PAP18N#8H>J?DKxsv*%1d?GR*fjpjMd9_HO=lv%+n2+#R
zF4Z{okZLdBJ6ztB(hmN)G+P~`;T!4<h#S>W8f2O_Ojp#lxpa(J${6#+x07RFi6k+S
zTlinbP-PmZ5?KyS<rBc*UOL8kF45F^%tug&HV^QLB!1GmNpyO{E;r6Ym1um7QX1oE
zEP9zSI&f}R$5_xf4{V1d-c=aCcpk)=T(V)U!0qSge1L~HvoZJ^JZwvHJLgR<+0Zvh
zHsJ@2mx)KwGC#@fkcr}(oI9yzf<Zhj&DFTm0q%SWK`5yll#SMdpogkek<nU&u1k1w
zzBqz_eG~-jqaa`(#sB&!{?|wGzdnlp^-=sUJE?pWH=-^OdUbFbaFHh?j&bt~9_2i*
z%c9jp7SAC$K|6gtYvJMM)Zj+{LOGvW6<Itdz!|5WzV5YY>9W=i`2OehsMG=eDpyxP
zf+nK2TVERlP`#!}bj4{d=M{3RQ&x(f=9_9mS!$J2(8uwc_<E`Roz`8cu9t|4q~g6<
zd6!mC<)>Ng6+V27PA9GyC+?w0ev|5{YTv{|yl<Si=h2#<9;%%u{#bwnF`~EO^pKrd
z)gpNRnij#o!FlNS!mv6*!#6G-W7b7u#8748k}>3Re%{nE=5bAhkAX=@VreArzl?En
z;}{h*k7p{h`n3&IVIJ~p{Jg1S%x@f{C5`cEOKk@lzH#w9W;c$}fyUTW)#5Vq=*!QW
zI>v&=G4g1P`|{dfJP+a>e%{Kl4>)hcJ2)eo7)e5C5>ScM+l6xvKX2%pTGCy>4A3a>
zmZ6pn=M8il25`K|M|fX%i+O0l<vaMNT~Vo**IYukbQ-uHfyW;o<^8Q?&@~(QXIy?^
zBif|On@#$@i*-k9Xt~YN^~w5qwZ+Z;WA9y=M{Q5cd9r>{ZLH|h{)zWRmG;xRF&gi;
z#sKN16_@r-yf1Rv#nV8`P-(}OiiX1Gm+4#I(DxR$PNfAL16n?)t>}1Z?{t@`z2oM?
z>zL-+jMM&)+GcH<_OF~L&r(DG=cH@VKb>#ohuWeNwQpK+$XIx8lKo;QNw)HKiQ4=E
zwNJF$f_A9&inB^#6QptcNo@y*Y^}$qR*^-!!H_G6@<zL%TDz=dyAF^)DpCRUhm-sU
zmn&+2ry+e+Eg={GcB?<@(z>)<uBg49mV2XDy7y6shAqv?YeYa$`!+P^Ja<gxIaa5&
zroOFN*-~m98tz-+JXfpn+-|LP3Ht66E6TB_=oH*rl+yQIjLr)1Q>kkzX@(rE|I~X|
zf!+#ePo1BvkE1&1rTufBQ)xe~E5^E@J#JOBf3r5b;L`p%*Kz8>btq6k?OXBw->EGs
zyG;MkphVt3_~>_NP-q|H{l8cnE5EdV&UfnSB>9d(_W(Vw*EVn4w14m&ylKh)Q}{%g
zT$>eD`&RjcJX&a{(tS=0gKqF0Q?}K{3e`T*?wtm{qmWGEyF<x#&(|8YdPTS&lUe_~
zPOpG=QVX(%sCBG3pQ+zJE&r<V8J<O~8Q{knkROx1a6TK(M>{Q(gdjeHKx6v?(Z-C1
zhQ3J~<$Yr<4{O?}9erEuK$L0Z9F;<@jq<*sjlQjFqb!2H*F}m``&M6I$yXiby_t34
z`zl&VKCq6pHjnz6&?F~+`6l0Xki?%N)>@T5Z6F{XY^%L{wbsyrq`tg&(t`Bj=CkT7
zb)frs=sOqdK%eT~(sUrb@af}%P;*MKsu@vM3I;EMGGrxX$V$qPl`^8Nq!C$3BeIf4
zWF?Krs%b>m#ZfJhG$P%_8c{K?6V30s<UPdaju$Pz1wxqo!Eo-SI!E#@qL~XY2=dlp
z%>1q_?Y7otuGZRC8syk!HeGGah#%(q!k5Y&-Zz&!SXHCe8W{9!T{!n*xdWL-`V5z8
z(f}?a)v8mV995@gWJcBgRh5R{c^vIUKUtNS&|TLtCznI-v8!O#55#TK&V1Ghax0%f
zuLiGRCcMZo|F$Ye8^;_degq2DF`?{Z%$p+K%Z_=CzAk0VG(P59_9n)R#y!$!`StnY
z)cpJM#hv-D!Jv{dvR3E$;*kf5?>CH`&qux`=kg<u)BinXWFH^-Q$$Algy!+6RA0cR
z7O>X}zAq3L6znVzn-_E{5UmASC`g?`1g|)K*%cTp{=I<?bp@sdvoE^>y_&3mj?>YV
zmHn|5K+VG2bw@>`p%^wks#(}E?$!a)EsaG?WhOCh>Sy{K$*VFYuO2IC(Ss+k8pF{Z
zCWQGjxWQ)tbqLuBYIqL(FIv269uiwvtK9o@6Nm7Folku17jtz-DRh;xO=#5pq7S30
zaY{quxyaj|CM`sKZ5nU|%;x6$sR)*^2@#=8I3mcO<0%AKMwJMjD`^1{I|WuI#D#vK
zokDzxkmfU}HXnk8fRYM-C4-$k2eFt`&<+W*m46nM4;Qg#lY|+HGY+P|%L8gb(_+w6
z2%6H!^C|R+$I=i!hahiT^Ngt(;`$7hfzS_)Aaz_KOQ({hrf?nuRiK3^DQ`Y~1|W3d
z3FZd-3V6CHF4&o*W!+ZspU)f-w=TK5k(%^}4rYu|KIH^S_49Q5+0RYZC~ca!P!tg^
zoJOda&C{o%9F`5`$I5g^bn@rAAAn4*tr7i>^EJ}3GUOBYBS7NRHA4IcUnJEhTUC+V
zIab9MeJTD~d4cxLf*<<%=?62Ed7LH&`6<YM)h$G9S-W^hpN_zClffcMRwF|CN7v}_
z(lj{;9vwwjc;E&FXz}z-9=lEvT0Bdog7O^5TS~dvT_2n!tq3QohOj*$W%$A;7d|NE
ziNm%joi`??h#SDr7)_AE&<V_h$exjwCR<SUSwb3vKHZcK{41bKA|oF78`d<kPir~H
z4Fi*BmnVYIWC1(@*DX&8cS>Quva;<<{+F+<y>^a&?f_&=E3e(2P(<-|RttahL%=2_
z1n?LTaobCRLjnw$&zhGlMbaZ7!X*uaWK?=9L}FV(UUmRMHXQleYBgp>qd;1WI=nWc
z6w^^+7-HLKMQqO{mjoecYK{X@r-lz}zws9+g{vKj`<F%f<_I%?2<>}g9~PJl)YGW)
zR_64Q|BU#3uw`O9A*73sn%s%WSoiw<K*l8mi+q~DDA*;B<ndZ^qf(YJE69=A0G=m%
z3y{Gc%Z+C0L=}z=SdHOGB+$Pm;`Uh6tobrF<^N;;$?0DVz{Y2f<bCX-IG{~YBM4h@
zWo2^}gsl%Va}=-RLx6e`xfF<P;_&<?Kx|4ILOs#I*f=IF$IkW&SI1)}hfM?^oz3hu
z`+z;>_c|OVx9A>SBZ`6*5IjKFbQmClRG=@uzr^uCu1^iH;&{y@kWyf?Q?{`QbavyW
zy@5?@0-xQmM|-hHx6;|j2DT9)rFoLHy4@a|*<<#CRv#dQO)k*|AT5>F{xx>DS`@K?
z7ymu2aPJVHG-LxH(zHd#ngb@Ss{gpYXHyoq0V=I%^qB7nDNS2X4K0mZQ$09GK4Eyg
zxyJ=yUwCfBbkXbe*{nXR9{??xF1y7edPdh6WYH-Cao8!@e2#Q=T`PE`280JER?7@Z
zW_IzTtsWT=OaW}jXCaz#dT`E(O=xvHHSasKeV`K?2Ml~HFfj0c>@l-n7j1d13~=y)
z?reuL=3q+z-%nK5vF%oEg(36Q6$bS#2Wo`54KixkVxcXx(3E`Pux9Xe2K9EL-Y!`@
z?lhk6-RTcfPs>e?VNN?B=``B0+?53#Cl<3D4VP|P`NU3nRT?xM>-aGnr(x6GS1+(`
z298h1YgnAeid%sbT#V9yh*1}St%ejH)Gx>YR!(}loyw8`Ez*dO91y4g;YE;@$`^<h
zr%XB?52FPLs*#O+ol{GY5MM}%1qrqQC4!&4Nvyx=u^*`bLt~|p3t1#oG*0aVPPGD&
z9*9s@q*E{;mjRa6s7GiHP%tc#&CZZO56CxQ8(Z9I$YlW35X1+UoJp#h=FzI66Gw{!
zzi~e0x$+wL8%NyQlL`Q*0&S@vaCCz36acW%BHa5e<Nh@4o(v#Q<eI?ZnXVJlB&J8i
zI#x!_@=%ko)GGxX$?KZ13MvaGmYkWPeEiG@?31?=8^tT7wu#B&-E~i5glRxQ8H<@`
zAdkwGA)<^(Ix;1Z%>rE8bjiwijZJm2`7%?`GDWjsX)Bx_FE8-GHrG}^dwPOTDvz^y
z&n8v?aN$8<T8*tOnle?~sbT_l)n;N7dc<?B8AgWfMhc~bqh^zUt?$S{G#&~uLrWBa
z1x%MTugjE@FPXfEcrZ0+z*1H?y;NaBy{)68S+DP&IqmPvcD}8cSUjYRpZ53+WvuwQ
zxGVA0_2b3PiBb0?PKr>2Sp6s3yd6T{cs?{Ky&YL?dK9QjN2QJoM>^_{I&A@?Xtg*5
zAU2uw0=Bw5iBPB2W8*hBzrj@&Bn2XesL~cjqbrSdc=q%pds=CCHve2=1?w14o@rg%
zT6qSGG;n_PwR35aRw0`crW{uPfrj~R6?(@D^g3%sM!JE?Iz5$fup`6ACZ`+H0h*nL
zIz5*=9DJE5ewO~H-QHjY2APAU;{T_E@wM_s;-|O7b;_aVnT37yR$@QPT1ls4WMa4Y
zH*s^~12L8uo;a(Xkov=r<-o1O3HfhSStU0eS>O_;9*%!Q6>4dMBw|r6#>HpePynp;
zt@7IwPqUG)D#h<zi(8UCu5=SiM2j+v?M?io4B{|g;N4fjQ-o6=5c<c9fe7Fhy!uRA
zX29pO;W7;RL&)`YK;!ee9Wn|@IAqBbaQINTKn>sJq5P`cPBJ)R?SMhfbsS1>cM=XW
ziET=J_mcR=AB10ja(c^KE1o&4BG`X5?ABqMHfR|3#p%jVc<}Go)CMVR9LavKp1q@#
zWkflgJ*ZCN<^_ZS@e-HLo@PzgL(*h`2{R;LhA$MfTTyzCfH`!izo*wZq3H)8a<pTf
zN_Hcd9&sV3o5GKiq>`MbFjgKUh?rx*>MdzMt!>vEIIiAx{R*e$*&3nsZZfhm<()Jj
z7ZAK&x$BLmHGn;69k^%S#Y%ff4w-cVY69q7K9npJ0qrh`qRTBAU0jt+s*oCL1o0rG
zg;qcf^l0&jSX}J+Atqi_2Y}hnNK1JgfW#+aj#>vGk-;n6XM+Ye$8jOsq=>o@-|9X=
zY=4>%1qxiAWR#6QKm*88Uo<B>3Y>^&)Qx&(C^hc1+ud$Jal0FU(UW>O)Nu}Irk)mh
z4ds;s`<#RPP?|0!AyWMo;EWSII)1gR5}*7tYu2Hz(D;TF6JI-d?_Y=QpUt|z&5W%0
zoU-93)K7XlZ$7gp+Ekr?M?6$wIrIM9CGC$LP~K2}u2*jSl*O3wmQA3)Gkg>|Ks@r{
z;nq8zA3>V3)$gMl+v>}X`heL7z>^FoP-mQ;w6u&2#Gpe)a%2Mz`ivShDui8wwn0w`
zEOsN|YG^d!x)UFJ4Lr-fN}6C?x@^pjl2twbbl>^U)+x%aSHAS^lo!oeb|O#gTGe*x
zy3qqVExF~h7tbqCKl1A16UVLUaog<&x8tFsdaJPJR%9Y%QSD=A0MV_o3)glu5&%Gb
zAYc@XB*&cs@avN~722yOx!T05Jbb%ccBE!fILmVZIzd34G9JZ1pFePdS?@^ApKyG~
z%G%eZOYg89-zo33m;O&g8pV3$w?j?RCw~9uh2O4x<0E<2&)>B|`UL1Ee-ONJ9LFpS
z|6-ms6t;y0Tbhs-$qEtNTnMN*D1?N<m$b}u{E|Ry8u4oOchlO<Ndz_(rW%h%zQC1E
z%A+tu<??=azrTuSQM~!->xmum!nqR{kE#6a?gK^QDDmK8<?FL!)C`J`l-v5=we_m|
zSYH-Ca2UK10=+E}OB_LN)W~=XU1_O3Gv8>Cbtr}%#03?!2V0c+(=9=_8=#hMk0BC~
zVciuiNdK^))N#s76Rb@t3ThlCkzD9ZYR@^ai<3fzaZwqNaIIzcCo5i346!pumrcmw
z2omS8srwd$YD27rUwJiXcFR3?&))v<t)D$~>%9?4m;X>&;gbu*{A<^aZM|Un+;xLT
z>e_7Fxa7`GeMSv_V(&}J5`d&;-s68xdhf^n_y0U*-s(G9&qcT1M*A}Wl6(W?3v6TX
z+YgO5%g*y-k6eDAjHiO#Wz`iG+OwnC(NQ(o`fR-qIHRL#d=8<&RDiM{^q?mk6ZKT%
zR1mVGkVNq0)76d!_Qj22g{bFJL7*l!9pOpy0(@$oK5Rn~d&_8)9k-1fA>Wnu=pixq
z#y^#ZR^6k#p!_}Y(8p}rn`d|4t!xOf-t1cCC*@K3yYa)z?V-?tM<2Rd`J$co{+r+V
z^OlY4CQrMYAxgMuowN?|2$ITBDJ=uFSUqm4k%meb0@X`vS{^Osyl6@f2~pA}I221t
z#X$CltD~iG6=g&9LFFYFE?wrB<RW+=i$g-~9J{N!#x9t=0^Sih1Q*JI+DYnwgETIp
zRpw}En$YC84gnxEVH*$&RTUiNZNfg{H%<BFXYre?#LE$cfc4znwUKe;zNri&f46h@
zlNF-|uWrINqR;_1!U=GV8Jb3AJZP8A0^av<)=Q{dKy@Sp)T84y7}UoD)%i>k4=tA8
zOvwdx#*oV|(e9%TBiq_oz~kBZdUjRopIMU{9@39{qc1d66iJ@e03!ddjKisCiuydV
z+fCqGSk@AIu}d)dXiYf;s}R&cDpS@J3W%nv@n6{OOIDN<_y?AB-v|TCs~Esf=f7Q2
zX;f|Wlu|=Sv+1fbp&0k-8p!w{^0k5<Krjhbi@^c_F_cFk=*M7Cl5qN@#>*6_LaFyC
zWD1o$<FdW6qzF%r%YkHncs`52{U|f7ep6Zfmk*S8%4&08+kBGwHhuW?UG>6Pxy9oT
z-l_a_<QHWI6$PDk`y;ILn=gF5@eX<qp?a0Uq3;J7F(6))jat9XKxTm;WEwIHk#%cF
zjTxuiWD3(gWH!kK1(K8pN|PlzQFWdJAlc4Ak55|tRB4De1=bunec4)3(}<T~fyyB)
zATz8YWyU0{i&W|Q&R3p#`%&fR)o-#{e_?^`X<57G#j8T4h25&{`L%hkZa%4eL(^fx
zSk@oYVHrn$Ve3A)D|XjL_h!f7;m^~wlqc0`G47SO>Wo4TpOw){v%;G*)0mm-bmrMT
z)tHsp3~W%;jW^qXWylLa5KbsZZ~8B@x(LkB>u5SF<SyFSJLA?j+crlz`SdGyet-D>
zu~&TFxja;s)v2d5>k<78!{%=rJa@`1EtDrdKKlY2djHid-M!g0V$A*iF%y?7AFhX9
z!;#H&Ti}<}3xDC-8KU6yGR~$;2%~~p$ZU6~WlB;SQvV{xunRkcN(nA0jf!`s9!?Gr
zog(uz#Vg98K{d$@A*eD_j&wb1&8~Y@nfJ3I{AAT6wwDE;Wd%FyzW6`gBIShg*|*A$
z^Nmvaf^RF!dFG>^NQ1l*w@wvkq*_WH;#uajG#l_eQ993~hqj1SPESXLSK#S58|)A2
z6+?Pgl7DzDT%Jmcf-MA0gU5cvj{7ny7JXR{ZBJqw2Pe|PfXe?zC*>|>{pO8qD3v5)
zC%2(m%O>U9>2p9!_xiuf58}r6gSY#|i!w}ExE}!C>@?>CTF6#tEAplrTyCqSy2dIP
zP|pMgf2b<Z$QxvH@|JI)45X=#f|P_$z@>vmJiT*T5(@Z52<dmK(s^q{7pzFUoF#tq
zb5wW8t?RkFiz=IMyQ6xf8={%b!(G0c$vZDNpUSGZu|bGzR!-bXH@Ya4;(bjT7uEd%
z3bI>p$pKvef&@q+xj81;p~B#%>(UHqm`p$hd&3#5PDZs+@>@{5YoIWy@*1~{fk8Wr
zdU=r?2dTIzptl`GxqQjb$5^&M5el*?_bBTJU4bmtH$Qz$O<SF?V01h2;1T6etzP-Z
z?RTcJA$^bDKuN40J)cZl?XmSYyu$ws-nbULVIs~TO9en&P{t=ihlhm@t|24pf})@t
zDgkPisV1Dk6<p34fOMh-=Zq1KN}DIty&9FuN7rqL%B9LX+t}alW#_;LkZt{-^L?zl
z8y5XR@lu-=NN>h4EIs<nT&upYK#%uqaC8kYjx#dAjy79{oRcF6P>6WutR@Il#fLu&
zF4BKA%>2qKURsFK#SA3V=%rHuuLI}Uh|>$0mFNe*y><MCSuE$DFMOH%aNhd4cOTnv
ze}~YOO6Pl*F?R6IK@Ys)I``n7H~qoo<DdL$-{FcSlQu25cJy7!yAx(J+mI!z5G2Iv
zUCK~hSFE2?xFVhdV~@=yraK&N_=H>xO9*t5G&|mAb}0?oPkI`aljk}HDQ+5KFt=f7
zCKd>1?vsIOJ&B<UeTe;YycEo;`*L~kflXbi!li{>`#V^+^kZ25D)G~fM7IrhySGBz
z>OR<p^}P;vM;7jmV$!I?QeHuU$B1ljk0&2jwAES~%O6z}ive$%?m06+vtT&zLg#K+
zV@juPygxKL>9BEmmCWYHLPKaFFTCPET_J=sEulvCUzFFBBX6=rzp?OUeenMI>MhdW
zk^6MsGj~6we0J}*@2zEQP=zuqA`Tk2Mmg((#Pk1)t$c4)X#G9>GI^|W=FCIN+1KCt
zy1JKgpJKmd3Z1_e$`D<EuYXwR7SA!K`wg-Y76xNlQ1aSP;9APc$cXsU1*&RCmBp|F
zv;oQNYfT$bZ%57P1GSm#ePpfSbyy%h@YVzpJeY_L89%4A?-b?r=l&+%@M<EXBJ;{c
zSCqGjcI_8ahRnLY;<go=<%M+t>8lGj-*-pVkj=d}jT|&>#^|FhV#U}SLN9#}(yv75
z63=m4t+uF?7Ay?H)>YcfZ7Z<)O+c!&p;CxjfC`lqdT^(KVk~^B)m3BkDuVDN2IrOr
z<U=MOHvo@RUo$Y};3k!CIsRCBJL}-#3!ciFeT+qFd%H5Fo(Jb_*ko;E9y(#}lB{Kq
zt||D+wRJ^N87uBrIcUJsI}+P<FDvt>44XV=!}1Qjm5(|VRS%i7O+1pQc!jDs3Q-(@
zpSh)iBGefC#DdrdvopcQ>elH|wOKG{qywr7E(M7)Cdq=E^hPF4I+VnMd`=KaPQmKM
zdjfkG*Dg5_IIu*#Z>_j9F=lOIH2Q{RMz>3MCzhm7yufU;OR&ipO-6^qX|*^lUVx7K
z%to7CHd&nxJe0`)Nw4y9TDb<RG2e7eoyTgb8ojFe7*JRRR>K@d=CI02@y5;_vT)A&
zIeM)TxBQ%Nh^2p43eHS=@}nTAaPM^V9j>fgB$g*u)%`5)UX=Jup0okMjo4x6>VtJ3
zs&uA1?M@U^Ww2%n&?7yv$BXikZeW$lveTMou7*Tlu=a4@9N%LcvE;R;UTXYq!}B$&
z5tdYHG<wB1l%MwZIQE@?$DAvwLd_$cdO2pi%qD)C_y_C9ez{FqCO>=oozP-Nk4YRq
z!@4WY6Pt-jFMj-(+$j?(6vF;yHe#o6Me&^?BV2N)NIuc2Z@N=~MN31Am)0&@6<WSX
zymy&+C^2wZVmu_`9z1lHpl_-?U1oORVc>-8i@7Xzn}PPpV|Ury04f5$0D$39KCXX_
z-t2bM%P@nl1YR#~+F&(o=lIQtjlz?j6F~xqZy&@Yl?=*{q3#;?jIb4B72YbT|ACKd
zN4Ru)n`5Z5?yR^X@|yRhoc);x<X_uf=qh%eGQkvzu1`EIy?w0f&D~$Q3n6Yy=z}v!
z6}}7Lrzy+=o@icfZX^mfwwRfg2^8s~e9@HW04#!}gT&MUcv!oOz*)3sa4KsAav9F)
zqaXN-&gex2B*?zNPb5E_gz$hA<|>>|`zt+%-#7As!|r2`A9D;DGiP=9@h48%2Gso8
z>C_Wnxvcx0ZTGqMkL<O7*OgPG&2`t0h+jYA-p$hax-0v(9yOeGl}=n3KX&PczC*P;
z=>^Ql3oMY3V0X)I4}3XBlvXqP+{`8!;4n2B084@Mh}!AuB=`!0XjKw&WK@DaO}&UT
z5LD@-#CO?guY~Vi(|8xXEqVZYdPw<Re(Z~a3$Ne1R=bdr@TR0WLsRlVQ__owg~Q)G
zI*TgwN;h&%da5#1|0~{O4p`i9mu5;%qgAp-U@nfD1L-&~ZUeMvTvS;h+5#Kt14%!H
z=0Qzy_hJVcZ>Vx_9?aP+hS@NZl^TvomH4cNSMrZTd)XVs%9dId|MTb59%nTpSKJK*
zleb=4F~OAtE9rB^Z|C(liWe5OERa7h<H#kif831jpsu)ssxUJ<kbY227(uK?E6BD=
zsA~h#Z4Rr;07IM6U<(Dv&|o9MehKMG;jU7iEDEPmjzo7S5w04jsx-`!z029iV&#K}
zneK^)Zkp4vD+es;*i3^fxvJam4qd0ZJK9PwI#r+&6KEw1)JxzEH)!n?k6IkCxf=b@
zzZ@VoJ><s9dQctQWAoUIFm{u~1|!4LL`!_p1q84dZdHQBBn?Y@wm3E8g7og!%z|tG
zH)ZIgCmUWZ1KAQbf5*Mb{klc3Kl<^7#7B)!mP9*NHG4i%6?vs5$j~g{3qVJ-mbglS
z!7{xr4^M?O;8mohHHXaf`y+H&X4tE1EEx=%RYA&)*{EcxqC*v?oV&?(jE4e15a`Nm
zeEb?3u1>IIQ)5oit#~Pjwh_lzrv^dW(^)F^-Zg_B5-FBI*MyPI>y(gwiY9fx996Aa
zc%=857<I4{os_3_s4)&3vk!iqA}4BVq2`2?DftZWe!>}Rk~94l(MK*~FRXwDd`?JQ
z*pla(?ulj?C-I}HGhB@%*MlKSdxWP1(+q!-^y)9loB=?JJ{@MW-(u|jx0qGA@zIla
z-=!?SPI+4VhtglS=-!w1J^pbh!K9^|S5CVn@f*p>0kD^}#QAK7cTO(cE#ACvR+eDS
zGdC|2yy@BDaCSCS$!t_N0t(0I8lZ9}-|g!2os01lHw5Q%*64d6Ly!e85Uyqspabwa
z<tQQIpy(OiJGXATW9y5pYipSQ`;Y%sHfYwWQ<GnQ_~@2}Cl|IlGD<m7FZ`(d+-k(4
zt!G}{d9{4yh_SO5MbGYeX#2ohYdV$Wx(n7%pD?w{l6lR)I{U=KLvA14y*$6L>sXps
zV?|2L%j4xGDN&Qs7%Yg{bN%{1T9A@9fyBOMZ{rRXZghir@DG)we0WM_V@b*Z2TojE
zlCq+zyIPWR<GPxKBP$}U;oa+kSYt$~BC?Dsp(FMSe04+_A}-Lq1G`oMPIv$iq~3hJ
z-s%<P!XgJ$4o4uz_j%?InPMga)Q%g?Ju*WQ^s86iE*??-3cc<cN<_fG1p_ke3s)uq
zpJKqXgu4pqH!!7D4HF9Jk>!(bn4VFu8`ZjHxO?a8XBmGj?bvJ3>y<s56}9eNCfARd
zHF<nNr{BL0dPbOcm~Wm~P$vH)H1zeWs)|Z_RTed;eXxS=g}M@GP^fiejCe9Lop8HF
zByWy4*Kc>&QKSHoA4a^NjUGW)4gC(PJlF5&0(-6@)Qleiz7wE7`G`uo22+qj2;#d+
z5*Nb+1ih(~J)I32W1T-QbHT)0n!k|w!n}-YirSVGDnr~`T*Jq97(cM8x43@E|NY;R
z#I5afhFX*l71&mQj)~PD&QEbg+^0`x<mb0o;OH04fcM7>5QSMth^pcfPrelWj!r3w
z&ZOi75cxGfo%!j-liVUN&B62TLO}lNG1cx)Z@Uro--<6oGG^0T2P<Sm<e@dknrn8z
zTw-Q^UJc5FBAkMNb>i;_dNDWDI%qWK@YBcbC2)NJPNj()gd&cu<@?Q?>Z;5SW^SIR
zs+c`o=H&V~uXSk)vvScUsF`ENb=B5qDTU(-Cvh{<>bQhvai7j<ate}L6g?K0n=Ant
z4e&xv@oFR=nb<fu$f7Jsgvxa6WLRDnR)Wf}Y5m)_%(^lTjsvRhSKGGzez+h!#J0me
z_1gUQx@*wwoch1(i!d&7OyP0NG#g}_*PCOL<@6jW7z-9e!uSk<i!h+#u|Q@ovYnDL
z$2AEpEHL>t<PQa4bLF?P33>V)m^uvFP0U?IG5n3!x`%vxviSO=$`2b@9`o!iSHfbS
z;(z}3(R26ww0zO}QZXm|QmYfYk3Ob6;$C*)L1tq!hnlv1-bZ=j>*qdO!=xkke?8#y
zZKi9Kw@$sPoIXnHcQ<72GTj;>O4X~pPLoM?hU8FojxRG4x=^NUKwY9n;x#5~^xg4`
zF6r7=&#D78qc!L!a%F(v@hjiH$$sCHd(HQ5od5bgV-~e)>5X??zGB>S$}6r(&#$~{
zkkqzrZ|4qc@7fA9-+M;xOW$s~|L*IQ0%gM!pzs~oKbHaT#t8~Dtrl~-&0<5hFo2-6
z7Ib<&FUn3YF%HRpv8s$CK(=SnZBRTXho0QHl6Bh`PP{I=OL2bNTt%9GW~Q?694lv!
zT{Ta)cJ$IfELxH{NbxOFo5V=bbxj;AMOhL0nC@*@VLQiB?=EPxrdts+7!k8v{^}aR
z%e<(n;}X)X0{qKKBLGl2xx14d7yNosg?FRWpuiiH<!#gw3<#bvcIudw+idWiy)!>J
zG0l{zYtIs0x6Yh5YHaK7qpwbkTJyFt#Ih`H&XQ8OS>j;lZCz(d58isqh=m<jUKsc*
z?P~q|kQqU6ryUm1lC%s&xlm}31z}H46xnuIO%?=#rP~EN-pzPUS{!;nh{A`~a8i=N
z2VAId;xPfvrKqC~i;IDLX!K7Ni_TyQ+m(>Q(%%9~KejwmaVs`yR`|k>0IOHVOU>Ac
zZL5{mOA|kCTQ6o3b#G%xJtAQK19gbm0CjjP5_N8(4n|F&#qo<CTdW2g{}JkXu?0X@
z+!v5q2b9NHX(md)91!;f>TV0Lp~_#yiR_BiE0vQ=m3^yMvSCEsNoBCkj<pLTo~h7}
z%ETci+fc770wj1;e;Hk)3x`D%PojeB=77vZST1=av?>RahC`h5lyy@*WVCK%?*T$!
zLxFg;u4Yb^Y^?h}OZq*Mc;M5ohaIcC>lNjf=KD*IES-34NypFL=?5vjZI|NlD{rk+
z>Yf^R;%K`&7WCis%C!fMtp&~Bf@U{p&ZI~{zZ*r}GF@(xNI}_V3%LCrxS29tE>y8_
zxy&BKW|_@U!Odi;Qth4GpC>fjaGYCJ=K;=74*3o|6)<X&TSq`G>D(%Yxxhf*w~g{A
zrS`$~%y($bT;(q>eyaR(fVF*D85NO!&#HTi-6u|hf_`D^VP+k0dJ|(Gon@^abFjbd
z+NL-__mj#XIah9n(=sSt!u%+RCi?ucI}ivFZlF&TvF)O0&-AlQhRUWWLut3efMsta
zoU?#hf>15J+mv(|HRv^_*{OIXDo87V$d`?YHtdRE;o`S%UNPnN{bdi#P_CPQ=6YuS
zPI)(5nkgMtZeBUz%q<JI&RUwGES>b!E$^|SJa!``SR!V8Fltk@g_Ui1ybM}I2+2ty
zr$^SieZFRRkC*y^Qv-rsE>s$iSzRvCYb_}e#Uf0nk#^M#fepBrkNFFkUYArk3-opr
z)e7S%<*Xh)Vj`%qh{~s#MXIEQcPiD>ADdWSv+bcZv*LXYEDx|9iQNHdoL6bSb@$@-
z500svIja4ww=u`W>y*=7=MU^M9=Q+U(so4^Ed#4r(VE%HW7b>8Z|av<;xz|Ly0z@m
z`#k0e1w<YMjhyN`wLn$UpeYygc6wNj9I)H-1L1I9Rv-+_PfxCpJDSRoTf&I=vsetH
zYb=fG`Q^?lgo)~?#Z?@oSSBu^W27a}<nXS5s!jq1laKBddkpJ0Z_<ss^A1%0cKY}i
z>(>U9|Lb>f$MO>Ky-?k7U*(!ZhY_Cmk6xRHj-4}mcHV(w=e8Z)w4%-AsW*4qvS9e;
z<uCxS`U~(2kR?4#uOY9^W6uZ#s6d*_717CZmKV`BUax@CK~9)qoQMm=Sx1Cc@@7e4
zHSJ_4uW#BaY?M~VfzO3<4?sQDm!wOZ?Oc57I{8uK!s*iwU3>4HZ`2$LOTEHMX1lW2
zzg(|eaMkRc>YhJq@=G)3EMPBg+ortn+NoX2Kh_h~zo63DHt-rnxfNRs<}}ISK+=lO
zWD22>Q_x~Spo+zv?)SscMG-7OPe(N(Ttk|$R8KfAAJx^Caz02X!KX<}uaRru<dW*$
z3N<O%4Rbc$zIgjphXPVYK<Uz=<nVL<_x|z64~WyIFPb@S1Y5CYjk5cW)9)SFl`(n-
zZfXxGU84H}F%ehBbM3a6Amm29>FH6MR8*V~!(~o33WAwqIaaDX2jK}Dg;qw#p_M6a
zcp4CuppF^n=pr|Om&ZyjFbIzET89MF=d6NRmp$oDzp`fe+%DgL{rp+;u8cXithu9e
z-{X_2r0|l=+q*tfeJWErF}ZneMH^pUugO;(I<ag`xTf#qF)cdyTX!AP-5%YxgbnMf
z3|XSt2HGH+40UdWuJIhF+04Rv9}E~sKtk1pbT<~)=0_x}Ui71KqZ-(Y)x{jhUZ+WY
zVhz=#>BJ*h4d9@~wc&a<5CSDEUzNFzg~wRl13Hv6?R0wDeFv2G*MButeDbCBkLQoC
zXU;pI+kROzq;$;aL;I9!<@=69@}$Y{zWqw#$7|kXFmW;A9DY#sB}wqa;X@N-WM`1g
zjiWcw0@6C3tJS^ydrQ3Ap2y?uVcwdm5?JukM^Vr;qYegQ`VtIvSbz1YuYQxh{ruh?
zd+GbU4<;<bAbrt?6E{r}e2#KPhMk$Mf?(D`78#tR>dF8ow;`M{4S~plO*A_|lxF0y
ztFli0nS2M5PQ<s{3H)Uh8Xln6z-Dd*-0@{>&0)4qnL+;?R&HWzP@GH8o>SUxQC{An
zjAr+3VJ%_n>w~%F(Hj+WA=@9U`RQMvwnIL=fCB#Mpu_AbLsS1I{zl$EAa#(QsJ1jd
z!LvrymLt@b!l!!5=toN=XR0mXSx%eCTVBcg{8WeE%pi<Fl_F{>79?ACs{b}^2_#KE
zqRs^5+?7%b8Vfq)M66!&^FG?=QDunq1poYM-o6h5wbZ`;TjP7YALIyAKSZ0_k3ns(
ze%?p>92QWm|Nd$}TK`&vB+O1X(Dyaeq|V4~%%vG1|MM`Oa^bj9mPEHMA3smBidu(X
zg8|~$4jh*W610?OfObRwlmSY1euMBH>yKQ-vUrxfvkU9gg;~3>E~3=lo-eyPcWvJ`
zPZD+Q+j_$sAp`gc4QZib{Y$#X#Wdu<QD$PVM_)&Txd>2!r;df9J?M8lgmSc~3?xbs
zLz!W;VVYr~K^HglGkk9N!5|yZq81s8c%;C7IAXeHN1RTty9xt&28ZVE&iz?UOnm(0
z$sZOp%$@R3)w!P{oC1!rgj{Hv_%*do_hs;pQs@1F@N@kUKJWIJcM0lZ?Ci)ob!66#
ztRvwSN#i<nYTY(Z)V0=T%_oi2yb)N%`iH?RPW}C$fI@MwdU628w}Fu0;ThB40Hr|I
zH|Apt5%>?@)D1xUooajWCQyuAZ;7D79=xK5rzF`LGT|1qF2kK26K;)n$<KE99rm0^
zZdPtAOOj&#^z@irDlCu?0XVuw*qIHnY|BQyp6vX1J|cYb^9{I6M%6eR7TJL0Hbe5&
znpA7ms#SQ?jNs<w27yiTT7BTqPe^X~+6)cI-iTpR-(U@qKfF9JHb{4Pv44pZ?${@j
z{@YJksIsZgR#ry%+5MT^bIXn|9(&7_r0aJ7o)nj@eevS^AisguFB8Idp-?5vi+9!Q
ziag;K$mhwi#9}${L}lmXcyv-mn~c_o7epS4UW%EWac3#4=HUPe@nu^BEfF9D$1XmR
zA`*1_=DgM^iFYpNA?Q)8_0@8<IxRQ1H295Z6_ScGTwXa5C<Ww@!Bm}y5}}(FF|MTK
zc;QC{m*O74{RJ%!_DEF;5~ZoFzdfTIsob0M%*^$%1d=V4O0my_lea$Ad(o-6v-bu?
zL$2<i!Ry@D#gXVgZT$5IM=YFn^V;eW2X}p!w{pbz5zIPs<e7Wtv+$V_Q%2^kHil~^
z);%x+{ob_lpG)SgUaouu83Hf9?oT{-o#V$MZ-1N0RV<49@)JOBNKbMVTFbPmJiojb
z=fO`YXMlK6B+QU$t=ftFbmM4q`Goi9F5WlX7Y&#IgiZk1FLsC3EvNRKjXPzqp&b0(
zSL^!)Hj4UY7BQcVxv2G2Wl$q-5TwQ@>>Dl<yW%a;fD=TYQ{7@v&fDvcqW5x897Fq0
z_$cp*?Jx@DJ1|&O`Q8;;eK|j8)oM%OXWaNC-SY7_T9#?@U40|c{G|KT`3ZkQ3!*rJ
z`8^hm**H><x*GNOVC{6Yc5=_;{Iu4ToBwJ!*9>b8mk=bIQDs&9h*}%)PG&$cIK@#i
ztY~_Yl>kjaOkF#E&+!`~hCU7IJx4c$AQ%s(e9mt*d`@@R5Ps8K$=mb03!kgp@B>y!
z<%YY(Yw+KJwgDs^jN6RRLQ=<7`Qb~nSNUNr(_|8fKk<`_%0_;GOrra+5Yz-=RfJ{V
z?)PVUk@?`tG)Uo)7uq%~Cw{l&a+u)BH#zlCUb(T1f+$GxG#HFY%s{vh9J3mAzz-B6
zvB(v{bHnuVzh0fcCcN~~)dhcl?c{UDR;gKQ&ze~5=z>iYVDQrMT^pM<XST#l-J--H
zabTUXEmVm5Z?IS2L3)}IKL+j3Vl)O2UyR%^uKi`|?FeU+J?1erGHgF^yYsZJOSC_d
z0gc+9L4DKUOsLKXQvC$Sz9-prC$kTH^4NLhTg9jRO}hG~n@1m->pJiXTl|?a#87nL
z$rn!iMe!>$N63e#%^P2Pecc^bv1{2rb$4|yaBM-`|2SWFF$9-#{&QlxT38*rj7E;)
z5d$6_?G>~F@N-uop|wUqZx#wg(tVAsHQm6D*8G0dm5ck>0D+@Q`RRgu#Ok};?WjAC
zZ$K+x27Duo2o3&?u7uyzzD<{l(E)Md8;~IJjh51A){SmJ0Po=j4%cRCNS2yBQ87av
zYZ##=;T&=4158eFNjD9zF-7`JG&s;25v`n_f3kr@k4VrNBAbYp2geQJnh42=i}3d_
zgEaKdX8`mYNepKfUyS&M-E2U7<1?6n8IS}31|Qqu({SrFiq!sz{vMp7mf{YLet_?Z
z6H0T{-nG{4z=$6iXa@-M1nY?sXM6`lMwlwBzYdj~XvZ4p591qWIAROQ4EhFSsybuH
z4Utt}@(pl;sBj6bj?t2RsL>CoI(8r6h*ObO5CASdsU!N;{#z!|u9yuRwBVxFDgqeM
z4~a|ENUkIY0lP;M3qtvqK>#b~^h5H}HyYO;I<+MF!?BAIz@X(cAb{Z;Ev1K5`b7Y;
ziL(nd95Zc2dDaT2U+ur8c$c>Rgs)gr7*Tsq;hz<J{ab0&97@ukP4v5bFdj8of2_9n
zE2n>uw*D|Bs_ReCE-dT{85~W%0r{+3p|8gpsbjR1h5{1|{38MhM7${{QyoF02>nY%
zoPM?cmfRCZ+?Iv)pO@uPd)Hd4cqg>}tu^|8OY#q{b}*4QqM?l73ysJwoc^KOH=x(6
z^v8&PXDDCAk7?jIJ_hF>b&QtMHjRI<MC|%(zdC|O5l4>U^sD{1B;;3qTClxrP(fA`
zbegtG8=zSbGGHZ9Bd%ey(V7sK>bKMuHJ7-w!l~6MZFmj%d||NKPIw~O?%~?PW_mxZ
zINF^=fAA5ZzbdWW4_Z6r*;=DT)wR*CozjN;2lIs?Xr~v~e4&jxur@PGGE;9L;W6kL
zSL!w+b^y7O8GbqBa6+38g#3E=#3BKGnlWumjnOE091f2MuV4?nP-7Y#0;$#*;0H7)
zkLtxHRpr9G8q@3e@1_<p*bam%B5W;tu=G`>JjxETn-@->w!i=K8Q<+Y_4yma65lI>
z9+<#}eL1Dgs`U@eXV&9mXAYiJbH|*syT05pZKLvmLe;A_D}$vPST}NrdPMC+t-)Y4
zOYbr2Q4l9LORpM_Q1{I3_LGsrZxa~28)UTP)(t9h3=JQb@@1)qFFmH04OJbbiwt@w
zoaA;16GN!qToSuN`Dk6}`xoYS8`7_4NyWCd@9*1rc;IzcD#Mk*Td(@*@aX2TYqRd^
zG<e+H-u=c7A78$5&5l(QcU?7Z#ShByq;`3p^IkFE&&_O&#!Y7M-g6e$CE8_QLkH}B
zZ)y!>q!KoX^Iib0zY1ofzLTbXK~sst=Hf%_a6qVv2h;5t$kR}hNrNFbJWX!du6muY
zAY{^jy(eihQQtpMPLgSZxaLv8jLL5&jhamA&eAM5+&1d@b<T&Le7ntwjF5cI-<Lmp
z#;(+1-0oLY-Z<-qW25Vq%H3FpVfU?EcJx@EVZXly;llIop5w2&3gNnVs}{DH-=7-_
zd5Y6>QSd_V^w{(*Te%F8W|3y2Ya$UKwG@o5F+2U46zLojVtDK|*kje5OlCa_6x7kE
zV8NDddyXqvJTg@+#fm5iyjuVhfuFfl-B&fJ(}N`j{0Mcg@tM@}={HVqX0uT0O8Ne?
zpPqY!eZs6i`0v@g_V!sjs%Oss<*_&K-f--Ldvu%hdp4|pF(i98-SpwVp4fBW2SK^h
z16%elmL^@(yI;Q*1N)EHU6^oa+l@1i-8mhm6Hyoq%fmL^o6t#GkdLF#6VYeO*`ek(
z*=V$7WQIKY@`^wPcsLK~(t<N$KwU~_F=c$JoC}Ams!ComT^@Ic;1$dQZ#4>KL5(l)
zsybypXIq|^+ab9pA*w#q#3LhC_M3Fgb9?S&*UwO1RW7{n`G^N5u}4{T{F7U{-0;8%
zCQg5#X0<fws!c=ZcAY-q+0`!>%fTJfepLQ;?!YZ)Z}-bRYgyp->64xtHDSqw<CFd}
z=Ao%mmf(cGul&M&cTPgz5iCZXkx358?Ql7H3bqM}xfl7Ip5vD3q>B+6G8JLLgA-0V
zZcC5x4T@IDcGXLF;m_j8nM>NPFX-60?rCx?t-kQU)Cm)=FYVo`Mag;`lKQt%_k%oi
zE}}tnm<$L_6p+T*;EBUIBD=GIa7sQp89tN#7rg&f8j{`$HAn^Nzn~+hBp`)UcU;|{
z*qbw#guUyn{sk+g{M9S#KAbV3{oumVVB5U0^b&&o4O-#@IJsOC6+U2(3Llb|2ty6D
z#Fh<s^V%(=YKbqSJ=a6g9udL(PHl%v?4Bg*yw)1FxJEQ-yqrE_)A)O_J6-?{=+X2!
zy>xLqs9Fu#jks1L4Uj+;;g`W$hC3TSk40jdUc;|RezS7TgImm?c?e`NBf~AdDK*SA
zd1s7uiZN@9#YEIuOu<aUYvd>0S@CXe9Sb2Uxs~5zl<jsAHrFR*l)SZx5iu_I6GsCu
zN*@u+#A*1KA4J^`BBS!G{J$YEmds9osp6<v{H4-{o>1TqDOnu0BMQS(aah<RkhU;A
z@v%?L{UE1P`__Td3fr(?>wz6}JGZOMEGst;4^<7&A6lT?;|+Op3I<$RfZzFf1A4?R
zw?g&eCd`>@(Rdb1;{An{m(lw=>$hV~)zx{ISsPZTmyj3tOU*0UsLH98VyDWhD@AK1
z!~ZKqJe#qJG_MiU`6{b8eDuQMdn0^+TDv~J^Dy&@8<J?k+Rm%mAn^%C#a?_M`~*5l
z_X1{}I5&wYthK&)-%nATxjHKj%YGu7bD3F{r|kI$%%NEeY0v#}tF$wRb;@DZ9F~(Z
z7e14BpclTO-v!#*Yb)^%>&tJeblg^D=^2+nY9!0xaJ4nKRn@Ef(5u$_1C2<HkfB#V
zhIYr@PnNNv@#bYFuMbhXMUhy<XOi2rwifk=>E3D$paNtd02fWblUC7>toS5TQ&LwO
zbr|y7sCNgM|L{LpULkTCZai7X9XP~UUd{N$(+PNdh_gXU&>P+!F-WH$aCH8fhm~KI
zPrq?a8aaDz;ArV*j~{&A*~`>F5VdrveSY?e-o<13jNW#=P43p`s`&it_AfqlMwZ5g
zh7B1sB(!nqeaqt`*xa&$o`z|*#HX^9*Jen^-Xp75T!pz)R@g9D1wFVT5J77SI#ISA
z9{mh+4$Az-@?Gf}c6Wx=kj3-Cyp4gLbXoG4lH@&4^ThL>yZp$O$4z-v6^JYRFNt8$
zWBdL?4%o4}y_ZV>6Uq83x4^D>;WdEuL=K_Wl`hu>WHO!JrAG*%56(23Y}OmCdbfax
zRUVY3QQe@QsQZ(oo9c5paoTa&C6$xQhopv%?(>-TryG*_=}iMsk4htM8)KTDm&{7P
zC<HZ`egB~lMdrrU@VPc?CYfSkDQF2&rnF=!Z$Ys$E@lc-PA|OU$dg7!UMjQUHfb^m
z)w)U+X6{)fi)t(f5$>=Dk(vcFGx^s3Kz8rbDS@^j&wt9Amj1$HZAXmT+`l0|FPU-A
z1RuPfXRtp$%JL;t8LKzVn&!{Ufa@Rp<q;8e1IMhc5pkk1%eNtx(-3p;TT;#ZhVK<e
z#?i_qmb@}>+Z@*8saKIr`rxzalta2;>tN}rzqDXoKYaEDW&iyL?xN&TmcO0=t;PCJ
z>i0;01vPo_JPnDL8N^_zT&Qz83bQkf#%zZKw#|ZC6f8A}GJ<O@7KAA{ofeyrj{qCu
zoL7nAIfaxy=EVVTNT_aP{FolMIVppxDLa`02RE%(({(8!lCJw~C{yf*L$j{;-qdka
zRo^>aTs39y2>B7i#Ni9K4mM7EV(hGCqfafEy=vN~+Tb|X;M=l?_ql%9y;GU}+0p$r
z4EK+ov|M@r=JKLzhfTY7<Q@H&jl62;sq7e?XWY`1<*9O3F>zJM60$Y}Orcw9fpqb5
zpR>Bg7cdK1>4Jf?mW{KPrVm1HK@-H$Rvoq~S6%L41EvPLUutA3%=rI4*|WM<dA>15
zwMy)>JAT=O&-?#%vN2MXImQmqlE)kKJ|VGmQxS<tGsIi1nUqc^#~cipeZGJswQxAf
zv(gPgx6NH$V`G<@A-&h|4-Qc3E0fRkBH@)9oB7}6STGXY)DWmy`yWKw?k!91M#$#y
z>*_{cPPAbc<B)B+;8rKzTV3PX7BfPUTuvBvg2-clei^U?P@2^SkGn^Ln3Iy1kh*ys
zog#@kqh3B$>M=4<;Ed{d=_IO=C4J<v?2D&gv5ZihyIzcLY4-Y^XY>8i?5WF-G-JQ|
z#7^%$KcG+I<GIV4?K}6>s&)(3?KlAXy1+;B8tBV~C2n%O4X7(BvJ@9*!?Tl}9YFL=
zsk@oOTU}EeC=wvOaxG>!(sA4!QdW9atY1x*Cmjh-=_zD;2~-1xk2RP(&V5PdBL|v#
ziSis0LyYt?1P7`mue_S5<067UXl!_iQ~}Luy6YFhpsBj;;Eabqa_$jXX+_ml`PWaF
zbR*N5HrH)A|0iT>3){}w6Ppa;+dl%5X5{#)Q+oo7dUVQJ)q346PbnX7ee-1B1+OR<
z{`LNpQqts*MTnS_KBAsAhd#mTf5hJlu@11b#7o^CW3DY2%#CDtbOkVt$0BAp(g4f}
zn>kqxAopN3&_kYZfue?GHtG!g<Pk?EaT-W#K=_QhUG$W!(q5GGV!#66Nv1cr`D>Id
zc<_b5{(|$<Z{4sXczXZ1>Jue<^UpoB^Xa~;22Hr_udcbbm+YB1dc=rjV@G$t;ttoM
zMeAnuy}6fB&R9MA-eZ^tVrgUr^QaJ}#oJ>ZErPb9P*IC!86Lfqo7)PLX<4dHCYoPe
zQxuB&%~5mok4%e7SL381i3M_n&rX$=T*Cji8D6}_4bxqG+3DV18=9-_@`$k`r>9A|
zcMrbo?5`W@Qa5?Rq%H#t+A5GP^qurKtbzyj@qzJ@5MqU_nRqYf<z;0`MTH>~2VAw9
z0OVsbWqY#`gqQ8{!WiUDVPx>J3gpu?JsN8O9gw>-X)6(+qiv=|<QF!#0}&@v6rr;4
z)~R!^A6Xr^>gH87)z_~bTfsK$KDlN2dw+ZR`Onrd1KWPbw#j4q4qZEOWVgP3wtp^O
zy>`}=Ey1$Kx7Ggbm8V(P2Z%STmBH)+-l`s<E&TAn8URM44~QXN0K<6T-gUc85Fn-i
zo))T8sWIG+M57vcLe3=eSX;z~tY`!mtvgkF>YmJdg5KT>Ms{iAFD&oa&E<P5bBT1K
zuIG|Fr%h{PTW0J!_7+49k$+S-1=6}mXd_IBR~6d><whwjmR3*@irHggG};beLv6Ei
zt821Yy5HjQwCaZxD8v+5EX^S3+^IpsoQIOgRJfy(F-62+DnDsLoF%=>RXId>!+q>+
zRZ&&dfKEXvcB+FJk=djj=|#3yd8qRKoafhVi)4#!#?0=w^;GZ0k1d$>Ku{NswEF>3
z_`s~_;d;O9H)Y$z@i!b9vvArqw^X-QhSU{p-?;zq!2TsK?ODoNzC7lJk@DV6%*Unt
zg&qI*t`wfLU^{c%HE(sV?aIF(Nw}YoBnkNmVPAtpMbbiF<c1+eEab7-tkxj&0Ei$f
zEC8SjFaC@Sa2gaRn+)KtB#=RaLV~r?LX@~3PI@5Hzxmu%Y033JEsL!xDt2RMst^D4
z!H-wo^WNe;?_}<8b9%=9VH=ij7+<WQe62EY=|5gspqv}O`>w#b)k<RPs(adff!&+}
z?P3ymit_Ec$8!ZQGRzT$q7zxb>NXm!ObY9CSzZZn(I7ShQNUm>phNL{DfPDHMABm+
z4}spvY;R6&m6Hwz(o11BWBtE4b(p<;K5-(LzjW@{n`cZZEYItZ@5$XRZBLlQpX)~S
zU(<QzmYYY+zEe5gt8<S@gF1K2%z@)Zgx~fXolWixe_Kn$2R1WCq|8ij8R8C#46Urz
z%Ca29?1oAT3rk93)iov75N_3wCj+VxR+wn!G4rZHP&Mr$cmc9myONUefieD!!vRi4
z(o0+%s}re`D7qfPnl3AE6_g3FRje%2QrI(3H1(aEe^XZb+?;mVXDc&T-GsRfyvh=d
z^&CHL?dCCKL(Q9a?YMYOhoZ`B3M+?q$tjdx7&mlC9HvI)rQ5GBp1E=Qu$xwmXVJ=*
zi>`fq)U4;nPM<i6xM(o;2emukqop(N0VK4Po{<5_Nl$uaz~(gitxg2tJ3Sd>rsWDP
zZq_8@sFMTZs3|CTI3RTsuOaAl+RikV6jwf~9c0Rq2ke`9*WK>aI^w^F*dwjy%&gh4
zDn3qJOEkep15`cAoPj12Fq`#)BjSv>-A<R@m7C)WK^q04LOKBctc{usjFL@XH*~`7
z#MRo>M>b@xN9*~&VT~JJIBbDN)}vYh^pqs+p3ZPUTBMSfm?<tD+Hv1gdlI{~T<sC#
zc8wy6v5G`-32uSnJiSE_f^MDD;7m)?8-j+?tY+CzVX^~mgWnG=#&0v(s%uQlK$+Vr
z$B+pb<O>z*(yAwtPk_VcsZoxU?4Ck(^1az4@z+@?4L>&jsmRS2PeGmGmhjq}Tle&~
z%xc%pvC$y~E}n}z&$@qXU1?d7HgLH3!%&<IOoy-oa5Aj0VulSktVW~7X0e+y2Gp1Z
zgGoRnxr{Spbc=K~z%<5h22I|QDppYrOR6)89Do>E0#GlQeogJLnVB<39veBG*|Tf2
zkwfr?(tN2BWM4|{QNS82+rIvLwu8%$thhxm=}b<C1w2|^lcqgCG-hm3Rz+83W7b=R
zr2nb3G`m@(ti^;m8Cz<%q<zsWX1XtZ{0+rzC0E_w$)R2UE{Ogey_<js6h!nMG)|*r
zG)sUtO@mc7%__)}3?9QqakY#8RCN+n!NjccI9fgrQqEyFy%tCu4!pYU)qq$Xcx}y^
zHB!#%)il!W7-<pKFcaPo9x5&CtTs8|4W<WNM!{<^o1v1+G>`@{tCg=!s&-{9Sau8?
zO!6UzvjOf|nlS8)Y*{!k=h&)<R?Ie*J*RfH*Q=JZ6~`HYuKR)$6>Y8J<V00EFKR2+
zzYcoRK@VlL_KO#oTrR=FnA-|(J<xVDk$&a3Fc<4zV{)b8?nf?f8p>c0!}1K{i$d-B
z7SsK&D%}+vq_nakx!)4D29?0G_0d_wCf_~JTwS|yzkmO%6|D>4i*46OtVx?PbmnTd
zFJW1f*eA6tD|#OxHLM<<9QFgJu{iERg%ZIoW@Okb%x)Eoa&?VSbEVNmo(v<W^Ue&Z
zk4(mXP@ZdiN3ts2%l|rAp3H32cLa~QaeD8?IALK-ygXAM4hB6&DGVq^D+UteEIDGc
z!3~7_$sEvyBwVfmz#QoV0bmiUYr^ptk{rU_L0t565u~jOFkDHYtDxW-Eq4Xrol+I{
zPz_fj8^06<+DBjU$84qhro&s5UmjEzMUR9(n0jjB_9fLp_HyEd6M*@ca#Xp?{pQYH
z%Fi2FGxzb?Z%v%L>JGNJ4wZQY_=ok7uE_lD7cY!u`NdKP(z`GdpgELgNzKcgep@qB
zwl#=HR?y=ClY2ZsFwx`?87v@3lWwdAF@%31Dc@j%RG|=(f*xranz)DUPIG8gIc4*0
z_Oz=8Pd^a7`Pc(4=Ye#G)N|wbIqNI~c1>7*r+dLs{-0+Yh};aw;bo(mMSEZU<UVnD
z-9w{RjJjsVHM6HL9<N>r$^W=VOx{?0h9$@<DsW|l^qGiGDJqJ^3JNkaq|#<Z0YPt!
z1puM|+oRDV0W(lanktg>qo{5*wy;4H#6jlMxcp>NCq{Q%l`i^kCZkS^&l*==b;+rJ
zGnM45FlF3;`yW$p5q)o1R;z?j@$!PQ%Cf9VKQmfQNY(-5JIj(<mu9!g!^Y(Wf-ols
zZ5})gJ&2$;S*(Id6CJn(HFE{=Bkq%AKqWt;^ppY@MpKYznpiKBMyHGJ6jj?bpkU)|
z{**0s8?-I$w|mm^J3X7iYiA`dmpjpp_EwxbyNWh8u}2y(YK3WOAuY#(i5pf`+*J3^
z?aS3$=Brh?XtO7=i%vbF_Bi%L9!Jp44y5^j>gzSSvRyHY#bwOTf<BUEgK6EGfwVU0
zB}wk(3IL`|N>_t=PyeFLm#mpk;2WMLO(u?rdr5pnz5ee=na62xE~csJ2g&O{xJ{*8
zI>YCb)DF}=M78EVcn=byYi`Ju>B&SwiN}*GONFtFq9|yN+Cm<`6~=wB8Yp9`S5@_Z
zU$kMIc3rA8OVwbS7@aXQ>AK;`jPAP~TnDJ7bJsxqX5HbW*b{%%)EI43v}^y@AZCEz
zJ^2Pm5G$gwU1@^Otkat<dLY7>bil_0nm?{6Do>H31@bUu2Kx%+0@dIk1&bYLJ+myX
z#RuNJM>$eta;$jpO`P+79g7x-TP{2&o*ACEAQ8tfc-e3-61{AsDR|j%TakVU*3b*v
z>zH^e4?>CcK!(!$WI^Z3cg4J7{~CkQ;RIJWon&>j+6bw`W`x1p2>SzMGl*<B26P<g
zIpITM3AtGsm2y?A5riqSqf{A2UI;JGH;VBWp8Ec&bm%_xD;=(2N@ilHW%5HDK=+kV
zK5;{);_q}|!Bh_Car^cm;`GJJrlnV0qhjdZF>j^vRO_`HRY;GG3_%t^2!$o=E4<sh
zK>g|#&-UgBQkpF-Xe$U7l$PXpy?IE!&V%JAlIQWk7Ua_`1zMs9X3<pthFm6@s~QKO
z9cXdk@U}b4WmtSvJGeHvTxp@hestlUsjuDfxbn^JVS}fx&vR@&&BEJeyt97(7W=ph
z_dar-%@+HN9(LtNzde1+;}bS09~_%8yY~EOkuCXU?}N&(8|KaZ_3YtK*wDw3Y0w2{
zwFPcYC-j<Z_$3M)CQlj*d%~`O3rXV^!0Ls)gsR6J9>novrNJp=f*Xt;6Pk*s{%*od
z{AErT4p$=_mBd!`N)mB?S<4s-RycIXWdeGI$YTB1?_2QK2YT=6vt!r1Zx3J14(;4?
z!}5NK+xzs|Gj=r+k=U;Arw<=tT@IzQMat~p8wU?5M~<76iSocNTGSo0+{^qMXWX4B
zU18gx{0iw)i>&=cU`wY^7WbLcoEfOtla_|3haHF2?y(p$+y+(01yiY7hk8r4D2wr{
zoQQ=3OML^yic6aHm{a4KQoGydJdh)ISvas+i#yEMJv>!xS@+DU8J{e@fs|`L>T7%*
z|NW?H=Fk5!>f^OPTr{fm+=a4~Q4t?aa}5h!;!&$FE$lTKG1*8s%WI7IgN7ic9Q3F-
z6nxSRZ<R)sOH&b2XMd@YA0oG5A^zT|i**&d-qyGt7kZ_b@p~<qXu-O?4hp}=Sy6Wb
z(P3_NKh)i@nbS;Gg6UI*C+!B2qh4`j__c@-M5xH3y5_v%t9&<#57z$Vcc{A&Yb_nX
zcDz@&TK-yF7>008b<_wjnZn2nG&(b#k!U2_ZHR`kBw<^o&1bcl@bcG$ck<?GQ2Iaw
z*cTMQ-r4}qpy^1L(BoOAQw8_9*~U{B5jHi^PhFLnHx!gfM;i7HTDu_r1uFxuOx$Wl
zV!uUim5tRkNU-Mjp-KvoQIYy;lzdAIzJB3~l1NGU+%=K8;^Eg{H|;g8-<wzs$v+eG
z?t(sHt3gg1V2c6IrpH57J+Dc75#Di{_F$-ju*A7ENJpP{3>wouKT_0s=V2>B0wL63
z^zih(=@0IX_r36ENIiPfXM)!V7a7R%PCaZ4g2@DfDG~$H^*~29nyu!3fM8{!XhCu>
zjHYzcBt<tVGmT0cZL#*$$Z>LaA5sBxu-U+2r8oY&wQsVsyPrP!ATz!3^IO;UV2(K}
z&&zE$EZlU$uXJQ5*zd}^S(7$ubZye;>Ku<S7^hr>hV6m>(JLctryml%O=5=Cglt99
zvFHq_0Z>|$j!Fsr#Fj((P;m%zqIm6cTA~sg@FLs!p>oBP*}s0Ml)qU!WZsHrm496+
zE@3B>)}9p;4n8fnt-Jc>i5r!5;Q3R?V0%~Y%_9q%mE{J7qQXKUBUg5`0sNE0(K=Wr
z#bTxXYoPMltm(iK2}pk6tsoNzTCNHPsS>Fs8Z|YctBb~5xDU7`D)q&z`bwedX*r<)
zi&W7bU{|BeQEByWe>*-Q%P_uOQKYJT=B>uA8>6ddt-q^e$clvvyM6N(8(VU}XYTd4
zEiJlw{ene3SclyYcYiP^vpQpU#*O3io3qiahxQvYqNqcQlA?Z-ue@`6z5nVfuI^FP
zwzRaM8UaI0`5iMagcS4$k+{v`6TO5Ng=ZfCWa!3Fr4OC*7G+WrET)mUNw>SXUp%W#
zdGF!=Kjj_Y)aQyw`|{1rzQ{eO4DoFDO`b2`e)_0yPx!AFW}Q4pQnw$*>&M@H-Qzjd
zU<Q&Z+<JW^<aTFeghOFM;CDOWEOQ3<$$|h*>J*KJZ!T>#UQF?uQz{a&wrH8Fyk2;h
zU;|(MbR$t`9?Cov2;KAlh<gwCsH*gR{GNO7%w$S3lT0SPcM_72o&bRX0)!SqC$vxl
zgx(>vP#pwBRzQ#<C<=BVG!+%abzKE}+ZAl+TCl9TMIdwXf6h5~N&x-p?*2Z1cge|2
zX3jn3EzkR&_q^||z4N28b2@hm4SyEC@C#yi&7Ib4-LuTHL8o+?0FOA%#i7N%17F5U
zX{fM?TvO3Xd|VKi9f!><VTN~Y1lR`|Cb1GB;?UU3qrxzQgM{?{r**q!LD%AhcEcLh
zTDMxW%SyY(cc8<*FX%6~^hjD2eJI4$Sl-7S+b6fAG-5yQqRTCPu~rwbRxyaY8syB5
z3`z@>qtuv$pqK!=9Z}x_8D`kUfl+BP%FF43S%T<bNeA0Y(qVYM6knc$a7Kt6rh6Rl
zX&%Fi0WjaLLVkvY6HoS{k~H#mUP<<rsdG2n>+0A2wWJff_%8RF81eChY8p~n-65-N
zuq}_y9p@Z3a@n+Hdt=qq<EOCcGnZbwW#VC?uPn{Uo6s*8yZ=c`3vOucfFy<Q#|U_7
z4YLMD1xD(F0)qzB7z3T)c7*QmU{COT)T`o}9z&0sb%BKz;*ae$G(N6Sd)A!PA{EaT
zZ-S!RSb`$^1l<mnfyW)iQWMD+SZX4q-XT&D9nPbrBbaZ<5)xuml(0yfF3QSN1X)aQ
zL$QHq+pJ|zVy2yU9CmhMA(8_@+4-dedI7^Y?;XZDF$_AK4MR<4!?^Z^HVnu@Q_HuA
z>}d}=OO?hu^R0=pf-?lOSy7W%tX*s@jw+ECGd(RSAc}cFbi@`NZBb&ab|f%@i<m1O
zO+1!q$Fdr*W4rBJI1%+jL<K6wCkXiQI1^ZKEL%wkPhRwd+&z-~d*rc^)1#*6`B^i@
z@aa+0M!vu5=_DEut+uDR+;iymnqzT27p^03G<Q1tz~<6JSmS)0max131?&_eJ}<d#
zh$#XUrA%$}bm@iZMQs9upnObir8Jn*FeX_1h9>Fxg?c}ufz3oa_3xxY*RX>*cCrd?
z_r~(3V>^mj4r4~R?9RPJ{_)yR=^ZLMr1u&aJ-7FyvJUM#Y;BnGU~NLenz>7&2NveX
zCdJa%LSK8V*W&Tj6=l)wH`ey<wxmbJt$pX+GX06k9VblaFmKJq_GyU~)#IJt(@V^5
znu0lnp`Nl{PUL6H2XVK7=`ypFgvdDAAP2&2U_tV5t%jXnB{-(4cv8-E0~Duhe&@uK
zbqIrs8jbWlYJ1pcXDSvH7M^r>Vsa8@xo$T44V9cugaexcgH$2~qoAQ#4OYW&`OINN
zj+7urFe*|38|UZa{yT2KGfAzTe&9FufBsY)Z188NGmV{A#Bzc@_<EYGOd{=HAN6>q
zp^V;fCR^Wu?sy#bVvi0-{w|-uc-}wnYQ7|YF@4}I&7ZO{VXo=|WJm}D&qTpTVzQc$
zx-=rhZV$HtSlGoeAnwa~c99RqLxWsbd;I@AJ1LA-Hj?6E<yx=2sFd6xyZT1HadfIN
zj)cvpkG&vIab40~GT)+KvL@@=>+;Z?FHLPfa&K45zdwo5NXsyqnOLC!*vw%HuH2}S
ztRSjPZ&Kk^*1;>zcmtK~{1=6}B}C?8g>)N2KYRXFa>r}#4~LLb@@g7FzH=|7eK1p`
zDB=;sk<6nI1ZzsCSc5}Dqr<G$C`X7LUP;)$VOH3|RtI;Cd)0v`KjH}{_Ur~|x0R<H
z7izT-XM<j8pPEsWk<h)}m}!<Uw|{`Kd?+vARA#FAfMxo`j85~kC}YYj+LpIls`v=Q
zaFb)Wvt4j#lt~Iw!(wCgA^K1y5d%#S165!NB7LRZ8YKp7G2sl5uME=1!uP>%1&i#J
zKH||7L@IN7Gd@d3j2hB-X@gFMQ>P#wpoL7n^US!qCHFn<?pm<2ioWU>94&V%Trh0U
z$*hgfZkRP{{pwLe%NJ<lKRKXob|S8%5^=K>I~dJ!6@}`fBXCX`7=<hqh@^>$WDzrw
zNKDNFXyA;CM(P<RBtY!K>FYgI1u$SEXaCd2jnb_mQxU6pBqB4QB+?)@NaA^=6rSGg
zkKIb?Lr=bCdpPc|vmdG5vzB{$*Q)KAoA;f&chVoW@7&=yvEc2=4V&TSWh;)mC#nvk
zO~5JnWM}*2a7%!i5eevmQHR76(l#R`B+HRnT@weTti*)}BwJKRoFgts3QB}aKPXyG
z;PH*#2_W<w9ugK&!`y|~f>yJ@RDk-mi5PHnnGRsX(&;c=?VXK1zl2#l5Q1V}yB?aF
zpSOPCz7G~XH0sIw-#wkXeWRG!$flXw9~?BUfzL4P{Rf`j)Ul#&-rTP9dMw#=cm2e*
zTQSRPZO3izT3TAcxa$PCO9J+YK)vOJz@P}pV7E&_N@NtHCxVlITVSBgW`YYyc;oq=
z@VhnG4zHsZ(g#KGkb8*_7-ZuO6f`JT>odzqMi0xJx~c0E9+*pdJ%4`D<@<ZfaUo=1
z_YSw*RzD)1<iGz)6Mf+^6J5#1bQ{LRJRecW#UB@iN&+};kG8}_hKD1)5^~?*E(MF@
z(aub~^uf&-tSyHSObR7xJ`P6Q8r;^7+!fN$_s#=-Z$G#7o>R7C*0F;Z?;bsMVTZzc
zvdVhy(Iq7A<#G2M2%0>4BYkD%qU9m(Pcf<(7D35Z3g>ioRf>Qm6QL?mkr9#+XQdcV
zSh$10l3}OpUebliZnaD(1jM~9Y?B4WBHRJzPImeI{yXmOciXFX95@zyJa*5DeWO0?
zP&f-G67|+UKi)t;da3r_yMxZIBiTz^LgX@V)!%VPip9so<8(R39;zx32Z2#h36Rp^
zSfB7{cJ~3nP4IEG3U1=u&(Mt!)Si{$wsaU=U4AjpA(A}r(AmJFmPw<wJ=~^$$gFAg
z+f(**xp?pC^Y*?aM5k6Ax-)X}gctup>uY+gUb|#Q-l08jJU^h8tRpcb6k3!=rSm&-
zh<L{>g<yH1JO;ikL<=MSvjSmgF^JY0=FCa6+bt1>czi~+sOcGMT1;9DY=krf_oStn
zY&LiwZ8p1urM0n`m@Ot2So1yJEX0Q?M9(c5W-4&l8%Ed+g@{OC4M^3Xe6?i_scUHY
z>XY;H+kW-N<Igs?ES`VMo@ML)^dX5EHEOvlCP1m2z6E6`mXAJsw2fT<`NwOU{}?)P
zdi9vqXS(#=c6%G(I~$^v-okE#A#T0OnW;r8nPTIkbeUPPMvD>dMynCiF&e{@c&w6*
z$0~VFPlOZoCKJIl_&6E<(LfL8&`BoZu9FZHf~1tFC39!27+W<WdequYQ^wcdI=+Zb
zd+6mo+aCYorPJ^C-~OKb$i}VpHQfeno?TZtxcdGd+}rP3zvN&<$*$WT{ph(>^wJCL
zyq!f8=A$}IhBVfhmyw>BXh<hP(IL@DBV-_LLP9cmD5r&|8D?=X?8q)U2!Sxj)b9<1
z@iC>yU+!Z|&AWgGGxHCM@h?=9%yvfO)$77z9-dY9L$`J;@~3x5>|yc?kuu{+ETVlz
zkK64RFoU@<PYJ90Y6h~2L56n~hwUcS6o|aZ18Q;!{xczSzTO1A36zDi_R${CjL<t6
zG6&Xhj4(I+;Tm$O=GdFZ{7br`mg2Y6j%O&Si7`yR1roywNfsydcBX|Q$Fwmf5O>*u
zkK<#a2i3$#fet;0+JuNOm?Gd?k12B9K|fb}!UYF)!S~*C1Z<Fz9t*&ps|R-WZ(rm(
z`#|?I$DZ2|y+QA!?$n~x@T@U)S>#;eG34-BF>T#0<wA4H#zcDGZCQh7Rd>xO)OSEg
z0BLE0CHe)%Zh?0$-i*Wn$R}W7>ts=bj3(SnH<(qEVzHVWdLSWhK>_3#;qnBF#MK!g
z@YLcYkD)$-EGQPF=BF1<Jb9kp`Jo&_0Y0f|8ELp0t33P+eTuv(PZ4_~vj{mIylw!&
zI=J4EwhCv_%vZ&bre^LyuEYPMB+4JUE8aYETsFhOGZGw#SZf~J#<FE22U%OioEoD<
z1>%GVL3ZJ}!NKjKqOGWRW<_=^#9AXuHcILw_{<SaON&Q&=#?$I1~w4<>AOhb7q{kM
zN0x}n`K4%UeOyAv?>(_<^tEFHlYLSAt?KI>zC#O9ldrr_9@y^<;@5($QNvc#)d|v6
zXIVsStQ?0_gmF<yLO^I}QbJ-(f|M|zCQ?#?sAScOv-Qp@>Kj47tHE&&Pf|kWX#pNY
z;2!j3E{l#7*{(d=(}S+KRRL#E;xFiRUPBPs<IJQ(;ms7hgH%P(qp`>0=pPa5V7iI2
zpRsh;F6=vUVsUMsB-J@fW0R7gSp$Ib<JDwbd`W?wj1wt@%|}P$Y|<JXAKf_`lTxCU
zXbI^pd4@KDOf-?ha26M%z~(+z65m5@O1M*o|1pRq?gd;24RBs%APsT!cm(O|xEV+&
zB;^tGY}~G;Gj4_z=)ackf`&s}ykQQ<Fl`XIRPSsbo?y0EbwLhb-YiGDqB!hIc3Yb*
zCo9AOGsEEsZfk1`B?o_V1S3y)cR-$g*0P5@HE7}8F5k=q@3kUR#wR=p>dlHjDTMgd
ze;RnKN(qZ@Zjm=cH^*OB0!sem4*6BTI#Bo0nYaeI@rFWBNJMLq{~>tMFbuOVkh)5L
za8@NdVxmLRZJF8G=CXE5P7u~0$Ehee(GIm+8=I{n$B}^;u8@ojT=R~UB5{xv86BKy
z#c8}1>(S1P_2|ggqwq#{^{$5q4PoI?OjdA|qlF=G7DfRPFEG5x8gW!6f<_ob@B(jk
z-gL9YYrS%Ev)9(38#5lZFPiByHlE%1YnKlQ*3xH-kQ7JFAdfNP&cEq>1QoPZ#c3;D
zDn=Y{S82VoPg!bukYp;?IfI@0lH}xs>|n)eO)89tNYbaO72VRxQp;ehv}Y!wHPxCV
zg~X#)ZaWs|;D8`>gq4@3Td@VqXoTwHmt|RfO{}Ds?x2ub7e4^yajoPLkk?z0eAxhV
zeNt19qYmgrU@xZOQ7_Hzu`|_oTG^R185u70l_>L&sC%~WvI-;3^U4i2C?ic@-7-P1
z4pDhPh*OX%LRQ^(2qRUNM#B$Nh^*@=QYmmxer{xbqy;6U(-U!)QmE4z5<}GXW$7r{
zYemGC9bSO~p98TJRH^AG;Xw3WP4W-+;i`n`NhmP3C?1z$VzJLW!FqV|NR}{s>dhd@
z54y;p#Vb6S*~zYo9=jiK+-sjQeDeI{ZmVX_?fm1XHsVODT-GqHI4$l2<ZZ95$?DE?
zwFj?Qh4X;1{ZsSOGE=K(_TKxzriU_0v$L~$)pjWw6YpNyC3FC|b~3yn_ke3z-oILB
zfiXQjA~`%Xw2e)+g(RzS?c(xc5^-uNWxz9n9GMQM-I|+iMoKcHnP;N+Ko<?1N4@Gr
z=}et^Vr3YJ0gloR8H%;o0MBapWngEA4)CMF=*3A2QTXvgVXyqiQGMZf)e_XdWAOR?
zaTxLOJD7Ic_WVpDZ){_@H(PzG?{q>p*1fbOV>k}SWLEP=w;Q`&io4hwoV~K+;?ly>
z02^|<svW~R7KfQbSZ0OdRHaAvu1aTpLFek4+?c3>0x2m8b$HX#l57q*HwV;&*n+Hj
z7Pl5AfzLb+PR2gh5d@2qV7F1PyWg)Z568yhnh87J@FNnR-`UGf;`|6K6wX7+;l1H^
z*|<#;7N*=e>F#!8ZXGdYx@W0)uKJq((^Gtx^ib$gw|vIz&U03M{`|tbN(#DcUmZC<
zw6tC4Hr|C3Y3zFsnZqhUid%dr0htpszEkp?33oiSeq8T1IsIlOrZT%d3kd9f&`*gp
z-&roBFlT;ZdX_CCBqKODBpsRB!@@%HmC~YsvRwFsb8T_ZadA>sSY&8KWW<1)^hj$+
zSgRWbfZ$xsA=!f_idx0+co>R7Pi{^4&aIe9jnfUp!m@wYrS(tryHCn!OnKiESoH@j
zwC9Pp#FdJ0af(!F@7gWcP8K;lu}XKvBh9)eh*!icv&$CB$u$k^a4Dd2)Hp<AX@NiA
z?pueoNrXT7XRJ*YVh1yEAe$N!tYpE%7n~ZVX17I=jZj6Op~uN%Mp!709Fb|vMzr`x
z02>gJXDK`)MHnQEl~~wgm}b}dA1`u)AWqiu(k7%M6L!L}uRHy-arb>00~Rir-u~Uw
zq*t45Y0pia8{c6_@!WY`uKqwTKNq1pcWppr-Gq@@<#}0|eWz6HxThs@`+$CJiqhll
z83ShbyXUb#pgIk1{7LE`F{1!jQ!KvSWP<f>F{^4Ii}Qu1K>(*7ZaqynGR%ocNHjt>
zdpr<q^c<r=5wHRFSK_1HVe;H)_xwHb-&jN@gBr?X%@>f#Kn86Qbp@VkK~()RXO{?b
zBwXg<sN|)X!i)~sS8&cFi@eI*AqG2~q>$aRNwq{-qD=;(MmVg<OB{|OTn=DNGw#SU
zLk~y0%-F-vSK(l1<MT?ZaG~P-ngV=+39w{EN#@rjkUgc<3ngz|DqUB+IEv_&w)yu8
z8q?~fVw6+eAIN9j=j1~7dAZ<fQR~<6K)SKATQEm<w9wm`iX{!gECNlkY&95y18qSF
zk081r{7-L$`G|mRy>@=eAP&2?=kYNL7SV7o>=b6TCVE=6-J_k{mpeUHtIVYzi(khm
zbCu5tD)Nvot`>?GUYtPkwR{?nFzA*^ukrga7QFKmHaAIfIumhwH6$Svey7mT<UqYX
zB{qUxAo$WMAuZ*8BqaVu>O5Ll)1Iy8w9C*KbA4*QXU45ST^irAH-XF9E4|@L>74$P
zCIt;$I>fSM*qYD*OAZ828Jd?88W)k37Z`3+$5%TikIU#w3(23lWGuXO4jrP59y!HY
zAJnzS@=~nlZPGJjrLG02JXp$eMq5#W8|OM8j=;-C^*hNb$IH2>(5}i~i;)WS2${l_
zHA~X!(N-(~Nw5DdydjJ(Pb#*BrnJeh>}@y@I$F1W$&zcO#<9BgU6mfqho-U2AW}9~
zDOCLt>$XC2@pX$K7jW+P8OD+B3^50r;C-?Ohsf5iEPB(I`pY8PMywL@qcEWc>kBS9
zJk}fbl%EpWb8c9lhMBSRBa}A7%9G;c{>EL4$!7P-BfEzUgjbY65kHNR7N5bphUo6F
zz!(P}6c-a4u9u^}GTXl8PvTpm`J(ZtR?qSei`1g6^0de9SGu%G2+hmvGDM#vw;58N
z9w}F`$KTfcNOBkBY-3gbnB*^qR-3@9S>$V_0Ha`WDNbh`;y(gqI87bqV1wDfgFxWg
zl@I`O*<t?D<8c8z;MiTr2M+;bA#M`>k*r+XK%%zOxB6B;a0mV4mZcp=4qe~W4oTLE
z=(D!5y%xLVtM0nt-KWrN+^<Z&R##y>b_p?AA$Ez_f&vwt-V|W4DM%iG;=2wd@N$UZ
zvdu*FY(Oj)QyjMWtSpQO|L6SAVli1|j1ue*enODN-xjUpT)wT-l4xCM@|SDkR0lCG
z1{FA#FLZx~v0UAlKUg-q|G7S&$6F(F{nJVpj3`vfcSaZkf-M0S*=j@bOozn)1Rro&
zm8Ealsh{_J%g>4_Vet<j4h$g-vBijv36iVwGaQ9o>&ov~)-OzNh$LyZ(4hlr#y@SU
z)sLMc|3pVL_6g3DbKSbzrm~!4FDoyS=X5L|HH0@_Kc&2=B=gshjClPq^2Nxyb3`v4
zi|nHeeL^y~G&VIhR+>+tUAa=UD^`eh`Et=NTgKWmO-q-G*9{G#U9yC=&ZfnS#p^|j
zM7waIXcsIH?fm(ybvDhLCtlB;E8018L_2%7XlKo0?U|;TGsWu}GekRmx@f0OW398P
zzFxeZI#sk&riga(WYN~uvGz>Uq)DQkI8nSmVS;GKk7up3Y1}yRdhA%y*4B!4%ox#*
z9?jY_O`}GMcH~I${)iExt*H_1@ZsX`!-k31Lx+lX$Pm^#n+6XSuLlhh?ZAPe9WX$&
z)zzZy-=DQ-nyRWq+pnK!`}P%WpFXT@Z0g-xw7q(Xwz5*RJ$s6_M-S0<?=ISk3ek4!
zCfcrDS$n3bOBc~Po#Oq@okiQJlW5D!#os%26m5qNqHW(^v}I+YEh-XiVWDUX3PhWq
zFWS63(Y9+R+N><mW@LyqJzcbEX`)R{6>Un2Xp@t9>og`MRhpf#vEtq6XwgPRi8eA)
zv|(YQbvQ&D94uO!jkiY)hRUq}xBr39-cuEFh4b0*@IJ}`#%E5A&zu^cIhzEZIhzEZ
zIhzEZHU9s^XU-<UXU-<UXN|wWXU-<UXHt{kGpEL9jZMFe&zwzy&zwzy&zwzy&l)v8
zYitsHcBV=2nX^gonX^goS!0vnGiQ_FGiTHPmd_fS{x^Jfrpd!+|0!RUmI}%(DG_aP
zv1qU7H^E<xO&<Qr%@v=^$r0`Kd?xs+v5B!0lLLu~qD@E;ZG60F<KjdsIIgiNCPuve
zCC&>E7k|Gw2R1fo9N1*Fiq8cFi8e5hx6TlY1^jI`<A=$FA4cQ<Yfkmb0iX$jDg^xI
zrbSA2T5<6jF}Hyd5|bGk0rfgZoh#Ey+y!$Ki3&e(WP~R(o4$nnGp)u@Fr#f?jPBgo
zr1VL{hfXT3_yhW!tuB@a>V85;2~H$Xk_;vTN@1#vW|Nd#5Oogs+`N@9*r{NN2--j<
z3i5MSN^rL!OQzcLdg}V6WepixS+{6NB^zfW`kdhD)1(CI6@8G^pl?KAb8bE&@BI4|
zaR&ww5-3M@8@ggraDI=r$?9TdV6Vvwhx9H>ZNre%IUqYLER=95$LR>i84(U|Lqa0M
z;9WGEjn=<OKu;`QHW)^g2IsUOUXEuu&iBuoVIWfXsI0*=yKLK#H!o?|(#Flh_Rnlb
zz9!=X$NX{RW4Agc%-y_l=65U9pV`w7;^`@PdL&R2D&g4G2&9>dvRI-K3}QvmD5Lg#
z7(&|fIh1Es2XGtr{QKR)XF(NkFe#*G-h?>?leW~&S}ivimkqA(QdOCi(1U#av*EVo
zgPvaBbxyr$UCqmbYQ_Z8eURB}q`TBQ^+8}K99y?~4a*p#oFsj#_E1krdMUyQG^{Fy
z09lXVuH1t2Y|Z&~dmN7;Be>e*5Is&$9U^xf{#FTU{!w}5hVP?vJif2Pf#r4IN1eC=
z`OslncZgJyK8L<lUcvX-y$7;WZIpXsl~C^eq=K`0(ul*n&Qa(2elz@PFOZFMy3A1<
zNniH)Ug~j~-PF|K^Af5t>#qBJk-flSAiY+<_LF)%lqj)R@ts6`XRh`gS=Ae)>%Nm-
zRA6_=p+CL0T0MR>mbwwEC)Lt=Vrw~paoJB0Mb)u!<$8x@$FN?X<D7#Ju~D_`r{9nd
zTc+_(D>_0{{FZy3o9O%ixg?SN(fvWBoJzmpu_Lkg;>?y+n1%fW;=}Z8M84h$9}ux&
zK(t;A2qVhCca~`1VKZ<29Xp?R2Ifuc#k^&B3nfGi<BS(JdOSE4VGELK48Sh&AUzPh
zAEO$Q)0L8faPr-jzz%QWpW6Pt_pZJ8-g{WTaAktl5B3OFKMLcpAV2nPPOJDT`R=yB
zj_fOVr1XF^ifkh9{a^Bdd&9i)0apo%NnTcpt^1HA^|pfUBquFr$cSDO=E*~JU2g0Z
zhb^d$g{Z$qMfFJ?CdC-{fL9F6F<FdYXFXB<devRm>n!OJ@-CrRp%lnR<fg~?1B`mu
z6OABZ$VcY3W8zFmhSbEOf}#RP0eP41S~_RxBhx?soQ=)b3u*z$icT>o#sC6$2;Wz&
z6XsfG6zxbZN-jzy@8bJpGWo;jpHJsK+)LhN&K`E>4n7ovV#a+wOQ1<lbb6if45tra
zZDKr{m)hH#HYW7QI!#!<eEKp3B$AfP#4e8{`#}Nr6A})qp$xECKDsPQlt;R6muC|@
zD&I-t$s~CKE}>hc7$>rE7%W!B7L3BEMtlcz@Wz%4QN(j76%`pu$iU2k((1NLM%2$8
zs4BMg6<t%d6s}rjvfqL}J1g1pCEXjCSB^8>EC=XR30lYkLoP5tXO>kXE_88Wfhh@#
zn#avyW`=ZDC%y#vd<^oX;a9H?zjlrPRMvTZ!)w^@dtjXogmoGWKSH51QXg(~K-eo$
z#A?;W>f*u`5@PvQC2(7CUxG-<!RUl7BHt12AJZ;vaCbKBRhE01$y`#hd&NRhwt>z~
z2pl=6YjwXqNMuwR9Vri&H@Ux-!`!p#D&oh^7}#ydq%VuIOL|m0BO>E4?`U$F)aVIT
zJ_?z|K~6Z~CSP-ngL%R?$DRzIoD%&)!wclH8g}h#d@BW>m#5Vq5Pgl9vUq)HXj&u`
zV0vIY%3;QQR)cgT-zcWfYFIQ7rXxJA{+B%9S<@JRIpz_$<#o7vV)eMU3iE=$RlfD`
z{uS$^CWek2I&M;I+1SMs_iX(>VOGqhL8F}WM-Ix9U!Jpk_@IokPCcBlZ4(pICikeD
zbu4&lX+dU5YFt?rv`I@dbX+Lb-k@70eZ}?5qj)C=vR1Dy#2yoAKMpWv<FAO9ILT^b
z=?$uKir9~#J|+>Bc7+VWaT706CC_%zQ{;8^3S3dXZyTgcrwMWu!p9iEJ2;7;F`^fJ
zuroiwq<mFHN5KW6t4f!0$;E=#Z`K>Q^!N5A?{*<L?0?l88R}B*_3uq5B{@wBx@QYT
zkeSzh6jvv22rWT1FU*g&Bb6?fdIcXJk9F>)%*HxLpz;)?7zze4&N}ZA@+=?)RF^3C
zqLD6AtIT$DADriV28QJz_7F=GU_@Ot&};5_hD-cZ1gj$^de}UFKAA^0&_&8@x*T+{
z5-~)PElVIpKcxS@azD88KJ`6ikUj?VZ;;}gfryh)lmHeG-AIr{m!m}Czy_zY^ttR`
zNB8aF^6bv;tzjUU`xnxu7Ba;0Ffxfna;vi`xsNjF3CSU>P6zWsz`Mg+Se?9u)rq!|
zS)FLPcZav|?(p~F)j{iQf>(#XhF6ET@apjQ;nm@<;nm?SygIyvR|oBxCU|xDYj|~d
z3$G4ZXA`_SyoI&N--oq{_6)N&`D=J}_}}5x;jdwB@)p)6Z{gKJdxlw?yoFbXzYnht
zTJF_BD>cEZ!&_LJ{C!xPyoI&NTX=QQa%&SUw>EhTYm>LIHhBwc6D_wk(Ka$`leh5d
z@D^Sjv}c;&)#0z<)j{iQf>(#XhF6ET@apguULCY&n&8#pEv!xcKD;`-g;$5S@apgu
zULCY&n&8#pExbCsg;$5S@Zz9tY=V`E*4YH_4Sx;q4R7JS;Vry3XwNjkd&66JZ&>Rz
z!pw9y;k)7Q!gqtVu?fB#{u;I=Z(&>V7PcjC+qM;LW~OLiWAgXm%i%42IlP69$y?Z%
zyoHU)TiBAkg)NEJ*#s{R+Que$arpZY5u$}n$=`<;hrbUSlDDuSc?%nowI^XUI-LLS
zT|1imQBFcm8*%nvGeFX+lF1x^xDuckl?!a0S75V?^qx33rp6#}3F-@y-~#2Oiyoxs
z$t05LQudNjF8VIX6tc2)?~-aZ{YSmuPCwzj%kRi3F4~<u^*`->J-tk3kpvgHTN&YU
zkC5;8>peiqb_U^mNihMlFjRSiBJ*Dtwkm#$vXcJDJBD6su24?16-PuFUlWu|aRxKZ
zW-<cxv7WV+W@mlgGLmAINeK)ow#cVw-6+xt(qH`(JxA7!qi>T!^obnY+B)YtExujU
zGnIR?rd8KG{>UfXnbJh>P!X*AZFI|c(vuXrltX0JI4ES6+}k^1gM@P-rj41d(4!t9
z2bN5m^CA1G3`Q9xf-c-~welL5+*>|3#=Tpf>))S|^~Xjls6u8$=hf^5ttqVtQJcgr
zMu|ljM4B$RzLD=E>!#5uG*_9*`t9Le*%YTu>=@fG1JkH%l(6_QP;HoeqkMfHqO(Vk
zM?Y~X2S`I5t#|KHU_r7TIg0VlTmo|VO*3a8WXuR`6xgA0B7L7^uo0q8&40f4$LPRm
z*c|Nr68F3EXI1Wx<V3$d83%{^R#VYqJ#i1oZ%G+Q48Cq%gW0-j9Lyguj^tnw=n?s|
zKJF%xO%m9+`+Mmt+lhl}v16RNoJK}ou>Hjf-vpAOe~r2h)5Y`2L=xbVcgy=K-S-GQ
zmF?|2%^B?Jo6&-Qr~Y_^5f?fQ7sRlSj$KH${p=z^WP<#14|k6%3bK?+a4zwc)&t+5
zin4?PnE;MD7<!x%uA>7Ftwt`wzUj&<uI*AMvw34|+Wuo~9EW268Qn9G<>~19v9ZqB
z_IIC$y^@E@mnyZLO8IYg{}e4>CU!rv`J!5r-+WO?#t2irtJltn6p%uGd-vXd3B~ST
z$E0lYi#Y2)PYYL&;f(d~cCS-2ikiQa>yENDxZw$mTYujZ#7;HQZcBk4W3VRlh+3K7
zyqtu{bMORI-P5Gke?wi{>4YU@4Y9b$0EOl^4_6Me(dT;C9JZ|<lFNv*R7KA=ueFf%
zBdJrgawU1>Z5QdODkaUK@2byh>(H7Om=yeVS}4Nu3R);%3R?I{9VNC6<BIi;3pX~|
zt{F{wIMKjIiWnMm3i_EyoJ}<qP`sS<W0K{)<~F(k?V8&t-1`DYr?!fjPQ<ngO3)*e
zKw(ti>y;(h_4;WwUeajb6m7SH)Q~PNWkK^sUH{zXaAkTUn|twp)3--x_g_h>NL!b@
z#XUziDErzac?LOhv%VR9{l;;pdi!2M<`aX9l+u@2-%GD5o7lM9Y2#+LNRUpFp}Ls-
zhNBXTe4Z;=;hjlL#8yE#Dko_cty)Fyxa`sm%DHCXHWr-9eCL0=EMe^5WfkefI`Qm}
zM}`{U=?Q`ag{c)_WX3F)qsLG~l}i*Je#h!Vac2)#|A{0WcTu38&(Y)KFwcLeSLms6
zWEPtt+>qL?w-eGI2ApCx$tdirLWIJXB;=GQ_D1X11K-fICj3v*=SGs<jI92E_=FGY
z$PxeyhAn(g$Pp68?+G_NfXPCSe}&VQxBs2=uS0nMavOOS{nr$-#QmJyxmEvdop9k|
zW#C6Mnb`zx=)P6&MMUTAeJ%ZF5bymf<q_6*^IJ+b`i8;IS0_Nqa3Uo-9H2mPIATyx
z5zV8rw3YF#w_mrL=}!aDZLv$;@C8<+xm-CbM(m>p#%G2A=oN2=t#wN<mYA!9=f{ve
zF7<hOaVlBDb`BmA&)B$!#AxDx8wwTr1&C1Wo1a4Ev|wO>o5_I|I-3k89bD=QpD;Iv
zuRkNaVH^W8K9UWhQ&WvWXV76id9RQyEblvl-C9cmADG__0MC#B@^Ut~==1Vm{}ID4
zC{O^i6@I1vU+R1xeT%FlHWw+9A9cBZMC6=r^Z`=lNg<{=%yybkDir4u+Hz<E_sK;D
zwKY`u2z`O<`+<3V+?|C)toE(2)6O^!7fztL;8*ouUo3@(YOe#^PtYl2NgNsHQWv}5
zAqU3O59Fb(d9K(Q#VA(Ah&?(nfcNje(A<R#<aHfqcwyHmI%zEFz&P)5`UKfC7FSYw
z5*yaUgJ-?#%_Sql^lVw!H2fcPy(<g?O~YMv^vHOUNk#*Ak%gn^34yyjd~E=4a8%D^
zqpZX2VxNCaTN~kj7OUfdO0i?)buQFf`fP%Gsj?HJ_4F4YL8EEt`}(cZ=#BNn6q*;$
zPZ~)cf8Qm~BX>=pgXjcxr07r6x7zrGzWpuZW8!z>XwumwPb7OL(dT5=pAQK@7KlAF
z8Gjcw^jv^34|b`s&7UjddboEfof$QhX;fyEG-_aUW`Y-=;qTu=4FZRqq5~J=QW`TH
z+;fzkJ>3W7Eyvk&@Gwo%!`sc}q~CLHpaw76YbA}nH1|BMT0}-OEH;lGREC$khmcaa
zvei@aG%2F6*$Axv3smR#2&P6gs=JrYSOnYG<RU|r$Z~hS@OOG<5x{V{pc3dn7}iWM
z@dUWn(TE1~kI_+!$Xy>nW+?5;n?HO-U^4X98j~>^zJY|VlX4zRHf#~ecadzRYq|SD
zB@1)+pqv0?+X?Z=3q2qnj&(Eu1#!%AnT8sKCE_v7`!6Sj9$aQ@*E~l^A&<>x#7PK8
z=z>0EgpQ(TaIk=8qUW1Q2@hRVEhim4*vy#MJn{x?ru8qR(QohHi=q7RnK`>T>jr#w
zUH@YEdNF>!b<DoJLCW0}qnWa=y`W(<&#E(Dztw}$piiNsnFGq_1{Zo&TX`Q|Ye)O9
zAiF<y>Coo@j@Pi_KK-oOe&|qB_-vv5Y0N_o{Z_*GK_|@(%Ip48{=dL$pU{V9kwpxz
zxzF~I8~l4UN*Z1hXy^CiwKwULvpje$j#|+D4S4Ope8Lg>fp`KC+aT)16K+6k9*X9O
zjnCl*$kv)7;KuP{w%zmx(f?P<0y+lWbI=Ap^l1`U-H;LRko^*7W12~56K}Ws=y$Wo
zBMh?*r1h*<2HMc;6o0A!cdG&Ly8WN1?fY4z(WS1S9s9N3KW+>BChP~S=AKq1UvjCh
zxnG|mdhuy?uasq&*CS=2HsMogh1FWI6*mY3+v0}ucv4SR0{76JqsTTuLBADbSdb$W
z50xQH2u{YCL(J2CICMNhQEud1?}B<Q19_F#GLXCf`cn+59#8r`Px0CZB+_diDE<AO
z0%V9>;Mhcl;$+n9(IMi(9~b(h52pylJAtX6Pln%NwhPAHXQRmT%?DM6I6-Ba?ts1Q
zIb(#dXTboP)dW$&^=NA#n+|K4A&lon1JEmfrq4|xd;Y~%{XawWiU-kuL5Gu}q|Bv`
zpj~`tjhfCc@cG>Y;<nTPUj)EZ@NA?Q>vbrQn+u#$exwsf9cklIc2O5;Py8|W|HNY0
z3s>|6nD-=wEOOC5D!W>*$nQq=npt|7{+VnbdO%kfRn-w#<)Qy6s@DlUeTGi1B}OvG
zrKY%p$;L5M8HZkndC}GX2*u4FLqf<Dm(u8dnyeW^f0i45U@L;^EZUC#k8FpzBLO;k
zy5#8)|EufhJ0xFbtK^%HW~=>&w!=<(`*_laWC6vI>7(cwf#N)Spm{`OVF9xMu$!Sc
zkI9f;D>u00Gh^KQ)IYMdK)ucX2I0>iO>$kB{KiT2O@(DKE%j1{AASSIf-&tyDX{ii
z`Bs=2BIx2}+Ibeqf|aD4Z7!Gp(uYPO1q^yE@$Q&MpK{zSxDWWv+qF+x_yJ<xzX!op
z&w?3N>r%3t-(nB2C{qwTag!%_5FF$0-}VF#hQkv&lin`5GgS3o`nbQ6`^atB%CxvO
zs{79{oW_h#Q1m|nZUIt556Tz%xSu3ll<|HmuVFX|xj6!m2H|&LxB;`s=4&oC=7}7`
zVK1-8a2&$@GKI;rH&FBf(TPqjsT^&gm;|5q@5gY-n$PV!x^f9%);sEz=F#~Ii@4~1
z13mcA&+qcMeMTQyO7@a|E@d$ZX+DSE=@G&--VIOi^SJ%4C%j6}E+zNCB#|eOAKY@D
za@GBX9O-?+TAccNX!>`|!5_mNrx(N%_9_e975PeY^L_=F)qQhl<#~hSP5-N&Hy=2B
zn0_ugR^09yERDyDina04#c#r2OjW;+zBZ^a?)Gd8F}hV=NdYSqSWstTo>+gUo1cY%
zLn%NB=5zaq9$rMolfH1{z2dGdm!BXoHGI8!{WLoG#eNmb`8iZLp>g*8iXK@==8}$p
za_)KM^80{t{@#WE0g`)@KDv-R%IKknY;w=(sr00S<zB6xf-K|)uMhT@(V{;b^{0o&
z>FeSN$K~(b$M67mg2EyaS#1H%iHsgX;EBa~hYSz+^%yRs%oFi_9jZS}-(LV!54Xr2
z?iYF}mCf5#1M3&wm)0mw6{j-48O6P{h&<*}o^an?uJpT`^|;kLQcfE>jPzG%L-EkY
z`*izA=t!K-j-(Ul&Ix3QJkPH;?qx$*1r9a>j1oi{&ZR?CMVy@r<mw>`W+D|81Sc!G
z?x#n}`&=&Ng1cdYeChM6EB(jE&U?9^SI51Nze;a@3dzrQ_?TWCiMZ^c09W*>38Y^5
z1wHfsFKh=N^gi7p7KL;rdGyi*vY4Jz*80za=gn+|>UG>buNglc>qO8SrwJtd($vwu
z56AEom-}9+Ba7W{smoc<H{kl;P7&g)j^lcH8^`rB^9%WKeI`8h%pCPNz2RQ>vq4}i
zc;Gi1X|NaBe?a?^futNKc5WDIp140vBmalUo_EgW#`knA4%TpJmqPPh@=PI<JYzOW
zTK`NY{T|D~FNoz`x|_tqev<E?XI<nLnbivM^bdYMiGwBs*qJcLw6O*;uWCRDR2ECX
z<%`f{@qRp3C^(rss|E7_RJ!P8^%Mx(-|FZ7S>df`3k>hubr{P>4J;Bs!}V~Zk3{?<
z*yYXU9I~YDvdUtcJ-!5=ru&`fP3JuuMfVo6%%u!zehA(FTY3Mv|3&{EV&=n-CDS-|
zL;v)uypm(L|9S?kp3s@}0%nG-fG2zaXDaUXc%wU*j0)62pc>hE)-U+qG>;4Ozi~$|
z&7+gYz{zEHk%d#~0|0NLN1v8PM%@3~K44lJ{dC~Hd@Q`XzSG-8#&<e)bPF0g&W=h|
zZfLY(HxFdHOlPbjM;T<hX2{VEV&f_HVm9rJ(SxWADnB9>y@@mntv#5jK1gzfZdyT(
zFcq}v>b0fWx<T|M0+{OGyLR#}>DbBJ&HMI9`PQeS7wCg4dEatx^6j;k(YgB_E_-e`
z)&FgM`|ISh^xhTZb&UIK#nx=h)%9=wKuKle_QfFh{A?^<pmh|2H(ua6jeLqWEhjIt
z<v<)lJKX>eLThze&ctPa0pZ2o5Cma=X;cLNx#x6r6?vBTr0tmRw1(YD;0TSuGi{@8
ziq77qgH}QYK?6VkZgXe}d|ZJ4H;XR8?g(wkVwXSwTCaY>N;@9+VY7eGNlVCaG6>kL
zIW}J{<Jb&~sL62LkN2S_W^Tf{->PRg*?!f>_8Hy0lspYvK%N6zV0pe;i3qHr7`^Wq
zT6~Y#|6hB8kHY+^;61u`1$mDYxL%a&n_n+do$ggIn(+i*R1){Ei8FHe*YH38a}O~C
zpXBv(<es8WEF)(bB_uar%vWm=pA^Y@#@ID%rbSO_nwTkg&!GqRJNib<=s|ebPAw&8
zVHq{M^3^k2SZ}_FE>02b)SVr<Yk@8P6v1eUd0lT`B!A&jCturDp(|%S+!$%*<x?*S
zTt6O;{kfX`nND9w_LK20rRj>hM-TaBxVuoP#w$IIh!f?paX$3_f6<p87DJKX`NTzr
z1B<yQRmvX-Eap2q`mZVMO?vk<VE?`@l0dTEO?~9g=n>@r#_xFsKlSp&NC2C++WlN4
zQ~Ra87v0K<?vJYE&)n~-OSHBAPxf9Quv7EMQ!dtFrF@BVfyZASApKv`z>CK}p#w*d
z+ewWJM(-Y4Uq>4FZ2Nh67BtCtmhG01)xSssyie}Kxj_33B6l%LpGtG-lxbw0eBU=%
zLr<?9<@@=PLFu?y0acaH5?WqQTcA@;S?=Yv@~19&u6y?w`JCJv{rSi9ig-(}%)%Kg
zlPpM`?CJJ~OEBn{t7aB3^u%~FhfD|1qQ}OOc>;TSM%&6Z7ss54L+1VR@wSSKXvOc(
zkK(HUAo2D%vW}ip|HSqjyQJ;8C!zqic38h`6}V^c7gvF)|5GE#JuZ?#-=By}mwVBl
z4`XIAE1h}85G##i1yu(afU86ytW%zR3ybR`PZ5>QL;(GmZbe||DwlG)xq@Ao@$1za
z@h;+In6|!Yzl`wx1r$TE!lB1Hx3Qy_wC2CM)HeLo&@*O+yG3lX2XFpb|9<wFAMXB?
zZb7E%c`muaecC1eB<pWBdKQBt==V2|o)aBqsJ;N9`XrOS>ms9+y)7;DxO#+C>E6QK
zop&hC%TSr;Q}t~U2M~qeizEETp18L|^zI80a*Fykkh^=oK3N{8zmI=LX7{%785GiU
z?~hauN9vPTuf~nUpVbqxQ}-k)3a6d0jMY7^lXdL=MoLB{YfprRSLzxA_?_=_Sy^+@
z1Ir>@Qot{=l@#dpU(Z=ZrpQBk_n93zHRFVOV&$CB@}89)8*WA4JJffiX}VP`xbrBg
zFCelHnPHI^sU8W1)puAmVVS<Ko+TN&rTC0N3Ot6S^6YcC>x>8ClZp5@F6G`7_uDB4
zQ`EDk@E<ZWm8zdhFX_kQ4r90!bj)gObl`FnyTXJou{uiZqA9W?8oU{>^NU|vTwT3*
z(SU&q$9Blh?$|LqyMylFfSI$Zt7p!v&Mqm*&Mqrsqgjb{Uak8K!UvU=kK-C}0Pfdz
zE{I~|A?!vkDd0cp%D=ouPq^6+^++g*kELIWpV*mW=%XL@%E)>kjkx3M=>d7=aHF>X
zb1FJ_T%G(Uxp}IJ4+n)l@IWZ`wB?Z6DAnMuo+6o>Jom0KCERU}@ZPwVTgvdMm-wfU
z>FYQyLhF5FL^doG5wRBx#pm~E-=W9YooJahtB1%Q-7`0xo05+DE`|dBGw|Q)E9=!C
z_)ql^zwWHvd6wx#wTYzYCxTi+aNpZ%4K}M9bzIDUF+Z18fl4bX@==E!`KRI+-Zn)Z
zR@rSq?9|LdnW!nPHm#ju@7&#4v1$!D!fQ&?3+f4y!l^LmSb)@M(Rufi<={_F<0-vR
zWI1ncBOz1ep}o2-jG2;tT=yg=w=UflZDzM07b~ZvyFhOS=@>o2Za=on!#msgJI84g
z<C~UU%6@4R-m!q%42_68gbs*0hgCNCWm?#jIb5IDkQAJtTlGO=QtiZk!zu<GzIlHm
z=~U_AmPV$oj%qi+(HXxmUd8T<PxagvZ|P6#rTzTAxZfugeog#{-!*ZJu`{ie?rAxW
zc?2E9(M_X)-9_iAw%AQ&+%3Lm)<6C+i`LGYGZ&v8gHJ!FeOiY+5{Rf0pElrLv;()B
z`KSBLoimTgja$?|k|lZ<#%pO(bmGH|xcOyIvSf>UulyrEQg$nD`q=>0^Fe6_>3B=E
z)CbSHmkyKGw7iL%<Uz**rAAzo_wb#64v6sf-3Bk8V9T$_OvXLLn(mVp4(VB(mIX#2
ztZJ3i)N&Yo+K%ITBWc7|vlJEV_HClL%iYAUa?@erE_X{meB+q*4P1Uw_;Q@X!FXP~
zaP98)F@AOX1%7k8r4K%TwB<CD4o)M!fF$Y48MuJ4D9F{vA0)oUFKHhYceLr-o;%v~
zG(s$Uv`heHV4oD7WP6pZ5AH*fEce!Ec@}*a{tJpah|)!AH>V?`)Tkn{dDJ-!sRS2>
zl0{0%68puHxV^Xa?iOFzX-RD1Zu;4-E#dcsZ)50`SJK{y@7q9!I;qj*_kEtZ)S$^R
z``3l~$(@T5$~!MwrZ3)2{~Z%MHsqjf$rO7BWH^`UofyX#Ey$XO6%9IOko2-qvVEBE
zFF+H70KG4T4&wrpNl<+2rIxof3F=U+#z^)pCPBl0vjqM6IspoP>q^U{>Xv<yLEc2a
zW*kWWfhTPS=NY6A=p&pb<LD4+Hh<?LeUJ0xG<>EI6pXSVCubo76;#2m*N=ugfiSbK
zuULnAYhxJoqFvH*2)%`zR97NPe4_&9fP5a!X}BoS!LCg$*+Ao6@{e@bpZ`p%@vXh|
zb~2%5IWm7lBIgT$UvNZYXb}4%QyTDWW8Z?=wxtynu&f@%z6Nhb^s5*%YFtiENtaPw
zN^)|>jT$qTUQR1oHN9`Q-rc+RuIMv;73R4GK>}@B8ZfdCso}~YJhhGv#{x7!57>?)
zdw~*QW=qUf34~30vJUlT3R=`rPs;S)^Hmaej!tKafKdnCN2ih!tfK|rMPdn~8pOZL
z_6HI+oeNl|ecP`)AkSAO4{CBQD0r4medyL9RrhW?!1(+bI*;gE7C}<mj+>bZw|RRA
zZ!J^pt!3&4pGYNiHD<N4Wg=43hMu%xAR#()1nY-Q17oo#<;bW)0>NC6A15OnN<omk
zHnVScr&jmAZQt&l;zZSZIy^Ny6(#T4&l!{2V}zg3(<H8?!%g^1=e`grr_j?3!`w}$
z%46wed<r;+-Bi{v%-syb(5b*MGJOzKF}!6DJ_D(8Qg=pinr)S!pe!cXb=qxa(#5?s
zT%OgL|NJYv%#2-IBmGDkdA5mnX;pI<jA|RA1E!M$;&~9I?0Jm$2e`XM%TJS#Ef~`Q
z5+jc%EMI#o>?QZQHXNfOG0V}9)bbgW%O&q;pc@%dm!;+j6O_Hm>gMs|lzsTzfR>Bo
zG2IvbpM&2N@5^WQxw|FnO;`Q}X|aV?NwZu2%;m0MiVbjUA<rtnik%^!Pgqv6t?ST+
z$+rCNpQL5WL*x;a<L1jl5EJCbIYGyuQh*s4+c2(yN#cOyMcjXoi+r*HYgzs0KSM@T
zfGbb8yoQl+$>RAAM_Gx%iAqtj<1|867S}$BuPmltJozM}yL;$%GNxrUkXfwLA{&iX
zWcdl!H-=i-^T2GdU4#ryV~J*y8AKEGBkG)oHwX7F={TxmN$=qCfg`GBmnBpcSJej6
zzxHOl*1KxN$byU!RalW!b*}VReJUhan9~$s*0IbLjT{JLR=hZpU%raJ4qLls=$f^|
z)~+48R{hhE_3H+$TQ_9g+Cl8Zqh*3RUD~VPfDzk{TNR5LPOV%>LZ)w(5|(#@!AYLD
z1eut^91g^3?X}K|j>#K0&YIULI$92#u1@b4G%U8PG%b5TUO?Y~wuLbrIwV^HD`3#c
zbfMm&3^TOj>lkuU9{{I3)Go`SbdF0cAo5iFqYFdT!=cxfv!8lPUEMQvb!<I%st>k&
zt9zc~3#AcXi((*}1GPB<qCI#ujy7}rcvXFnth(W|NHdB1hU)QGb@UVU!BC>cUSpIG
z;Mu5q8hZ=M=W=;APQCshv^{+s+Fohdt-gjFP?zv*mZS>W)C}J#bQLEaP){y)69j~O
zmL+ypL4=`o@{auX1@Z~HAaQ#lS(dmXQFqBouc1;3{pMl(hxI-My1D~6$O_FD)F`uZ
z>!1t>lUC_N3k;o8tcj61=|!c+@HGzlRjhutxkEu>_RMLFn$<UfVv;yzDuza$-$+n1
zGP(Hc0QF6-17!D8AkueRR`6X2Z?dY0VQo2cJTSOY1qcKJ$(jREfo)*_+#iQ3pN3w$
z!hU{JU;lJ{J@&B$SVp?YwG`tAfx9&x^1$w4>nqkjysq1NJZlWShiR;qB7Ex=Xe@@e
zfL%B^!=f3GyP+uY6|!SB{icRK{to7}OI<+fbXTM(37NsnK}MS`LJE`R5Mv|i<K(^&
zb@2sQyk+bhmXjuD9F~xZC1iopV(I|E!;n58BX)v)q`BRI&Yk*~k1NlNoESVRc;b)_
z1IowgBJ2%yQ_I^;FP<LSux)YPj1ozqE_FOvXOL0LD@IC?+Bi{JLKhey#l{6jVb=qt
z$hb%;mn9&Fs}$Beyd`WD9^tR|N&jLd{&k=MX5($n>eH=rd`U<9l(c2T+V<^M9#>o*
zT%XXnhVD#iN*aiNx{`!+$em@g6Vnq*@@s1fVG)vl2&-_G`W)G>KMtO3$1)|giOo()
zh=|Yyhg!HTdOjZ`U>UJEDCSDYZyanG%JpyZ!Oiy#YQ@mDeK4qTDfMw(Mp|0GUm*sI
zKd8_7#yEB4s3H>JdtH)`H?VKtW4D7_o&b-8oPZ0&h?~ujb-8SnKvD*X$@CIOK@kbw
z@vj{_{`D^;Xl#0H;X)>P`hzx(0EOv6PXMZ*O{Dl>U<9(Y1lYF2!XrnP(P7_h+47wf
z;SK{4ehvN<+~~k5K`K0_MN&E9Qu;^(5WzN1nkvnamLQ5^15V3#NqeOO(jn=}vHex|
z-+TWl;y7AU*bdFHnuyYlrT7Jhf-xOQFWcbZgYoJ_P3Z81>9ePcKcvjI?8%tFcs~C_
z+r`ecuC?M16)yAcQQLNI<9`^tbK<7kH}PMm++KaKaT)teT1{ccUc+baS?t=q^Y(*{
zjR$Yvx!bjP&+Os7Iu-`@zPsPOAqJ&q@1FSRv6=w2H#3iUnsQ|N#z_x9Sw`rq_8-3u
zC9;@nKehTSzw(L~oM4iPCw9^?#}E>wq=qJ=2ya1ty4KpYHe73o)*7yR%@RZbRC43Q
z^BGTj{b#R#?Rlo>S)OO7Vm!>Dq+`mrK>m8h$E2V8X?m1Y$=znmpj!(|OAEIbmX#G=
zDJd>3N?|W4l4q3^KU!K;R4NZeZmyE%wI9zQ{nT4%)5kNKjm7v+zLovlQB+!5<bI&2
z6vds`Yw|MtBCTQHxx&7_gS|^{pD_am(|Dr$G;NykvAX8Mj2SbU=aH&A@VU15N8dm{
zpW_#@1HX*GFYdYQ;nyyZURMieT#(-@E@<!WR8&-QS7Bk9oS=Q$-BMCg^f!EvzFAsW
zmWe;3&*phEW{_SNK=Xstv$}Q2s_g)`I1E9Jb|lwfIGp22+__9nN=;$;yE&!|3s)i7
zbnCK@t=~nzqF>%NW`5kd?B|!(oZm{U58hR#YuSJ2&>@3IZM!!kd+6g@@9Xu&Km|ZK
zrbZ+P<fwy@LK?bN4ap&i3A**`#?a&6d_zx+S@*TvPR>=&u3orsHDUH~%OKRUdJWvn
zcoMd^9z8JG$2l1rR;0YPqd7|X8`yX{%ZAfZOfJfj`VSm>bfRvqN2`!CN>zWtI~DW-
z>>F8%C0~(|dN{bDucDkb-DUO58`6h&hCpTN6B(#p4sQsjf7#NoMR&`RCC%gIYi=ET
zQg_}j@`4BSqwn%3jmER%;R`ba3~GUY52GJJE|7OInh01rX1m2^vwS1Vl8z;(D#&Gd
z7QhwueAMb=whmB@uZ9S6Yfax+RzL8gHJe7<w|w?3#wEIL-G)x>Aa}VZ`LjJ6R{eAN
z!fC;s`;U2f+G&hs82Lb+f*BbCy3sfIlRF{p;<tDQI?HJa`&v>$O<!7B5_g{Di_MNd
zjg_YN&)AL(<yqI~X@8-iAmJw2+0`)m_uGJ6SZ3_URkjX&;Co@Sz7Nmdgm;43v(1KJ
z+4_y~vVkR&WCDdH{DZR8vj<~^3)ncq$-<P#Uh_k=eCRoYJ0!)aD~<c-(0OvNBfH1+
zF=EA~G_2-9-4;n7Fz|l11H16#5q!Oew&1~dvK{YaA>Wo6_9!s~=r1cQqZsmTGm1fJ
zf@FeRX2?NqCz-cVdJCy)YFzW(Ci?ud7;zc>6AqT<vJ@1s9v4YOx}rWL7jp@3KLJ|N
zYj}_Qxv_xERis>*`PxV7L!l%vmNsJq(gJ9oqb-Y}71(z$$wrP5weRR0N^+5%9L1Mh
zq4cL%s3v@8IKETB5m=nlf~=1wlWGfw=O~B)A<rEgPAb<yvX6cdl7Y6nqdMb<7=4tK
zAr(lIoFz#C0d2$bWt8~~3o0tqq4ud1*(S2OCcllGpd;2c@oi+IqHCjTgOWM9sF^ES
zP~hF-U)oTs$~78Fk?8?XQ~}SW&aDWdH)v!9$&nCT7!txrnw6wYQn)1#{Lc1XPelDj
zP(c`(UX@sOY}`XnFTA*muBg5D(w1BHJ#ygim$S##+}gWt+^9`eWJ~qX?p=GV&l{m;
z?)|=h&8hpg{;-t1bQpmEZFV$FTeH>OP`_Zz!!xGM8S{wzaJTZT!akLK!RN`S*1>XN
z<{+wWhO;a?FE1y|Qj$uNa+6XmYF4z(kY(uDA=qvYLb*@8SzVKzYlybz+H=*6jKTpm
z8Ip>!-JWWQn60S)$__ci^t~5@Jyo2M?q4e_fu}Q;W;K#vQI&{g2ol8*i$h9MQiM+&
z{8wPm76n=7!qk=Hy3@m#*WI4fCaGP)6t%vldPs6sa<}rjr}re&f6^ace(2%T=5aJ|
z?%3K{L-xs6=m9!#ab3~a!Ig1s@-`O_>YhJ(*x-zUl0Bq-lkWJ#2mgHOe8pf=S-JVa
zg|qvO&I7f*gA2Y5y3Ozy=Q|^VPypLv4pdMXIutdc0~K?Kq^tFobZ6D&cs4}O!3*)!
zb0FYe*u^LZt=qYJ?D&c<xuvmGp7YE+l*cCd<Yf0o-RAM@DzcK?54lgtl_=CSMh+R$
z6I=|2FubZeFQw~lA?&)eo_u@fi<03e34`yqi19feq5i0xrn?1yH^@7Q6WkqnLMBnV
zG=xvJoH`cn2$WMvR#B0}{^2`aQS}JbW|5l}5fRw?@|JJ(!;sq(xouHLFf#_%+S;^j
zYY7iaN<xuRozgBhBE^PUmw}Se7M76_j|_qmYUQ%ToosJG&B);dVa4%|I5Oj8&a7pY
zLKC%qlX<;PY;$@t)05ckkdkB&HcG*!C$hSiTFnQRCh<w#-spLm>ptANY@<;ve{9*F
z2WO9;t&AD9WmsnOiHVCIo3tyg`+eO4G2)GjcbugsAK0*ZW8*VN|3E61H@|c%3E#7K
z%yN42&JP~mN5<0qJ=;y132Apf=KQwWNy?K(JM&X*HoHDAIyxu5ZQC5ZS(R}lB<Ht{
z9az&gEIDIfO=@y<s3beE$AJL@YXYq@YF%kn*RaVbOv9^$vD^-#YzmtwpD_d{Nh}T#
z1#Z&?A<Kqvk{G0L&#2GA3S7e%L7C<5LjToxc*M}y4r;fG2~(!@SLLH5aNuoIONO;6
zE{VH+Y1huN+4*G^Hv1imdMi=Qf7?u=NzC|$pk4O)^Ow@|^AQ(6?7hn$b!rHtU+&%<
zyf>&~z{JS23&@mN*xOljm|oKDfPP7k%AB#`YOo~Ph)NRUES4l&RBa8h*#kmq0cKG`
zL!5hpVMX>#@GhSiW@S$UbB3f8<f|c$P<C933T9fl(iF@#jkFB-y!kEC@ZCvbz5Qu=
z|AqdSwtv3A=ABpmNF2NV0-3!RC69mpo^1Wg7W(tUU(zLiv(hR0`^KN4AK&uE2al4G
z&%X8{M$0Kv?FWZnoP?UgHc1K(S5Xp^#G|%Sf;DOYN)3kv*sE&-P$}>x!xbCB$IDh%
z+W=@5VuK_V5(R~1GY8ypzsvpPn;$k@I#fk={(Q^5BN`i~tQ^|`1Kl70@gq-?o)3KR
zrw8b<Qy8T>n8a<Qe_Ok4cjfM%AroFi;Lw{`(Fj%p$gYN?JP(O9o1?-=ZB1C16cAvo
zt+80Jp6ndiR~43v1||-%q=<U*EvQzEktby?QRML@?_Yb0^m_XO$!K>h^|kHWFK_<r
zeEAR(3-8Cvr%36c6Ze+PUA^@C^#_kCl*L)wfcm~d9o|f-vok(D%7juhN|rq&q^%NV
zO;1ggs%uiCSv_}F!VQpyC;DWZs);M!GU~;uaYd7s&dx)wFBFNYN~~ZYc$Z}YC8O54
zl6#Igb5Fl5=e8bv!uFVb+^~83M`!k_cW!L>;qz1L5+|*tmq!jt!9+8jy=yKBdtvO|
zcSTIA*+Bm`uVPR^ye(<@gu_S5?#+tD3~=LG*A3@dX54m<!P!2ppIJ<%K%%d$QJsXK
zf~-_qV^jk8!MrFN45x=z)?(la%KRYdV=_Tqr5}dMPgfpq<NkTYvm{vgDNg;IcBfn4
zaL?DR+5-{U@){kkFllFI^}i8CU^JTpjTYH35R#l271b%rMw1D3w@p?fr!mhHd5ulM
z^w>r`6`3aSSQOmCZyjmhQnI?szLd|7KSolK`t~vU5k2}ubFJ=E%y44Mx9Yo)<H=Hm
zGtq!h?ZEiR5J#XRHN}<`Y)Vd!F~x+}qRyNN`ov@x89KQR<<-+X(E@@S*^`CD^kU%>
zlFlS4l&4qb5cS=mhezgTsoi={pVO(f`Be0<BUS0ey6(Lu)K4r|x~o-Z++R#yX5AmU
zW^wgT&D7vHD-WMK4zK6W8%MX?O@3l%3%W!t!Oj>_9XHOPKmlQQ6vZS51elGG0tQrK
z5*gN*gcQMUtk4^mA3_guYR3xUzyP}=uX~Y9cRP$^-wX79`EN#fQ=a^S`(dVQSJN8Z
zV?ZFW(nM!Lpe`T)f#}gBG&(dsPKU_1u{8k(rhmuQ1R|TT!6Jq8vfpEC5X}hAW8y%F
zWmf5x`I%UB9M?$VrxtL5KWN0Bo{|!Rg(HRO_`yzTRji(na5jlN6iw2|kmnNIE8ECV
zCb)ZN$PYU&Y}-UXojLX(>H6&RB;_9WPqb#&fDcIVoAlCJQo3sbJ-3$REn4MTIRCEI
zPttoY(su49wu)cTp{hamHtfc}&J2qIDPuxHRJ}P!7Z$EVMj8~eGMG>=ySm2AXBK3|
zCovrk#c!B}SXIuhA;E>|y7bgE_CroBQKjHe*&uI!Ql*PC$-QB@baWQkwwM0-BuOP*
zNA#sb$s43|+l+^|Jhi&+iQA78^Wh=;-Otb+kI+fS7-zgnhwHz?ZnpypXlpT>)2#vF
zQBiWX9H8VSBqrvkXN;{$kIs>G31MbM2c@C2OR-pb55cmUZA_d%Rkk7kA@X!d$b!sO
zKd&hTMenEc3-Xz%5hN$$yaEM&SOq3E_<XNX`^Vh>sH5q0Q^>G!OE$)xe)<X9pqhVo
ze&XpCDgD;JJ>HxitGs#N$>cz_!~W32V|pJx&~v78XY=II&dH<ix>NacbI+>M+EJvN
za`Ng2FaBlH9rqmX(hCk_(((>wx)L&=knM;qG&IK&laQcK2a?rW)S}`XK>D0$NpDP#
zwpx?JjQ~4}(N}}rGf5BB@hbmRK0*I!8n{^3>RI{y?whGDtIytvOKuAqbYRLYTOBKp
zE(;FmJ9O@Y2@Az<a~@1w*z|P9`il=W_li~?-g_i1{)w4m7R^~*_lH}Z6XnhB^|d*P
zefmFpP_Fg-dPpACod4#<NgH=Iu^WtsAYCUxU&TT8Bpbp}Vi<X>;{$_&65?WF6i6L4
zIMfshoduC=3qfXgk$RD_4y%O<-0ruTkUc!0K}-c3iKP14u5y2_;%w8W-S}I3-Er%y
zFK>K?e)r6jS<ept;Gf;rKC@_Dz4}~C{EV0DmaiWnpS!w3c4Vi$_k8^)2l}%dAqOF8
zcIe&*O6lN?N6JAf63i#Y$0rdrO07n+Y79Rx1f{G4377+VmGL^4H)4FeS`|~PUJ~P`
zvH@(3$XPF~5&5}k-S3-m=UstSvG;80)H}XI>4MlkfdeP5JRP&_82wmoGqU=w%{hI@
zAGY7&I2gW-F6*8>VBq81<rP;88QpwChpS)eR%4W%oQYOjKxAZy-KHiaB_t+5MI}TB
znZwMrHTJMDTd-nd>Iy^T;)ksymQgFJ#UOEhCso*Yu<a3As#!fU=sr2oNODd*zGe2%
z(yiNT&W&F83<-H=W}ltAKK!=Q^#c9uCwho}o7ijl$$t;qy1!kfyIQx}{Yq^6%bzZy
zuYZ46f9CJs3u~@e-2oqKnY75+B`?#MVopj*DalmB0YN*2w@)#q>kCo-wnWht7KTev
zC@XD^ijT^TLaO*EXSl-(W6m0;*GW<ifIe^o*4y@CJ{Pf3=eZ{2)rZ0D!q($N!qcsL
zF&K_&i{amg*$T)A&i9?ShBMY@&|llF;^J^ofCG$@mL|9FxwN`ld3|i}+^qFK-c?cC
zqd2-e=+2NiL#hT1teSY&Xx-rRbLOv_^IXI7JB#xt9;}M5QL8da`;8oxHmRWRw%6&O
z4#g$M^{HQwpTCxvcV@>79KE=1<krgdqbjosYOB+-nM`JNPz%5n`BEk0itsk5!z~52
z2`s>Bq?!^EQd5DAQ$bERbRSz|QiZ7lJBRZHS1?)(ABV^s4{&o`C=pCKNYQz0Sj@Bp
z??|YE3upyzWJ)JRU9@l0{ufIg??K|OeE4(z@TL3c#dX^&pE~&QPhlsc=^pyhecvye
z_EHlGY#8ZGQo9eUpS&Rd;EqS`9=c+rGp}Q`b84Tu#g7~;?~&B6_qX)Qh(ojH9GRM4
zmXcWlue5J|Z5iUo3<`>Nq^7FTYEE`gYJ?OT8W9m(T@#_A94E{j9FdD@-8ebVW}<$y
zcjOw`a%Jg1&jb`mkVpHE`WI$MGCv9VCe(k#xi_6%p97s?6HJ8s8i1WjL{#}uXLeF}
zklAKQPPPRpsfv<j2#td5inEzh)S#%auqec^MyXayQczNDO%OPcZ5MaW0}Wu;!iACQ
zV?_=4B2r5PYAJRc1rmk5z)ms)B0QW`lSow5z9Uv-FHUu)C3lQFel(`}XbgF_i#ap7
ze?#rCgTseU2v3^WdA)l$d2h9D$Naj%)uqY#^euPt)~)g-lGrY5Yu&WEiSr&gF?ZB8
zvs{UJ^?}6um)eETYnU@98S_fAq@*O-f>bfF$k2f`u{Lv(8Wb587Kw>PTCJAkAk>fz
zVzrn5lZn|q6T`g1P{j`uL%qU)s)n@r@f}l=J0!g{BHI1$=)YG6CZ+ePo4EPT0i#P(
z3cGb$P4C?ESGCK;;lrGuUwW2q*|?FcAz8(Rt0tUwZa+VD&eU4>Am&7trTO5jJwOpr
zQX5!EanYtQTT+q|retN><Hpw5>^7r?p?N8FY-{A;^N{g9(IrUS3P~wQG$g{<WX`e#
z6+R$YvJ1Z$m+GBl`EmLkeRs&_7l`3?vN4vfc>IlR*%LonPr^u&C6})K`K3QT`}c--
zp1k$t4ZTs#<lFgVVDqlt+dHhPuXKL;ZpW@T1p8dRXXo7w?pyCZ+H31Y#ywpjKl{O^
zN@3c_VN9|rN=%ZHmKqNiV0^q}G@1t17;O^D*mK_D?f@<i*(5ZC2DiKLYNaF^5>(Cj
zWbP|QS{^T#O8)W2Cj&OVMgqy8So#G0dFP<Ds~&o`WJ+D{4(*~APkicWdNK6k%PZZ7
zr{?S^+(`d9Yu&An?&#Dv*&MJweAm{G{>4Tc1^4_ZXr&m)vXnrJ&0q`<K<QyvPBtZ0
ziH?rbo9w1q0OcUNJ-{LCC@3Z%;p^2q#5sI&%)&^=NRwgO*prhS;0@-1W5J)?L#eE}
zHDPV>*=NsYpOJSeryp&f_iSF;W|#bVe%HKl%?{=A$pm{y^x>mduP&TC1>=ir`9bLi
z-5xACoyo);hziqsr0)+24z^pYaGMf>s!!E5Hj`CW2h_-#7xkuk6MUG8aL;4|s=C^B
zhGbY^`ShbFTO|FY120aFC?y%y2*00HiqAdT+-+ivQofBOkbM)Q=_gpJmiw`<%nOt%
z^>C(IP5Q{B*d(N04s|#X-Xf<ZL=UV<2(wFasMX)`!=Z);)iQ~wsd2VWt=&CPbj;g>
z;6U!~VP_Q};u7KHX?S=PbMjPlJvX;I_wmd)I<6)yPuHW*iw!-QV`n`gvlAySfn(?L
z3i{l5_;u#fH|Q(1>>XT*pD_j86$L-mSWspHe04pXDH$Olw*QZ`_W+El*y6_T+_JmL
zW=pnad+Mflk`U?&Ql*4W=pZ5>N)ro$1eGeFf+&cJ1rV_!3!<nXB7%Zl5xYL@`s}{<
zl-&G(Gxy%j?k4E>eSaaz8qTycGiT2Eoik@RPgWLQ9WJj3x`s9egI=H2tTz`^DWL~w
zr&kVd$P2naySHARjA^ZP9qMWobDu&xFz~6qgcI83MDS`p&;a`ImWH0x+Pozt7v1#A
zs@LCLEB|%um1)Ml8*Y8>#s`GXeXjZZ6Jgc-Yj1pT!lKzLcTdc``or&uxMk3>qkH80
z9=o?&{lqzyjSKw_+}nCyxU#9~X8G-9i&m^Bc|at40)GdFfoSyJ%sb=*5c3B`DCsQ-
z{QGPmlt8g~op31-OYBdq_-zca>=OxF91fd^M{$LW)Kt8v4aLPmi~_!;q@>}cb_)Uc
zfp|mJJY?HcGv(PtVnU%g;%rt>4}g_`+97nnhUzT-P5IYnUK)Par#BLv@25>K2g#LQ
zc~#mE#PrhPl_d4R)HM&^bwj7RGjw(R3%%;adUbvz&t|c@#Z-qVdQvmet>{!bI+dP|
zi82COaK-@CR@tF-N?Bk`N5t_8jSxl=HI-l*(M_4PmzbVCI(+j->*YUvKizdWS6<~M
zSEl?R|0;GmerTEe?fwaC9(~}3lKL~0a}-;dq5Fvs!?Qv0;af=wIB3T^GU-y7%rRLx
zh7AK6rm~w-AJF}T*gYGS-6;kGPY516GpFk$yWWvzGfH{`T;SFw6ODEM*n5(yxb^J$
zU`6aPNT0rNt<%Hchu4Y_Y*@FxJ4t_dk1tzz<74^9U3)v8?TE|JA4sn~B1lWmPQ7u3
z_~@TYgq`wVW28S%2R?Vup2H_2=1XVL^S-p_Tu)^GXFcb`>0!PiJI~^xs5b36s7C@}
z>CdP~tJGK{Y@Au?VNw>z%t+O!v3{_gQY)cTbmGQEDmvtrq|>)bjBYoVD|GG>BqX!2
zuzX@;X`z@|2esbr2NLDC!%j3$Y{Ub;ikhUXCrlp%6<bu=brH6)*rK8yQM!|Asj{nS
z6q(dahnAn2ugl8LrLZbR9jF3=b*CK@b>ag94-V>bV#(^C9v%DgQ%~G7Zrst;xGG$7
z)d%v4r{&$dzn2f}lYd)x`CBCa$))=S&7B@y_TfDvKYr=@ZzsT|uu7ggX!!isiEH_x
zH)h;;UcLN|eD+~^$8Ssb>{&+)kK9eh{=B$jpJmf$yd?j;<k+{PhADeWd=snJ!JQY$
zOt;w_c4RU$TT(2%U3BWx(p*+zOX2Mn3y@9hCiYZtD~PBbdN@4jZpyR6cgQsSYM0YW
zas>KpFlqQAe^;0L)|+;u%N@7od~)ydM_(onlOt!>eoSWV?r?r(Z~4OJ_sJIdBJ_gi
zF2-8C9eRWf=iBf|G2T=%zywUAr-m7?2K#*?G<3miF+-2Ai1?G1E~MFE$5O3N5!o7e
zqNx@PK*M^aGX&X<J+9B9E;lhN%Z}Yuhj-cGhzsXr@khu;zkEq4sXx;qpO%}OAAdz&
z;wRS?9sHeKLgwDSL4HEqwc*<%(bv8d-5XB*<sy!`SEJ9_(0%?3>72ra(dSYJ7xt%0
zkj`PJRmv~m_*}lBF`Vo2dpuAeJk~(UkVdCH5U>K8rB*EtWq47TM4-mEay)Aa1v{7X
z=xU;CDMz3>5p@e|eqoneV5c+AoP43^s>@g0x%h^c#?5|qmH)EneIDDc9Ni^vtnkjt
z9>4$eM}PeC`N?IDsk26pBri|jJH7dY&~5d+kCx3!k>rZ?H$AeC=J)B|^1Z$X_DCN5
zp|zesK=h}j8B@g^uV@g%He0^M1xwd%5k3BijUE8t*ds<GGV~a1u%x(56&He*3ZqFg
z)iYwxOlcapf@#v}fVRZfFf_GVsJ3xgRidJkb99#UK#MZ%Zanuj<$>Ru_*WMlB({TB
zz1SIV!#R!<XGt{YspZGzZz}lFzUGJd!w(btLpNP6pLVP#rbl}<UnebXzKvv)@xadK
zFO^$9yQA;1uSibgGY?{%bk458oaJ#-A~nIBoOG)tMGU2w#Bhe&o$v6$PRejtvy4{b
zkj9|J3Mp>2n#>lHlfJJ3bX})ePs%VM#Z}FPV*fGd1lxse49IaePtO`UQiuoU(vMjm
z%BkZL=8a!ocE^1A@RKhKPfv)x86CT?Mt<x5L#dCYTs&g=mOOHuSH3}a;lg>B*T~Pm
z_tGdiD0Y&IfBN6f+dLOuyz7bUJCrvqqbL9@jBl}njM&q?BiX4&BbS~6wG~$%bo4QD
zz_3<8r&g<wCJIJ9yY<RK9+W)JtnbQZLEqIqlY_Vb$aU=J9Kdx@zry+a*r()UCxwR7
zB=^9KXD)t>3>Lc7yi0cXFdKPC^Y_xyKbO#-;?MedljZfKvG+)&Z^C-)b40rUO9`e4
zf>}bqiViNu6pNrYLmxDoQ%tEAiKH-Tqb7b(;U2YHjHg+wH@KjLo*8*z{e8VI@3XDX
zoY(j9SMLn>|D4Q02tB^UPR-Ae_3~xvIj7qO&e)+dLxb?7re>s>40^o@2LbpK2%1xE
zf^AY`h9EfTePAnM_aIiP@GLpvBNRx7qVgITOQ)6|dPt+K@WxL0lqF~^>W<aAj$B5b
z)Od6;SoSJ8PkwE>&=TVoR%rqMp2984G2YqyT>{rQY%Hk&T(iUMxFAws=Nzf2F4l9W
z(shG7gLS>35igTE5vf3X4*t=eSGV7D)_1H#^qumMs{HH=IDht=(K#fG4BPqk{Tff-
z`@XL*s{iMdnS77Gj%v&$b8)Zmzl^;+RvV{V4DR{>+6|2q2Q40`8UBFJhx-eDtH<lq
zg)&W6k986}9v+X=>kUq9^a>We6D-C9^y+b{1lFlcRu`aRn@~rTo<><g5ay$=5QMm^
zW#jVDS3J<!`~B0-%xH1SGcPQBZsAYO<vG!U8oX~~kzWwco|VbH%~uJM=k)%8Gq!&;
zAbaB)UGqAAp8l2ZqbG@l*xdZ0=EdYI$Z`{SZ3VAASR=q4d<MHN#pU-B@Wq*t;ZLzU
z%(_5OmtqHS?{^_E!a-$)!(t%RJpZS0u#sftXhVR;i6M03>o5(#V}&fcxPE77(Z=Bq
z4uAadBJ(bD?t(+Ny(zpWPbFR7l?Si6sqdVrqCA8=w)K@>y?4Jj)6DCd|ICx$87O4P
z*QzVrP>DInhFrTaQe(-?%gVwm<m6^&V-|9(nVz6CWbo(v!&Vc3ze$ZbTqxwv%F3JA
zm<6NJY0>-HY*bUnH&buaK*t!2sZNO|7}}o{U|rNLM^_h}8|lxsbK}2qntanjD$f`3
zAOGVVtv}hPc`Y`|4Y7I3!D?HJc?w~y<0C)|G9-g9I}?tJKp@+Y;YoLy+>X?oT!UnD
z!#K$Hx!n$rC##{+V{uwSCcT5rR@-qZyE}g2QT3ZGI5u0DEDViq9A(b*m^A6)xH-$J
z>{%thKOEwFD&Iq$yU>$KlecZf#5{Qjw$q>54Bigc;kB?Pet@NSRQDaCV;_h#)^&u9
znpwd0>(q5{*V4{n$DWk~25=pPp~HYx4(;8!r{z5OF3;;48C+UYS~97zv@`(Hy1K4i
zJ4|fsDmpVF8SvL|86-`}2n0+M8v{NmmpO1WHP(8B+8>-Z!}_YC-vTg$dPgsUbM^Qw
z1$`k!6r5MFn>6c*-9o1dmBY;IX`};`6zUC7u1LVuK}{>H1RCH2&4n5>^aHq<Z_9(C
z2p9@sZB+l&>zR`o-^H2dFZ<}^`PWYB)W2(|X_KeaK5<(p7#uo%aleHdCq47RJG)0d
zaOZ{oKJPrgX8!ua-FB=Zy%%hnvaE1ehhgDC4yPw@{px$3+J41)vTNp@GkZDo=3s4E
zX|XTM|7CHuKihxp%*l)U*d388r_R3m)}^Z_%)YXzE6FP)gXIJ7_3SvXTd?G0)*}lx
zJeT3Zt6eR3!o&WmbT6_pJP;X;&i1Nz*zE)Ai^RV92mmhY+cz|%x<dzpArxxp(Y<SZ
zWI%CIaZy8Kak0NwU45js9)h>NvZ1lw>TpNgR^Y8}tD83pZoeO<AoN%uda=MM!0hcz
zgx7j9VJ@_JpsSN|pJ`Ds6`allWTJ{b)0u!NPZ^#(6}Wc8CIU!jU3>GO(*s5l>MlC`
z^6H^QooYHx8Z)YV+?cyE3Ie@HUv~cNl>;_By7q={Yw!0T*g19RlO@}`oVp@m5|+-q
zV$kXlv#ufyv(}Bt$;hfHC@K%-hUP5DD+uHSnx>7O*C*(%8-D)KA<L&s>ec&Z$B7~`
zBsK-dJxj+7x}txIn06IRI_@Xz^TUv6L9S~gq>}<cUz#~BD2XALE7J!(Vp1bs;+6t%
ztJ6GDkiVMmB_^>{6$VgtK1LhltE;I32J4JDBt@!6*!dHyA0O|mc&5VIX-1>t{-^FA
z+_d9D|CobQD&)6idB(7(hLMNHzy3aXO)lTQs+Vy7*(dvM-bmh(rQg4lN05imPed9?
z_p);X5iE8ap51kO+$Njol_Xz=XtQu`6a0y(CRZAbF3@yE<sn^V3Yns)^a>jaohsvL
zhk@AQ0qd`y*^zVYzQx&Ve%?QL*Wfuf^)nSj3sOgoeR|iG{HiDT<;{y8K0KDlmynIR
z@duCbQ=8Z9zeOj!KqGin6a{fxS%`xg6)EwSmy3ChG%>BZ%IhzI9$!|1*VC-|R=7U$
z^HaDK1SO={IY8-1t{0D=uwFwboTy?5qT*ZEP68!Hh+4QDq8f7r>}n<wa_eB4(C88Z
zS37pR%MCeESJxpd?4nUa^FNkf*(;xsk0Oj{>W16MJFk34O1dnW+Wm@=wKIt6NBNCT
zx2}s^wS3CJg|mdy(rq-5=n46mpPTT`g^NZOHRlcS``-BA*RQLx3%z0fyt98?klC%Q
zW(XpS1cvBVBC^QL#@+}&g3rL^0}tg4)m6Sgd7z=Ovb->oZYi`hH0Bo;N@-~T&(f?C
zz#~aTB(;N(jyZYoY$GxmNC6uKOTrLIw(0@KX@Os3@Od;6NgX~NzgXF@@x9eY&ail-
z<_Ud}vtZ%qd80e04emO6LS7GY_`f$lP|~+sS?}`jfTBUY_=m2Ozj|Tvw<lSQlDwy|
zsOr`&RhQh-tEk@PUrvHs?+d%V&fGBFF}O#r`xF+OgT9x{0q4~5Ca1||Oowa4jHoxH
zK%-~85~V~9GR-p1!ijCC{sDq%QminYp5Jy<e(TVS9%I2c^2+>^t1cU#->0C{plkp*
znKxcG=pmu_<w+~^GP`v_%eW&eoe!JJ##)x}tRHW*8xb`*6roWmRvubCJ$2h_84KN=
z&@MUq&XfBu^jtyg)1SZb!b$$_6=gjOabQM%_>NCKG5)%Y{0;*s0>nm(0P3)Ggd#vv
z6~B!PW08=VN+e`K)D_}Q36YSjpVD(E^P*CQJP*`}Mo$KTF(G=gI_e1U#?~@)7s;bi
zdV#BM*!VSwlqfC9Hm0WfeASMW6uvrJthL+gLO_o~_Kf_A@UdA^95!33g_9;V@+_=_
z8u&1?py)D7U$ca%bkZag+=Y-!byO&0*TYLgV<SivMUDW_^4M0)WvZb?6kQVk-M34q
zG;`D~gM6o-oMZ8l)J(GXrRH_BS8Qm0<`cs0lwUu1=C296e_L_c&IOTsZ@T4`*>}sM
z%*ze)R+fup&AS@*`dkqq^RJ`NZyBiXE+3Kq_dog45AZsKb0_Kb!;(9u9+5w3I`z(D
zWX!>npHgXpSUvqA>?rt4;YA%BDJ}`6W@LmZ7s4SCq2nEL3K|-7tbPPj_+8+FlX0Qp
z|AY%T!IXRG$vhC?|51@z>@Iz4R9~%4m~l=9basuC*W7<_{#$oE`t-rQ)2{3`Zp^g#
z=bdZx;_xX~$ewRreTMYjdHOgB-YS2waQ$5yDEx?c%9gFVY0|G4bve8lS-G|hT+z4K
z#EQy*FVh9oL*QIuVYno<WMZQwjmC1tT@YeEyO`OCK~fp01XL=bkp)@S)dFzOXTP9$
zpjE2DE~Kl#CVEN-+TZx`S$XH@Wmne^w4VC@Aer!Kg#2~ObzLv7A7*^;m+Oi3{Mq$`
z%n$yuT>7<RMTPw4`=82Jf1NR~D!+`Bee*tP`Zi-s^SEuV6;19|>3>0f>R$Q42!0kk
z?1xBCI=&t)H;JpoM-bguhI2NUo8|!+TwZ~}Su<f&+O5_CWJ7>=Aw@@ZmUafG2@wL6
zQ?Cq*A?tNi%fon)+e8^0)lb~9p{<^O`tFXGR1Y@ZeD^h9+~pZnTQe|a&AO+rskyLr
zka5C_K{s{2u%f?t%;J9hLwCwA9`w)bT$}&lJ=;m$UUx-Rud>3Eo1g1BxTeIrNxtl@
z^M+Lx1h(SBfWXab`99@S{oBa6eE~OuTNCLwY`~Bq1BMUpaY2t9+Xa<CaJ(j)G;-7h
z9Xs|IHeyH*{ORQ$F`}EL7xd{~rb3ImP7t6&<I!|jsXn(@61IeabXn-k()m<jI^`U!
zN7O$BfY_^`Gy+Xgja!XaRb9jHG5cUhCI^Hcdzym5io;XIg2Sy~a4rHasg|N($iUUv
zAxck?90fVXKj%SF$ibzlI^BX18wUf{$-d#=^8T0QkJmqs%j%!XFJJWusd;YLie4A@
zoLIf`v-`&V>(!OSFtXDZD{lVZ{)=8cG+=fa*?;k#5mT=3v*50>r4hn!>#=zDg*!$!
z-|lq;>t<eT8swKo<@n|A|M!S|M+>(accR=akC4eNEBraPW;<sbm(N^(<g*dIdykm+
zCds(*&}%ska-g=ZYsIB=w(TwMUSBEP(5349DSg&rPNu<|^QZ1sM67lIwm&0M(>-Xf
zswl4R%L&!y47m05{rXpx7Z-Q#(YL0idwKWrj2`A3YX<UDc`~eFwh+^-bn&VDSF~V?
zor2{|hF0S<m|mamhVreb$MkH54qQj^UUo#YMX0!Z^w5lz5OkH(khTgt0ZQV`PUN*N
zYt9vcXHSgV^3g4auh{b3;TMMA`>*AJ$*U*Te>dj2F8SNWPr7;9dGhRlJGYqejX&GU
z*ses}t}vE=`I`B+9p8V0{LV|43>$X%>18DM%}Z_@aCdW~+^Mvr^U!+;Ck$QJwPQ7S
z)}%1<o~I}yaZt%0h|lq}pbOI*<SC-TfVT~sz}W8eDjLR%q0%f3>K8w&slfM6&jR1u
zJqtQWOJBGM|Ghv@Oy&jAeS_2Qad!H>Dh(#nna`vbd_(v3?wsq^d?ujo0W|SVX(_02
z(&Bu56**fK4@(FhmYPhbJx!yA1~6A1!J?!+TusDh7c*#-wAX0#Y0=RH=rOU=^N<~b
zDptxg5M=;%oUTg5xuSrGO7u1&r0oq~$-loz7JPY{6eC3X)!X;WU*Go8^Iba4fd+nO
z2C4n?53=s`-feYrZrCj!eDmcmtj*7%M?KXzX%Bq*L98XW8+pVGlGkGKr6Hmm_sy&l
z;9SW?^P#lqly)}fRn<WuS0bdTIMcJ$LHkC2sH&MAZMb9GEk8c`;ESodb+g7^d*{gc
zO}6G2$rjt&dybLO_wTyZGkL}e`Td)g)9kdJT0Rx$Nbdv9yCTvp1s6+11N<&D38BFZ
zKOxqsiNL=Bgw}2W%b|r^bSYA*5x#s8fx<v-jTZdTr|Th%l+|xNf`BZhr`E%eR6Z!*
z>2{!&A{_|+!gi;tBu|j=m1EDVlh{|aAkOI{@4lW4=`BBU`raSp{e4Kk>*Z)~GWeaX
zUkkTvnjn8SanmHZhWt8y(*)w2uz4bRL3W~dEv4c$<U8pLppB-eL9m;t5yp}<AZR>`
zMUJy5f-D+J0LA#bel_y;o@G@%`qhxJ^rtkps*9szmq-WY2WspnzCvD=o(I-xe^N|^
z^M^$zR+n2(uq$dgb%=Pz5u;Neg*sZT(?O0liVZmfiYw;zndTqSVSL%;y@!qwU#S?A
zm*FeDDce>yc33ueZx;J;|3S2|5xvzl@mR^RTuOR}I|p5@tNTx0qf{_GY;{Q|p04cM
zFko=e;Mo`{7ZUrCY?MW2fv7=hqGehB9D=?mVuNG{(mNDiabbF6o^)dUkh$eECLzOw
z;cT9~OZY%~5+xBii#KX3xz4x&J(z2Z6!%8RT4vvYc>}8~sdZ@`>eK5BB(9V%D%Y0}
zgjlN|DEQ9n(ygb%<MQFE^@%F_1@VTf#_848lSukNZ&M|IpfV2u967i;?1Vn1ero+)
zd!K}M=<;H}<Im2Uck$`d>FoR2wd@C9%6|O0jQ#jT`Q0t-N3)0h5RPozi0h9!`kntb
z{r=~d^t%{t{r%Zb>F3|*H*jj2yi~XYxkZvWH87IbGt#S9d1*mjIOuZ(0>OcU``5#a
z>|YS<-#=I&q`*C>7m+jRL_PjunKKUIBUTMUz)sd%@%Kc1HGYE>BsBR5K-ip`bSz7x
zAwbqCLXFfK7cwm6(GBhl;|{d|wFO%p843uF18C<+Tp-Zd25^#JN1)mu7GLkyN4);2
zJuYD1nrALNe|+KSAzQ?U)el`qR+OjqvDDXGcD5Hjru4?g*=ZvyhgJ5O)v4w(;jNJs
z!z=q-R$p^zXI7%&PVr;)L$jaN*@1nR|1%1Ny)W&EGJ00#Qd(y>rFvS^%8`|2w58fh
zq0x1hr%4C&9k_HLq$45$qrt=@do#y5O#v}81-NsTRpQfasiuf2Wj}F6jEyFn-__)?
zA!{$TFw*{<pmCqn;HAEP1^_A%Fp4ZuJRj8E4;L?-2X@@LrYee}wSX_WR^R_mhvc_*
zzrSK{whI9Om#==TYD3ZGqbID(y}0C*76<TGN%K?W4q@j5qi8U|m5aJwIDFdJ-0N<|
zNJh%X;p6`nJExd>KhjcC5eg`9UT>DQFjXooaZ3%2ZkNd#v8D}ev^op2oAQFG^p;vx
z!XO|Ind3$gg!Hha5yI5oqHqu$0+s>-(3urqXU|I*3)y<DZO^rbGOvh6AC*7fef$!q
zUKsYk{989Vmym-A1A>Wq&FF3q9NNZDID4^NK<bRk3g<T}QQKD}jH???*8Momsi%8T
zq|hb8#b7lFhW~dzw}Q;l3^~>MoK_z<px0I(H~Hd8|C4bZ?i1Vm+y2SF9Y&navygmL
zdX0&cdpNzrVNF3m7amhXtgsXcS_4BGEqa3<VO<6*{s^g@!zEA<MQGL7n4+d#3}xpM
z>o9JFss=E-XJlvH#hp*Y4&cC`IxxeJg=eYz`jZ9T1-a4O>%G^{ghRWzN_BXX!SG&-
z*IfV9Q`a|tx?X;OIl1XBK=1m2$7ZT>M6%ohGKClnHu$eixQ!F=TM)Nxu^=km2XI6%
z0T<Ey9(1{2*{eNd%2gGOLv-t*K~m=iV!0s%+^ln1!tk$%dCjne<F9>49z7E`kZQ^G
z*A5$g^~kEb?~w18mcG9Ctwr-DEvae#08Wg~+4Cn~(eJV=smG?}B)ydh%p`#O7d<0+
z#c72ef0@hWFDSI+=nPecN;_h*5p8baj245B3%AA|(rt;}#sdjh)l_xOap-WkL$E>2
zDV}C16|CoWrt*TPtn1XY;ES%=k}0K6*z-T1;Q>5o-tWFE?|N+3m;v(!k4(RC?Uas7
z<_@hHHFr>Dw+W8v6O6NDzogrIzHx5e#F5W#e_Fn6!o_1|;nnaV_y0b5@r{A2#$Ga<
zcxGI)h@O|-F*53h&c?3Ick4Y+X8eFPbDg$KI3;lN!kv);wr2<igXp%2m<g(aDKQ*0
z;97A%DHfKtbFs9o6bsShjAk5RKHx+b80ak?ctn2gjlCZhKjLe;YW<m&8&>tXYyOS&
zR@mlHbN&Svj+<Kd_Lt-X`9Jcs&sN_WY#6nl%s9FAk-X~WD%=&5n@WP|?4EiyG{+}_
z=mxlkNReJ=cevmi^f+{4Fl4j(5ZmSP`QV<(XlR7nOfNc|Vk!{*e;fjXd0~s>WC~1H
zDnp=nFC78ZW`rlN|K&dU;i8AqXH408c=a`xPHTw1$xrsl!v-$6BzkK1!}52ViO)1_
z0O3zuw>A@x+;+NAzC7m?c#f-#xT&xa?^n%_bWIJ1GeyDUHFqqmt?gLh6{LE5W@e|d
z>Pd|iWxgB>3!<@DIK-v+{ZP#PVn<|L*JB<;Y;`0Wro2~ggRsk0idTr4zAQ>W!>u(f
zS<22;<v-i82_7Fr+(1pktpMe_cBhc-?tFg8Yw{mmch)|3%ihCxZ;x~EY$f+CdG)fV
zwqLpa#1qzg*Uuc}9Xx#42%Tfs6TNR*xar0ji(_t_5u@&$L_Ig#=kNSDuWSF+oAPeR
znKd;pKy}n#F_TT$V|CoZNF*gU*AM?jS!PyNetw4zwP|IdVD<a!g^nfg)|8d_GEHeF
zL=c)x9?t3Xcwi)WthI3Y=!Q_nK%D&}V`8DA3S$)MMmHwI_b6}TTri6M3Z(*_Vhl=T
zjgBmN@R)CB!ST7*tiN0HxP*^9vh{iRSf($!dcG~j7Jas3;SD9*W=tACUUjT2UAk_8
z;!C-4((F6)dTVUS&Jx)Ug>-abhx#a<X>d#WbcYQRj(B|@gWqfpIMUq)_oPPTyYfwH
zM8<Xe;q4w93j$;jBha!mc}_2c$BQBaGP1~Fh;iy_0h9?{A%~_*!Aj4$;l84SMNj#k
zs_Hv&<|blzRo=W|Ai3x*`3>*fl0}DJxli16>eL3gC4b6pQYlY<sKeQ2e!J1xd=2j1
zVwEEvLQKJV<b^k*9M4#}(nW_&f-UCpW*B^Cv)_^KGPs5`8Vn|ThEwn5aDx~F=5eJP
zN_)&hgoVsJo$*~~%8lB0x*uuZ>uBE*9-(x7$5MYZKq@@)YnRsznL6l&L-H?kYrcE>
z+4>3NqTe-1^&2)^-@L16(&QiI11oZy_mN+ma*ntUy?zKwr~%w|LeA$BhtZ7qN{8L4
za~TY{1dz_B11U!QfgORCoD)_b)G#Ux+vy|~A$Fy2iG0mE&Np4vE=zxvyW`~9*p{JR
zpl1uf&l8Yz4%`~a6*!aCj9W}Za^ga)%L*Tsjjnv&;&37=5I1CbngO6q&lKg59h3;F
zYr{Blr+nH+J{Z@AXToDQ%Hbq_p-(uu^{c=w6Oe=eB82p!WKK=B==q7bdMYBum)<6j
z1e5ZNgLYhK$05BFrbZwzu_`n#X(mf(w87<k%jNvSpxpge+@hNgo;=JCzw<AjvZ|!J
z!3El)KgGb2G|4QA7L$df;sQDm^l45(hbw{V=-Ju<7t~cx^+~jeB?Cc@FS4_dcQ%sG
zeDYgQMkh9ZH!+GROBtz+Zah1L{2<%W5FMpF%5XJCnTr^P3IWh6&DBQ&W;1b$VqO>y
zahuIEvC-zs$ut6G)*FqYB!LC+b;h18L40@XZ8LUgs+z7MeXyc6Zm0*Ov;8AfX#TaC
z{0bh4i)T(9Kdr;tUnZZUz3*CZqxk7xnc&))(m?vzZ`wOUDJPMApeF_x;)X<uym)iN
zhhQCFP{_>6U`inr-5|nFhBSsOCR3_6=uE|FO7qFmRYm!#O(%o;Vxxh-n{rtZnC%{*
z;JX-^P7lepC+L3Jzn{)Q^EWxCo@;Z23QwNxhaOX;|9j~U_<2fjhE9%jaHm!V3#`?(
zTwY$aKbR`jcgilE*qEKIH=7Z3ic33wuO0!ZlHOijP{bEu+wvMjtYO6Lykzr|Xo4_B
zfFb4hrlMZ3HUVy^m>0v(8M?u<ba?{%7dJzMr8};=ddRh1Z`$#@d=?3=_buylLD#;E
zjy3Jv-g)BOg(q%UzTvSAm0czbZt1_M@6=`6&M)ZV&+1CdfBjAle_OM*;Fx^<b59<$
zZ~Xl@X?*P2$KQ~rTx%;A?zvn3W8JAs7m!7JE~Z%|a34l^P8<NctCmI+xl^iwR$P`X
z0W&)IgDFy7$86ja%+A(<8GzEvR=-zAMXk=&p`eg2gsMt!b+AeNTV`nbLmn6rhtH~s
zRNCQ&8*m)32^|bLutV4}bkf-Vqo?h7aM0?f<_?YY$}JtUW&D)Up^Sl}Hcgv8d%<PJ
zJv&Z2zqD^r>F_Bzb$NLwpTC9#U%kY)#Bq=O&H6Pfbu)IaCBlmJ%kPlCnt~U{{<>z~
zkuj@!4ktRgN9V$`PcuK1Q0o&ql^d~wR-0Qa4F=16aFT~YKCz_4ZZ8Bj2hXwz_XeS;
zW7u>tGpw5CvC<@yHddU3^oArIv8om1=O}UE^fI~vFsk5ZZk;sf!vEcEi5>Jh-(LCm
z8<Vln_n*I&a8t;T+je<+byD@8?7%G~?ePR)^w?J$ZpNrIT(p227%9v*W$5gp-I*a4
zW`;sVeuSoEX8Nr<1iLz&9HNz7M(j|NQ5%*rs&wc8%D6PykNug)LS2)G7W0fN1Ec;e
z^3K$o%I=(WCT>{IpG*Kz7hZN%r7TzX>Jl5whc6_+sq*i1e)h}LrE!p<EVBdhpYal>
zNBU5MNUt{I2|oipDe#CikW?KEJWPxAC<IL04PrVcOte%(fIxgBp{6kAoi&&39=!QC
z*&h^_Bb&ru2bzzOP2v}K(rgltaMN`czzbRh46nk&33=K1#o=%$Cnq0XL8Gp^gU4n@
zEJgN^#(bwAd&F;b;plK#amnAPxWMV^P`|84DZmm#Cm2x6WVRMBg<i!QbMOf=sh}5>
z{<4TjiiryRt&2PZMzYJ}I~?|104e%yn1);C4foB&E%RxY&$z$g`b7?Dz{vRzW?sQB
zys{2g$RB9lCJdXn5-`QQF;~uAGJ`@D&3`n1K{oLV=ai<?OXkh@s(jY{3O-wK-z*IK
z*=#frDNUb}BAHDV$(n8uO(I-mCYw&c8Hsc#OoL&*vhGJ2zhgsG@Mx;U;JnPD_zQ-J
z)AL=hTK2!qANuv_Umv?HI{2>>zsdm^Wq%zIKl>}BOaQn)8tGa71!<kdjgFKD1uqxK
zw3>}}OKMu0-5T&p**RP=1hd)U4q41@1s|eu+*T+sD#)*_f`sHn3NRE~3vu8OT@?x7
z5M3d>e~JnTJ$)<qx-o_bO_hK0@t^yIM`gVR1oflrYz2bInl%{3t5~-efuCNkUnDQZ
zWRfzRUJtHdc_qQ;=XeW_d7H&z$nbih4SH>MJnVn~0@m?Zj8iK|X}@tgQrj3HHdso9
zqlRwL0SNz<<vU+|DRt&^GkL=wBflQL;kjSdfXBCyvz_nWRF7-g%^#(9O@An4=YLap
zjXtiDrwh&Cv=34upA&=(T(_`Ut;mp+o+0=Vb)|DspRg`H6)6+a)6<4Drek?4%%ul;
z`~i**vZc-X8FxEhUBxlvjoj2TZQ!7emyf?F`V?KU%NmDn9D3av^ZC%9cGec2*Toj#
zrL&Bs<YZCFva36GMb31d^TWS*E97(z&MVv;$$<C7XDBSp%JSKTl2Xp<MSN4f%Nx<-
z#5M+lxsw`$qLHpx9N26pQp5qeRJqssYJ9)dZiBh>Isz4MN{~~X!fK$$4uni{S@ebv
zytKHufZ!(blX&{z-QQ1Gb*22u8}irktAg)}8%iH2ofhat9wddtNJ@guAHFZ2=q#KP
z-{I#CJp946O`{*!LQ06e&zz~F2lt7L#OE;xKl|~@IsAJ0zuymf=@Z~ZzvF(?G1#)X
zIFH6g%K3E8pArsdXZzDFVwpF?=`7{a{kY{_;`T=jeuF<P6v9CqvZetgZIh|aYdxWi
zl$!IJ5LZ_chNX@cXB1sial>T}Xn<k)7%3Gz<ldBJ%O~7fxq9%YTaJGs8RlF|hgwTA
z51u@eu~l4p_3|h4$bYK3FIzXJvHQyTpS+ykWzs}8##4X1c3{TT)qNM;@X%d!4&_(a
z9EK5xFe6gu^SBVJ6f_ylhLV!pTyxNt?$VW4aP|O{uOd$%q7Uc;Mi}yw8nZ;R$rx#!
zPa3<b29=+CPTABZOf1D=*o71}<bRmkIr0Zj)!$tIee?g(<Zj)fmp>+956S=Y?`K$k
znayxMVohd7YLU&;5i+M)QVI+6@+=_%5hocL6`Ui4<PGKCP{a^2gwnFJOQ48ZE#|aH
znxv&9Y{P<fCtKN+U_#u4GcNp}&Uv3>H*{QAf8XQ(FzweYNRg4<%6)2Y`;!m<&k)$?
z2rR?>Pux~)X=!-`HsI6x4t$sgR*qYYxA4!9{>)RI3s3c-{BkKn^F4!lAJB|fq;Ekz
zL7^t=;iIE>9&_NSUKK7AV}5N&wg|L3H>7ViZi3`xIkWu+1ji9HpOfoyW!w17NsUIB
z<JmS_2DQJCy$Qe%lM{+qi#N0=3&Fr@73tuiu0yrca7u^_hVcRTAVUsb-D~Xh`+#`-
z_P@Sg{`-CihbO<u-__%@^&edI#!LTNd<dr1hMWlpfO>o>e_H4G>4OjDy?fTIEO_8H
zl6Kz%yPH`|Yyc=<3OoOh$40NS*+V81yz)+$U5B#|k+JDRkdw^rb5LB;-UgRsmMhhN
zVyB0)<@1tJNea~{gJKW}f`Xq|`tv>V_JW5T7f-(Hg@cb>I38i{F_V5;mmPba-YtK#
z1>of9K7_ox<}NuCLR+=&uPzI|gNbR`0MFDCaNf=JkJwx`n-ea1JC~mBF=XJQjXI;O
zjcyyeqa^463mbIIq>5LVm^+G!EXB7C=4S~!OhQ$ew%K8WGoOyQLr%MD`TY+q>EsRC
zbNkF$I(>&QMDa)6E`BE8EKikpu1(#fUrA~ZP%0~KDB8=r;dN>RkKJ64NH(4=fz9f2
z@D8KLm|@3tb-N`6DKU*)ii>v+g{7|?AxB$t1X7hwb-SZ?RI5b)v<`OTS^xNDFE7U1
zmn)j4%pP@qNoH1VxO0yQyZLQ<;A4`HlRDu^d8WK?TOZqXmQG90@;2&FLf<HAAe{sU
zUGy$E=W?Z_>Je{@%h1Tbj=Mn)r1x?7OwfB_U0aMoDs^kHNvAASaP=5ghqVibC<}n0
zOk<ZeFzGzbGvSxemgR5%QadOPI(hD2-Q}&waW;Lx^u{4A#75R>Aj)5}<o!s_oQM8-
zus*5%?*h`5lagwsy_1k;*9G*Bb`P2vx;KP&&uX;bR&=}FQ_dr;b9D?=!L<w8ISQU1
zNuM!x(Ji?{We=d0Xe0TmF?zJ>-!IFL7cCur!NUj04vMi*z~!tYw|qq?!b5$c$H6zM
z!DbogeQ~21ac&e_vZkh{YuJ(`m;tUBu@IkVr1!t5a&T0I;WUU-lbWqClj1~71e%`y
znRz~2k*3)Cf(3D0><%7Ts8y*GM57@!Rl@5N5}v1%L@C`$piB{xDq1XNC;hjf^!m7}
zTB)5;_AlMMY^hNhq-fL3A*-TL<X??Zx}bKyylA2vh`~^bbFvkQYSl)2MzW0-0Bv5q
z;DaNI7t^66IdF&Fi|ZuFca&jsA_F#4Md=9>)ABUdFkGYB-kv7PZpjth*t3l$D*w1~
zaP%HBu8k)8=Muag7q5r*ie%&IAR!~omSOYbZeyzsYJv`GvceB(0-sLONuz7NRli|7
zQakbE^-m_|T2n~H>7Q>dZn%HOtVlch=U+$V>Aa8hkLjOmb?J6tbp?=JEX!;$*aPsZ
z-~cjO#GqHm$Os8WquVO@?FNgD^CYaU>T0YnI*qM*7@Jhe$}D>wGVB057xMEFbV_5i
zk(#Cs0*?wf@rP(ZM*6Ul<_{M=m1U3$_wOR<-#?pa>Kfz=ae0C*KjEI|X60@lcy@pg
zJ=Hz@pR>c@bT2;{XzC~&PgsxA2&_jBl_?T(FIudyrFE_}tLO!4?(?Ljq~p4>OEfxl
z1i9;C5)XS<f&P{K8tXSw%xG}|fX=ByG7C}7PV`(F!PevP%hy=*<kXF;#q2eYzDZJs
z8%=e6$V9P|vNZX(N8Eh2kMLypaC0S4yQlk|iQK+|-$?a>Ex@b4*5Raw7EJYmE#z68
z^v)=6M#%Sm(m$G>A?jN-1Fj4@bE)(t=+CG0+<W+9ngQPt@!mT-_b}$SQmeHix2{_I
zCNdV(o_zxEl)?h)?-;dNmHK13b(I#biM6nfz*oq*BPN0Go{mB{cj=_Gp_OQP41qy*
zrt93ya$RJ?dU=!O!r03GpL(umurVqb9JY|{N}mBshsjopt2KiIG$)!hp_q+O$(ryU
zv8p3P9t3`8ZgE1^goVI3Khk}{hlNWRKi2V9GE?boAsynzaBhfcR$6bl^H6_|gz*Wp
zloH%AZF~iEe0}nATo%eht%Rbx(G10^?zV{^rIg@FF%8T=To6{Yw^#{9e?uFJ{>H5%
zJG2r-G%WwN{5(a2(@Jo5^y(061Kh$o*u>@)T<1w8ZR44;5+N(0SHA+$Y@*}fC#vJP
zTWh0?wz09eQ1G{wfaF0NQW18wpT=m2g3Ds`Alrx_2GSjlpwniDE8AtYT9D$%%Gr?u
zJ<fXy2?PN|kq-@RYBjN_qh52CD)9~2(LfcD?*O2n$a`Ouf3Duy;jtxG?j9d~q~1@?
zo;?#34WZ^A9zC>1{=>2Nf!?c{Mr@sM`NH*N-JSQ#m)Q<&S@-o~x;r-E^p(U;NH)<g
zwvrC$?#GxTY|N*~Z?KoCUX1NRwwrPDxpnoc88wDsB`X;<PLWh_h*AfjMNbceS~F^3
z-O*KgfXx7_8#8bdsM!oS=nU*mM@GL^exihuv4idurT%p^C`l;+HJvB(GJ{GBv00vu
z8Tg;>3EaD=`kyk(fTP%c%whZS?51dDrXVD=g3K~v6`g1L{w-F;I<8r1Mc{MkdYzvY
zGT`EH>w2ZQKkmn4z0zDWY%S4NFcMM7m%^g3GB-O-Oehg+L%`*7)<%m~0;x(wVL?t-
zQX3A8<O0U65o#L%n3b{TQEn~B&a|c^w2^}K`UG3A@X@h0?$=6S96Y%qE0mHj@|I?_
z@e-SDWEw+>Q{-uNwjsU9a;IBh`&7xF(y|6?<zk7>_Be%_djs{;+4f+zmw9}=o%Tni
zR_dmEn$?Zj?yvR6NBh45?wv#_pwv(2L8*TocUmif@L`_Z?Dr}yXtS;M|L0g6caY<;
z610tv9D#P)xSr*JQQG*B;7UW>iuyexE3pmkRjk^J*gOnY=K&>^5<%L=WS>WJB+SDq
zTzzR~^DtYThcC4fY#hV=UPs)0A*^#)tU8&sF-&QLhu2zJPiR9F?#GFmn4cX{R?^d~
zjrmF&1i_<92?%jfxF+aNi7NrL1W8S$(U484%8e_tAQ<f_DR_$uNVkpyUWhASngYut
z5mnKsT>`Bl8|n3PkpQI{Dr06kpq?zg=U4JCq>>oO&Y1`0A8X~s@^yFLLB_wn_rt&V
zJme>MQ9h2CC3f0;CqBsXH1$Cb(GTPd8O-{T&-IGr2{vD<F+0O(6AKE%fk};FyA!d?
z&Maq^#VtU!M9L6)kAezCDj^X>pu%r)Q9iN6kadE3eU)`KE@ThJR3^V>|Irnz9)3P6
z+d5_bnkmP=ARS0LX}tX4Ui<NDZwd|C+fee;Yx3{>hI=+lpZoYjyXEkd-g!qKJ^dR$
z{Op+VwXba1N^X%a`W(0#PSEdk)rcv`1nM#<QdBC0(?bYQGKU0Q^6|sH<wy8Wh%+K-
zB-{&t)R18dx5;TdNDMrrX`5~JEQCzU5kYy4$Paqq0GK^q(xu3(0?Z<V3&T9~b@{E=
zJXlEi_8m_z{^*f$t8+!$sOT~4Lvx$_`FjhB&Ky{HXV#LJMqV?j;^I+@){dCqJh1zD
za_y5Bj$cd;|MlO7+L!LR>*&cZKbSJ(#EruqBHV!MmT!~~ELEbhj$n>-hzu$LHVRX-
zBt7g!z_~ZwnI)B$6}p@*=cGoL-lb2=$;`~jL4MyHF%2m&(_-K#&FDf`4`z#+kTI_;
z)u>^3C}1HS9fJ$$1<#~A-z?`23jh*JXH1y4)Q{;Y{@3$+o)^V+w~q2ho_(}w*77}_
zc5EUyKl{a=?blpS`d&O$nV~Zu?Ru#1`BTT=x@`IQISa1qN=EG4bnC$k=gJw>Ho(5w
z21K-w#%X2bTg6ajrkIbU+C{|<f`3OEun-BEa&wWVA=i}xq#apCkQ6~#fU2*VVuZ=#
z!l=#>r=!@*GzX6|THw8XlVfu(y`1O!kD7E@7N)N3cy#B(H<RC!!*Yy^FPVJNhFwQb
z{_yrA+b2OmBHR)9HV$E)aB@Y8{T!E_nUmsj<#;5TO30&=bhuEc)7i3fb3+pwbKxMc
z*|6PleIPa*>fd6!J${y`b%F8FG=zw+Wa*B8+veL6!?IL=lCZk-qU#WaMRqCI?3F02
zBm0+KAysUK%i#9DDdbrHk>Oj3QMp4;gRgEm;Bz1vsr*msrXdT;=*+--K;y1*5noiy
zrNNV7M^bMc9w89Jd6w*~Y;2(H>=eY&Ay~)flwfuM8$ha>e;A9p<S6!xP;A8+7K@)^
zW1z1fvM4M5C3Z!f1x)Q&F>$^w^GfOjt4h1>AxxOim0mxmQBrenH47=1T<EOaNL@8Q
zcPbm+cli{|N6QB68|0A3ZO6V5yp5I4`TTw^M=<0Y!ajOC4)IZ$_H$xYNnnfG@wQl%
zhP}r2Plq~jirkQlT$%RTFPj<@Y|p;nY6rrig6*Pdnq+%yTOEA|<8Ej-17O{;42W*d
zLE|q3PB7*h!#Q4D*K`GgDfT#AOG$g(3KwBQTFrZ9CDpb?w6sxZ`$Dj$%xwqWy3RUs
z@bpEQ*caueo_g?M;`4UpdnF=W%~KnSM~u4dfukqCdG8LaB$}0KA7&xIMIt$Zjpj76
zd3_nWV91BSMV~JNxqK`EkC0)rAZ0u|UC?<306=EZovjLF?16aGU){d3bR~9aaT1FS
zrOgA?z@a@@2g%$G_4!%@!07HpRw-RM`0U4RqfCR*=&^f5yiXqpx`7tDT@rlhl1;K9
zwYu`U2oQ>-<Bu_y;jR?vO5`ZEEzIW{1@Ai3xaT_S@If&~%8#aIC~yu1y_%;EEz}rD
z$^(%F^xVD(lJYZ}PZ4+U=>H?W13p{iUlct!$KgrGzdr&ld$_tt0C}OD#tf&;C3$@u
zE^y+Bf>fN}@%&Y-n}1@i>QLWgza)O`rroW%*3bTaVR`(D4UZIx;AUssG+YiZdpBg_
zsp#Mfa^_BU99njBu&6Yw?;fc`fO(y@5>lkn+M%>iuMZbmd|_uAgox(qV)-DzWbKev
zmjT^~t*4f<Ucp_Y#-(xtk`Xfy|1mC<I_7=Har$S&(2K610>0wSz48;*;tVZ^`?<aF
zj&d`}8q#>vqeoBv{5mP>*8jt$rHYUJoc{P;6MyLe&)-bxJ+ebz%wAKhjAY>!+Zn@e
z2Hv2rkmg8DlCVVDikB1)N@4>NKuH9zl#d@jer|d7c;(tDt_326Dr`*R<CmV{KmVio
z!wf!GcWvrJY4RgWQ2%A9|Cm~Tc_dTNozeZK<8>(&+#C+q43}_QxyQJJoY=r2O*_Gx
zU0U_HQ9~bW&8ed)+rIpqm)~E?Z{c$@nm^PRr#+OKzXUpBOGJ8se1_URP@-xgIRO`*
z>@;P1E4-7ubG$!!rJuZHiFd2_F|QEuHh6ij0S#2KCRoZ^OqTL=GcNAXC~u_kfG3td
zo5@-}o725ZM_*~Rb*#VR@NT*1b*}YRRGG#F>V^&doNwWl^3n_LfIFvPSf2v?4Cf8&
zn@^^vT@TY%Xz7ZceT<&bx9+kKhi3{pd7a5?h&UUZyc2J(M#{n^ec|cW>8%G1E#SCd
z)o1GYOnrrZj=o7R{-h^M^jr0h>4k{CLC@orZpxW?)#dZl?L8L@P!;`1_k;_Yb%dow
zPaX@|?7h-^1Yg8<&hhArSKvQ+Q}S>qkH<=%lLdMwMv{WpuL%+1iE6^rp12<h%@prB
z3po1)#Nz5naD{ip43St~ljNnk>sHC993&K=51`X^_CAj{?of*fQY_C{f#-jvrW9QC
z;H6BSRPb~7CjKX0T*4pZ`39aKCKT_{vLVw}Z1qT6Gnc-$N*kk#4q9)u{^#Z1<=$7G
z5vQNzf1e@h?pq~4_M`L08=Z6pE|Q)g->NfUL>|gCUP_fx^_QgJGPa&hfWNS^FSyKD
z-oThHQC5Gd|4A=WcF&zSw;1eZ!jx`na2WYq8KOeI#ar_7FZf1&Wsh|0i|Lc{@`@!C
zE7=13_iLbVD%L0U;bBv8rY8kH&0*FsK1j+k(3L_`st6+Jus%5}-uK?$@<Fs)M-|)y
zB}GK6x*ed*gGkkLr^!?fcReFUAq!~5;$WtUp$KaJ(f}lI2Ut>J+y_*s2jX>A!ydjg
zJq!|BpL`suAMGKlk3Yg6M9b!<z_w*ktv1jF;7^FF33M|QI=<!6Xi<rUp#-eHcjN1m
zdh*p;eQTqkETwm>zIWs6lX?<rxuada<%wu<X{^4v@=)nbmT5MOf6wPWAUC)C1^i?q
zj}g(4)Jp0|ddf5K9?BVvq_;xJ;e|DDXf1(&pp;dyF@uN87!MJ4&v<x~!b9E-^ZYW0
z%fLpX@(`9Avqr-ltWiqMom6-T)UcI@%NP$?ec;W5XpxPjCaTqjG53;>#@7V8?3QMQ
z&J)cq6wDM8P<a?vA9z@&)i*NgbSu4M^}QQkA9zSDde-jw(SoA5`s(q*D4k=ae``pM
zMpqSedgJP=kFSqk!+oOB^@$dg#??1EzCLL%56`;NZg$k`h^udOe0{hF{<%gMjF#rN
z)`$6+p)W@N3MhwlU3nRF4CS*^yyOWx9Ha?&3CrTE`wvR=1!X>WilZsZ^;}QngR^sa
z5swhcBR}Pl*YiHj<L}9PJddx)!~03VIWS{XmW-dv^83==6yI_;{yVK@z*%V7X=<nC
z^W$5_K}cI(OP<kME+Rh_k=KhpE#mJfdc26QC?ZAev@DO7X0SP7V+IdbE4(2sgQB)H
zrByb^qs4qC88A`^%E3I2MupecM)R{2+?}nN#QKKvm0EohqK?ox>l;dt#7U`dU9_-6
zTz#Wj{R3P+d?3%UaehD|pf~KHZUSZX_k!%o*L(w*i}$#{6iRL{qg2OE`v`9LWc#j=
zQJf}sDEp3>fF0hEnx-?fqJdOm@!#r2%yB=3nwv~IGVIXHhskQUN6EUQ?oy_EQe2Yi
zo|unQe7=fHLN1agvT}r2re^d+M4u-!T(ZAH%~m?3DBl6F;g}A!d@!yjwBN^Bzl+s=
zf1~!>g1UF4nZ@|Jfy0STMy(*Er%88}I)Hwk@%kOQ_`2o8)Mt!-v$`P@K5h9Qoe$E|
zKdRM?9#em=lSy(`E9lfcOj=e%wK`QEAE&sWTHhw{IDRkfMNB#Ct%iuQ+b+GSw}!qQ
z0nV)>m%>{^vlV6W*aG_r9}TK~*2=WJgb0CHuaRE$gC=^~Z39<heT262LCbi>Lm<y+
zrN$a=;Nj&_#yBi$aVh;_W1P`ip3<?rNsJdaM+3PE-_VXEk7jW^VH(E+x}n_lT77+^
zX>M(;<3Wkh<afri0ie@KL(fxJdR^4&6PZLotB_qnC6hj^HUT#bQJXJf5qO%-9N!-?
zOR5xL3}BL@5v4lo)4;X2K^^ASwNT!z<@S&Q&V#a?dA6B<%}f(48JN_8*lCqH_p%eM
zjP{=2NDiY0iiz8>nvR>SZC2ArMh(q@Qggp()L2cABvI4T{9d-2l)8`bCqd0PctO-;
ziR1KfaU|o6QtJ`ERHK_1PuE?3H@-fcMDTDb^^J&{)t<7MdpEv5oJ7Yoy0!6i=$~+g
z^{<?b<_N!1qdODT891i9V1_?Lc#1M}3W9!w`#_`X78P~c3{&kzyo&95)CVbbgm0qt
z!Yi>0yB}x1QI%3HpUKDh&vegXzEC5j<UUm>IXhN6C=GPWsHbmyA2F7XP=fLBWK^FL
z>!VwKH?EI5sVCgHjA}?!(#Q31bV6-|2|e2w-PUNDPODA+IJQ>lh;`CnL}D>2Ulh*-
zX=@ddNVkivh6={Njr?5HM%PXNYv;ENJS-e1TOf&a7ch;efsJ)7zgeZOhWAA-t2E-2
z)VwcLI-_o?S+csh(|m&}x8Qt11{7~QbyLk!srxjK*dW%EO4NN{Sw&*q@^Kowpw-PE
z5hiO~7!%cMX6xuUjeFN>1s%M23LkEYYITB+O5|g#uQ=r}-=~Qtk?H#bJIq!omNkaf
z3W<zt8>kg~ol%QwUulk+2XXHvF3yi>#K%})S>0Gu|Izv|8EaXonf3LA=wf|kwSul2
zY#KIaH%GNPX<xC2;_Aa5g2zUo8xpmo$JO_4e0^AV2Q<2Sq5)(<qjSaT8=X+!VE!qM
zZg|vTj;n8ULVbhDTN>TWXtqCAAM;Ey`Bz1`qw6lzf)3i3z{6`O@HgdEr6%|Q>AM=@
z6s7~g`^n{V?{dE?>x;Y(9jF=z+LBuGNo`9lAF3ty)ILssme=yNJY2j2KQphQ)o%%1
zZ0_87Orj?DBO*|(7jjq>_)_Z9;@6gTQhU-WhnbgD_YCGXu`lbO37&`8ry5b1So>Hl
z-@TU1raxIv4%L#0wX^9j2iNkJT7ti<b7-TrceD+rD$*X#Q{FgE?qgR05W2!E<}99-
zlh+Qfs^WNciU^EXJ;{0C6>t_Iltq5ZBCltCn#JFf^>`Lvk%fboaq8k=W&)=)tu?t9
z-2`f5wa(aWd4YC%(Ji4DHg(4K{Xh4D?!kUc7NK=^j;%m1s1B6@)%j_=OYs~l`k9i4
zfXSj^YRhXujhGr57qOodMhi;}@v=*)ok}BCd#jzxyHNXNyR)6z=?+(FKTY$xvcA9(
z#XnJ4+@|i8OnN|vV)Ed2Mbh!~b?eLB9+7#;Rm~F8ga469j}f5Oai^y$a?S<Wai`s>
zx5dj)oWCoX>|ixRCj5?mKql}lOQKr6IN!d&Y4ju0>S>*NoJMC9IwBvBYIU-`j{4a7
zhWgm~hWgOsQ{+>2z6lV`?9^)c5+`ebX|$-3oo`>T-k!p7g4502YOB5*-$O{FF<K9=
zf+SW(jvkJY-;M8~)RVhg?O}@>Hmx#h^so~!-3a3)q((e1NeLwJmcn8oUbaezH+Yxv
za->4dQ5i?iuVQd>T|tq~6UWU?;ARAPav1jmQFkjh@#Ioes~LTeF!p!F3qZ$e1sxPU
zMZ!K0J6Nex>#N?W)u%g8z#+>t-70GA?I$_Wq6($Inx@O4$G8jrl~%XzJiIXTCM$z;
zj+QY;3(J)jVr3Xlm_%j$*7e}uL_5r$Eu#&+QeM-x72!jK<)|aj^&qF^(@F^-H9XGK
z4#{m$-e`P}TN$T`ww5c<)RxlnME+AwY5ZrUz$rRw+C1=dzpTUa<?-{dA3J><YYP&Y
z&GEIWW&rhy)EH95c#CFy%lCW}_!Q<wfg1bej|E(Q#7jbcV)2s}Kl#M}qo3dE$Fo#@
zJwAb@PF3+eb`I>v$Z+2d<ymW(O%-V(^2w;y7G~3hJ=7$XsO?~N5T`clj;K~K=x)dP
z8&@CBRZW+a-;AahmA+%e--{I=S07e9c961)u7ZW7bQJYXh2<V!U#mtZKM*w=V)e~{
zl@edyU@G~Q`uapeo>+aGVN1Qi#@mr{SL)5*1Ul<(nkd#2^=1f6z|fO_B<!pHh`dr`
zo21_4lNjZoXe_V^l$+7V_&SI3owc_0(O{ucCFs)e@@RaGLs@(k(_tdf+;SySs-5}<
z^EYbsr9}O%SbgUu)i*fC>y~cNIa=$3)OdsK5H@D$96{8_c1VcskgG!_>aZc**s7p$
zU9;H<HX4-BIcNkV*5X?76;81Hh>vey=OBI!^U?H-%}H(d#BD;&-b3TC_m+m#5h>w@
zvG)7x7AU+&`z&q^?XM&C+@D-d#4YfHbGPR5<+&u3ODwtFbNSp@+jHm6RYtKJJLz}4
zXBp<|Y47>Xgj&Ly?RP$Ip2Z^|bD+0Qk*LiAYZGm~%TY^&Qad3n^PQP|yq3Eg`{sAH
zj+DBO#PmY>ZLD*pX3XUr*i2K{Dq^)_-~5bP>72`d!1hz>1ReTnC}X?66Knl6kYR>2
zGh4&z^{2$kh-t7MYM5lfd4j&4CQqn+%|KuCfLgMMC-qE4UkzofudHt9`R{9ecn^C`
zsTqBk2D_n#^_A5MSwPQqwmz*C31xL+@16!<Z)1JMI%ln`QV^c1Fu5lU&iB@HrR7oZ
zwF~R(ScRH<TJ5U^eO;bJt<+5s6;?N*(tsu?Yn7psd+=sxLR6hvKaEOL>R-pb6DvWb
z`7OyM=)X&Eu>N;Z`+u*>YZ{GfNihm>F_dal9o2RaS4Kz6y{z`%hyLG^p~k!^yl#09
zb^CQPsJl{X{x*hh&{bqb-H%#RNu2a<`3<<n8R;!h1G_=p?=UIIs8RQNYbqzjaq>N^
zIX|06rS2pAJ?IIWpIf7;X-dtQpWmq6&*qWUig^U;snG2Lol+<0-h-@;s}HjJ4~=ed
z)M$#U@7?(NKo>(#w}MWq52)F@35Zfp<kDB$y(Q`kXowO=&#aGheK2ZzX3=;~kvpNx
zF-!B^JD?s^u``~ncinuHU@Mb*pBzHXOoCy-^Q6@0R92@}LYXyILYcMqX~q_%1g4EA
zvw|5(afC|L_pfLJs0-1H^Eu28(`tL5zym$H$H$e!x5)8NP`s1?kz%Vt!%J=W-F{0t
z7dOvbZ+JBh=_>FqKz@i`zY-DGQ(4{Rs5_^;C?j4HB~u^9j!~$o7UZh_d+OU+-890z
zh8lqTTYibws3kP+wCT?_R)*O$wX~4F<3E+y#C?fAu@bDA%9>(j4CicPdus{SM(>X8
zmeBW)acOgFufQgOAJDa5du_y(*wI=7tU`&%fW#8YeE=qnaxoJ+{mQ#I&K61K%^ZIW
zF*AxguRG5FHk60sDBbQjN^U8nu>;YD`CKlcsHRSTJ62A{UV#sCbON4^dhqlw-N-du
z_Zq5OJlv+lHk5Eh(gZ$)BB@@yfgDfYwuMdq*DY-S+ZJF=>KwW+<HoRAZNbgPa44FU
zmDs1YC3dJKylRQu+{6-yrxEUCyP#a%1yN;P6R6!}PiaAF>`o_mluUh?yGNzQVj%Za
z{v9=D;3~E{c?3FPxA(4Asbi}%v38w)n?_Gv5@c*`d-Six^?egZ`_3c~YvKOtLZ$Z!
zEyS1D-dcjSvA;IC#MPLCO16#)u#TCWXrYLQV-In0&`&Rnrs17kb|BCd%F!7}q(7|D
zBUkhOmeEP{vvC9Wd8K|HdL3P-|EBAdC&*9$dVh>wTc>xlDX~p05jaPQwry-mXk&8J
zWKza(?l!h3w9&Q%G7^a{Iv2c4;S$MER|dl9$@{sXRA1|<iBl<&`f!XIf&Juzg1@J}
z9oU9C&+OjH(jt|<b)J*z-_}|JW;SlRl(tu5NL>Fnk=ledzAnmCMv%}(e2ML?C0HBH
zrR|m2N+qMpqs?s8)X&7O8tf-Rw5nS>t;Cnv5i3JqYlZbKL~G7VDnr-oEo@B{x4UMi
zU`<Ji5))gqiS&tUc2p8Q){`MislVMd>x<FHt*4|CiEB34rbOE|64&e`tXX9Y=WZi$
z&9*JEfR2O7*J5=Xo7Ghg?=$w^iD+?gVjFEs>_{q6R+d--C>~<K=)TBcyL;t}Olu(N
zSm#fqr%7>IImPsODUSB=ZiUtk+O5vEw0FnR-i~^i<O9wH`^~LV$5tz?JDz@<M$dG$
z+q~`3{}xyOCV+me_3v|=l%6NlA5Xtsqi6NM;%$ds7{K;|!k5ijf4~@?d=M&bTYm!m
z4vikn0eyB^5<T_+|1DdiCCPihOyzJxR1}lsb`pJT4_GOEuOxb`PjR7Af6^Xsu(gvC
zqmNskNhP#BKrg@VZ)sbiZ5!GiP};a4DoJhRc2XPK9#GmC)TRVhw78J%fs&*>0G}Ir
z^>j2RC$WvTCA2-DmB33>>_pT?u6QW02b8;F(6p)ihDF6^WAZj+2NaB7wTzRg567sf
zl-wBpdum0~W;!stH`%E`rH`%D<oe_E>_V!aHWdF;iA_XQ&IW;JZQNcEZ1qwwtR%UO
z?X4wP8;=wxm$({n&Ev41a0hQ(tCm5v;4sbF;!jlqEEIX2M60Y+N{gqElW5^7(SOg@
zX%+cCre83vwgf6+j9QzkJKE6GRm$i~+oPxTuT<-YCmZ?;U88?re<D3yq35n2cN0~;
z0@fX~(tcFd4!bS6E|B3+;8Qqpp?xJ&ALc$*si~jy+N{5)zMcC}nOB}BG~r4A9F;z{
zc9QGg)>?uc;S<B{mFUCdsM7yUutro#%Gx-P<55PC&_;ZT?X4wP8?T4kE3t~nQl*W}
z2p3h`fESG?FBjLf)5eu?C3dvxN9?xU{<2O<C8%E8%;vcZv#0d>n0$0n`FK$jS4)(j
zLAFMrr5XwqdR4Ay($34|%0*E#ZqvovQ?$fdwZt=QC26utD`7MymO!5jg-mvJQQJ_g
z9UeG1m0hk_pS0DDeJTCPW`kOqu=&ZS>iU5CPqua__r<TKWa`7@gh~x#nXK*j_tdvD
zYIbIJqO&ljlS&_(>E!yiwU+2iOU&u|PbD^y-?W)#ZQS3fLK(q1+t}V(g0=Bf*LF*=
zwW086Gvg5(2eXlm^%&G%8*wFew3Yy)cyg@Qkfah+LtReinm2O$l$l^w5@Z;uMCf~d
zeojuJO_fL;lX#@M4K>vq=_?|rn}<g{&Z4SgtK!wDR=c(;=*mkhp{>=9=O}?T^m~*x
z$iG+{s?_5NZG<Z*Q2HO&LK3|y^>{*?XhRQdLH{^i*}M_Fq+{6pr(zXW&>qPo+No1w
z3vEm6P)k&+CAxM^ETJG;dKKBx>G#3>gg2UkU;A4gj~17;gMVq%dh!Dq0V|lE;k3Zi
zqS6Fv#geDg<*fJn@Pi_#6jLZFENKT*&}eDR9hI6H^>+ouiPX%p1GQ>H?c<iI)DVuO
zXJ$@2c4mwkbvMOP{}IYgpoWf2cH==tMOWAB_qAN4Qd4bxkjdIcTb~xA){!3&c1g!b
zX<tdRB+x4Q0BTk>pncq(O3h3I>Jn7%u_tIiF>3T0`-SnE>Pv3~)R+jBS~-(wuNCRP
zk6W(xn&uP8^7z|1A!F37^T^KAof*CaYDGd(YDE_8BYo7msk{^_s@sv5F>3MyA5VRt
zyefgZH)b-1zjFBs{)&~pYGCWSYJ<Wim0>7sT$xJnrwtaHREBAYYMFmPWRprVO;Ih$
zG|Y41vPtC_E*oF&T<C04Ifl;0mpd0mOUqIDOOb4Fl3}#*<<5oFCY57IZG1Vfvt7Iv
z<-XSNS}siSTAZb;hz_lv1Gh~o0o=Ati6s0M8Ls2-TeJfFmX_gx=Kej7+omLN+*nDb
zX||8&wkfwMuH4@u$8Ab(k1KiZ7FW=6On+e*HO9C(t{iRgoH%crk~@-0o(u0aVkTlZ
z9fw^<@g&Nfmaw|BsT@tl>yk?`ye^?sd$?V4DTdp{N->S%9Qa*wNrvAgmOKZJM@z;~
zIWAw%aJ<Bltj)G~UUEr>=Ovar2d+m;#xOdx$#A_`$-l?<lFKrDFQM$;;CxsGakw2?
zUP-kmTAKV9v#DX!ZScM}<(NJdUyfnbZE!#2(vQRa=$`yHYfV_l_N0bcw}bz+DG3dW
zwihd@VAt*7fNe@b(@H3*;N)%5y*t{JgwB;vQfaeo$py3|+m{R%r28_d<T>%dHYI_L
zB($lOOvVY3Exgq-;po1EWkO358Xr#eigqoOq*Ba6NhsB>rIJ*NSt_woe`~QMm1Gu6
zV##w^E=eVs<&s$PToz1HNoK($mOPgwLrZFQ2}k#3JWv1DqDd;rESkhN&t=(QZ^hXv
zXmu6ttI{>V_9i_aNjnx!n^LhINlUX*?N~ZkZE<!>+<v@A-H+$Ac-oZI_M=wvoR$w>
zr;f9H(5AK@5v59ToO4+~ZOUo8F;=d9O9<uSEFroV|5SDqEl2%i=d_60l!Qe@=a9t;
z(~^H{8PWS(N@M`;bJ6HUYU|LWBT(8Q!Pa4R6pcGosZVkLQK{*1kzJf<87W#XbY!Nh
zg{jp=6rJ~PY%iQIcoAG}L7_&33EvWkc2KP}U|)$f=PR1MS~u-`dv==Acf?nzeSbIB
zcU%?a^Q*chj+FL;Mq{zQ)2MfhG_Hkq%KYDE5>)B$g{8zS4n&#lA%m!0iZCWbNr!M>
zAU^Y;N)LW2^sw1*hYKekZ{_&?^7g3B7U$_oqK3_eD}5?$izS+#o<NJy#@$?2^;_dU
z-ko7nyTB1LUhKzD1QL+Sg(4;cvN}qfF)c-ELMQ0srO4dSdNUmlQsm&ZqntW^qR&)W
zeMP5gsWB{_SaJU1&fPBd9|n@~g*=KJYN7d4Gb1K5$EBu<)^uDkH>Y#fkG*(kGp;)1
zo=4hBC1*IUf0J3cmMl+Meoe;|_w`Qsn}BYPv2%4+>1CIom!ri2{AB4cZms(wMkILP
zQjG>NsgLwlcdUbx-N6Z0bm}BEW=n^!y5-Vtv;B`?s<{Snw=hI{7CC!^k+hTyhr?r+
z(wfp!kV@c4wfCc{BP@vteF0ayeovFf&{P66lK?-gXh82ssIG@&Y+=*Ll7YRt1*e6_
zW%n2>?#?UC>sG&Z34UBT^Wx69MRK3`f-qKh2%q#^kn0%nrt3s8gtMOa`!hWzpQFjj
z8IVa!LYz{0^+#17kFUZdeDInk_{1NUw;25ZXC%s<w*A2y@P1rcZ~iiOdoC#s_v+rs
zU)|X@EdTNW1--i0`^M%D%bzPA*}tFQZ)$cycE=9a&Bc#d*UzCyGu7K%%=(AF8&aO(
z5LCJ(=+Vh|1S>^%GDR<t<%&_atxdrx+SHbeS5Pl{2f7~>ECdmuJZh!7LOyi(&G}Uc
z=mu>&Mva&fMxD?`d!?d4>Ne{1pf6ByUu}oc92NUp98s$^-jDV`61}#^6zXfE$O#-5
zEkSGloz-64ZtY&w9=9hsT6;WwV(p7jdptGG;vBo9Nk<A>M~!{EIO@`F8S>mx?BUbc
z!xCr3-JNu!4lgZ;l4P^si3p=4>5w2Hn&I!OGve{v;;Qm=no)+WGi{OK3AVcGETpQ^
z_V;OF-ZJ4!`E|FgW8ISah+$M%d^n8+&GRN-)v?Q%q8H$tq^;ueg3@YT#BQd|is{&_
zHj7{pjD-AMyEOGR&BIWQJSuhU#avag)O;!YK2PwsHY}Ym%b%x_%vjSrw?Z5vtbl%-
zf_q{8BgJ+DCxmiBxjsv3FgVFI$JONe$%S|Lh%2?pW=l=g>#Zr7DHSO~3bxvbx%J2z
zQjI4ZPL7|;c%kMkLT3~PK)&TA?>3f5gzxE2?@)BbWJ_Z<F%=E!(<4+Dag5DhJi4Tz
z?|H%6F7|Pu$QX#5;g?iSANEK|AUDvVe)*N5yiiTY$&>1^OK{@zC+NAX_|m!e5THv}
zdm2{zI*Tg-aijk3jr3GjX-~bR(3(Jd171@}_PcM@n-p3OH(8HTJz-zVRYZq8J$XWf
zd$yYoxy#-BWA4}7{8l%yxQUx5Rtk?0&T26z(XR}2XL&ke_gwis@%0`;z2pb(%Kv}$
z(g;=lXSVOLo>AAk2bHloFt(+RP@A!}=niRo(60d)qTK9lxA)A8HUtr{16gKVU@ds=
zXG@h*zldnrm-L9ri;Ls|E&mt0pF?SJFNZ5tZ=Fk^zE`^ks$!Mc@4_Iq-%FDByPirD
zL)2i1mk-$Q3G}i3&ZwtG_4*h!cGSbMeT>A15xf$VVm9Nc9OQ$tBc}{PE8;fttHn4h
zlx?iOKuZ^}vX67rm&$AFcx@wxM+qI5<mp1nHhv-0dD?k{0^I=+u~yZ6oX%B7(o+m(
zQD+uxgxCdxU?Aygqv`)2Y2O_fRh7nj&%Jl%PVX%<$s|+KE14vdP?Di{l28Ie3891Z
z-XWCGn+PaHP!K61Dn&s>#KKz9)wS%3YgxsHyOwp=U6`BqJNM3n!0LN{JTb{+GBf9#
z?|i+=+~c-ITTyVUHRB|lSTaGtw-&uc!8#@#UF-^#45xOe8P1>K&$M{;et$#KjHJe-
zACh<`i6rS8?RLGMg+`Qy!d5C!f1iq5n&@B>OMF`U?-8><%BuYHyn5&VjhG)zwe_m(
z(6O|`g5RKL$#X5yv*fvko{dnjMA0;3eyPWQn=e{^HKl0z)gL5sfu&BWW0G$7TuZN(
zXb-Q3^x8t}rzusVULsD_f$0G@HBcB}9}Bz{U=IX{F+c+FVaQaS9REDI0-_aF|L-SX
zrJoF$z2pDylbf$VLf1*r$y8~tl5bA3J80ndi(slj4zNnG?*Do9tvm_pF}jd-+pFcs
zxWqGL=)I4~wG8Vtz`7<a_kUq6aSiF!!Y1Y*UM=&D--M6EH{O$S_`iiN-k$Cs9Wy{6
z(tWDI3#>Y8>m2@g#y{;>A-x)!{u^=5p~0&&HM-kgy$zB-CUK5L{Q1e|Onf?gTsq1*
zMk61rb^Q4*s8^%nug7}{ILC@xucld;tzW$spKgXM&V-DSvpf^gZRGwU95&>P)!LGQ
z0TLR>zs*%E{)R_tM$hC#ta`0hz*GawurPws)QuXngeVM!+;5^kzN{+HQNCa?XxXHY
z*o@RED)-UgqvAi=xtrNjKj9(&_S28*iJ%j|e;SPMe^#;R73g>;ErQ+ijao{|FTK=i
z5j01wpwr2*O1h*Pphr`PlU8~76#MgBwo+atsuTaC*FOzqV-o)Y+Xrw`FxDq|NN}zZ
zy1e^M$<V+DL9ek2<iB?dZ|Md81(KF7UiCo|%igMZq=$j_OD0Gdd%L&lf8s;btHM`<
zf??ZH?U(wt{`b=mH>&=PPrEaIB*msAjFv6M_oZ4est<&L(R0F`Zi_ZaJ5IbB_bk0y
z(g_p(wcmQz8DzHvB`hi?(kgNLl14dz7))AP3s&G9J!xJJULDWjA>TJQNEj;P(6TeP
zXYpJH2o&_Q5#ueD&if?o7D6#Phhp><WFNMUf};nFvV?v*s~s!xoA{^8ukP9s)kZoy
z_L2%%zfCJg5n-o%Z$0UQ&z9;^j+|+en=B{Q6B6YgVLydsNbjFfazf(%VMb9i4&8JG
z1zvOpZOpFnkJt#80w)TY3`si>^rB;Y5d#b}R?VmldZCfpA63QfH{y1x+!9p?pvhuf
zn6LvgqI}MDpB9?$3pQ7`>Tb0~rE6hX4n-c?S;e1F!!bG1K}fPXEE<!|r*S%x1iwxf
z&>9+|7N-WiK#dwkOEA;qF%1hXS)<i>9bUE}%D_r=SkYlOK2C(rO^i<)8(BZ1eneu5
z@*Pb!(TdPOI|4i9L3wmop5U_v&FCg9wG-wBCO<N!X;{gug@a(Ui-X#c)oyV~guLX5
zts5%N?X&HJrUzfv@+bCo+Wg6Yxw8p5yHR{^gLr-;d5b4gpy-_+dG9hx%QKs|qKlV`
z380H^A+svdHQ8!4nJhsez$E3l^!fRPnRyJGq2L8g5hnK7+i-!jNM24xQW~bydOQl?
znl(SuRj4h*&>6E9!-p`C4?SsN280StFBQ{X&vcZy^t=2EW{12{EZf79iX$7w@$YDw
zoRJCckb$EHX`fw(Q~D-kWRjqj4qyx5&z#K(nPzo3Nk%5?>fO1|mKl$|L8e{{Z)rC$
z(r3%Wru;LmGSNvq7q%`FpZ}B5l(*$<ck<RR;wKNctzm_Z{W)Xs!EX-`-%n)2$Na2C
zx}*bt9(rH6SJ_QgPwdfWkCA%z$o{F^YaVe`Y-+ZNukyl|fQg{U)1ebV3o(DNz#({3
z^74|HV3NQW84PXwndr;w_j{9*G4BJ@0gOg1pOnYtjf@r+a&(XpuAVl&j-!C9up&f<
zl-#;`87*<d-y8?(#5j<U5Tf@l4U09f0-QFAe)NF9H5K&k<%5ze#{+z)#(|mTzPy4S
zi=sKk_1_OAwa*^=pV^=XKMasF8)kjnG{vw>KkkVSYE?Vd;Jp6ka`Y*QVA|#I2&6<3
zm!9m&%JTUz>yn|vF7tD}xoD8>HMJoHNfw3H?T94CT^6NF11~R!LTHQ4;Lfk$vgNU;
zph9_oJnc<P%|$2qy_TCWBr!}LlM!z9<rFxGDDop~&g@e+<3!rL)3*j*F4$@yJ@+3o
z>oN0k`6)UPGu!viIj0K6w_jmzTrTWged%zknU@QulfV3vNK-Fo%Plx{;(^#B{}6kE
z>*&DMGzvN)Jr%T(iQZM)BmLYCHYv%K#srWolFesk7*jC32h?Iwc~de{eLP`Y+FXN9
zmzU{4lUhs%PD?g=0;%X#iII-kT8!1fKSj{yvSg_-$QeX||E1oA6b>?Vw0cBcMsXuR
z@*TxVM1D-+W`#`~vZA*q8pei%fPgP9z|rwPXoHA`p9)`QfWWawgwVPCE#57C|MVES
z(eFgRZQgBpTfJL{UA-cf4Lv?=i<cWfl=<QWu@{**?gREwv-=@Y@Xljre6^Qs6=%|~
zy<hDWbIE)3YwuTIeHEL$rHTC#DhW=}d|mY^Af=}r(U~ccwtBU>JS8vabhc@eXVy7*
zWu#-U++A2$+7K-+E;PA)n7`<CTXn1hP{E*Ug#u$P@0@GhLMn8cPn>7A;0<7e|Iy1H
zvv2~$SIlE_1}v^(35$Fjp~H1EFkRPyR-tI?nvq$+mX?%-(&95{!B-tlFU!TmkHmXt
zUL<DL_AVhGzDp{_%CqNo?hp@;6I8!`d-Bcfdwd(`ZrzbLcwJ*-m#^O?qw@|q7EM^v
zlvBNR`HCKF&)8Fn6|Wz8_G(J(VfNE|*UwlG`&Arq@Ugke%7@g98j;hXO<qpT<nDLh
z-<(w4t-41}+x+~j{wN(5D0a~*+c<9JV&-8nQ_9>QsdLy}mY^Z4s3aq~G?0^)onKI(
zp}s`FCOfAzqsU;k*sUgGYHHY6)}}x!7)_YAniWjrO}Uu?&T7MO#FAteV>98OKIC;f
zxWYWO9-;^6MZa2bEsksw{k1%%_-6hcgoDhLF$@r=7{>X+p-ig8N!Uj*kc5D6^ot^$
zmHzJl-U*W@cz4eDbE^2?FF#2a8?Sy+B*s$TbKUJ7oAq*lT)6O*k39G6t2aOXda8Ke
z%@@9!BJL*pNUr5kvS9T+H=kQ|w}G8Ka5(qV-fMfs9P&Q>!ovholC3v?xJLhr)sh17
z9a8WI?)2M~PeX5^-LV)O{79K*3~k|UCaYS9xwTe{U>5|3$*8q4HcXh~VJhn_79}eU
zwgP~l9mfeV!I&wsQ5_kCMn`>x2t+Y~Nk&;xVBoqr7w7h8pZ_J+mR*w?d!4-dxmcEe
z;I50y)^YjlKssbTcH)89Y<BaM*eC2}?5z=dLze>hs?lrNs8uQ$jn!Z$28~uwx-bmS
zYA_ivV4S04-lcZvttEuC5t0s_K44XZ)5G|Znk@S`JjcFI?(&K|YoDtW_jt*KH2Qsf
zRBpB`CU+x~Q^j3u)uRU<5$j3S(LIkmd~DBg^2)w_;yyfwej4A4lY~>s*%%zr7M(f=
zF(a8dk@h*xy1s!np-^Uc0IIAz4p3(X>V#3lQc@anGP{Q=O(u6yer|}bb6ST)0)4B~
z8tc_=OSRR~MS(ujRiQVl-mJR(ru!<KlhEEPAOS*jaM+usH;ZK*;0}BPoF($j<YcF%
zRnm8eA4HsJ*-ghOge{gZ+?u6j>6nP+q_YJqbnYVB+@puHJiinT-q4blvH%QWWJ${(
zgj0`gnNnAt;XUmsR?iIXUAFS*jgl^7rd4LF=rv@-*xHP`l(cqhhAq3^>1k4&QN6sV
zPrp51E<7aule=e7k3PePbniLhMsr?|4kg`+*KM5thj}l=CPaGXcBsgoLCUtA=qrj3
zcBt5&L0;OqVUJjwQWfsnZ$NFgAuh{fWEwd+M<@<<9L{D(hj{wT=8uY>oclmrf0=kk
z&74y|YR&?FSFdN^zAm0wxbOus^1`nq=f>ik>^5zXKE*P{&E?z`=(bcMHAQ;r)u|Sx
z(x??6l-Oh|2bUWssQENsQVP24>s>CR#p>Yo2B$kYRm*EUgjc9|sKXi$<8hii9+Q*f
zY>YrJ>7^=MLLr<^A*z_s3&9s2IxA#$aGSUW;{_7Rcqo_yW(B^4(y;UuGN*%7!gj$N
zR^SiZl~)?XGYzlczXsBW{uDnH&yWjIaUbdMfVh`bMh`^EFZ5e?@ly<e6JN(;Q5$U}
zzdRsn;q@NP)bS(v{@|EK&`T=ha3Ok+RH5H%HR{1fG835T%zS1!^LAu%&BTcVr<5;P
z(0)nQj2U@z(i$3qV^uwR==z{>Jm1AsRAehD>C$KHoF!8P*O1}KF4yoCjlE{g>o>2{
zqGjEd72h?jY?^y$y|>=dzs^y|wyjiFYH|t;1@o3otFNmpD5$KfpSEnCkTH6^KZ7ZJ
zv+zwBWPln4+ndGzk8g?i7zM7(PXNK+eMD&>;4du+6=%kOTH`;R@t=vm3wQjUcs}v-
z&cEOJI|ds_>m)uuu^#tfNqKq64*Koi;nHwvkUkQ_W%%#WaA|3n?N7hQ-1G@{Rm*E*
zCrir9%A^;QSLolw;q*H`qBOjNKH_%aTONKB-wlUL|At@4J$Nvbe%O3`Bj?LP6|pXO
zw7aCFoK23uNaXO~3;MSA%1g>~@Bmysmd#&e<|&IA6{9=Ns2b7t-2H~se%j9?;1TrA
z<FAVc<~Q9>4xx?dQ}b3ncb3YAY5YY*@Z#@6Kb*w7N<(QptU=#26-gq?`ZcW(Qx#7w
zzVPI)Sm_-967#s?ZOCoI86Br-gnt83J-QagYM^O6f*jDwA0K<6Zte`tcEyE@3qIp-
zIJ1kpZdpc6Xl5J#61N`j*W>*#M>+Uh;e(+vMbc4d5E2tiw~f0vbp8~6hoaxXbu<31
z*z3v(N5)R>K+g)E%#e$GTg<vIiMZhq(Wo_qQ|J_WLCa`sq6%;bwVkCy&Z!8a60DWj
zNXRa#9$Eu=Q-_`zI?Fw){!IN;b`trcSlA>clP|D9vj=hBqgX}Hq(m@5lr>;%I>tw{
zU^-RBblQz%wxOMPeB7!$ZhUNcPiIMLyLOhZ&U~MW!B2*Ds)57#!#5)Pn~)5!58lI#
z;9EW>pBWS>RN3w3Y>Wiu^m>QO%=^9GLTf=TV>6oVN~_0{-VpULR*T81)HY!LE7p}J
zt4gDF7!Z%7ql9Ghfl`p<yt2~KY4H)TrI{SOT~I%)lFmnM2c^;~$pvcehs(IEQuV=O
zBWi-ZIzPbq#XrtCcZ6&i|BvFwch7C?u{Nh9Bd2e`((699CU$Lj!6V1r+q^GzCws(^
z1Ud}s72hLW$@IIQ`SX%V)o0!#ua_2eST$+ELvyYp-iz1{<~Y&0?x~3SXES>v!<?|D
z&1QEno9A;f{2q@=#q+sdrPGzpxdK|NEt0CT1u;Voqgz~QE>8WtjU2E&W@C$N#E3!9
zg*Ko{a9fZya4uUAh6Cp|yR$JAo`Vx10TT?cDU^H(Xr5d@LQ-DncuvUI5amp9Q(NLT
z3HAd910f29&PHtpSe&xW5Tf=(7{-`SP!yw)y49C~zeJw;cfo%5WL1NEc9r<+1#!w<
z7x!#&Z?WR5i1Vmo{jH?ad-buI)}ic#eiy`ZiWRHoHI?Nx&07)sh)Zr7-Si(ZExp6&
zZ^n)#Z;zoC1MN%vUtmNKUd<|IW~99#9JYJgwBd3(bnuukww>c5c6&!tng?S&TqQNp
z6qiTOSlVJ{j7G3n;GxTxrZA=d#uTOsilx-dw8XJRI<kx@34Br9F_uXH@yZwkB?EJ1
z!r_1tqnRp!K$N<r$xO0s;TI5pAa~#Y*y2wfUA#9<k=*~xFW#!~tR)X_owUMMGjiP8
z?b%$fhdYhgJi2`O%q83U*R%5~`jq5#>#k^Lzi{|<vh>`<`h(=q4eJ5t(kZKUOp5j%
zH+s+X_r^sx)*kw0)Y6Ujicc+GyhNPYu|s}Io3e06h83H|!E8rB3**okOz1?OfgYYN
zhoBcsX{J;@3FK+fL&McTkF0?k%0qo!G6XQ&$XOwK7-+VKL@pA+gvgyoR<u4~$1~!0
zZ7W)zitveJDBk$*Tt}<Df8VlI=qNPu|2^h*<e)FyU`+1Faw`;BjLE7~h70`u@)S0U
zOHWOQ%OEG+<HRr~rzy2f4Mr-brs|AFon7W$7U>S@J+`{Wgdq&fEeq2L9f?^Ttp;>Z
zFTri+N^gCrM>cF-YdO8_`Luaw;vRzmM`rKXX`kKp*8P!liDQbd-#?Xod`RVy=O2n4
z<OYmfr)|of9hIB~XIhTGtkv0@8_=odpdyb+f}eF{q!?qTc&A3EN=d<-CeF#DgL-C?
z-I#_6R4j(680`u>=I_`YI*e?rjj9C&csHg<OCBQ0MJU}}oaMGcVu|AcN9m9S>JI`>
zZ#grtx8=xG3w~hj-Lsaumrq(y_=@|L;gRB5OCH$rmyDW`<YGnFlDx{!LPf*w>1_3?
zpMF{;rs7nq?|Gs3IO$LYK3CgHDtG3Kb&49k58`=|h~FbP5ZTiSXon0pTsm}0ztLi|
z8T&_VCf-{U<y&T=$phXbaS`8po1%13m7Eq7pRfW_!$2xrT3lm?G{LajFS)KyEZ)A+
zRBG?uJK9k@cr~$`!p7*x<xhK;oDn}dyRBx>+$E7d#56CrPuGkC+2ZvMgTya;lnw0s
z*e-VYf0N~14_0i$u1hf)EH_1P>9UznMu={_EI&V7P*jxLKU#$CryJqY#P;nb9<yZr
zXZyE_QHgqf`xNp8$mej-@g(v9pIeDgWp|z`IJ0u=R&&^xJ|H5U>wWco?R&H1Yc}st
z-f=#&t8q>DLE>lqGCD<4=?QO~Dh}RnJK)^5+S7ra)gvAt7n{!^u;YrTc|pY!jD!)8
zmqingsKXm16W~H{qY_8|W3w6>X5kG<$B)zZCgb7riT7fl4BpGam4Ewt;cvyoJWt<w
ztiO2R_;K2%3OQF|9hubpU#yFqD^|(jfuLgf=V_egO6!a;g<Wvk(@V*u<HyCXl=8>i
z`F@@#FiZp+V4tT7*&Xj!l!i0$e(|g0#~+iA0AAyTu5uFd9<;Cwkd<apVxBkSO0si}
zMm1Hhs43Hu<ffqd0fzC>n-W?Zi6<A-)GU}^+kaj|yZrq2?ep{7eOo(idQHu=X*K!b
zaDIM81&su)Bqs82wlnOI&J1&NB($0jF#Tj7+X<dREnS^x1fJImIu+Nbr1NVi=w)|G
z1%*G-y{vE=(C=(V@dw3Q_j2M8@tWeT2RULSjui1ToBSQUgpLyv`>wRs)#iI{j>I$V
z#i?vX^FpltezWkOXR)8%WIJ03nIK>;Ru8fr@?adlguQ`h6ihO5Dmm#kh@z2`v|C9P
zl;eCpd%)~tZ;01dl3j}0_Ym16WCGqxYiJdWJAwcqhv6{_BE2<!3JX1h&m1WAkqKni
zN)d(I;^Xh(4t2PLgUv_q&a{XD?oR~j_~nG)%}SaW_~wYj9Z2sF*?r`oc-Kl|!`o`;
z`&D?bKk<ITGdz%QIVKo2N(k(Jqt*MZzS5A{ry{nM7#Q}>d*b83!R8B)jgR5|0uzjw
zpaZLUqLMeD<Ww>m<0D9@*c?B-8G9%Vv5&<J>&R#8={8<{6`%7AIzpb7_Tfc$WdSJ}
zth5aT8REx~KBG;MfcM*dUAMB6VyfsXYv~?d#d{gl&8eB9h(lmmMgemh*&+&shNzZ9
z8GW8w3vZ0Ll><n#0HysXe9iz@icpr1WyHGkGv0rH#(8r5?9aqwAfBHApLYCGGEnIQ
zV(U)xh<i(<0a)5)iWo>KLa`uD5_o-AegPvYewOSELD{I6Q1J@2Q)J|~%gzyT(Acqq
za>C&pe!;}L!Q%&o+q6NFbMqelJ@T1y4c=`=PYsP3&GH2X#tL<f0imnhZ{mZXDFs@L
z9u5-d+PtPo?BE_fXC+O_dc4qo+OJ%*Zb?<w?j07d7pqU4K=Z<v#l8%!#DGPAR>cxd
z4S<B+D5jKQ6*7g)aAw#Ub_$CIuU=KRYW3jNtLs*a2M4Wb8qm}<sA=_p)qt{iL#$(L
z61Op&Ws7*=3R8Gx1U|tja~E4{=5ojD`6BQZu$B1hCD_?oGZSc8W%&FX(&y_jB|xjz
zsPy_)?+X<oi4)f!2Rw~ISwm0I&tPAcIa-`CiH8&XvGrXjg+@RXOi8*6St}`(b<VEz
z9tMsZH;{j`yiJ?%pz(tTPXJae;4dnU!%Ee_V&s`d0as618t$I)rEwvLuQ(W192eh=
z{W13T15GQ)XV=M?`O0E(GnxJCyp<GUvlS`q1;svwV^mLY1U?H&gQY(9!i^{SUW%0E
zcui~xI^|z(9)#CuPB9$v4F4K`6}e1bCB9E*B}sOT2fYN9%(pZy9`6|a27dnzx5_qy
z6uG6a8U^e&KjLCk8fuwpHJHX$s397SLaj6s1++W(pkbZDM3G&qaNtY6WD)|$T6#1j
zPI>$!+i*0y*N>!Bd>y0TSCKbGnq1d>43^b*Si#6xp<9(1h@Lg8En1_+OiW6JfNQa-
ztV*cACakH^Q#F`qIg^IAP&6vwT*W9*tS{LHk`EmAQf_WSytg>LCEW_6aiyq&9CPIm
zW3UDk#j)NIar38_*iX699??}vE_uYN&Mdh(goK9Ikv`%XzU@Zw(gyJ`>5X|w9Mb_Y
zcl42lzp6cY1n!H}`TYJ;M`o8Ix7)~cK|*$AUS1am*R5-jyEa<bp(dJ{U1TiO6%`g0
zX6v#$)<m-%jL+m_HJs0vo(|nA-C-%OiCU1<M>L#Dg-%JBb=NX56X%H!x}(!trQZ@^
zW}0#gl{zsAQBq^5DIg_@O4dLb9oY&mhCESI9&-nKh*t<u%&0o!q>5W+T!O;qoUn|P
zf&%sseFayn<Q6X+yg6?}_do5t_qo8RAGVC#+E@HheE;v(x0ftWIaT=8i+`Q4<l`4V
zG^)7GSMGVR?}&cm9+_>5vHZO0i;w!*&VhbSTZRp(T0MVL<Hi+z)(<*=LBWkqIW=%d
z$~{f{_rLvg(PDop&zDWE?mIlXyY8hPOI9D>k5O2^pbtkX-vzO!G|W|*7zsNKx-=6|
zBAE>aIfh9#>2->{{4|BZ2qeg5k>{(0_N}qmGHal<I+HXopmZ82uD9#n0AV~35RW=Z
zaFZ=a$wy5!@3`ARQpKqU2&t(62DKUkiTSZgLEyevdd_`!hvsiSdvo9-_abH9H-CKm
z;?3p-bJp%#vFg=NH{COQ_|kRBTCT^gnhoJ$M^9yw7dNDQ`RVGLFWbgWsqMC5>gbMr
zc5Ew`GE&eL?;CU{S2Eow<smZ3@O0{=3LHBtVpA&&5XDvt0R<2vg99^htf#k6We&Y>
zL~Ou%FvOU8%b^(-TLSNpiJ$x|o)BLnZy&ku=)Py({*`b0$IId+aUc7@hSfJeCVonV
z|BbJvgN-u~`MG+FUTr}DkEQwhZabo!Ku{wG07L&!D9mt685vA!Y_$mnCMgB2M0)a;
z;$|t;F+voQckB-K4c+0$b)L1++jd#`qvyxY*eSWTfxLEWv*HVs2(e#6p~L+X(9trO
zO|8^uh@d4LGL-a6H8_M4`&23k%TfoIk!WtQh`9NMeI_`S3^>Xe5?q06ck}Ca*k(`c
zY$Y4?#IAN`$0j%cxcASvCp!N&10JtDyF(oenou5qSSXjpWv1zMdL7I_2pYRRDG6LF
z$;2pOejv9QZnpSL?D*7WIrJH4m~j(c8Z3?QW*pZNs1~PR>hBWl4vL#(`LS0#N3&j?
zxp@2jJEs&+T=I==(dxX1CN+#0ap!bm-NuGJr|FHqBTgd^1A;U;GdE&GS`e>95P^lJ
zjv+h)qOjaxwYE40CAEg4m=hTs1ir?j{xg1Z>YX$1UORC@k#^%UJ_^wJ5zr~ZLlcu1
zacJ~fJ!j#}I(RX4Mg~rS+u=Y(MO<5g4il#AhT6V9dUwXnckk*KIgvB}A0BdWhwpXU
zJ)47LhyH~fvoWT4<R~N;(15Q)cUvWS3iLvnzs8|%U}Zg11<xCJC`a^a!WoPz7F}ZC
zLqVa8U}W_DTX2?oQ<0`2?Lm%%P<(~t@>zv2we!Lta3A~ESeJh5QrC}tqSps$AM{4%
z)Q+JChOtU<#kPmGh)aNr*ok5gR<_eKYjxCLYtiuzr(LDc8!fEPj_Hl?+DK8_ILDEA
zGk}Q6uK}DEk9=?!+wrSn&^wQAGNp@}of~-nrjzdw^+2sY+?|Z%+upd${%O#*o87sm
zGG2(afed}R=NFNC*Rnfhdf?Yer}st77_-Q5I;Fv=;q^v=qs|v;b!l;^3W&cEI#HRf
zZY76i+w#~~-g@UmW3nq&^x8Z4;K%Eq;>KaQ9ZfYi@8#P9+EO<ORFNoYHwpai!aYAn
zxfPFiH@H=hX~S1@zXJMhKtW^HxHt{xNfvD9i1Tz*U<~;A1Tv;51yH<i;aG51(&(OK
z!C8XNM1+rWT6WGSH&=_|3tu#^Biti@e)rO`doD$v=YIX@r9<M4#t&aSO311U=l9NO
zs(oP0T&hW87k6==aUa8_9f|0Ylr}Smounii7-<&<n;k#TMr}4hP)hrOvMPCHZrc@5
zlImj8PH0vEEKAD&L34sE9ogV>j}I7<v*g}|U!8mP>L1^5446{BoAVvt-D8sBtnuP~
z5BziC+s{AS>_4yXy|n9;S)i~%&F}M#d_6G4i#S*Bh+FCMnR$yKq;r;J182z2Qu~u^
zJfqb*u&*;wm6l1xgHur}AVz5r-(;_6oUc-D0p|<0DR0avw1{vh+-26{Fi}#^i`6fX
zG6|N4Ke^eV-DuzO^?&`MxktBQzGLgAFNumJ<?SwgH>nSKDZfwx?4(zEj63|;zz<)X
z`)>F8!;kg6`L7i6ao*Z~bDG$`b}=t+c~<}$US8xVb_5Tke*aQtcBE2WSXhwiPcpEj
zSypRlDu>z21>k+j2A$8BtV=FNB9X%xq|=g3Ind<(Uz!eFV{t}pL3$}g7da}>Dn2QR
z;<#dy<}9OP&&DbPX^BvBSYZMWwUnBum$yZgnV@Z2)37&xL$6QoC%Q@Z5a%C0S%34K
z_|>>RR~EkUxr=+^*R=<uzpmRGz4<l2bkUlp(%H_T%BC&#gQ}Y5U3&KG*UpJg9eaMn
z*elOY8hb|kd^2&cBsopukMp6jJc7Q!ERzblcp7w=3dnSg1TzgD2Y8P)4UTQA!@w65
zrUd#&d233FHq~X+=F~>DkPDQ_Qti2-<)|$h32wNB<;RsY_^>HbhC`ADXXPXXFYab5
z<DT}MUNmXJ#4Gn6y*T*LR8l`hbxwQ#^F{STM+{olt$xJdC7t-TYoBuR&Rq+pU7z>Z
z?&(j@H}mc_<APajvL7WvY*X~E!AFJ-A2;Mt&{Hqg%eR5g*T!T-%mS=#mC5d~z<h!>
zpr;BdVjC|d`~VV91Go{J50r(=f)dT(Avgcm`eno0s-EFBCB**eJAc(at7jh}-VRGo
zRb^y-_pgus(7qN-g-DaDGtev90)5A#(<5z2&)ASlWHPCMGcufREhn*Rs|*GzE>Z6T
zrOBVsN%f4TanbY*qutNuil6@Y(ih}V=kjjlJN8B|+$;V={N!8Q5|tfExFrqNDu}pD
zN~Mk<#YP830j+ge7V-*e1LfLrG)$l%^cb*eiff3gSUDfn2m|k*d52uN|7lTtU%WP<
z4>2s-@&ey>@0#Opum*9_%DeUeFPh)Nipf~f0FPE@%pXDsOEBn>Mkr`qNgR}eTBJ*{
z8jYzoszEw8<=D5@M!+w@FmY<>-~?GJa^@2a?^uE4G&8~nv2@>CWM!M7ZNK@MoO$O=
zwBfV+*Nm$rO7a>8h<{+Hp56V(;TxC9Yvji<Q+f@f7@HN}nI7CJ67gv)7D0#1azMc#
za1N*5h#kRRM*b^rtBvy5Spr?D3%}LqZR!3YHGPslB8==Ir?jn5h%-jdydw@j`|6?l
zVt=^yMQqKwFaOHUAg|rHymRH+qbcMAv25w|yY^BXcnG`k0Zsyw9kD?&Dg@NC5VgY2
z3XD)2g_S7f&B)P8$^8sR1J&GcEf=`4N#fD-XU>a=bFRAClY5FvDyepY>It-l1A4-z
z%n*JB_Z;J5`bLaqi-qTPHkHlgb|twWCR`Cy)aXie6(V5AA!SFUR^iFhKnv=4j7tlu
z=H3x{p}UaH1LWqRNESq3ry>I}Hg?L<`wwr9{Vl+mpUd$n^DC<FzV=ycCebh7JayR_
z<#7V#nj3!pgO{PwHjB&<#UbpDYGrB6(1_QRmZa0!lGBnoKP(@FKYapvUh?>7PD`VE
zI~z^2o6IIWdLn9Wk!LLyBIP91TS<RP$`*Y9B?q1<xH<6kJKOf2OFK6OUmyM6_IDj(
z^AC&L|K|{-`E+xXzr_C&HrwKe!=0I#oSdun*{uqN-fqwL<+*d2T<rEqXahct&yR-`
z=Dt)Pi*d?UwZ)>=sOghBsL@+Bq(;-AVKsDCO#=MpkbD8iwWhj+91g#A#KZw{FiA+X
zT!=s~1V)?mBS4>yzn~vGrKz#v81Bf=nJ?z}6}TgEZ~3e-Wap4)PR3^W*ePoo+djNK
z_BVD(o9SJ~&OaT$wE-sv?irrM4R~_qnE|KT%<ME~0mV3^0ZOwzlnjoD-^U~0l+M#o
z(u{NXSWrtR%~4R&X%E22o02Zo7M!6vl4UVy^(wGgtvw0OT9;X}Z7n)Uh1M}fDP|87
zti_su*q|V20mH33#w9D#5~hSt9-J)@*?5>Ep3dDHd~x1t@%w<AOpaamus^uP(VGu^
zYZLPi&mH%~dXl|yt@x~N$HGT0Qo0OckBxjalg`vfiX2X7P_0E~qA4XMP0eLyq-pgL
zpU<syINWa7JZ?waQdBCLnyB)2PX>*G6#^BJWdYs4H3O0G5_%Vm9m-;1>Brex!c9R{
zv9M$ku}PyQyLa^<T@IcV&pO&I-86CB*tvo2SuY-c@(&jtu<w3=d!buR(a+nKiZ=t(
z2iElI+@r31-qP*s7Vc5qHEfXN+kG3}h4GMWSxnnVnjXVXQf=vKp3C8~eaSUZp99Zu
zj9IeYD6}cl1HS?HksVwz6*;9`RG2N{%vOpbh~G(V87Gz4nVG0jz1U-J@yPbkK~?i7
zWEPKlcJqPr?oiK<J7@G86&<|n$e_Cla=P?cZL8=$ZgAJ8!&M7=Og>t>abfw8+P<GG
z={9IgWA|YL1`O*??}6IA4)8|>YX6PUEZ{yya$qg2amtzFyOSN_5>w<HN#Z@{&p@dM
zL!_E~GdL`_i((_+nPQ*B|3ebT&5T%SbU~qHlxl=)YNLXYP$N*1L~(^ZVYpC+%ZJ_p
zuPu~5{l;bPDY^i~_qcRrl`5#OSm6-tql5TU5-hVcR1@(GF}hrOo1XBz+v6g70`acb
z+YB(z=pjO(M4C%$?4T?Akdp%(fRKT>qnXiZR{EG1IM&nty-yUK9&N87X-l41LI!ne
z|7h2A@s(fOlQQ+$L!L0H72jx+|2?}rwu1B_A#wkO&pGimP~U#wK@_{QGKKJOq7>R<
zSF3Giz|?FMV9ToohrBC_0dcM`Up`z0EGxOssJ&jv!ner2b51<HwsG|I!Cmswe8G%%
zo$8-pA9{y-3W1F$AL?#dX>7aVCTqEYLL8Q{lW)1FrAUvS2|&NnYIxpYgc8836xSI3
zYYKTOYgM8WYPSLEBxEH@Jjmb*O2r{ZcCtP8T|$A>7o@I(o_tGu;wRkaH@)1rj^Y&3
zv8%j_;u=<={?&ew9FEsnt$Idf(ilvPg-0_mrCo(C6f8p7RqARrt5z$n@n7p1EMHtz
z1(&X5BU7e&3-RMDmfY@56`+&&*q!C#ea~%Yw{abvu~>WZ7l)Y9iS;@}GE}@w$`V_g
zBfd6EJUNG(D|#U78UTqS*dx`BQkhN>pEDH>L3NtWgNz4@TJ6($y;aU?CyRz{4#l<9
zTd)~HeVqyUMkSnlH8jr@*CQK84o5t4jx=gXVGD3v(<hh2#h1viT{~w^svjyIp0Rl7
zkk{Maw{*>G*Sc_7JC1XoPa8jGmB%{$bp61t?Zhi$$<%S1#Dm!DFzof;*sB#*W{~L;
zNeg;BR&-!graSfeRJBr>;nrHMK^1P;WBxk8UTe8VDud&~m;#XQRaWL`nm^rYi{BA$
zX%gS5^ppDXX4Tiy?T&xac~3dre6*hIUb^PeKe~|2*$e3A`FwI<+W6Jo7nBd$ah$v^
z9+^6Bt$2j|ap(XX;9X$CK<u2x5!KM=5z|9g1iMD5bQsucMj|7d1WCFtAX^-Ka^fv@
z)K#+NX>rdb(*CWFc8LEbrU!PN*!k*+2j;fN$A138`KQEhcC!tuH^tcATb~8h)73D+
z5gxkYh+6^Yi&6up1k37GRf=i_t5ERdnp(y((EEti=mqWMmN!lqc!~XsGj_T?o9>8x
z)QO$spzFo)2kTVgS4=I&Iz^a3FCa*cWi%Q+A74hLzDE9c8C(EX3FDCR7gy<ECv}Q_
z<Y3d=$4)!hzg!~U&LRD0k+L~Ay;x-uxyt($9|1dyBQ7m&Jk7${?LMo`W^jEY6e4KF
zGha~;--zNW%D!ZrjC;2T60+b(fHaGnY2h%I<&=`9T*<PJ-}^+)%FG3$mpnIV>-u4b
zD*fW;PVzvPi_Of7R|oETU-8kbB?S#Vmj8XjhI_-I$L5Rs4!n1M)_+b6m7&aMNvAJ}
zBoPKqJOw>GTP0K@Lt4NT#nzmp1<JTzO1og5l#8+-Mn!dW^QFzT<lnVhadK)caGxWU
z{2&f5uR;!C6%G+-l)e%kazepgqgW%S4azuU#Rq=A<<b^<L3meNa+TBKT_$Qh@*Jl#
zYYhe%cGnP3XTG7p0<7XFC*xd8WryqrM5o#X%Y`PkM_K1l)|pQ^Ntbo)$<^f>ti$_`
zZeY95iS-a)iNioG!5}~4)WG+PsZG32t=4OxFW<&X<s?JNY@jGk1PKI4`zP#&;$PPF
z1PJQcq!Xf@fFqIj#)?}31vj}Sc8Xn%!y(?agT|6U;iy9t$Td#JFM5>tjZ?AY1Lkgi
zgnTaH>&@+R;yZmFJ9SX&hCynV6G-H;UDI%eYZiggQ!11^b#bUl9v-;q;I9jCsGXzR
zMP*zV-aBsj3R9rMFRmH8K&ADpSbpi`LKP-hE`18u$KG4BbY*31IQvlH=>4%t+~=|W
z1%p<wk4u<bL%!vM*n<vMwiOx#fS}i)#22+F*92MWP*0_NFVyYQ0w{QrD6+gHKI~~+
ze(63kQm<LP0?Tn_2V+wpbzUCUjy-(a8hXU;Ejl%;U=#*HFzS>bd4&Wl+<b!KDYZk0
zx40y0E;TOKrm}kuUTSQ#*ke;EHpS+K7s4&?Wp@neee+fDvT>lt_Mk^2vLwLEknrv`
zX|<_V)mLr_wOSBM+CQ~OE71`MJQkzjTRTiFtm4uq{dc^x`nit>?7TwKcdlIe^n~rJ
zm!F?NuD*X^`mc`+edqk_UmqLFPF;KNivKLyxO+9B_s&GgpSkgh$FX`YQx-|`n>-Ga
zBQKlRX!31>7es@s&THugV0m1IQ^b(ul!PJDuAtV2V2?-|IXqWp_!+|q$BqM@(1cHi
zx<c6jiySM=cMa)UIr8ip@#FUMs_#-SQ}-#UZtOmI(2)6^hw{%ap9#-a`iz=+Uri<I
z;ZLvdbX=2_pO?|EX3Y4<#}2C=e6f1i*tisUTcQ>l&8*-|cAZM)ASM%M<gam*qGg?f
zZWeo`k^pEYi&7-pLK4Bg#S~}p``()`k?kAzk9}(6`5V0nc|V}wCX36t&)3Wwdo)T$
zY!_EtK*p9VcfP}lw2G`K;?$dI<rwEwt6dNWh%wo3<55&JQbM8?3KaLK(vy(n*0?l;
zqV@9=;y-Gzfn%E<+_m|F`00!_<A#Ypb_3b&5yx|%ub9*LaEe&RYNn6s-CNuP+B*b1
z!W356)xn6F;W(D(R7xc#%kyXlAsxGAVR>Dwiac3%{_#!6#dA*dw^0naxt*IfXAb2A
z6M=ske43r{M~s3-!*Lde#c5Vv)3-vu7Hx#$Up#S)x~imyO7im2v%2}47iy-AZ#?YA
zgTT+^>V4Y-mF&3KJq1}q8}44mj*aa+{{~$TWTrTW^{g}&Xy&wP-e$Ghd9V%jHM5qe
z5}ZTEdjJoR3vih-=LlKDU>Q~?*v1bJ<tW&a9P!(Sx^2rS2odkv0xg+*FL*}Z#f{sB
zqlEJFo2O>XMGnlppL1wy#xfP;V}wus2|J+#6<5I&lgZCIocS7!ljSl>Gs<A|<?wpF
zV0B*)78MC7ful%|$_cZK`4tqM;x|g4lw1+moxhZ(;>wv@;c#nruA~Z44Id_yfco$j
zLI|@DEaCXdMRj8roV{|;(5qAJVC$09`&Z7}q%RT5Z4OP|@{QZ(cC6?;rI&_$F(rRk
z*ZIR5*Kur5b5&)#O8dkSGa52_ivLPaDp6Ex$qJ4e(!Zoj`PdSiau80Lic`{V3_~J$
zEZo*vMq@h4=SvW8%hPB|b-a)r(dc_*XD11EyCvzHKw%+0?e$xy#i^+|ZUN>>q>jT%
zN}had@VR2UT;vPm)<*;I5;8~;cnLwMGtn=E%d9BIkn@w3!nwqW#ifZ8d-wn5iTUs4
z6N|qj4m_cr9++t41A{bM4vZ6bBFNz8e}XRPL)}4AlEIjU9#DQQD&H+?t?_H^cgeza
zdmNi->4D6@;_Qo3CdFz?8Hyv2tjY<25;?WHW$Shu$(gaBZr_4qMVxc#9M1wHUp%w0
zeqPnEK7+@!BOk4uy_uLAH!h1Eyx(8lsdDs`KQ;`npLlK9Nf@Zm9X{s2!hPgOH9_+t
z9a6mdK)9-k5EpP-2z$9K)T~D;va&k1Prt5&ZdpYyr>e@HlH$wL8v{Nhf4Y6wL&k47
zjm(85zDDB-5<<e6M1QuD6OvjWVP`^$6X8~h1k%S_;VM))IV9`E`5kuT=ECDA-)9+0
z_aq4;u<t96cNm*8DztO_U8`M<Z;hM(^t(s&cMlxuSmHmp=KgL&cCWpU)5n^&O`6cY
zs=WKWS}n4Nhx8ac$Hn!ld7)GLypjD!54#|va2LnYiimyE@afa<ZW>%+XW8@~9m+aY
zPHVp*G-B|A>F_X%<SP4TBq%!IBfx!{^nP?3@t}o>ULQ1mtFh|8_6pxP8K5g<Z&gKw
ztYXOL1tf5vl<p8h@n;55^&;^oimkT^BJ$&m1%vl2JX*v$g@yhTOWUHSN%5@0;R~vU
z^{pGzj{kY>?0dw2uh=-rc0adJe7`D)d!79D=)}FU%o<?bz1SuACbhSHoZEtO$N=_e
zRSTxCb>F54*By5vopdv|AskgieiP%SB`{9eec2<whjLkD=FPQtA|1=jg1(x?{|pFv
zVb=u(m&@iQ1V)|Bmd1Dsy;a_7FPGvaO0UwZ@tChC5DO$x2=^qYoXRa|OfB@@8h;XD
zL?BKaKYkIOshS!bRd!(VrhQ}1%-ni_Gfd|i`i)%f=K9vWP#MAf@7uQJ)1`Me^{*Ty
zUo+@7u}f+xL-P=lkZF)+NF~Hz@VT5yr&612`G(U{wnQ-=Ta&pFHq|1J!cvNTW?Utb
zxiC_J;t4<OVd0sM)BFut1LoFj+Bf#hjMh6_S@S~24tZU>WbNCw`7>;7Xjyz~@J#^&
zw}GQ%GCd+euUVhQrz8BD#XFtZdY=z{OY}X`(gcqUaJ>#clO!iXpg_n9$~N&$Vw)0&
zk-kx!jAtl;)s%%xCGQUiE^bXhLI|>&L;}5Lw5jZ}wSMlZMdK@a-LrDY;;j0VzNKAj
zzO*(@>(G^LUtZL!OWRoub#u_eV^G_1lgm1_&(Dm6XO2nfSP|+73G2h|H{$k#OrJ=G
z%J1h`t=D6-v-WhO$CKgJYIT&s=yd2nX>naw-~b5|1_$`f?W0JCB5lG2o6(XubSs-9
zk<3x>b^5I2b^QiR9c^7ct8@8M?~Ihqlc%nnJGg7zescA6>YU!4ySE?NwR4*`;|yc_
zkFTwrj6PqZx=ul+AB&3K=eVwbyAQSIog+b&%LUJ|-(*TIOfK?#r+3<n!9tA2t`73S
zV6F{YN6)LOV#!V&0d6Q~@&j#wx6+o=6BS@B0-ADphZD>I3M*3Kl^o@Z2@ys5e4jom
zX~Ve54i{-ZqxaOt!F%V|&Vwt_!_C(^XZTP4dt09+orYA`jjed@ly~}Fa~2QoaQCd$
zM6<MaSKD2Rv}LjLCw8%+$7Vb~F*<7e=k!Dz^A_pOe~F(0)vuH+oIz4%%6BZMgsOA7
zIKjPu(~zt2l$3j%3!Nl?$HE<?$HIl&{V@f5gX&Is(EL2$IXYx8I?=jM3Hwl?S8Fr|
zJWzk9_%`lqyCvh|W)E7^P!l<f^m;3+eP(X)(pQ%*-FkDcxaC{unWKk@|Kc67MQgqk
z&mjwzFh*Eb-Ej|DOl2h13xBvBYNo-+x!pP1?4awq(t6!))at+UGFnMpqw7&3m9XAS
z*OWL1a3)?v0aypDEsa5F76Jkocq*YRapdVbOJ2L$d5->&uK;<;`0fu`+s^KGUN>w>
z;xE|g#etb6<?Cld9UgLMRc+Ow;oV>H^b@n=&(9PGQYi7vbL?g8-cPewSi6JMrlbTd
z0loXW!(#i+^0h+38mb5+c8pRz)J!ChrB&fhV$0N}1#BU!^Ycxf)SN8+IQ`PWYn%h*
z&9<N0Z^A_5WZUTHG!4pjomfk^z`Uk;;vl-o{*@C(1!`mOPaOqpm=3;NfSu9Y64>3y
z-tZWZ{HML{<YmbY04B1);m(xBG{snfvbls6#TAS^wPwTqQKy#e+`aPAk+Uj?3?4JB
zJ@>}SAC^75wdw0Qdp5l~_7B6xPoI2+LZb%U;3~L*i)Mbq+hH;qlbk9QT3eV*x^HME
zIAySL?iFWS(*0422YpkmK;8?;-yu^Ad1*`gsRO@Uvu)UsRrA)XmMFS*9Wtc@zxAO1
zi@obt|FC?{6iZcg{Tq|0_iPR~Q9833etta^9t)$_TTKG1q01uVE?Z|3gOLs?m#I>K
z2g=wJkJgOsY+mJg_2|yss#R+4jaNIZ8TZ^9do~r7l;E=|JTth7h<)R;k*#Fa!TGLZ
zRVE6}+dljD@VW%r>55gtkij(#`23Vtk8Rk`ncHOK6po+Xam|E_Z$2z#5<bUiCCH^C
zw(is#QaB-Kw`U3&NtWxJLGzvP_cU3+QzaxJn`Daxs)vN&pg3gPNd0gmorJq}jin{z
zK`4}}Zc9&^RdZB4)Q<s>`FlMh=0%`bj)sG1Bi~Nk#cdo@p{;dvs)U*;{<M-kJNd0K
z!$wZHHvA+Y&`7QlQL$CNT^%BhaKz}7^lqad=rpSDoHl8L#Z^}%-?t>yW$Fa4k!`tK
z6<P^9rMX=f&5*&CXwQMZO_oiA)m7dseHFRdqg`5i^5%%+$47{5bCN1G^=P*WAM(ds
z3iz8F9LWJD;WX);oJXTcHtW^y?-aIgs3%C4-}I*Anki6Awu&SJ66z1yza-GzN;(dS
z6W8qIc?JdBZf^C2iHgzumtsXv-`u8o<dN9XL#q1Z{v9TavgELc!7vR_H=pLm!va9Q
zg_bv|&{@P`XKe5Xq^b$x-EbF5`El{s52P6kaf$iBGDdP-Ji@(zygz%&^f6+Ci|zh^
zvvJJ*dqoSoy{@6xpvC+g1shp%PZL(_P5#Q?%U^@P1W_PgFqk5p+vrT;^R(K0v(uQX
zN&7C-{f*N0jWK?D5E#`1Zb5)5R&gj$nxZ<Y0NyV{A+rS*Qg}#y0sFVX=F;}n^C^ck
zYrrB)$9EkxMpH4PXZ?8f$R+fTwe#%#`D<dw>fEyMhFRoz?C994RRcN<tQppG!YEf;
z@^|@98>f>Klr!vxG#QG!Lnm8A;E-0JLB_XM#eS!}-H8r_!B*iommPNG(Vfdzb<-#Z
z5Z!uM+c!jG&-#bSPxKSRz=qzSm<*;O;<X3V956DO(<O6RnI4ZT^&7Q4z!|T@)tJyY
zXtO11Ys$$N66pXfB|U=%BB3ft>_?EIkO>7UGt<C+80zEinN^jaKd^841Dj_~UAfes
z(LS|{C%<G!s9pE8<YD1<<l{hb|BeNN7Y`dgclEH^l`EHZ=o(DvUmPfEU)+#mqtaOg
zeWL>M)CNs267j3OULV?%XQgvow&m|ipRdYa?PvXdoy+4f>b|j~vVfW#RJKt+KjeqZ
zz2ZVvVwAEIjG7*}PxMdsBlUz{Ahm*JW0)<UwRP_BzGE*RThYKfvzM-1LDHVgpO!zT
z&8(GEhTFzY>!D<pOd7x4VqGwJ-&38oyu&`oJ~-xj?6s8O;u-zNj5UlK+rAHtPM&05
z=7#fMprCCu)5Olgd8UCM_Lua7G<f%&MrDd7DJ995h9n)oGTD)$_kPPbWJ#02M;S43
zBznivHUV8J-!9WB`SaqoVkSIDWbe$C<yniC^sN7PxadUp$UDb2-2dY1Crsog3)}Xg
z^}|+`<c{7ncKCR1lJd*phX<ef>wz^7e%AIM1CboSGE)KT`}uz{$-s_Iku-<Fmz1Qn
zs8kxQL7NGPXIaeG@svvYjppwuvT-MYy2Y+dXcckNq0mNn8cGD!r7cLQr`vX-6$|V<
zfuq^~?0dtemf!W@l(N}n%eOxLkgaxdSxrr!l=-6zBi24+mPGh}Hmw@{?v|dM_!&u6
z9=-bl;oSAM2`7h*nxP=Ocds5%H&GnNPWx)|y@;-U#9Rb!{}VP<n@Ez4vm-0iYIV^e
zLuQV(e5Vm~*Bva>QK&&78ef-CL(+u+Si}<%R)<SOlBdWzK&>JoV+X~HYsmg?DM63U
z=_)G9Y7_8O+*mChdwdbQUCd{@{WPvrJ;atA8TmF@BHCh?Y0kxm=&bDEwjx+QzxkQi
z*7!3Q*+x9Gj0wfI;F-TQPi7CZvw;}{n%B{17+>=O_H*f(I{FNx+Y@3x_DycPg!?@s
zey>`cjyMkI%eEj{$YRL?`ul<R2Av=OEFL@ZH;W<XXeSX$00|oh4<!pHp)%Y_1l(^E
z0eN@k`WeIf4}1Rbk_KecEn2pmxE{}+oHZ*nec6QJ*3px@b6b~97{ATxSloZ_xlTRA
zZ$Jfy#(x)k)swM!M$Nc56@cetiv!pXfc*yKep~gN0V;-xF`!YA799?$vP`!vU52#n
zxGUI-ZVYJa5yAilr1){i`WZFZ#JyUaUL9VU-FG89OAId0at~zfv7D_>uRPBF42Zoe
zHn5Ka&K~H+T_Qe*-JYB*2uzOOfMEmKNfxa>Jw2i^^suB`(s_rMw$?8MYzmRqLOsAT
zLL_Wg%2Nf&=@eJ5GM#AnMY)|+xRya$Ykc{AU)sNOH`V%jvIQfjY#B6@Et-G-9(GuZ
z_BZx4S$2BQCa8dOD!Nt&+x2(qSF!_J^g!Um_hN4@g<S=l7}nev+l*%>i+$OT*p+x@
zc=I+1Z+<2(^2^yitdc>s6lnH5caHr;u>$r+60qK3b~yAXX+u29t@jvN)+RJ2>Ed;F
z@kk*x%;hg&{jJ`W$f9li3ptiKL|MGpuMU#`BpxYNyquOga(thmzFy~UJ)$18G2CVD
ze(ZwUP+I62HcqWZQ%;3KtJ5MeUeTzbg}op<+U<lwS@sUdMk~x7q=w61u|<({;;4mH
z=g7-=#9b!Oh+X9`*bJ4;KPbLX>_R4`6@I4>GayosmyDEfqBI3<HWNwaOG<T`SEH=<
z)hL0xA9<Fpw6v^OqG`OV=#{7oy%XiU3fj|wcDraPW}?(W{{bQ>Yn2Ej5HQ0;m4pJ3
za>j#TR~96iB9*#?4F>!?n3;tS6$dTsmbGN)>SG5tzWZ9ukioU=rc2^umtGbhedYyH
zbLj<A`~2{u;z!4iidT;wBmQH@NXAi;$>pw|Id?7DAYSd$qgyZWL;99iN#6^XNX-i`
zil<&UMtsMQiC2%{>*!Gu1b>M4jKs}nNSQ7ut5+VAZXO;u1*(=AwUW~lMAuM)pw!S<
z8>6JHvjBEnc<VmB^q@W~I37*$AjC)b>p#ZcTqB<S@i;MmO?sgLIw$^v|1h?Loq8iv
zu_AVW9rfSk;IMC@>#AIR0Bu{UJ>Z;h;yR@21Dyvw(P%a)mZWP+)Fi2s04ud56ZHoO
z_y0!y!6zp%IN`Sn5P~n<SflvctpWsKeI0Vb339@7fdvyHVK6~kDClF=`T5z|tic96
z$SA6bW|%@q2{V{g!H`oGQiaTZr_qcOII}}4dW$Do#WPGP+XPm|n?@w`9pFTZp?sSU
zJ<~2n)Fszt+_{bv$G9?-@VaqV)vMOj?`yN6`qRC?OkFSj^Q9+^O=njb>L+jCnA~*M
zwBY!wS6v7A<qOw66(IjEuV~sbG+MQ8_7U>%#(Ua#XCIA?>Q*|q|Elfm$-2AVetOc_
z4Lz2wdK9^<98=!>os!OUNJpfkGczhuTFj;Se7Od*Ik%(BmCJEmy87&Xug1)S1)?l4
z*<mk5n+TJh5s)ko{+rRN=?RjJT2n?<tJ5dw;?7<ttt}==m69~$JDQ!yy=Os1=$wYJ
z1g+bh4A9&8o(JbkPyM4amv`8!=y|YJzY|^<BlSL6w56`Tb;lDiTGe-C9a^A>tIoar
z!~-MiZfkhL^_AP7+)a9}SiD4n6DCjn3AuzprkLr-L?gvTTz0umU*&Y_%hNbT=T5#9
zz{r+r^t7vqdQ7$us`(sxkB|o-IT+d*MovAK;3ES`PR_dxMnG`NG-QW1Rd{Y$ONpRG
z+`UaTpaei}>kOk<2Uz^|#1EYn$#rLjIJ9>{r}zG<)klUdn@Rz4LzIC-8^iF`7Y@H6
zu6*+HL9rWoZc3U29Q20)a7GV6ADBO`Ub#jF$Ia6+aOB=F4Bx!Bd8gt6JW_h_Q-@TG
zSE$7x9%3_@4KAmE#5}#;qjK{}2K4B)J5^c}W8*P%KxNjcIi<?N(%wN=V7P+2fX?CG
zYsn04Wky;N#6`nya2mt}@efWKt3Y)t-hJi8-r`Jg)QLe)b2Wbs5!cBZKaD5RBCd4(
zn>TNM^`Fk%CpUd$U+h1V6)XNlM&9gB9w#Q%DDh~sSWGIY^ee^*{(%$FN|&jT@>HwC
zY*Wy%5(+liWWUX!$ntu#{feMFI5L{zjwHL`N_F!-rOK!p8MRrBW+Rjksi!V&S|{ya
zYBCHJ%5Azrk0Y@$iHjwKgsg~Dzi=k4(+nc@5+y~nl3Qvvj2IPscxWsPWs+wVT_$Fn
zah1mSF?a7E%xI~N@N4Tgo_K59J7n&)ldEQ(yiwJiy*^~_Iq~aV3frKS;U3|eT{_*f
z4b6k=9wpp<!u^YE`E%PXH~Z|L#vRRiLc9n)XCeCI90c{JKo*RMguHgN#zFu36a~wA
zd{(={l4Z$Eh8CnqvznBKq@+Mil;e_277wI@0R;{Q%KN0`Sa516KaxO{eX}jD!MHqZ
zIVWs8*5}WJ)JTNlAhYFTqU+_#5t=7>tJpWc?bxja`xc7l#`hKfwU?Alx%(d{2lV=N
z-_59lJeppxY+oJs%b;yZB{{JQ+q4C3#0#ln9}=7L`YU9}As5+o<9uCP_Bq2^@h{LD
z3qinNK*H&njuF3JrG@>C?0llrq6k;eGy0KHs5)9!i>uUHXyZ+sNy^if@$gncC&Zo9
zbTeLcX$|z-GUwtPvNctl*}%Tyy}5AN7A}V!96Pp8H0)!y0JEB(0A@`CW|=@6=>2Ii
zTdi8HLW!&=9j`W->}s2pL;2;%sF_F04kc>+I5m~FZ&Zb7gW?v<i91vz?SiTo$bzS`
z5KyEMe;`UYpm2BcJ}3^_^jx(#{sg;p8X9eKy9S<&J^S)b#fp8gZ)0u9PLbifZ1KKH
zBFf$X8Kqdqz0dbXJ=EYxp4RQoWE2GjRzKqpm$?hL^z_`?XjWFbiN@np{iAvh=d48~
znu5c%!<d(qAetK8x+N~0AF`;E^&r~l1omY-v$%j|<Gw|3^55%&yYbg=!;uZ)UhR9<
zjBhIJRn_j7ie34O=KXHtThigsNzJppD`t##=656Grw$(4@&D58mNdU7)}d^)E%3T$
zBwYh#JSi!KvD<CQZl}vx6LlHkPlCX=A*WWS6Z%JW==v7Na_NWk3$zmHGU8T7*vrC*
z4i_i#r(psnve#cL?cKJZE*dWFF>v<6u9Mp?N{RH|=jKvkM?74)=jLY{Sa+z)>UDgV
znNvCrzm%W4p3B&{{^nok{XC4U{6o-Gozy#z-kC6cT!Ph_#5o$GD63$Qfow8q8lom1
zj!}xXi9B^+F0^AXR9uFvrBP{-@WE$VsBUUvP;NS8Vo{$(FHhdRZq22F<15LrFa9pR
zDE`okbs6S;uxb7M3umQ}VW0d7h4W{0;%e;Z7ybx2tr!RG99<k}c?n1&?z*8)>|e?=
zGs`P7GRqZ8`DZz_y^iQ*@m%wZ*t|WW))HE`q<G#yn~=!v6xwV9#ej0-jm%J5Q__|Z
zoqPA|RKF={je5Xqq2B3>vX?K*UYOpe6g0(&7ttrBYx4zAR4Oz#bk+}~r0BDqP9q9$
zo;OQ<E$E0dSOxOorDi*cP&n9X8Eh|wBtGSY1%(v)mIW&5I;meY6pB_)oYZe<aq-aV
ziLqBY<mI(%mzURpe4BXmuYTit_8ix*-?$z<#`O!8;pq-#q4-bSTXQ)-fq6w)0xQOJ
zmPg^{^R!dS8_=BrEp!V<{-W^8$eEF52HzAb#A~OC8}-ekxhM4E#m%otT{Z-^5o`&q
zduW#p1><Y!va$G%E*oWuCL3%sCbFWwxF7H(9i66fkTa~eTX=J3ve9V8ymccwGNW3|
zW;1(GZ7ZZox{0fmZX&Tg<WJucz!ZcD-TRhmq7=XasS^|B@o;>>2_t#FsCvd8efgU$
z;=b4C^I9LNa*LPJ&ZI4LFI+#C99sKuMrG(=ubBr&tmXUteC4$G!sA;9KD74m;kE1w
zth(ui%i@b2`)?%9<@X(cosx^*_M0%7LCMXPDpC@5ONL~(2#lGX#*S$9x(xa{K-|nG
zu_J(~RpLbcLvVdH{9{RIzk^m(f(CqEjV|9*?ND)Ow+yNQ7c*T3=}6Y3L@t!Sq7Wej
z{u&_shu&D(yBnrIQF9+LgOA>LCiV)s51)(Ju{cqxYfvM1!HpF#E|9@(Yc*;l;;W5x
ziQ1?NhD>4!6vWYRB{f=GuVLjJZt<Q2b0!_CX_AT_-iUok?gN8@W@1IAe+eXX5xSnt
zi&P>sk)M-eE=x^L@6dtclFbG_(lI&J?aM;HFmsO8k>!riYL=keox*7I8G~J@kZu`m
z?OJP~U<|nCm!wAcAHRg(B#GC$v_+yFd7p`U&ybQV;K7DQLY*m~Bd91+OJkZ8NOc!U
zop;`*ud`pv`uZNI$r+ETvM;+Vnd$14wnZb7oc1&RBv&BaxY9ABAvM)0>GGX#DeQbd
zSwWvz@4heTGIvu|R5*RE@~%hJg+;SwspnG-KCZUM6?GO>zTYXf0A7VmC9@z>)SfHN
z(0fq0k(XoTlvO@oBwr)s*i(!tMr#nRNr#Zc2<T(N2#8a;H~~YbP8%&f=ub4=(f5FX
z0|O9Rt*o-=(jq#lw}V9Bf}kFsL;yCf+DY8@HX|qeyU?O7rQ-=mi4G=It#94WG2lr6
z%b5&dxovS^rFhS$s885$w{>pWH&3W3q=d;QR1{LGn_V{d4^3?WR$Orhzj**C_AQ{5
z&&-IlN8z)PxV;`X%5s7Nlb2U$FYu!)Nf5O$$tlUTQKJqe^5~-BCbUo<R-i`dav5?{
zj0VYA2T)%6_$3*U65k<@Xd@FUi-1dsril{vb5tV5@dlLE3Q8^gOQ0H4OhbtQIn~c?
zkDom`t@g|amo<(=`e3K~-1j+Cc5Uia?CxRh)Y)u(*NxhhY4Xv<2J)$lHl$|NqTS1N
z>s395k6MMQMGWdx{)$?v5EEf~Gy5ZTHZzZYU&Rcm?Cj}UP?%Q|#$<_-!mgd+fztHV
z^zowMr`P1_0S&=Kiut_4lET_(uteZ{^QbJY>|D~@W6LyYN_uBz_Ab%zN|UjGkxG#y
zC$ZF-8H5JvkJ~pAlf`eS&}pgCxlL=9^e759>SYO{p?<(BksUG*Tg4jX{x}GtA_-5*
z&84r)2%_z5Sy`r>)Fn9ibcZ4#{n;G@#gEqUqfd|OYFc4lQJ-tG9=8iz&wIu%++wIX
zco&9M1QcD|D=jM~DmtEuOcno>)R%STo7p~fvyP{klqB`$>Qy8M<1VHgPA4bZ=|nC0
z!Cf<MzU^bFE#<7C^JgxfL|apyCH}@`yB*>w(nDRU6z7oFKA)lMU48MPYEp4X)9%GK
zy{jMFL$&1H&~x6wUC=(AcSYI?rtCs5W-}0zMgdQ2xjyVc*Hw=xixi^l%2%jFBPBG?
zF*(z%`a)BBx~WjltF1;x4LocOY<ZZC{5@U=6_;kRV&JnDaK8su3eZpjpv2*H0M1gE
zPxj4@Rg34%43m*(Mh&*CFt45-2cX=(GeDxQmDY_jNXOWf;rH+DlBYhs<XO^JlT(<d
z6J6vd``|H+=0CUU-+4NH$=nB=;uGu)TUDj*liuDV=g|M_CrI)(kmPNEopT~p7CS<h
zY3Tc{4`!xeYo1P?j$9^_n~N?5xu$^8ZgHBt&|T96uiAueG9FU|<wuOo!vJX$?28hp
z`*sSY4jZZLRuX>{`{aLeOBV#TZ{zM5gL8}X!#8nfz&nvnDCq$?v>~lIKRLnQeQD0q
zL3@I19nNPxsv|IY;?A3lTU_5Zv0gj%nuc;N&4P1E%E=VmE4#aBXQn4SHrxld`)5cq
z>Q`CX-zpdQ6Si6G=|R9tpJwMgxw-kCyx)RPdbZbV%Y~z_e>58)v{5D|sn8ZUbuATl
zf=Xs$x7a+D;1nF-PruK}kQ5-N1UT6%7<scW>ae!}#GhJqrnfD@-|fy0x5nde$MxeL
zn?6N?fm(cytdgNXO68F_;N0}Q|HOIIVYe5-J&<Awm=ql59c5}W6sS8lpmB{U#gNKC
z$<s0s1TJ_?A?_b_pfjq(t)**s{SQLieo7qCpLsiTMr0FWKhBsF2PbuD{>sODw@7xE
zD=qWe%bg3;{Oy;mOY<iu$*h}HXv7O-h0Kp1e(inDVa?`;PfDkx+V2<8b-+!LJv%&-
zpY2knl!g50{LPeC=*u`;k;{`^oaQQa!9$srQ5y{e(oCEN1)oqpLH3e0D*GV7QY9yB
z1?D?Q99PN(kQ}g*<e?@hjXcxcmzEUp|A)Ev0IaIY+J?{G=iGjCd+#N^LV764rISz+
zLJbfSdJ{ueKuACl6a=Lx3W{9>v4MyU97n|h>R87%>I~zI;HWdBqa)mt|Jmo<dlL}n
zf4}$t-v9eVLITM-d#}Cr>g!oqvNgl{7%mvf;)F*Bzg6mY;Ng^}2C&$RMts-5vPXZ-
zI^FCs{%(U<>gSB;KdWSnbDd(;kTB_+8od%I%*$*r(q2X5*I0`CCkL=p)kZvy$jFiN
zY|KmA1H9f2;Pn=9?Xmujf&!1nm1E&Em0mQ;E71WNcDZ`$dw48X%cv%k*NCyNXj9Hq
z>(h-fBSJADv{^gtR_GiKc*fF|XWk$%eA%_X*wAC1VnQn?I9gIRvRIVNm+~%+?35I;
zjP08|aTt57N=d4AC)Tl3l|3!SghtNllfw9|O?M=eb~HVxnwZ<mI^8yFjJpaBAiLHA
zDVMN*uh+B7uDhqiGQqGO{j5My1@tBi;4s$~>+22~tTbqZd2KdFxrhZrW}t7aI=jyf
zg-ivt+NX=@po3jNCm{x<4!Dj+B5^)Sc4eoSS!@jF3tS>$k+b2%T{cRJ>3jBo)80+S
z5!Ov1fv6=670g=6_mV3L!&zCHb*5F#0~e59@w=HHFK(~O2^Xu^8J0~Qx=uVwAM##D
zt^|JG!lgmdXVZ1!HdAro;>GFW(M`~IuZd%YEO2@h(c}@ataNHNmj?1Q9#0@pVt~oz
zMs(D{IS^s@`yB|sv9KF6-(@ha1earA7xs`atx`?}8!99lO^Hfb$}Dqcy2Ey;0919k
z+)I=QAeUR{9b|O*J<$_ec84Rhy5))yw>~p$-P7$W9&k}ry5fK}a959?$c(wOE_-xp
z$HIwMHdYG5&gb5~?ZJneM&`bH|9bJ{$*GGcW^B?lZsB|X<Nfo0T+x2J_|1;ho9gZ$
zXf+^QJ*ua}!agaV*R9)61s^G>s$mU(8l~ju7O|E}*$<O@$XF9iqS-G{BkrrYV$&5>
zWJ1-Io5;sxfcP9eCH|gd$4fxZ&!H^~z%LQ_Nuy)AMvhluP?3Xo1d7#JS%E-L4v|a1
z@N!;_7g#=CuMQX)Xp>GMb0nl8!|jm?%FMLHm5>BIlMPY_BxVtU?*ka|#AYPmudAsu
z#7dml&0r=L?cq$XioFzn+RJBn#Mj)B!hsC~3rFnvV9klYH|+j&j`&Jn?dG+sA8Xo1
zZQk;5!Qg`HHf{LS5_Y=E`qj@|(=g}FI~qPZJn#M68?O})mldttu;9e9RW~sCc(C(?
z;uXbN*huSRbv?8SLusj{$YnAWTGF$!JYI)IgSCZ1m8d+e@Vab8)*cF~b{E>y?fx8a
zlF4o7EEog`Lq090GnR22j0Xwh?W7#m^1LCLq>vesMVcyYK>vZWioy3M4N~bdW+EV1
zU6F+@p{~j@VlAQQic8?RODT*LHafdVXpSL#P0v32@218zDLJv2)ZTb_jE+2WK)f-p
z6d>sBPppx#(GRtVf3Q_af+IBOne>WbbSo1X@grm<{j)f#h{VMvO=4!+`UE^WIV(OM
zVS)tF0SgF+ITci?dPj;PT<|r#fK%X{tDr~2usut-%VWK=Luy54Cb1QndqSici!w+k
ztPGX~OM{q};M8Z@!W>-fLNg?k(-~ptP<qH)y-5HsB@B5vb}Z2n<|Z@n8B<AeHep^#
zgk-_w3oLoqbqMRS<PWZ^R8z=0sw={bxfsMmn6X#k+@fxVld91@vhwUJlBqT2(4%uH
zzkYje{5@4W(cSn+F3nU;p>w}anNEZIt{3A!z`VLl^zk={H$3{=lFHSa_{K-~*Q6uO
zML82R@JQSvhF&=_)+6Y!@ID{GY<FNQsJ+B)L9)^Z^e2EQs<B}p7IGY>zr*k}0%{l(
zNC5ybVVk6YRPxoe^JEYmcN^PPN#cp!E@`vaEw-CGXW|o+$Tt(8m^jlj)0O$J-yV5U
zX`4gd>e%8nix!(8j|q`Rg{(S$?4Dbky)P5DU$=R}WhH69VgAHFu#ZP1d638QIlRhX
z5ln)~o~hHh9Cj^+<wZ!)9xTYuav|8wJXyH73Lk`o&tWm3(i+;t$Pn=5EkKPX1Vq=K
zB=L|4bjy3g0kf^)z@RiBZNms~<Fhb^yGi?GKu>6?>pD|?^Qc$EpS<LC?}Xcm=?L05
z)JtCQia$0CQnYx6(+u(C=@VaS>&Oo~-t@$`>o?H3Pu#R=Q}zQ_th_I4)25c4jq5F+
zi2r)$$?{6^me=+U4X;{{y>otWG>aIqjPAr(Q66gATwaW3D(3m1moF<1aM-gKM~Q)B
zP%!8~1K_+KV;Wc{H<6^2W}L|Skp(+Y{U#?t5{D>RQBqV0u}!dRqKYq}XIPmH&h}SA
zLGzmn0=I9e8xSn5Ug5XbRIN(Jg?>0J=W;KK|2!q`Z2juit<JlhJ1$F;13|*y<m~M)
zVn5jVgV=clUeknFk0Ra}%=Y;VCR5Pw;1$IsA+2BK$7cO@*%HPO4;Ah%Vmvtbq?5#a
zaU8qkk+Z?57w%m0i{uV6oGP}7_QY-!_<sxMG#(bkri!lpJ4XI$2#4JB^PA#ndE-ld
z8N4B#Q-C$jVmA@wZqTcU;W!v|Y82FNE*wr*N1XtKaXUHAY%z~&3PF;Q#wMd(scY;u
z#fI%NA@cD@!jeeXgG}oo1loObmyFBo9@Bk4<DQa&F}tq6AQ*H0bZRI3lUJ|Yb5$}5
zLpcEv?|D)bra%1L>QZX%q3N9yaC?fPQIEzf3>X+e08VRg`y&y9-{`1rXmXfxvhuSU
zn=s0hNBLKUl!k<fgnUky0A?;gB3Xk?!uq=eC?BLSHkp7M!jP4OLbosv2dB$AM-b3N
zFK;&@u$xU%sdwi7QF4QLP%@zQgd((R>J<&UpJE2o75Dih14`wzE+!9EdbX^oiTO%O
z=Xt#1_qHBCiF>-4RN{D;RNMDGJZ4n>>-VlFr6;FeJ_ROKplNRWDe;Y)Hac!|+;H=(
zf4t8JU|kUlv#xFz|IMr`HsNF(xWLT~iDfyBFba48qv+HCsd3uv97aiajXE^`q`~@8
z+j&!C6VGg7#^ecTAPJ}~5qFX=Hb}ux2Ef|rz=c9j?w?ky@H;Hx_xpw(BB8^FPLjEQ
zh<|f#Y4ZHVfA3gA{&kgjt>WbQ`Nzm0u}CaVoIA5#`XFn=FfUA8S<J&3OlbtIEEbg+
zxWHJZ!LHCYHmMZJ0ZVL!lGaR^VLf}GU$fgeV0Hf(pL{bUiDLqmv^&LSc#lLI<uLG8
zFVyx_=D6J)25pxFi=vT8Fo=n<Iz{h3Zc7hCj|hfu*t7Bx2FUXI%Ao^H$)T~*$XID$
ztQ@5KrCg9SdBQScVLGOwnfVRVwR?Od6{NfPN~OM^?qKs_7wr#sA0V3w$W5KreXrBl
zw;~p|Tpkm9{DE#$WRtNs(U2lW;=AsR-<9MT2dI+G4UOe+fG#&@W~LcbzMxB$lN&|u
zAZiL4yhfM(*Nz3ZiK)XBiXQrDE<BoUT{Ycl0P}{wb7J>>G$)L_3kTqIogz(IbQcV~
zfqrLJ8;g!*B6D3IE68xWOB@cpF_^DVSE$SVIMATqYZTlW0%x_tpR$^CMzxnK>JsyE
z+zaJ<iSTsNI!gt<E;>LI<y@%itQRIZ<Y?EFL;vn(oL#jjvrE)lGsavP;(`sPP^L_?
z*Tjy=CuC_qOLb9ri*)vatY^`!5YUjaRd$bCt+v4d356nta3~N!1S??j*pawKw%Tsj
zn{l65(pqL$N&ZQ0uq@&w&qm_gR0Qi{uKZ=#s$q2ZgByGI#jz?3>rE;vzB(DD;uPZe
zM18@SSiXVP7pRl<1%;f)ARu;|C^0Zel?AwX7bvLiQ5}dV8BkI(Lhu2rms+(hv_Fzz
zonNmm&<^f870;sU9(nUWkJTl8qs8Ja^3hzIwY2>|&(bC0&)9Pg<WB}SDwY@Vh7G7J
z@bWZ^W_sNLMBr?&Hv_hSjnm8L1fa3TZWHaGh?&{J)K@Y{)5V*7SK}IVl;r7OLO(5U
zhy|;PhfQ{Wk#Xea5rad0if<{rlRS5U3i@MK`T=pg<965lHNrK|Jnp(T@YVS@QmW?l
zqX!^A7otvL8mwp+Iy56Dql&YkvDjwh-A<Rw<1`v=sD_5}y;yQfVW)0Yn+aCCP)H!X
ziXIau!+4-|-<10{C$*zneDKIKGc{Vl(@Z*E+$5gfwt;ECtAX$w8@RNr><E2<X_JQ`
z0s2U58y(Ac0JP2IGEi!=+60To;&yOA20;%ggGE!q^no>hvFRgM_`uX-)V;txV~o|M
z^x(2qM0wQNFc7m6I{TePWxn0l*Tw?HeV6-O;ophZoFHFg4Bc<Yls9Oh*erg%W3%H9
z=Z#m9XT^auA8@LZ$bD?Z?_$L)re%ZN%~bL{YD+9Sfc^kW#9}f*1)7kQS0ikzHezB6
z&|D?hQi+%eLnaZk>tY9jwS_C>AXUmrAwNSK#tXe&1t#=?(gepd6`d$A5x<vMnt2R`
zIOhi-UCK}ax+>P+S{_lUva*Wokq9mF`h0ziMaDq`EfvUV18*(Z;3Y;cJU_2D7)0$r
z(4?<{|LaiX0MO6Q^#oLT(hh^*k?m+!l>&#b8P0GK3%kkj*o4+(e=si@RF5z>5TNQ&
zrs&}-rDK|ILZ4<yMj2Bfa1Ys;$g?0=I6-CL6VaCnA^&rwr(K~O{rH;Aj}Q%s{M9;d
z$`vcUj~9IQ?12;3IyBe$_#)-h{G4Ek`0j}-HV(_1I%4XcStfDZ`{wcu=4)bWX6{?}
z)G-009wv<+J07zh?%WV-7O(A*U8^MDxPz^_+tvIF0-sSezIxb{(btY(^cw{F-3yJ%
z<_AuW_0Z;~1%n1dn%B}3K=Ng!5p7T(G=Nfer`v67Y;t?`#!E~LWF}eipc9S<vwd)T
zQUtmnuMF=wg*U>6row^#&&lNQp(n2{k@ueSxzfAw*IbW7=SPWgd8_Z6%eMT|_h367
zuV_<zgltPMcprt8d{3`88<X^SzPH8FClrbJ8=E3tlf4lGLP(AlK+?$H!Ouc9Y|77)
z#az<WlEcwS)@H)}g3Wf%I&|AL^QW!gmW%3zyA4DP`EFi4xWZo)su^ngQPEOa8W_}X
z_A*VyuVv0}y?Uqp7Te^R=Xjr^Iqi<L<#V%p5X;4>bNS4(BnzYvGZhN#dVRJj9o21q
zzdD`oQB(-Q=u#J|3q2^NM#|FUfrH|4SPhL$*6!CMDeI+Mkxaj_1IKMh#1t!>-8RgQ
zS-u;rg#e|(DPRV|Y1T_6;)7C09Bte2>StRBz3bFz6o;=}0ch}4akzL_;)E>~kN5uU
zwO2{aV{bmg3d1E(aArG?;~xc2vwUoMkuQXvCbLde5DJw7y`d5W#blU<rlKN8G>U*~
zR#p^km^`Y0uy2RMpn(CB+$NJ?D1%Lw2ueu$+=aRv`;`O$AP+CtEj!-Cb`gC21&~5G
z38Zk-)NS>1`y}=~f0@odW5<2R9=nl@p7++Vs~)e~kkdA7`VunK``kSvW-pBmAC8Q+
zbd%>@R#>vF<nE2D?nUNu#punuM@$)0Q#pCWoj2sS)(xA;r1m|a1Dl*t#$6VxbfM_c
ztHH>~ygZD`Qz(qaawZ_Xa2b4Dc6xetHgtQoNt>)1M1BI8*^J|n%ub0y`IgJDJM8=u
zjyGf=$dEvgVxd)8(5d9(uCP|H05g+@|7pI)qb-pxG7S0;qc(;d=pq4W{!e2!DAy0S
zJq<KqT@uKyS_=yDRV8}8J0}>7az3A1#g~?)XJ&>Qn=-vXF3{kXdo>n~MQ}Kfsd1PD
za7x!K!-RDsN7h(it;+#rf=>E{54Zqq5Udn3lLDX2t4e8s?xK%z2~cksc`5{jvP}Hy
zH(+>Pp}ApA%Z|e9hkv;H)z5?@S8J#B&kMwA7OY5%PsL@p`q2#X)F*#usQ4AV)^C|S
z9{m!Zy;fQnpIq#nYP`+3cusad8kEQSK*onLU66UNR@BxFi)Cw+nE0f|C@BT%(_Coh
za@%dAo9r0Y!DhKA?Fcg?&?IR>S%b^corPE=8JBPylRA&(Il8vQBkn+EK}28s_Ti(;
z5+ZvcMwc)xRklUw)g_>nud#_{ozH?xG1&q>9nhGw)DE>T7ybX}$o1u<bPi%%p^#CJ
z>Ff#xZmEKW`lP$ry_7e}i;_l`4k4nFt3{=z1i<<If-4!_F|vT>pBl4g1sVGM8>rN7
zUX>TsNLn@r*KyQi%F8CT?;giL|7A}y;G>sb5%=9wSnz00fN4{92g&X3sdG1w%&kPn
z?i^;HNfva3>l+JtLVA6=BNU2y{eBl>cV0PM$?;Gw_>gdN5{`K)sfo+fvqzSc;bkeW
zl&y@gEW@{f*&uON`8}5GXkD}WK$oF>Fnad}nq0anpf=5K=i3qn^7V%vRQlybTPv|r
zZX7iKT-bEEEbD~c@GL(xJkS<2+AM8ee%P<cHKs%Gr#t+5Bw*}zr_<8d<YbaD#T85}
zK>BqVMRH78qP;Bm%ULv4)x{o3W#82sQeh=~Q?9hRshg6YjKUtdE~Om?^eQPqLZ_TR
zIJvuqPmPkLH-P$2V^8(iQx0mvdS#hiyu;@3TG7Gb&7(FX-6_p=!ubR@1p<uMl>wK9
z#TWyYfQ7Rg0nMM$o%12s<w%?vYJhE9y725Gu$#_gp7aa10>N{bF-*`gmXbtWvV@wo
zC$rv&RLc3b&n+eUP1mlNdheti_YQZH$Kuny{1U%dd*7qtAO8Kp<wiQIAR2^W`+imn
zG3eV@jNCM7-mDHX_J*6q!@B)9zVpM<T9<wr_z!n`7BZAM=w)}Z?w**-mj+}!g(4$r
zvt_z~n3M*%mA?irhJTP(E(Oe32RIA&{GuL)EjO_j^6I@sf_23r;KD2h07TEWQ45xi
z-sPFNw7O~7*r}D|<ISsS%cydjw$aYuAGV1<tffchzc*!4%ltEA9$~!J4s?%m=t_2R
zxiKqXJ$Sd#C_{UE&7eJ4uXi_S56Q`gcqx_((qT8?60jbOOct{Q%-Kzws^&F*cJ=0o
z_pM&IL9;?JV8FP!y=lL@qo?;=xAuqC%jcVc>+#zBXF;C<<Uye6{S%Sq0%WVRsluhn
zL)KQo7iNY+W|OHX+molFg5S^C((28C6;As)D)s%p%(Ol*reO9ny_PuigaDMKOBNIA
zQsu>k>q`dAVA_EbnCy2r$V1B-2Ab>3$}=ZDaMi-=gew(8YQ{nDkLsvtn0Ryhs42ty
zw3S;2kx%-L_4XUsyXNvm-(9t8re(me$!|_b_to~TA3SHpl>X(_wN)+&<FSo=h9+VT
zT|fEUq*#GFH&;phYN&EQuZvoAmcoJ{B&o{pS8&RJ+vo^50yNY3l}dSr0v>=hL`uxf
zE-z~O*aybZl5>;TBTJg%5Hhn$0Dy`*p+s*NG?siE2vVpj(6HadCz<4I@#rfH`W{MK
zGGcJk-Pc@u+xWYdm$drzy>p*3%x{=mF|NL8e%Um|w&Fgn9z%y0HNSM__D*iaof{VY
zc3Nio@J&7I$B3T|e{kfa>8-~`R*whY)PipggKyH|o0I}0DxkAd3>ud4p^W;VzDUor
zPA3-|@J>y<4Omx}(@lVjYGsq_W&8#p1k1_-ZX7mRgzO%+ols}E!Ay}!S)gCBP?DHY
z<Ikio@ogMF=CbM5wTlK;UKLp6Tfg-3b;~A5m{Es=OKS%W=`&@}K!zDLdE)GbQJ1NC
z)ien+if}uCK`|BQWkbESn+hn3;q7_^_#D8)v_KOZ^x88rDkkGNNxn!dCmjY>h>#vj
zRLkms75%Wn(i_&SS~J@`$7r83xg=t#F3r{GZ?p&-;?wEv&EpqLP)}9%t{8%P^3ET*
zx5z8NV6d~db5<LMRUy&t)H{?mU<BBSQLp`moMn7*!P_C{WZA}4Jch@mV%U%u(TXp}
ztr|DmG`ojw?!-#3Ic)9OQ&+InL`A^&dM1nim^TscF9j+tGT9@6s?Y>PA*FgK5G@F|
z8<-w-poR;GHJDnKrgS-!yxV5;@R+!uas1V)0h6K{5-xZ5-ZRi4;ay8fI_6AE3I?D}
zw7GIo{mhw$ajVAaSBzWd7`5WXl_ep5V?%8A)a>Epq*&E2d-;Z?<iNQz#KgLrxI6$g
zwPOuBVA>-8fQol58VdlwO?i{vU@+^AX~DFjw3aj>?Ti*<d?8oQGALcvVgRnGk+Gd+
zlSn!*FcJpCpsPS876X#%*Q>!iYQV|?jh4n<CC-&jyt1;H%oKMwi?8svuUNro(GP!F
zhqIBeo?-a_DTXM33(Jl}=2BcumYn6IZ>`+AQaBw~{<nXM?YRl>Vi@60ph|18>ojbd
z>Myawq|9SnAkCNUwz=*b>%J-M!U9~Y`HD_Z)ddud!N~0J8l8>-mhyt%?e#($d4irI
zPm4$JoJq6U0Ew<XYm&jPE<swRVUa*#wsd((g0?CqSt}q|p$kCe=SQ}#UsAMg)iqPB
z%|ia8nS~aAY!DgeSmiu6Zse5t^r`reY0mFw44htB*iV=tQ$5TbC(Cg9Mh<AkRIf+H
zGiNrQ0X`W6$B;1E0C6Qzp77nxF4!x}-sk(}25s3T{l+TaRdVOHNBe8qG$ZT1QDGKN
zwDUeZdkvm#0(aYy<x?SFM35~qAY2M$NR>i<1-s`GjU@uhXWTs{4a544KAHCUtvw6v
z(cDIxvCoSu>G)R`OgAky%^3x!gh2bBp<{8L3Wn3gu%!vc3evNJjEs|z=aPg&+YTS5
z{l)YxD^`)|__3ekZH)We+%cgJH?tgA5mBu!)8&FGXfW%9ilRWEGAA?rn_}<RO8eI?
zGl0}&95pGa4g~@-C8a2KAfMAkNNOoisiaC|@MMXYH*T&Za3RZh^4l@ylHMbiI2u+i
z@-6|IQu(w2qg%D*3kOf0Zk%OnZOAJyxk5QvY18m+^@|<A)F#L4dNBMT31m&(;v3Uv
zOvA*w*;9k#<G;VWl_8w<qq+$Ze9J-^Z>^epPG|$Iau^<x(PGhgpd53u5U<QdBtPqK
zoI;)MHk`GqzY6g(_>3eCW%Qhs-j|3e?SXw@ObNm!RA53VF{_Dv3aP}eEt}E*L0j3v
zA(N*IQ&+G}veiqUNV|PyWo3ZQAKmAkCM?~YMb%=z=0F+NOdd*n27sh<ACkPQ!B>-U
zvyS7evYDk9@ES63R2dn$h8#uY>wxF1*`WVM5>Q~@E}$=_)};VtDznx71giP6?uF1e
ziO<IASB_ohoN8~aPZGUd(5MwlaVk|yhR>K~7!TsVJRocN#wGE8wM~&JeXpymD5AhI
zFd(_STCtSzmKp1P3+v6|Dq=nkXj^_jUZ<z$II_**uf1pe4$oP~Us3QYUk8?&OTm)?
z>Q16`H-ATB7iLU>uxL3+)F!hq5>JQLWJYa0b8#PMNvm&IxsX?xms)AnqLDLZ8E28U
z{@R7Oq5d#+N-Jlmccy3?k$~?qN6KjPY_Ng@9Ae~v)1788m{5{t)+vl<)w}_MUjmBn
zCXtC1h7mjG1X4Vy{@kh7PF}Kg_GzC+HFe2W;k4*2^bRI}jVsBwHQvhjxAbS$kH1#J
z*JG2#8S-g03Y-H0pUDJ}mLL~0w)on8TYbEb!FT$6f?M~sH37Q^fsvP(D8Q_>64^kz
z0D%u6__Eb5BaVhE_`>Fg*R9{({OHP?c5V@;@#DtSH4pUeo3+$OZYTW7HQ%qfciXx%
z%XW+3R?NA)_uBVgTe$*5WO!~JaD<8=!>qte3$w|38sZFK7(1qL02fQkN02~?TEFo-
zoy78$=8Pi{(5WSaK4?ZJ7-W>oWWWH|2aSLk@-!Lga!8;}I7?ER1rQ{K&1nTte4t|5
zqH%X$UeZ=N|MJmyt|%wb%i8KDmx&Ft+Xgh3A19gi-K$rfUZEmJ@vLq8l~<g-MlF89
zr`;KeAJklaV&453v|cysDR7<>oOfFI4pl^hVv)jVHl~{BqI|i^Y%cQ_@_Cs#IhkMU
zHHL3&m<FJbZae%BCeUE>OYyu51RKl_8<SeN=H1-ygs+FFR%Vtw87@&;4!_BP>TCMg
zf!nVd;u#!Dw}-Mvj-kafY?H=Kof)d0FmX)bo}0c6wfQ!Wo*b?ovtl-Vb@5d_w;Ow@
z7pq4M)!K<YtFn4<ERY}d2P=jZ&uTkto?BTG%nN%n<}v+pGk2V};cV<2rbDDTsl$|}
zJENdUlu=nKBZQDjxLLZz5Y%M__I!U?wdvNPljVhutn^u-+uX~J8{5ny#`8sln3me_
zJ%93=<)GqpP*Jbg3a+e)1p;a{kg(8+$?J6XkUh+DXcp61ullR5H#7V`FeVIF=3xSU
zjBzQu#}&z?$P%-w<T9aIAInX*1)PQXhN=PT31cnehBSsYS~iYV_w{85yvK}}8HUas
z(#KgvKAe2uz+|y%K(+SG=a>y=Bp*`|H`XWh5)=^^Zj{fL?sga*LMAZ9)oK{psFBCg
z6~yFWuty$`p7)*gTffpLK=0VCs*(%rrBjzxnd}ispUdJ?8r%UR*hstM07_k?R(SkU
zr6Y+{lX2Cns%y=4VY8O$vC2gaGiEtz&9&9rd(9rG757^q6poUi;?XIO&#2Z+@;Aih
zObxD@LWahh2CNz|C(7tP5AtCicGZLH9rNXcLOx%iNvBrZ?L6Nzy|A!2GkR91KkJgc
zda!ItCNW}56qjVD6n>N%e?V^*Z&$JaSi+~5QR}cDW<&*0P^~0;w%j|hSFmTLWn}4q
ztn7x?af6ricQ_^wYqV5GBUYF7E%M2>RjU^aF0f@!8&Fy_uIJR5_0#Is*X9fvnl+|r
zTDI3!R5`fdK{g?z5BUSEkkgPJkfchD1|UpE00tNpXZ49ycUv>ASBS+<l6qA7OiB8{
zgdDTFSyMZ3e`fQl$^O0M4{!DwMjjWV1=%INe@i|Uvu@jtcfn_-FX3HI7F&QuwAs>J
zT9~zIZmsjI!Yr$D>2)9v<4cJ+iSSfeDcoBbw1kCXt;F4^-Lzu8v%@jv(UnWD(T&7$
z4J*#M`Nu!cnbtb{fOzhvb*swD$ennv0!Gx!cy9uikSbA^t<mzDzbcvO4gkKy7V$>x
z5aYO+nm{i0@dPfR`2BUvmM7l<mryh^eF^KFekeT=7^rGWd1wSqp;hRRaTU&@lTVuD
z!O{`fMB<Vqw1734Nmb>U$WLO2ncB^wn%r+DXIg3HwAT15(~=sQor@FENxun{vUA!r
zt;;A_EN-jGWIk)a-*u^EyeIiC$p`2%^STMbt}L!fNn6Xp0Y}e3?~zW?W}yLbww3m<
z#6Kr*gq37YrFxNO=rI3PY(-P!uO9N_23L^<JnjVUZ3u`4=?<eM&0|mo0+`h)gv~Zv
z#BQ-zF>S<XJ?k-{PDabHDob9($|U!YQ6fR;WClticR7p5fT^Q^R?osEmGjIQupVHX
zL1dF*v#;(qX!N2h9_kSqSN2x-rCy&uwqRcQkN_RNVQPK9DU%0Q<uy*F6^w>!Yb!Hy
z5dy_osk!HXx_TPgF$Q!4y@z)ytyZU=_qqx3IeD~mz^&E(je0y1H!wm%vq=6;BJ#ji
zj{o7=u{I61ST;?!B5^-6B?yL(Xium3_RK4%9$YGl&Smx;!<Y4&I|*!BCDse4*WiZS
zyzuhlv)?mzH14b&H)AF-G2IOWYd!}3phvX9&-Fq517Iz!R$RjX4Vr6Q^{#f;R@ZUY
zn=bUgrYTd1k*TRr(j}3ti(<1JJZE*IJnULl(4DI1rbB<4cXadeHJ3k`KdmEIyv9Nb
zr>)5)tF1LkPCUL>Ty^}hJMShdpFH2|*vUo1-r(my`^usbGpAyWoetpz^0P7ro{I){
zkT=FWL{1&kX!s5Q2Vhhoegh2k6v)HFrN(^l5|skKZ``Il7E(<}zb8E&i{2N-Q~GC!
zPlq2ldi3F=M}e<!MtFf{UG!W9doKEuE_^NzIin&OiRWgiZa=0Hza@R~<nw=#o*X8F
zGsI(wCzH-A#gW|f&i#nD*<zX;RnRPO&s$wUkzh~|SSI4X)wH6NnF6dMS{f|D0HlHb
zC<$2hr^6YzKO-MAchdveJ+ljP%1Hm-Q_}M@i96^HWkpC~rZ}?7>M&|m8nwn?G`p;3
zt<lyaT<Q(m4Qi!YXGU2F#w=+J6m~#A;ZNk>iuZ7LEJp}Rr#ehZX*tCVtAVh=z><f8
z9WtqpmYNdsMWk}}oVHl=d__B-S5-P~)}jGX#l(z)jG5y+{!n_K>>g}9E%yvqd<`;2
zGM1f@Ym60OaxSlDv%WB+F-^a_Nu%D~l%`43a2PDMy9sSR3XBs492&tFGBQC8;%(gv
zf)b?@jP0?$lClyzoR8G+XMQXH_wmQV-#`9XoP^&^AAj80+4<Yf+4Kgw2Kax~o!7^&
zM>I*%IhQ^|fh4IO*twly1ad|oNxnhX;%`QD-YKC?zR<aXenf#S3ABSp*xzuf&N=is
z+K%rT)VVXh8M0?)XTIVKWfV4e26BUyK}CR2YXljAs9xhVdOVtFgesJoS#DQLliMB8
zM63a8OA{rrfYlP!L|ZUdTd&m!T+Jy4C?jP>Jg4Lw0c*od))_JhmH34}P#l0(RF2{3
zF`kC0sLIUZVL-6bdp24T6}nC<M$W#rI#U$Cdxf<9-M7m3#6NrfX2AEKtov$wiTHMi
z{9(rR;_J_gy`FyfQ}KK8#Jey1Ny)h%$hr^JTW&Jmx1;<u*SVV%BWuMwMe`L4C>{IE
zADzN{v$&Dnyt|=O_Jb-;WcWhdoLH49X!US58?{rnCm3*Pm6(yNFq<Qau#-noPfL@_
zruJHaV%UO8J-r&g6qun-6gXu_HCRUy*e2UQwkM}XWp#Uj(;Nl_Rw9UrjY1!yyTA$i
zBO{y@Mr(LUrts$%M#XRZ=c%6#`p;|-pYfA*#Q*Y4a)V!dw8!`UC*%3#e1Z5x=g6k_
zLu8LQgY4P)#ZK~(n2A4jenDQ@bIV;!F1G`DqqpLHSpM5%W5SV$3()z_0wLQ7<(!8R
zGudV31uk}=xo%>yT3VV)tZw|u&>Jxjw<U}r#Nlv8MzFOh12W#E4yj}62DL&1fDFWl
zTATC?Karg@s|o7*j9H6}3hbW}AG^4nb<arlB`&4Z4^tAdI++vBEDo4v^3lt&kZxIG
zAW_0#Lo0^x>iNUj8?Pjq>3fHYr%rqs?(bjLcDg<OXFspayK?>qV;>pv<+D$}8{Oo8
zqj*u%b(4nDW90O(aZ@iRe8E%qJ$`57n4PO@GIkCb+cfjf;lsBd*x594XMUwCBNW0N
zScE(9HtqoP@}|a$Q6Zpo1)M>E^8^D*jUocpz)Wy!)EP_*0xisDGRD$`fQttOJszck
z2R$y}e)%Fu=g)Y)8w*H!8T^g5tBcql{GV>kU~I4C6eCxPuf3kJI`dCr{AJSoDR}?6
z^96?^kFEZMIG#M;c5wG6{}$gPqn_NS_|3~cQvSo=$+}PVTW&Hvy0c>T8vVJO>?CdT
zW1qQ&c~0?aRNMZG+e8oX8zf0q7_)Iofl`g278D9tD;)^6@_@Ht&Y#D05`_-3Ey0cx
z61^frMew^%h>j1&rv>SRAo=0$@9vJ@j}NRrYjEdT;dvE0l}G{5Te7$hxZi^XRjONv
zf=uBGVt#?|QBB^e{;rzVRM%J2YMN)x6!5~lg0L=w<dv0`ad~B!WU>gK{D<f5BEtXH
z=iSTwCH1@-@>b1vHMFLt9v}Xj>${KZ{NM3BMJ`#{`5~hp_X(aiJ{A-BH)}turF(0S
z*V4Ay_F7tB+fqx5YHMn#u{KyskJo-%OKWQD6Mq-1CABnHCUHUeg(L=%rT;ET>C~Hd
zaX<YZdh@;9`>8kAeO5>J)*Y{-ZFTK+w7#yTjsi)njvDKNb@X`Mw{^6pu0HX1!8$;d
z{x9q~FUhT`J>SQDPFfPw{-1es4P5m@?4D2;?nx&1!EdBn()p3hH9YMRB5#Gh3(=ZT
zeTarwRX@9yX^`2MxFvWRZ~w*9c6I*z-+kI8)^=~VwS~!B;qSt<CR`t;;s3(g$S>A*
zU+0&pwf!$XjlSOXG)3-o>2`Gf15d;4;OU!rpXJfLdB^i;TV8t}t<P)8qeXc&dDNH}
z%%jKizRjaGdG(3E3+9nLqBm#ql%Rb3LegG%I~au(zj*Ji&NKh>@1^^G@!oqo-%PzX
z|Fe9$H~)A(ZOd=Zr}g<Q`Lrm%CZ8JfgZcD${<rzGCci%Mcfov;|6krO{mU=jdtc|t
z|Kaz}L8qrfdT%(PKR%H42lo};4E=$dkx$;r|1PnueBzdGhTCOJyTr|4&x>5*dAo?}
zzx}*RtuLiNu)YHFR>5}#w5FiGfEN50)_1Ar-N*fyTHpVN=cOdtEyO6F9Od7v_^g8N
ztvFsm+bY^CXnjRX1ud$msi4M+U<Ey1@ofdIsi;r<U9f^w5SM&IFw;rhox~U35Ju^O
zE=s4~yo*@=e|U2@8m8WSFPD%C*mLD)m2_|A@k-iO*<MNOD_bgQQDsdfHC6^I>G8^M
zD``z-ed6zem89~&zUNE5`96+GUdW^Wu{SgQ@stXhE1^HOJpBx_wmQ#phlx^ijho}H
zjm;GJcE?@^t#`CJXpy7FL4ywRt)tUH-*kNDpzV&W4%(9XH=`rypwhp7<{*zaj<avr
z>!3#Va}G*cOeAC?CT2-+cAMFd0g-7<icFYoT;8I^Wz2BHf3jJz82^=(!G`-!YgK91
zbAXKczihRyTufO-F1L|;F+thov9Ur+c3U<LW*22sV>ao`ChggKvuRCsz4Uc9f80je
zY$RwS9X3*AtFcj|4QTPChpELxLB@^*C9ST|r74*pB?u{#lzoz*<gcwQNy-0ntCM9n
z<4IX|Zvj6_TnXTi!$hUIhE$|ZI<hxH>mzOGNQu-$XfQ&)jdVunn~~2Vv^}ylLR(V*
zW{d<QRQlJ?BIJ?CarO;+Bh<)#E&{&vk&uu0B)$xX{2s=aJ})opg8$5yzg+M87p!+Z
zdGi1A^-A=Gyt@~?$>>{x^-AYo+Ez+~rA4LGSV}reNqgzuQd(15FMVCg9}khX5DA7z
zM~D=KYC_Z)A|Y_6uf<0}%#H*-t?BufrsuD4=P&7b;riB-qyOjDhd9Ut*l<^)s+!fC
zc@^l<((!f&v5smYgiDh!k%2>GVi-e-C<c7qRK$uk11G9jBgqnKmaA2aX?tM8+zHS3
zJ2;n&+JEBI^L@#qjkivnI^#tH8F1*<BY(>fUq*xpNp6J+5hk+~S(_89a1e74*(<Hb
zla>}ytF4G3Dl)U|gp$@K3)Kb#!2sfFK?J7-vjcF_79j(;)&R4X`wo&lg;K*oBEEJZ
zE(hXH@YfMbkp@?r6jIG?I7|>@Qguzx!o=@zc<lzyh9`*lyT6MEuiquUBA$&OBp%Z2
z5${PS3*Y|j-kst$KN&`*Bd+!Y8M~f;;NVX2PraS@EPwBh<fHY^Zr?J0;Z8!Ig-YUL
zh&8>9ecF*B9Um+3+btM92;S7FfjWY8DY01;p|D41=j?!M1x^s)MzB4jRmFh1Q*a~6
zm|0g>aw=SiO|g<ER=k5ynF^)+k#rU`A|Wfo=|DEGdFis_OZc><$CfVhFL#xS4~u{M
ztN2gvQaXinjBuR)r`h}npF=0a_p#r%t`WZz&wTgJ=q>Rd$<0e9j<4Lf3lY}4IU@X7
zv5qQ9CwP|U$~uFJ#Q^eV{Q_QYN~{C}uw5=HXf+0lBh4eIeQLE|?^HMu0rlFvElsH6
z5;Urqf;YPa1crc&z+!_EbiAtu$ULmliG{|b@EA*6v0M!c7UI+-C|;yzB#16{VE9e&
zfyXcuGH2%<J2w$CADOy$>V&}E;=80*KwK?8P2UW}U1Sg`h=2K>gA9&;@r7dTO*ick
z``jkl_wZrz;<+bL&L|*eKVEnhacmah%|kwQV{BL^3j1;h$;d7WsXQKMzT4;PQRob1
z8_jA%v7skC)Z7eo1r=pvqbgF+DxIECp^#x$W+*eXc00pcF&VrJK~#&@7{;HtKM4kv
z_9g923K3o!IftDs0)aAus1ycF!pWm4icJSVCP;-!30CQ%LRmyqi4qA_32i=I)sUE?
z(Kc2*vzzo^#@eH1HW0c;{Qb2qQTuXHIl836;r%aY=<2+k&ypX-n>`cRERCo*lytVe
z#TunNWS5vX=XG>TkzR%ax1VdSA!(IFJG16%xE`J7VArODquuDm$l+ap(kCvrVA5a$
zq{*XkbC`jEyb>xRZMdc8G^+p{;^aMLkv|Z^)eV3-)iA;$pA7503p59bE|%#+)SG-r
z6ywBC1LTY4*ZZ$8EI9p}y{~%qITy~DyDpF`p5t@KvwPzEcAYu>!PAe0mtD2}jt_D7
zI=w(-_!myrj<o_U8mwtDp~F+dQwJbpsK@CT-Q<)YqtHJKRJAlCLn5QBtEHHoT9PGM
z6Aw$srIyN0hfkI(bgOs-bOv~IMrEzDG}ybhWywO%!ik3`;p3IT&BPo&92UnLHmb)=
zruFM3Y@hhecdS>wiVhdVSkZ&@h2my#VJ@R<wvE$a&Y4eV<MZ;pd?ek4!3-Xk5DuCU
zVl|kokRYI|Ce>;o-J2BJ399-M*GEbwNC|zZCj_-<tl<nZdQ7ar&Iw?BC2HsyE3r8}
z4&kxFd|N+buzJLM%Dh`oJ|+Hm-FxIZ@r7-71;r0kqWjzHj<kODtoX@YpB?O(qfy*#
zc+FP%(WD!Q;vfX|jUSGv{8^t(LbLgUGY*SSpL*>t*co~$g_-EIV|YC{g<^Xi#~E~f
z1*W;{>_S<&(Ps&n+(7EV+yy}NSR4#j8YnKQtw{o2Iu6!Fk`xQ_9g$$pQ{679#@dT!
z<B|&|i170Y^D~P>CBvq)g))=)oCg`ilrE$^=*&H&5+}(}25fE!_Nl*HKYdD{J04Ds
z44E^fyhAtg!}FJA6Y~Y5La<w4uqif5dd-7A=nM~H$qKXG4jg;6Lh$-b6!ChTqzXl(
z8r&2OZ<gesEFcp10>Uo^J|WA$WLgBO3&3nj6_MxLMZ>({{iir&(ecIm{QK6?8SfDC
z`*(<5T=>M%ojb&_Gih!7Nm_d|z5DeCp8dohzn^}7%XJH{jQ@mt%;Azsm<ujoE?{m0
zsIEsDfzIGY^ScYBNx;%HsWG|%tyC6-`n4vbmRSP06o~;QiQYD;$biY}q_ma+2BC}O
zRE~v-ZI)}7AVMea&V9mvq~&nSD*wtsY5Su>|Bf+PmB0f%xNV#0AzyAIQ)Ya+{xX!o
zQtoEZ@^=y~ZOEWU;a{n2N}XP#v75~fiweWDw3^l?12D<8TBTXfv$+y1*#z9cq`s7E
zASAdwEQnRe1D?JltHjAhN?5}R{Vv~6;@U;Wmi+D;-<J6=&Y``JzkmMcAH{XT?rmaC
z{3sntezWb%FTadWA-Rw!o59Po(L3bj!swFAa#;u$v;ZH#>y2Vgs1U(;LWV%^LaI#d
zaTwKUPyvjQrS>gJ#Yy*6Qfrb#ku(7$A6pzt#mc$;iVC($AP7LI1LfEnw(xhg`R^C^
zwQblwd1#+tL1_F<BfZP-@y{9bWQ?>weIh<lpLLITwio^Lw)nx{>>gpbR=s#*5goFP
zj1>=%vFES%){$KC4R}nh&aYV~9aRb#go3XJ;OnpObtX3$dR@hR$jv){xa<4iLx0G*
z&mTrkME-twGOSM!)3xgH{iO3jP~<B`2XaGGV#OY#GR=XS0=L;|)*I3kUaQsT2ApLp
zSjm)TvB1Q!@M#_x0~SF8H6bKPld|EuX$FZjvX#SZ0F3m5;F9Qr#sb-n1BgA00iGP`
zj@@xf$AkU{m+>0|@rv=}UcWebS~tLzZQJRjJz~G@q6TZ91SE?9PSXP%u^vu?%C5Ev
zN~Ig~Rsqw)`IOSM3|KXGj|X6mo?k^Dxmc&AR?gN<ut0VfP`PyR`uTucysp>l?vsO-
zbl<?T=_}kTM+?2K7T>%^yfp<oLg_W+FjoB`G{w!h6&`dXWMDLp9qlX}X0BMQ0stp`
zW-oA3c(cRGn=L#hz9{%4k#RL3JY_}3q^MlPh$YJNBc!Sll)YrJ5s$Dj*#8dU`6q6x
z?;R-bTRkRX7ylgp{vEnSeCPzAjXr)SzK=}GTE1zY<qrGUSY|^WEsx(#&(K@qAJVM&
z<oJk@j6ae%77V{B!)h_uoK7=aE$nx@!vTxI<}~moJ3vqEJVvnmudX&Lg<L@_7JmKy
zZKHYx%Paddls(oRw?fR@degEk_d9O0j~LXjkX+dXToM0X{FC?@qbg(#qpBIzpcy8T
zrZt$gm_)8tsCm8K%A?I+p;Ulz(TTw8)I7&0GuucEGD|L*6qE@Ila*0XN@6oYGLx16
zi}*W6znJ()fV3h>D--c7850l>B0)0+)VpaHOmIfNeY;S459*=Nf}w!?$5p{elUD^;
zP}VOhiNIf36(g5qV*%@ft;$MYkPto|7T@rZ!aqtVAL0U1=@Vc6fdPClf&2nP_z<fh
zo*@?+VEuif*om&-HIn>@Kz{5IM!+v9lH|d5aA!N{=wrRD)XX4X&3>;s;MSr(f;Tdo
z5ObtJ$u2W1)!Uk&A><^kO;QxX%BRx2Fo{1cR%;l|H;&dSXK8ugF;*go`YW%!=RkWe
zPr#Z!WZ~L5_w%E~4}isG-IX@7RZ%V8D9#Y~-Jsp2+DOVsZ@||G;@hC?9gtgVL0Nxl
zok4TJs}8yWABx69w11k7jtkAf|GZ9X7|TrF@M>yhcqMe{h*D>6cJDrxQ{tu#9n;#z
z56s7y<;>pwr#wbao(({q7`ABYCkqjAo_OTmA(nN<UTe=&%emN|4OnBb@Gd#5co+3g
z`a_BiDGBX43DPKVf*Itn_^!C$O{$1OF=t0d2fn`<-+wIe{Q}>C!B8kQ!S{!=Dx6^)
z;e&r4`!?w%yu0Hv_T9tq-47+cn+hFLMHLFLNfw^&B;(%^Pq@jre+ch(bnL))kHvR?
zkoaz*=#b{Uu<s5lvNFQtnE0}Ip5>0lE5>wOhVK{83h&Y|>W);LJEjG+l!A1iLJ><!
zq|v4FBUP3nqr#a%!;P<q{}lh;_%;y~{T8fTxnlv_kN77%BS(6M<%p699VjB^ie4=7
zd|Lb>oZc+F*;(QI;%)JKHW~VdpR(Cf7wlNMasiV&72<gAN=%x;D7GgtMO%wfNi};p
z8(#+Y;#ubvvr14|BY9D;R-}#5(O_SUsWb)p4A2GOJGjQw6-6*tdPv0{Jn`?sYEq>P
z!*0?aqTKVCiHeCgpa3R1qkNE5Ii9`6@uN{0UfkNc_`yclFX938)E`2mLy77&P(i1T
z!FCa72P&}eql^%zKtj+41ESf?#}b(1dZYNV<GEc9^83ami)+>{ex&h1_CWDI;@-a>
zRad&s6RPQGhUL+pWk5&H;#glo^UXny&v2EN@<E*;jjGiZm1)W&O=*}KAgJ?Q5o09h
zNK<BJM2%lOH5%<lnk*J026Mq$g%8f4D=;MHMf5VU0u|XuV+!II6-v+<*fG-&S@6kG
zpu@ujX9bDOPm`+Le*t2F;w7ncSe5zn=3R=V=Y?$X_?8>Vch}$Y{fj^0uD)5Y#V~hH
z+amw4RoBjcYUgziJ2qNoOc+1I)$7`2<9j}<`0C$(P)5!#>+Iw&KfjHBDQ-L;_=lr@
z$cRCid8m$AI<BpK-t<7MZ>)DXJD3%z8XH@)jh+AB5u|tl_nS?}@t}l5iQYUNua)qJ
znD_<&DuktkX)AlANnmDahX|)&h!GQ%hQn{iiI)zmj(_5%=|Zn_FK;3>*E7rM0!s?^
zbQ<1x8j{b>EsOQH8L7p<VHT8D3+~ekuw5-`htq(@@>by0+f8<=!Qf?F4W70F5s44-
z_zOT9C@e-8Nft%7DQ&1Cl2i<Uz2Cs+#ZrW%%R^v_TncSTb>>((i)YD}5v-&m{;i&^
z(~nOl*LcLM{L;r7X_VWP8$ERHj`gHdB<pvq7mw~Cr`be!BudE75)Q<ySS7VsR61f7
zP?xP_6X+Q<v;h@S407LUvSP(nc?%5GiERP>k0v_`{3JKw602s$2mS|RnbEz2&sYTw
z3(3i`tEA6xr+<NG!Mwxs+B|K3{GN4a<^m7BX~%jRiT?qMjek$|SZn901jW6;KlHhk
zoQvq;r+BPd6khxM4w#(^&Ow~KgH5~fY79diF$;=3TY;2~ztw0E?_|-6WGNyX2as2~
z37${cBpf#DCFO`=;V4M7Cb0BNoLI6HoR9|tf$G&8qgm+yO<&!bx$yWJw=WpQ*q>Rg
zd7ftaYJff^^eCFQQlJCk%N5e(2Qgz0^Kp<1Qq+QL46x^bA!o(C)M+uj-jt@{y+EAt
zSy5bPMqwRRt+(PAkkes68+Z+KcDlk!5{JlP3d#IrgqG-wNiM(^2q)_5pgtLMAj+8u
z=W)zmh(UZ){7IZJ@A#uzJzIueNhW#3`?AT^WX&D7iT5bhzV*Z>=i(pp*RLmw#VzaK
zAQe|Y?NcrUEzi7M4-np)Vg(!nc6XqoA|t9{s4-?f-A$vILlup37E6R#{R}gvg-x21
zm(7s-6K1o-&L}%&e1RpStcrcYSOeC5H)tSM2}dsN|6Z#aS5g}6HDGC*mSkSi3$6=>
zn@x9^m(40FR(x}@Gc0u8Elv;^`bi-qYHu#a-4Ls<-~<EdSykQ3pIuag*#vzYR%@TW
zHR|lFUR6ZU^|Rai7kaCLJ@YYns#lNd9vIY+Lkjr(YO6!tS4gYIFLQdn-Nu<Q%Eg?(
z9Zr@)!b-#`CC&`SV>bkCdGlQ#K?j~NshXY$_+?4HG|V>^1iXMgQuqVrJMhU_w+U;Q
z5(pab%cl_E(4j<2yoY+!CD6haHWKZ2@wHlp83qi${?*N6C0MbZVw`@zP5d#9p@zjj
zEBI3U8=cM1n`jj$kmqu)9|`O*;`U0&VNr6I=o!8w0UxGXXc{pb@M63;mw%oYTY(+6
zy0(bS@sddT{bU-`htGk^CQ#W8>kz1RM#1Is@rd;Es5J?2===4g5to3FjsruO91b1l
z15h<k*;EXvI*Hv5w&9o~Ba;mL!YppaIZQF7klH~WM7|T9SRjctioqQBDXx|g*<T{u
z_PALu&1<Ne(NlbznqS!@PM|wObU)D7$+mMd`$X8NhQVT{kWP9-E@Il6;#F`w>jTde
zFj&*52bfD*8d0eg3X@rlV4PY_(1ig3P6*~*5->WGB`?b%iKHlzcwFZ0C~QOqLMuh?
z`KWNyj`lcdKTa&im(tFqPych%<&V)D;!7}A`XM^zTrmC$L^E)!<_LDs(2ri+bO-~p
zQi)WJ!Q*!+0zo(Dvio^7rfWt4wvb08f=@7>v=Y`l*%d*PNyeB-VkFj!3XqQ^m_5UN
zR*`lYTV>Yrx%bp>NFvq)h<2F8&#zt5B;nHkiw$#2A(<*pifd-fWGiJ9y9*REv6b?I
zPD!9f(C`4SN-zT%kWhgG#)e=)Ukm7!kis&(*!@UG`lQok4i%a@6Og_51A!b-%sw{n
zI58jJxS8JiL)=212F2>>-D~3*^d29vmKMjakMCsD>=JZiIKq-Ag|%RGFYqa`7KKHt
zwPH0qr!gux!Jek)^cX+_HD2>FW3>d3F!P%wR%17l$)@hhL98ZfrN6rfIT-kSQ$e?j
zAcNh6(F@w^_n?mt^wF_iV?wD;r)0P+=t_cJCPfKVyrAXbHxcG+CKe+}OIcPXmIJ;A
zCndU9!u;9C>d)7Eg+QDS@MpZ|{>U#A=a5}ng>ic}ox7i%iwPXmAC?h&Z;-VQY1KMT
zrw3|M8bh1_l$8<rY2Y+!yU`%^T1h;E1WZ1cq+S}enml}Qe7iL8^9}mU{CgS_FpTj}
zu~}#g%q|pe76#$&M_DAm!t)+AT3Q{5ilzfmhqw4J_5}fN>Ne^Cw52mSsN~CnaZ_>l
zZf799ABHFo(;Ko;W?~dVJ7vsG%-fY~rIo_X@mt@Uw8*_obKmNb6DyWa$zj;hQ%HM!
zpZ;3AKewEjbTpd2I;&6d#)l>ht6n`V`%k@BOE{e3x$KfbO}1z?<7T#goR*4<#4MPR
z!3%1Qk|2h~XvWTmtx~?^IFQ7}7OsdZ6BqjD<W<JAqOe;ka01e^(4?Wnvj_wovr>(0
zqS^(|l0saVg!^C<`HNe0w;sj_MX~&9(TXQfZV2j&|0OhnuIY%8Myxs`h>E$G4jrG7
zX#hN#!2}|+c?J&719ZZqJdij$DU@VwgLN}efY2Z-J2!C^PC@EgcUsHKoyaty2N#2{
z_}^{5b>f3!=h1(~iSuip_;p{)vgHf&9@$zu$+M_!*X$~x;l!gii?6-ZeELtsO6I1o
zkBP@84!eG@iVpnfnf2>7#h>EGJxYwT-$Ok0asCLIf?LUYNK8)<OsvC9P^q)$C8#~P
zXw1wS>ATg}W6r8M!jkRVpQDcW8Sqo*A^u0QA@!38+a>(n;v)Pc+!LZe-w4?tZXZt;
zh*#gHm?3T-M;5Hzz8ybXC$x}j5<d&iT7?RUqEG*THX;@pVa+~dLHtuEjf#i;xA}#Z
z6;tt3MEnLnWx-D|ZyXIs=oCU%5Br(25_4GmhCHx3{)zDW??v{#abYfDQ|C3T>ju*$
zI#j&$?Q*{q(3C0|qEeXr=G%hR1rHaj9z<_Z)FaGHrsIZ+Tk)X=pR%7;V`g7+YZB9k
zp)OP<%zGu7@wtOm=RcBvRsOeRI)0jYC1LOu&#HB};dqJ?Dy=u?gPXB8?U6K^rpTm6
ziT<!!Cs0<n#^p7afgkH&%{`{r3Dkos;F0-wr;uxiM)N}EmZp$k_c`6X)55`eLsK_m
zi89h3Sd^h;Gf4zF1TtWzM*`R?h1md>iCV2CY*0c1%#l|ja1>s)r~I1G?AZ9lqoON~
zx88K+pLbgi9)GvjQM+B3M)K}HdD7Zm&~Z#0KX~N)f~uyM9-~W!_uF;P+{b5}UoQ+K
zeQ%ku?uPeXn9vemdRqMV3U)WK{#S4}UFc&AILt8dwFbd$w|mTHgH3DXF*wFx;S{Zi
zIbq%`lPIu_@f$ZbB~qCAkPJCh06~W78Wwto9f43+BBN)v$6s=4kL@Sscc@?R9D7K7
zFUVpzET=bLc=q;z=Q9**&t2iaoqzM+|Gr~AleQZ=&nUKnw%J_2SXAKCA`v&tdPPod
z(A3ft6l`7x0LU=l%Y`cdCCFMw<Wv_tahb$P7X)$IP`bH9%H>&;xUtCpMv-9YBC(PJ
zCU~cKUi{bb{SW{Co63N3&(<qX@3v+fU#UB4a0*jM_`r#`ox>I#JY)NjD4%@fpCo$g
z@Yt>Q%sD*$IK5)z%yrAxzjdPDPI32lw-1NS_8K~k2k`UY-Fi6dV+PeT#D{tjj(DW@
zRk&|b3nk)SObWB^KiPs{We39+U)yqE`Qi=D`&A>R_E|QvwRc~B-Ze|EJ-^}lD>}rr
z@ntP<G~GDu)P$i!pbZCetGN^Wbi_(*hmcVgo+iu_1-s##iqNMnb@%b3mVWB}OZ!c$
zY15UPSH$7hqkm&5iC}$RE<2`ISxqfzZQyfctBzviFaak1QT7nPw6NziBf^190uYk$
zKf)C(@{^U&9a0;OO1#=!vbSx{s9u%5M%mhj{;BQy=4rQ14U+A)rH!LE^r;wMo>f#?
zW;@k3cF6Mb(F5~VW0B$>&?tm8Wa5mS=8TM@%$m&lOg=MH7jQLrTfG#ml}Cv$rfXBT
ztGBArC#29}c?i8=Nht&|hByVGSA6lhBvdUqu*e)v_RrCZo-bCF_Zes2T=(tbj>{*K
zK_hS9_-(JvrlG@XhmWZ1Z=*%aGYiXlsNS4Ds&TrW8piaWv-%Zhao-`8J$uc^sjlZ%
z6E~=>g+9nbN3<ZQ+l^aMdJ+SmgwaTKDn@@Q)1N6e47-t>bx1Cl8q8aV<p8eR7F-$>
zXPe32)=pmJ*i-n9)$={^?cF<u{8P+bMD~`w>0rzvKF7@^F@6$GDL-cNxLlCe7JY-U
z6>l`^8B1Z#4qnJQq8Xl=)B=keDaA4p=Og8Qk_3pTqSujEgW}<m-cx6<+<*NKRT~YH
z2M-)GG&a6w20v-_!5%B;cI<p9qgQOy@IHgfvE!Gx`6QR04;hip^?W>Hwz8Oj5fgB&
zR)b0xGuwvhbYN}|ToVrKkyet&R+7i8y)2o%VJahDD6vgqRp>}coJmAkwS4pRhZm2#
z!rr0pl|Awb-;irsufjZ(p_R3h`c#dWHh=Td_MbOQ7-P*ZY~MI-;pC3}XL}EwU02d~
zJl@!8<gOy~_{lgC+aY)qN=APo)1MJOD_U-0&3|Y}itY0sc}<+?po6T>KXKJ9B=mG!
z>qFv4=xg1NJ?4WC-N?1~#C<SYm6@4Eo*GZR2SrEuX^hYzyiC5ktdkcKCV7Pu2xjs{
zt|*h@cvhL+So^;N763lVn=M^>&D4o~hab4*>P>BPEBfx8HE>w}SoNs>+OeYs)sC1r
zf}c0Fv2KozH`dp*bzIh5f4QC7MwL&QE4~)%o!_&fZ(;d@ku`;VNA@d50c6+NIAIy}
zjOoKBOAH5Nv81VVIHe~{iL>#6eUgiZsg*pNE(s(h2b1{0<=v;AXRq8i`M|Pqs~s!6
z6UQ%g4C$D;>JZ_RC&SO**s=95>&8s*OucT+w58MA@9cIm;$@27^b6$<h-T9h%CrtE
zj;N@lSPI=Tr6;q4G%T7SdX&&trW~EUa$WV@^*uJ!ynB1y&PA6UoUEuWtL&FQZ^>i(
zih5TTGd(?1T&?&QoBoZe2=;ZNN&;Vxk-mP6!zcm8T72D0`g#^@qcS$<i<`*uEU3Tw
zS}_#$A{pqr&2u<IYIQVf2nO}kDP(4a($e%ujQi5koIW44xKDrrmvS!9FOmXG24C1f
zxGsF!q#X!!-ijn&vw?w(<0WM-jofoeo#+Dn{@#T-%ddLinLGE@ddZ5Mo50a?BX=FY
zEC1H>$M64XjJWdtC&dqK(c5$O-MV1bW-`63X3`Uno`0F|^Jnpj_ATP=hG%yC>1XU+
z+|B=vT%o)ZHei|<B|%uVY!*7JhB4tfR>LMy5oFYjDx*JOvY@Rr4frA`lG6!1Hpkiv
zna-5LNeBxt7dHVcE(MV;u6N1kUhZNwTvX)pbv)ix<1*xe%9i%^-RfE}JphrrVpLBu
zObI)3R4SLr<W2+rIf|Z4)Tkno|H5MHl93_fgrUPVF&6+vbvJQB&cFBM^K2?W@4kN>
zylwWVD}t*7#TmIZ(ZpDQWy{H1n^!gro6#q$Pk(m)k8_-+pLG7cV<9wOIt@Vqg~nMv
zK8S>>1sO|=*21CG1kn|AA1919X(Ud{=7Gt>;AkXy23HEu6TqI3)>lyuA<v+T@Mn3s
zddi+5>;2^!#X}<T_f8L13q_6M<kL5tsMia<MmoryPuA&FrpfuFci;OJH*cTcJG*Mo
zxvTm15uY!5_WWAK+Vg97AK!SSkY8|q`?@pHk0;Yx*D<RN9IYw?{UTgx%umzQeAMer
zcLf`PHSIDPO}r%yoyA5KkZxcENDEKVk{O(!WNN*3J6o=^0+>(TXet!^E?Y>Ci6`D_
zemq;zhg|lX0?p{N+2dx89ljvK$eUjirtt@xZi&}{%HgVh!>{9gard#8sba#M!rDgA
zy7vI)yDsETk$(u8l9v*Sr6~abC{T@BDLkLZ$zkL@V>wBh5~xV&_niEb$cN>g$|JX(
zIz>01I)x{NxbOK!NNDEo0GCI}3A~zWIQqN-ZV%jvVs<tXQUF9f!SB_6dendZtdAb`
z(f4=k5Cc1Qu+zVvHj&>;zKAmh*O7IE!*SwjfQP{16ilcCS*%3$<ERn&Pvz4ly6uZE
z*w4MjH;|JT{Tx(px1U2SfjL0lQGWa&zI!)*kZ`vODt?Y?IXsdGknj+tfcvA>!L#9!
zR09qJ-YFA+-8d39N6q0f*w6eN@sHcZKaxpiGF_>S$0_ebLCSu%k_(;)g@=?3o(OLT
zvweU0L}Z-G!jMj3Jn?ojl3{`EB%o*(_mi<s%E#mEls@3^r)yQGB-)n7>_`~$YD}Rp
zk|05%g5XO*ag_KUXT^vNu~(`?M3g^q9k6bI>9P7fa(M3KkHm5Q5B$R0^xU}*ckRN{
zKg83oN<6(X=Hv*kBs`Xj!!w~<822BEK&AA22&+pxU!n}&U}gMq=%bT!FUJe;&~qdo
zFTfifAotNaoDJiRsu-rkUg8b0<STGy(xlfnq?|?f8=ZW`+QcjHRQVO8^Us*F)7-ff
zHa2WgP+W~SNm*4X6De~JSck`5ie{-0xP55<{)JB>5$YHJbnF<@)Y}zDXqhSxr*GuE
zF?~A@G6otOIuJsV9>O3wnn6kcaYQSeswhJa#@!^7Kjg*pt+Y{?`xNb*BM|%RsyzLp
z+DB{;K4>EbJlUW)LL%LstRRXQ==zH%^LQpow^C1ji?%+`e@H949;{rUeN->*O+6WF
zCU4`(W_U1RhBTDMbFuH#1Yk+-4q&S$*4->abVwl(C0jKNao}@gmE*v&uo-M(SpPwz
zdn@`H$CQ=it7_bMrI_4HkIdpe&XEN^Q_PlnHFk9X@1Bl#yWp2kjSaF1I=xp<C+X+w
zsoo6W9``2yZvO#4?~nPzL;c}A&m<4s<ax$()^pAyw0n?^neU<X9^&=nd3t+zqlZur
zSJWak6*Vs^IhEJU`q4{HH7_bgCfORvl4N<5iNOGVV>%TOMX;9&<hi4(ONNg~FDNxl
z@>Y(mNssj|_w*<>O!ikcp1Su={_7VG)0>rZGc%&u4YfH=zcVvq%#f^w1N1j+)v}X+
z7dsgwosWf0^zGotUhWZaZJM%yZ)J%;Q%L)kmcFI^T>G6CNx=qfD`J;0-wqY@9LoMY
zY!46BBJ+JRFRyvg;^L~J#g;0p8>=p1D|Eub#*8az&C0%i<iA}@E7onD&$o^ly(BPy
zD!65v_KWpP2Ub)L`1hsOqab?~k0>Z&m<_a*;y+VJ^OlCbrTJX*oraHT8Z@mMUXxf4
z`;)ClgY}&H#d;(T<GZhCI$irZ|AnpFdX%?lx9P=A$pv-M$ArjyVa)8atMw|CnTwfS
zL%A4q7~c4V-8IziGK1kh$!o?)T2`lMVwDUD6rwJU>;7(A|3MS#quSA>jOQ%Z+|Z3A
z`I%*XD`cMQwvty9Jg0-FQx*&O%`Tf>uMq@SDD=7OI~Q$p?R7ok;$tr20tXfqvlcbf
zMKGVMNOlNPdq-d)D^iHEMAd~X<({{Ata8MF4f$h7<VXAUsq)qbCOIm`_D%2Cr^3^t
zr+%`xY?R{2+$q_4qfdNnby)k<^bX;Vpnp(B0KC*LJVwLHOi7ABe{mYfX+wvO)n_nJ
zAMnK`B*@TTNDyUacL@^zQFsi)u~Sb~=onmWM;f!%Q%{wphm#3mNizLKk{&O;en6P>
zEImJ0P%MS)7%l#T2@l3)Yw*l7%4G@JVN@&9_Cn+_7$#2#Jlo`xPc|1z@R>mJVF4K_
zxNwo|=zDNngKCncPvOA6Roc32e(uwq+#DWqP`PYYS*<p63h(jeSQ}hoLqc%j?N{UN
zbCusRt;<DYXekIdEIqUYQyG+82YN+h$%O+fIVHUxrdv`jUQ!aweElI|2KKo?An{Tr
z3rb9re3fIW)B8!XAZ@b0VzlBNdG}-v69uD(WJ{u8^w2D<=P1^*MEM=g&5WuVBn*t2
z4%jeQ27|@Gq45<N5d0GRAom98L#OjZcvB(X*=xhjWlyzU8CbSJ@w4rZ{tv|`@4NBV
z;UmP?8I{>{N2Q(%d*tHhS`n0Ws=7ayif0vX9^voo_Sg^of3$TymWq$#slz0>@8?Ql
z0VGyTY4uzS*9Hx%RC;^Z8|<`){X09gcc6fhZ31GcxCmzn;RG|r`peT~_cF1u+;<mF
zR<}9oDjI9+^eu+eI#hWbHIsGOm-FfA`L5}K__Y`9a|zCq#UR2lqgg;r1;<5Lds#=&
zEiFNk=kjS@TAFt!!j@k<#Gg{jQ5IZujN&!P1rhFJWjQ$|$@D<XC=dpAQqS$>=y%|8
zuIT?E?LFYLDzg6ZJGb8yLI_m|CbWPE$#d@$LI7!ba;1axjv)yokOC<n7SOdI*mdm<
z6<HT6iU^3kt)ilfWtDZ&wXb#UjVJ%_oH<W;;C1(XKfgbGa_*dY=ALur%*>fHXXf6!
zU?sds>DFN|V#@90h|_Oz_I0!EL9g_FEm!(*58(bE68CG^FEswc{aNxYM$Q9v-9G2v
z_MqI?dcT60&}H#;T6W7`te<j6X0^jt%u){up^1@ViZ~fBGl89aaRJ5^%o5t7XChoj
zqf3&Lk8e3?OVV<B2Z85Srna3iw(Zi)VG%pN?!=6o?16*wBeUkGEL@l}GU(m|L2(={
zo20L|_h8>k#u@sK?1*otWn>uQUgImH1xIgW%)#iIyHgBDVD3dsQv7oJ#O6}Z9({_E
z(oRxZm;-Zq3>?@aXW)m4#I=cpU7s^xfcjNk@68!Vzex?Yu_lQP_HU3Wb(;q75v=8w
z0#1}+zQ&<291GiU*M_?;d}8%o7vO6DHna5~qH}F=_gh?}9wW27qbrlqA*nJTn<ViO
z(hp6@+CPzK6}nYeL+H@oCUC>+*C~$IISbL%bjQii#l8AhdJ9f6NfqjdxS|?xO;%#J
zL;eS6?BZnoC+_-~x)U!;Fm9CqRjZ3%E^=9Ut#XL?EAe$Lzu;tSsyr2GpNXCd^Mhk_
z6rOT0M59H!t+Lr2&b`!`+PUMH$;(!)=-CIl9$?KD^X)qzf9f_vC?Tb;q2u{GSMRj7
zJMOpxZPId?HAQ@BpADPaV`O?}ww9KS{~bG>X{q*+#!j7+lQqM)4LY=!YiQbol<^-K
zGLt(Ym<rHi5FX0U8Q8yHpX29@uO890uxC!efPQ_Cn>%LElwRF^yEu|xkU1t}+`vim
z*F~d|{QPzjnLKY;NimMoik7piN!nI>9qO7vbtS2(y6U~yMYMMxm<#4~IQJ6Qn$$M8
zbW-gpwVkl5)6$6X^=8Y*u-0vM$U%jmx*Sq+Fkv`5mtAtn>zBM9U$=exc4>oeK<Q&!
zzQ&3mOKbO#<BY_&5i+Gy|KfsT#NRvFw)`$rk(Jbn$9CI$L;EEg+r{IF)|-0Kt;?$C
zrzJYL&~8Pa=?(cE$d41Ls%uc_Ool%kgx_!N`r-{8maNaRCS816?a~E^geC5=y~_~k
z(p%;prlECuC@mFHpEF%WNk-vlOD#by_b96IaUkEmdOb!8kq4-rhi@`JkC@&&PCx3&
z{k0;k=Z^gRexhGtPbhdtmwePc%OhQ*`iMyb95H<I<gRm3A{vU|nAKh$0+kJ}_M#oy
zTTt;*F<|YSd23H!Fm%A|sk5`!6y^0DGOSOpA@Tj$zy}PSf5zH*bJngI(kpM+kbZpz
z+f(PPJ!9^iwVh{ApPfIf@8IIRyyC%qhvft9Ec4gS={tCEU*y5}mbKW<wa7YB?5F=X
ziG}&QQvEJ_*%RX!kQdn3Vdn3QQI2(Q28NVNI+EUxI?jtu(jyNWo3PGu`Y#d}q-0gk
z>e;?S#fZwTDaRHRq^8){`Lma#ED;knrVS|aK{@^udfp_=10A$%%!y8ibRApbat<(X
z3;`Wh&H!?#;gJ|QwsGE0=~YewwsXdkb~WuP94EJ5L4ImVrQ7}T_`3ORYrD?w(Wl+9
z*#(7>$e-}IrikAZ->mg)c?Y8bySI9))#!wSo<UL1;qhJV5A^F9e{R`6lzkNv75(1G
zF=*tpx%9F(FL{$kj)?C>>7lSk4k*h$F88m|T@oW^Xt(EYk{x{N#kXK=V5DJ!(q5(V
z8StW1f5s7*{MOElohTY>xqMxXaV9B<9W>z1Z>NSC##$A=+Yx^W^t!bCB>8V2De!iG
zHOdWns<^k~q{ZKAd-*!iFXPJi{lS!u?*<d(#+ud}?K$axwJdMKva~<<(u8GMT?fme
z$3L`&YOl8TyR7_lk>15=9WF31|7A2>C3}7Tka=s*oHP5(HA8y$88)PE9(w)I0@cIk
zo^krTzJrJK$tx~KWH`|`Z0~B=0-T(H)En#_(gWQw*<57mrZVKxtO;ry5u?_zCXrne
zEuZ3!dV4+Y=sYsjklx=q%m8O%8yu6=F)uEVvlI0JQ9nGsv%`UY_IlL|TF!!A@A~ia
zjBDa`ck3^8r?$-=GiBN8x?>8^9!sn#+Ef46`NR0%=a1k1pXU!9qjt5p4=p8qp0+!T
z{0x!dbs(co2CWZFml{mHlkB=E9MVfROP|5<=g*iwZ>{{Zr>aI7+(+Tq_tab3U?zUE
z<x8U8X=GZ4)<KNyun7*eCr>-P2nPVuauVU>^mB<hqjknVnWv4`sUBZfo{Kiv!5n&O
z`Pxt|Z)E$RYu92eSB%Wvl&j|sfESmSA^FiEK*^M5gyf0pKe=tml}?r|J~tuU|8(a>
zW5Sv1pGYJGhx<qOB`WakQ8;$!YEhqSP#@((!QN$IlTYg+Mt0fMMel;ItdQDZ@t`>i
z;otuxdAzp07}Ft4h}o*cTWf1a|7WgpZa-G*H?pIx>+ry}GYzAYmMunRZ_3uQd9q&#
zTP}wMxotR_jbr}*S&C;m)=4>*b^4#J8UMVYwzgsW(ZXOR=@j4Gvb|+AdX2k{ItomC
zQYZN|q1O0!d^0T0W?1ijbWbO(&35UyQ;U<3N%tnJE513QosScVR*H$1LW?{TKSLYS
z@;UY4o^l4lqn+HflGv!e{D0|F@n;h9xAvXu68sl)g%a!&9YxMh&$nRLw&iT}jI`|t
z{GwN2S&vSD!`kt8pyT+iGnP>~XhN2AH2Xf3k!x<%NCy*b5#QXrY#EN*39Z@MBHGz8
z)D0dl{FxD0*uXj`DXbZy4Hy7<tRE7}{(rvDh+l`^JqbQ!Vuh8_Ap@V`lH>GUydBTX
zl`*ic-N)oA^MKf8JMtTn)!HdZxa4&Fx`bLUNNBS)v5-X{%hxbb716R^U#YD$@F0fP
zX(YOgSAZzsrQRk)25nC%IJxT$NRZZ_kjsvq1MtdD(Q+*M>rQGJcN^{ZNSz1Hd;RPB
z$2T9uvx8dPTw^S@CZO%yZ9;ZT%qeI$k*5#scjy^w!hV!#Z#^Ma+Wo101-2tlOt!B)
zj^9r<?@qhFY+rFg{AA-E=S`v|xuJ#WNz4<(o7ctr#ZUHD|FA)|?Hy>_@c-1dKP41G
zZTtUnpRVD7Ch@UZ47u<H64Y|1DA_(on5OlxDADF<rWm4*J3rkYm4bTYM#^vfp6nO@
zBY?4N-@f0j+6UiC+hBJQd6>cF=r_;?M|H>zi6*eCNN6;HXi14LYq_JvrF(wIV*HS}
zC%!vTQGqYHYDO1xFLsc7Y)f@VrHGM`G8Ix{;-a)Bih17{8V=+)4s3jC9#2FLH}q@H
z%3VKx?$GW_#hTnh`!4S?Ve!T0-mNEGaO0sbx9VT7e|V`6sqToc6SXZjAv$N@2g8lA
z+LJ=<7>;80_B5-;%)h_A*!I$<_U$(<NBINTFV2HRowZ{hO4ZwR);p(XJq&^5`>-Jj
zmKkc-T8bm!JO>V9_t^MK?7SC=wl9eZ+sBQ1Y~-;gpLL2z+aEt|!pXyKeCpPb3z}w`
zdk<Z4Nz1_lHTPaw9`C8YlzZm2c#iXu8?IWI1KxOXhdC6yv$VViytLG`Bz+*%L;4V{
z`oMtz*@n5aw!}%FTs#Uz;g^qd#hMRaYPbB{oL^tf(Z5-ix%NUcck7LJpHz0}z}BsL
z-i*-;=7XAimR5fb+>X(D?QpWP(vLZ&%cI2O81TTuaI&xPn{CK~`*=nSpFU7q6~m39
zfd)=Ei8bq26gpiWYBPJ@n1Lmag!$v=opF(sbzFGDlw5P~<VT*tXAyqtIDFNq+jp$H
zaQ^UKkDNQEGwm$m^rZPHxI0?c2jt=0M~Jlv)<QC-=Lh8Wv3$G>&t(_weCbe0uGuE%
zI@Dz=R#hSH--7!MXshRg*w;%-OI6~hfrgy04~yR!%^t{YL!}^4R7#8QyndJ1aY5#~
z3**_j;`I+-%DTYF{_TDJ)$-{41<=@x1&1Qglr{$7OXAh$VT7pAJ7p`3kX--=5DRyG
zxzpVHYoRQ;5;{F-zJuq4a&ek7O{Ax{fh28qi@};p)uK>KVhcJCy2RN_oOA14q#w+y
z7**6O?d+XrXDweEf1;P!<+0v5!PpZH&DC#Oc1}(scJ@dT^G!&Ssdd?w;;8zjK$uL;
z<N88pTuV^qdKza@9Up#a=NIB@bd3vD4Szjo?xk)K0p&|@mcuj;!t==6)+K9H8Z}23
z$Zdl>UKB&PCWflfI0E*AzKl*^_#o%BoqSjcp@JfLV4`D(wwfM${oSr-?OfmXtV_O*
zkC_r#;rE=op?-C7{POlY?wP$ozwS`U^oey##Y$0DS<$omeJ6~&>74kCIL?_1ZKocx
z#<L#EF$6+p24V?N`b!IF-;&gR#x4w}(@^@N_&Vb)XeC4IxXpD`PjaQ$;sn`~&`w7+
zyk7LCZ1gp1q+pR~PMtBDn*5})U+=@%_!M^OQ&8*(yOf?7hv^_G*e+4`qVp_Jxa?3c
z1sHvllp#-ih*b28Kb|XMd-nJ1&_2F5z9(0V{PKf#T_f>Fx8A*L(ejDEY~B0P+{I_N
zXy3^iPi@(6_Os7I&&}P|He-}0hGA%!q;&^;Eip(|MIMSpb)aeaI0`i{KDt^os8>5<
zS^3g<o93O<MgCLweG(rX-`DSBF@3wSX3|{!<oLL2Z+k3$Reb-FeJ6d6M_w>~(5LYn
z#a`?#XQGa}$F@eNIx0JSWF5IPVHu{BX)gZtqc8L>=uW>Kyi4D@3<^bex^qf}nEKlW
zJ@4eA`3q35miNIY1^ue4R<ylimo84HQ5j&7h2H95NJw+<$N{Cb;SM&K%{^+0!^>=V
z<ResU-_XSjIcAFR94=0>UiH8e$DDR(OODutlK|`AIq&`FzL`IK+jFza-ZT$Buxr(M
zhc;{#JFcGf;dk-9hknqz>{~3(di}II$n_iMg`_ck0%T2$X;|~ZUGZlzsDGAka(EBw
z+5=6slXFx`t4;pTeL?95&r8a2(B9G89omPEwj_Jhr1NvnI^&Gu&Rg|%*PSq7^j3ex
z!dd5_E##Z-ZE(oca<tytQae9Px=0m6A83bopu%LskWs`DD)azMU($x@Iz0stZP%{I
zmM;cEJO^LFM)wetw&&>AeDKQ5d*eTBJNQXK-Rmb-o_oRB4>pfjdnGLB&G%N|S@v%?
z?tfv1z@t9-3*xmGtzTbtKrHUPY!>Rgrv<hF65)Fu4{G?tXj<yS=#cnYrIZ4PvXuqv
zjjgOf?Xm*ACCn<y5jWkn`-&}ZPI_ViLNo2-)xAZh*Nq>3n@}b8h)d&r4*mL5ho@vu
zUytE-320|&eYbfyVLNii9M6NLbk)G6QKkkiKk_T9o3Lq^=Mq+J%g#63uDvjRAog8u
zd@A15gq|n|^1NXS=Et{e)$fsgQSyV2VQvDyW3=ct3jq-Dv#cyHt35ZR?28@`HIKBM
zIHraVKk#6a^Q+=3HJ%vn#=#Aj#Xl?g7W~f>yT5s7`~&eXcg5%DiaU0_H888KF>d7&
zl4RHJMe+0FEoW|h`R&=$AQARd%=wV0lh*mcPHozVcJ6NQg;$9oj=f##^s2`AWG^1e
zcH}oD<eNzxF=^-av}1=?JwJa?H}jIq{P6K9!@v3r=I_>m;e*e*`Gb9ztsN2exc;7>
z;-9|pHu=S0qV`qbm8s=D*cNZTN-<$aAIQ{&uKJZ4<Zvd`_rGCXqz#k4O~Sd!GH&{9
zN{;^Sp`EXa&a)Qw8vW=A{im;4{MlAB_s}mr&Rcizz(toY>J^`YVIoJBc^SAFh!f^*
z$G47PJUvVrrVKie16m9NN>*8#GOR41VEOm~n=;HEy{P}@it9ew`C+bZzqIH1_~oDV
zyI<(*m!5v;-$wSYi_M$FJ=bi$Cw_T+--7+q-xubY^QS_q7r|!#{wzTL#NmlCG5zaj
z)3nI504BxOIRMkX(6+byV9Qb2O&hYUGh(QtM`q5stFuV&d}C*vB*Ob<+GrggMZ0yt
z+&c<&>wtcwEVQf_jw~&Zy(ci*7&u~((`%5ND)H_K)52~G_MVH3-g_1fESYmgd6mc%
z$8Rgy^62L2n?H}A6TknFnGLn@LE}3&ojWba%!<bsz44}=e(0C@_rGo!uA8qP+R(P+
zX_rdt`X;PvSCX;s0}h^AR~|tJNR=)v>iu)H^qo?y)|X-&)&d+k_-`@*jOWi2j>0n+
z$RV|FWzXfCZ%N5*yL5TCHBaQ~*M6`s>jM2%IkFDz-tpp`t&P{}%eUTe*O(e83VQ*V
zON`GUMIY};SaQdEQpD*r?9SHwXOGO+LoToKpOxjMZNWn{y)g&My&ny+KTLV@jDdW{
z<Ef3p{KT~N)6mOgIrDugM>`gHeum0oe_fT%YQ1Cr24Q|IZ##4@Zq+rs?8d$cl4feT
z+R$BES5f?sljUT!%WT(yU7mJOS0>L!nb2cfslMcstNHoT@goNk4|R~ojpxX^>T)_p
ztD=#iSYznko!#<x4b5D(CVn5>u1y#1suk1g)}EAo_O5gLu7B-rbMIAmEV$+y(Z6QU
zqRGF)*#26mzjf%<aPyV=t%s)W{j^%@^(N6r&QW?FPw8o!wm1GDT78qXMK8ABhn$()
zUG2;^Smw!~fjaCgqx%$rcQ^pA7k7K&ij6nhoAfc`$5*wn-@kgxd8=}A+h-MzD;o<g
zJH@c1*2wdyHSq4syYxoAr`F~neX=Vua1cw&T(AId^G(bRy6x?gt(;gf0e^&AojrTt
zj}y+GI`Ai`Jo{F_|3bgB=L7tC!r3zc{sQ4Vu7ST!_j8{Ijugh}Y?$P6W)=L2ZVx!H
zYdgiL2j^Uh*bFRPkv8IKe7Q(2mE==n(q}Sz{}%KX>!<FXDlXLZ-S|4|bg64O+I!eB
z==u%ntM^!Ki91<=)_mK$XWaiRo#$;cwzh18&gd?!<H$DR@oc=+N>pTvXtv0P=16zS
zrnFK^+(%UZ^Ia_mTDr(JDP)6&F~087p%bb3_~s+>@78fdF{wqUJfzwtUOe;=T2kb9
z5gA?Z$U-K*Q-X55-UMANE<ksiI7s*N$`JXFLBYt!_fRGvrrSkK?kYxf75QC7Mpw~Q
zRCE>Xy9yIYS;0ctLF5J6O!R?1vJa31>%hU=E=+W!OjRb)FZ#%SA<N*aPqK_2#Y?AE
znU?+dMU4PyS!_rm>xVf_uCgE>915A+m3XQZ404}AuB5kvO2^e&0{Iw4RGa?VU0T`>
z;b0?cjH6}tm+z?NH3UjM#}Y%ATKYpG)>fGEz1ON{iIoA$q4!eF?!nua+l@>Wu}&h2
zFL8Ggok$y?ndsSlWY4Cu_aV{&nup6tZ6$nU(8NI-(!_77T*q!ARle1jdB3MTQIva0
zmD50%wAxX0WUaC<i83#<7Pd$&B)l%<zrsA`YTIR>c%hT1h0Hv<6W$Way~^dLpj@Ys
z>Eea%qPDx}E=B-IW(ld-!@wP~wPY_!i@!#_<=%GU=5}I4JCWZ`WV93QM6{hSaiu$@
zlDJ;%HGslv%(F_XfS&YdM`2RcRF6qmf<Dp`5U1a5qr}V&dKk;HoE)A1Wqc(pN*`%a
zNdM5ZY^M&{!d1hUdNnMQo<^fr&2#r?zfcdOab)9ZP98_w#SfHEmX7k#SI{H3i<_t|
z$RnkE=ve0Ky>S)VZp`Kp%xjri&+QrT6fz&f<Re{D0ryloPI3*1kMg#<h<L(F43cp?
z6@!|6Q{(RGGsU<E#*cn<M9!kqPZueln)&+F__#w?TqFd-PIq5k74L~2_pMrOLSos2
z^3Z1JnW*_aEo*`Q&mMYYc`o-mqvmeCw=qsj*^U?Kh%EGw-y2!C>xD*ttqV@5<0*Hn
zZ!o~x^8hQ<7O1cK?2fOKn$Y{Cq>_fVD9fhp#`8GI`FHAgd=ql)h9ykS->P3g`H2z8
zb4%-7^<OQcW@GuXP7FO_M{9(JFJE`f%|!#?OP3>yHx=u}d5E0n;e9}P!-o&ZlY3k8
zwM>Zc<m2sCa)%42HiLpla^O69>mzwD>p$&rIhe8H?GusH*1d|>V@vw*M8KW)xgtGs
zj(ciY-LU`bURN(MFMc}~2yub>X14Bl$=#<8#~z#2y5)uMa_dg_?zHozD#;Z@?GT>(
zuhI*-_as{PzFHGf&fnPxQz9LfNbQF8#M!`OdiFfL50*MoMqJM{&D0(}Xitp9!uz^1
z<>$Xh`2`Wdn=b!VzB!2<8F5!a&qv7k`&(qJIXP;z_Py{Fz??K#Vm!TXXuVpt0}ex9
zGsIUiExx1lkCgtIp!Avy-6fa~*j{VjQl<668`rl37E!vm<r1Wa;MZQDCV!nn>A3{w
zqqTZz52AcO+;spjBmNU$Cc$1PpHKPuL@i&F)bc@XJK(UE7~p)|l@AJ+z~)Q70Z|Bu
zLV#LSX@$7=0AMjeDM=yj-Hwwu8K6+4wI!HIFdOBIwC)7uy+xXj@<m#VehmqZAvgh&
z7h!Ic6lPG#nUtPQ>A3{w0~Ujegl)kQ5l%{HgJv<fNZ1RK7lXe1bqv7?ls}cyGblZq
zpseW-P}>gJmeQG&?nUVs!7&7-Y{N)z!>EqKP`(N|vW~-W4sttScY>1pFmRW@j-j;V
zJ`DAe`O^qaCpeqR&jB2(JqSN)1}I+wC?%Nz%G&{D{v4|B9IEMDDl-@9OSJivKcDiq
zV{Y4y(gyM$)MkRhgVYC}()+jA+EaS8B^z*D{7b;e@izgdwq%Rr(6YY(W=e>;=~ciV
zTTTG{nP7{Adgqo+fW5VaqCbB96!2$)EfS)yUIv&Bcszc+PaID<$5YNg5oy^k2I}ow
z4gmIOc?NJJa`N?@mghx83}|^Da3H|~g1&@$8-g7Ob|;uauouC8fId<7iLy_WeWLu8
z?6Kl2(ZA&?z~fssh_7@*rgf*K7|@OX1ei`xO7)fAjbIPJZ%OiRN%HR?+a=;V$R=R{
zL7(6c+Uv;qv84*|XM!yfLS~fI(RP5D1UnM!Ot1^Vt^~VNNqmnKCG(K}p7?%Ge19bQ
zf0S(}exzFbNVWKpYVjl0;zz2*k5r2vNdrGpEq;U^4v3$L!q0T?&ve(%bl1;x*UxlU
z9KYTq;-Gvs;DDBo0S6K+Am~eodr=1UlIacvI}yw#*qvZ6f_Vh{0k(kq0ntL-aikQQ
zZz1k2#Jxpw*QNFQ6cBw05Pb;{eF+Cp(U$<xmvlU#6#oSfJyW-&wgI7SKxi9pD~+@~
ziYLu7T0+3K1TzW3+8_tk277P)TMhsoPjG<z6?NPLm`~{ff<8gCDe@&3hqySz#ew{w
zpr;aSBTMSUQEw+pLi2Y3cBFLYmamcSO6hKt-<`_mQce%b>De+9WiXBa`%r!!mFbJL
zOLcLjRY6+T#g$eC5LQKZWp4yTZv;ed1VnEHl#;t7xl59}B)KblqwdPy2#DSYh~5r}
zJ_(3E35Y%kh&~C3J_(3E35Y(adpc|&U_ZbVaDN?eAi)BHzJ%Z+VRwSP2<8#&2bfB&
znM$phPV%Rd{OKfrI?10-@~4yh=_G$T$)8U0r<45YBy&2+oK7;Qlg#NPb2`bKPBLdm
ztD<)Ruj>E@wmbuv-*Pr!0p&zmE<oCsY0#H2L;eab7Xh}H<-tp)J5jnbrMpqOd&>yq
z=TiAzbZ>8MC35m8-IwzFQF<e|bb$;X17b`8VoU*IOzB;~SHcdU*+tJLh;f8;4y7@g
zkj7{N#Awow0iE{&VIcuwAp!lCxAbE`2Wj-fM*(3c0ka9hS|SZ=37AX2!e%1fhtheJ
z?n`M{Q9YaJXA}KwqMr@=$S3;QL>Xs`C`VGxCd%26@O`~I#vmZ|tM1YQBfSwh$4bkL
z552(7>pejK9l(JE3kdoWg1&?u2zDo!L$DXYJc9iIdl9u>#HAN;=|z<DC_j(#^C&-$
z^7~PKKg#b%`TZ#Wc#N+=KVHiucn4bcc<s-CJ}hmv9srKh2Ls}}_4+Wa6X1xJEr21)
z4AxI<c@=OhrN@E7V12wSuTN;%3^<w6GblX=c5E=7(v)xs!D@ob3Dy7>>w{s1iuGa8
zPq99n;0S^xlpj)hEWvRtt5Ie=_!fiLtAG=!%w)=$O25t^nzJZ>J|r*Jm(#tgksd<4
zh7hkI;I#)ilGhNugrMX#1oe_o@)|<ChJcsMk-UbWcDn(mqSiz7S(Gp9GDNSXU+V#f
zl5U5RZim8Z?MF^`lo_f?Jr5;44}~Nr>q8;Q7QhkmSIB^Sp<xNf5|s3Z>a!_57y2Bk
z&nLKm?mC%ZIl&5ol?0baE_xNEmlJFx*hKfPBDflG80zvV;0$PHn7&9G0Jt3K6G$F>
zz!$#`hdlcMrA~&Uyo6IxW;nF^DZZXN46=<NO^zV>M^O0@RDJ|>xEa5WCn$9|g0we+
z^fp2-2ZhlnFX32%vQ0<pvIR#I{n2_e(k1!?a4ga10LDm$m_D1*Qreha56UsU8R-yO
z-48enZ4{DJAxRZNhSkWCEf|7=gi^O5$q=IL_UmIX!#)9+NiZ9H$55+{L3{1d$54BX
z0p*jC9u9qup`J4a^j9MtljTw0ivVSP$Dq&1oQag4Md|qj<yaU)V_}TG8tJjrC&!W|
z@nv7ikv(B7(Hu+q84JoXNA~=&pt&D#GGrKwez+P?YGW*E3?B`~uj8}~jKOi}ffCBP
zjH9|>jDpTM@Io1VIPSuCb>*+5rEz+Ua%78-gZ#3jY>RRFEXtov`Ex0M0l||AE+$w`
zu!7(cf=dZj5v(S-oS+;j<MfpT8woZMTt#p-;CRS?GGHb_IfBMRen66cJn3q@J_1sW
zhvYI}YI{8O<nbi!czrJA&m$-`KOR;{mRv~bMFdYKxR_u$`pkH}g3^@)mr(hol&&IJ
zO*yrct|PdD;7Wq42+B5{068xL9ER4J010JU_K*o^$CCl2wVXh`dIH*UH`1~<PC#$m
zuTP{FnTU4Zjr3T8vMnZ}&&Xe;HJgMMj{z>gn4P3A0Xzvg5-xyFPNGpfl`Q#GP~M|Y
zN7~k>L#i!+vh}B<4_^d0LjFoRoDK<Peuy4B9egDmhq+)n`kO2{85VCk`hzS#3%||)
zo!x-LF=l6gg3JlQeFo|^0B|DxD(f{vpHDdp>DLN^(i+bsd1ivnMMz6)Jd<=alluHj
zvI#RG!)oNqkvkJIY}RM%i$HTWjojI~Y@ONA$sWLZl$=c#V-7fW!fPUAThAe_&LO?c
zAuBxxCHEk|fuL-!xv;VO0p)Bp7dBR=Wp9}a3KB|=b3tbhU<IXRTg=sEf0(N;qr0RG
zbM+d^sYi|Gg8pW})ySC#`kw;IemD=5C6qmI9@SzV^}2av6Xt=Y%$Ik~rxCq??p;9l
zE}$AMpnDgPJPYXF1$5T}l4JpCV*w=jR9}GlZUL0?EYz1lCkv@>EF>$jP;WraBBH;D
z>b{7$EFuXP5wAt0y+y=j5lOg+YQ2cKEFvz8i2fqd=VG$bi%Fiv#Bnk4DyO=XBfUqj
zAo(k(Oa<jv5S<EYyCtOaB~)e!abH5bmXMWR0t%b;C0tT!sfy&RqViQ#zKW!+qPwc7
z#jEJ9D!QwRtZp^kRZZNhiE=f`R*hQhhuj&^-ZI!9K+?}L(#$ftYZ>ucM!c30uVti}
zWtekidD()?KpAw1<1*s795h!$`<W6#O9KGqh*%Cfp90GHtA?~!L!-Ec=+|I$%X~?#
zhH6nu^3+lr)siH&#J!gI)>03w<&tvttfSeXj@o@CrB@<7KyN~sae6b=sF`>*Ll3Va
zM~;Y9l)sAdSCI}^5zTW@i;MJgP>YN7^C*2Dr|*D-=V7kguWuC6OW#Od^hWZcH<A~<
zk-X@Q<VA19Y6WG;f8L0-l}y6}M-020m?>k0^iQ65Qfa&b9Wg1D)^WaO1g8z0JS*k2
zsikT2IF09`w56QJ7Y?*WPCME(JTar_xHyr3Z)XrE4<`{n=5(soUHhKXX<7{Nc~vG|
z8z^w*hsw9njuYo1dMWV66b<j}yO+~KOTk{S%Gb3teE_Eo?RZ_DHkRd0t+QUqX*|cH
zpTTLo@m;@?(+=K=b2q15?Koo^r#-Ekktm<44KuFg{50)+<8@A_YxB(ooNl8{H+RLV
zmsU4bpITXwQ&HAbmQ!B8VogK!(yFGMzUBRL{DMfq002Md#QOTBHI+Ff^$jcP8_Jrh
z>+1%NYN)QQAKO$`Q(Ybz=m$e5PM$P*C}j>%xs=XP>6w)cjkqaCmi(V(svC34a+(^-
zDk^Ks8kXnOFG=tlTUS0Xr>w3br?zZO&f?0PhRUVYjZKve5VyK6r@XSEsSMX;%?;I!
z71iZZtj2*8>+9;9)~u+^8CzSnw7PC-jwCXzsd80i&cw2&rpm_px~it86+`m#SFc_@
zu$D_#tHJ}z>udk}ulZ9N>MNSdn;NH8Hms^HuWZbp4rZ~+#_FYYl?~IX>Q|SSHC9f*
zFLjL&v$?LKvLUCbsxoKPin4NC_?P2z5-RZr79?>jqf!Iw8<yrnv64n({)Dk5rIV(W
z4nRpQrd6Z!R%=c8J5{U17GDnj%7B+4RgQ<gR%mOq1}asB+#I})vm7Dq9L>iEA0zl1
zz$qVjC!%~k=+%Hyj#h$n1MZhlQmjU*4ljxyMf7TcjU_%c_@x}Q27*$62bCsjlW{0y
zGE#?24mhIh;ryH<@@Il?0|ubtl+#M{aQXjCryBR=P_3It-U`sF1>T@7M}9qCx^;B@
z#-cXmkXqhVN1Bu6*8pEk^=|-_x@|-)rCdt8)hH`9D|4il6}}9wd6rsk1Rbf3gti(%
ze<JCv9(ik^O{v+jB$=dL2M!Wfl1w8`tEkLG&~75Uk?xnR*M$3rV1prFTTTB5f{tvH
z!?df9pga(g)FbEr&%OED6x6I9^=hViHNq^)y04;oR-(rFcyXVqSq#6()>{ghWSME;
zTn|ahQI|&KOyGO!2$Oxa86{;)H6Y!D(o#F4P|Gshqp&0IIUc_s-AjDvxZpq3u`G$!
zK*-Vn+49l9WgAt3x0FiOU;^5p1k=ML$XrTeLej+PCancWiCgmI7y16@zm(3%!|`QU
zP!qF`EzjTL++zx!*GQA6#c+DMEq0#ew_@942I(kICu&`^V{me}o0g5a<5*NDSH9x}
z`%b;JK3X1zXFu&Yt-p3Wgcu0H<RF#9DvEugLD=0HjGdVw7+S-$6Er->sf~oXMnm)%
z#11il$DktPwDG9WL>h!sw3F}z%QQ663@C0EzI;3f?@^qG9gqduLc9~?WT<*Elpz~o
z36xU>)hxr1sX@1q9cu;7-^(G{gr-`BraT2reX4evb~@f#yB71~nc7*}AGEWzbF_1{
z^R)H&Hu?r_qjrIIA<hn7j58~jYL{u3YgcH0)UMR761sMcb}hd0euH)+PGT9_ChZpO
zR_!)zvv#|-1@8efwLfcHwL7)DwR`Z6rTesPc-!9tI4kj>wnKYJ+o|ose*VMS9${&Z
zYL97;YforTYENlTYtLxUYR_qZ!P$)$w7uGk+DqEY+CJ?S?Nx2R_L}y(_6APd{0-mp
zds{o8{at%U`-gT=dsll;`=|E4_JQ`H_7P_EPqa_9e`%j-pKD)eUus`zUu*x?zR|wL
zQS$G#AG9B}pR}KGHsM$8H|>xX*IMwx4!pG-Uz~99w)+&3D)3|izH62t+T!S8JG}q9
zz33qD4HnT^bipT-yNYfi8z()E6*(eT^bkEoFVP!k(egxJ(GR;u{jmo$KnxW5q5%6k
zK91)_MWGlZio{@1EQa9wUBko)VmRK8JyMJkqeY2`;S0Z^I8lrdW5qaplX-%eC?<)?
zc!2yQF;z?x)5Q!iQ_K>x#T+qL%oFp)0<lmm!sF#-VzDR}6{1os5lcmts20n_a#15{
zMV+V@EAaF{gJ={@qFJmGtHmi|jW|`DCQcV;h_zy!I8&S@{($eKoFmQ^=ZW>=e6c}n
z6c>mK#YN&`af!H8TqZ6TSBO7~E5%jfYH^LYR$M2p7dMC-#ZBU7u}Rz_ZWXtQ&Ej^k
zMf^$JA^t43iaW(!;%;$|xL4dKwu$@217f>)Q0x#7;W6i3VmD4~?-7rPN5x~}aq)zB
zQamM|7SD)h#dG2>;(76c*ehNXFNv4MKJkipRs2=#7q5xe#T(*H@i%-z_ib@N{9U{w
z{vi&Ecg1_+pW=P-f%s5-Bt90Oh)>18#Ao7j@rC#jJ6~Ume~WL#x7eflUi^Taq@Tpk
z;urC&_)Q$bUQdg5hpyp7oQ~ZVeBe~Ku_J*O86uXSs;BAccn5Wc-d4L=&(z!LS$caJ
z7uP%Koe`BjM(?V3Lmarfeyn!2o}=d?irZ7~rT3OEuhjeM{q*DX{`&Fy0DYjIuNUYM
z-PZ#>su${m^diJWixD|Q6c8~t#M|_d`Y1%cN)XK|MQrLs#EHftQiA9P*8P+8$@&zm
z?WgL~<T@Oy;aOPi&cO;3>q@Ng7GfoLvR<Yy*2}TNs>B*;Db_~SawUS5LoL<;_4*2Z
zrQU$kicRqHSLv(uQ}i|ZsrqU9>G~P^T78{<rhb<G2mNgQ9Q|DVJbk@>zP<r|`33rg
zI7fHA_K1G5eu;jmewlu`eue%={Yw2R{c8Oh{aXDx{d)Zd{YL#J{bqfWev5vqew)5o
zzg^#=|4F|?|FgbTzf-?UzgxdYzgNFc-=^QMKcH{dAJli~59vGgUHWeQVSSJOi2kVl
znEtr_g#M)dl>W5-jQ*_toc<U6dHn@_ul}O`lK!&3Pk%*!RsXBLUw=)1U4KJ=Q~#U(
zmj1SWK>xe`j{Xn*p#HA@p8ik$ef<OdL;WNDWBn8TQ+&noGyQY@3;j#H*yU^e-}*QD
zxB7Sb_xca|kNQvg&-yR=uljHLAw90Q;KhwXzW)tRT3Lo|IC$xzXQbd;TWLl*PAF#>
zZH-K$9X=G*9^bp_Xmm0<8(oZJjIKsEBO9NnIM&F)SAKdJJ&j&QZ=;WqXY@7t8OIs@
zjpL00#y}(AC@><1kI!dDjY4CPQDh7@ij5)0P-B>Jf-&3}VT?3J8KaF7BW9Eup>d)y
z#u#giGsYVejETl1W3n;DI0^6EoMucnW*9S#S;lN*jxpDmXUsPi7z>R>#>qyRvDhd#
zDvU~FiLunEGOCSb#&V;^s5R=0dSivL(r7RmjV7bnSY@m>PBGRPry8djryFM&YmIfr
znZ{YhAB?k&bBuG1^NjVz`Njrgqj7<8p>dIMv2lrUsd1Tcxp9T@N8?K4D&uP78sl2y
zI^%ld2IEHKCgWyflW~i2t8tsL*|^=<V*JUt!}znY)wt8R%edRP$GF$H&)8<%Z#-aZ
zHy$*07!Mgcja|lW<6&cu@rd!L@fbd~^MvuF@s#nj@r?1T@tpA&<9Xu+W3Ta|@sjbf
zvCnwLc-8o;vEO*jc-?rzc+>cs@s{znalrVy@s9Bi<Dl`b@t*Nd<9*`;<3r;k<749!
z<5S~b#%IRo#uvtycsJ75#=nhkjBkzajPH#fj314kjGv8Pj9-o4j6+7;XfZWY;5`h6
zY2sr&w&|EIK023TrkZJHy4l9eFx#4$W;-*>Y;SfjJDQ!$&Sn?$7_+O{&CE8to5z|t
zX0F-8>}mEgdz*dCJhQLa&pgiTZys+BFbA6XW`P+oeKRnlW}!LAEHVe1#pVz^%{a_F
z!5nUmFh`oB@I8|fGiH{Wp?RV?#vF@NyW`CX=0tOnIoX_Io@7onr<v2u8RkrLmO0y;
zW6m|_;W>!~=0dzf;$*YTTx^z`75GZ^5`5ja%B(h*naj-@v(~IL>&+GBO0&UiG@Hz3
zbCtQ;JjGmNo@$<Eo^GCDt~J-0XW~1Oe=yHB&oR$6&okGX=bIbMjphaBh2}-(#dsd&
zQarbCxp{^8NApU20p)7*8uME7I`ew-2J=SqCi7-IL2`?Et9hHb*}NUk9sbF@!~C<k
z)x6WZ%e>pX$Gq3P&)jC-Z$4mdHy<>2m=Bpd&0Xeh^I>z3`3RnKe9U~@e8POve9C;<
ze8zm%e9ruf`Mmi8p0Rn+e93&-+-JUGzH0u}+;6^SzHYvOXZ-$VzGc2`9x(rIzGMEw
zJZQdazGwc^eBb=Q{LuW!{1}JfKQ;elerA4deqnxTer0}b{@eV<{MP)={2pH#`O*Bz
z{Mr1){MG!;JY>er7Q6~p;Ju56Wm*<Kk?L5k<yk3Ks+DG?TWzcitF4u3wX?FU_Erb0
zqt(gkY<01YvAW{hH`!Kq>sTwt%C&k}J*{3=Z>x`$XZ5xES;txZt>di$)<7%YDzGA!
zZv|G=DzpY!Mb==e*cxIDwT4+ISi`Lm)<|oVHQFk%VpgdYS|{SI*ki46)_7}zHPM=6
zO}3_3Cs|XiY1VXWhBecgWzDwcSaYp;)_iM$wa{8*ootm^i>-32!m6~ESWB%ctJ+#-
zEw^f{TC2{gw^mpytp=;nYO<QGRn}_j6l;xjs&$%mx^;%N7T-EO(>lxggLSrbj&-he
zp0ys|McZI)v@WnNv@WtP#<w3XwJx(Rx2~}MXkCdf%wBC>V_j=qXI*dIVBKilWZi6S
z!dH@RwQjRETen+VtUp<ISbw&*T6bD^S$A9a;GLHD;oBVdTMt;<tp}|g)<f1#YnQd#
zdf3`yJz_m-J!U;_Jz+g*J!L&@J!3s<J%=x0Ja4^V?X_OCUb0@c_F1ps8`^)h_FJ!6
zuUl_eZ(4t|-m>1d4p@J;-m(5+9kkxXo3{UHy>ESBeQ14TeQbSVeQN#7`po*=`oj9s
z`pWv+`nUCs^{w@t^*!EL{-gDi^|SSh^{e%pb;ycaEw*M0`Be|wv@P4V9ow}%JH<}5
z)9iG+jh$h)wKMH@c9z}V?qGMcJK3G>F7`2YSG${?ZFjeiwR7xToR9Bm_p*E2ee68D
zuiei+&hBp?Zx65s+WB^Y9kG2ou%mXNJ;*My2iwK=5PPUS%s#;$ZjZ1>+N12zc8MLc
zOYP7;(H>)uwa3}x?Fsfody+lbo?@S5PqnAn)9o4dOna6++n!_3wddLM?FIHidy##z
zU1l$~%k2ug(q3XOwX5uEdzro5uCZ(FI=kLpVXw3s>_)rEZnjt1tL;<lHTJ3YY4+*%
z8TMLxoqeW#mi-6&Z2KJhT>CtGy?wsD!QN<JU|(ooWM6DwVqa=sW?yb!VgJ#-(!R>R
z+P=oV*1pcZ-oC-U(Z0#P+1_N|V&7`tW^cA{x3}1TvhT3}Y;U#iwC}R-w(qg;wePdH
z+4tKI*xT&~?H%?*_D*}3z1x1+-eW&vKWaZ_KW;x^KWRT@KW#r_KWjf{|HXdZe!<>r
zzi7W?zijWbU$I}c|7!2IU$bAg->~1b|7O2szil6||8Boy|HD3LziYo||I>co{=ojw
z{>c8={>1*&{+Iok{ki>x{iXet{k8pX`y2aP`#bx4`v?0+`zQNn`xpCH`#1ZL9k*NX
zsVL#-_#A}kSa=_k<G7CJq&TTgnv?FdaWb5?PNvfi&%(5KIyfEinyk)F7v~tKtJBTN
zcDg&qIyp|R)5GcM^m2MTeVja}uhY*t&gt(Q?+kDTI{8k46LEYeaH3A3Gsr1&20O*h
z5ND_}%sIgs?u>9oI-{J?PKgt9N}bR-(HY~6b;dd4oe9oFXOc77nc|$}Om(I?)14X4
zOlOue+nM9cb>=zqodwQ9XOVNVQ|2so%AE?Q(plmxb*h|dXPL9ysc~wZI;Y-Q;jDBT
zoJOa~X?9jQtDRGvHO{HdY0l}+8O~Z~opYvhmh%VaZ08*3T<1Jzy>q^^!P)3s;9Tfj
z<Xr4r;#}%n=3MSv;r!9L(z(jH+PTKL*168P-nqfK(YeXF+1cdW;@s-o=4^IuceXfx
za_(^c>}+-JbnbHQcJ6WRb?$SvIrlpcINO~EogL0Y&Q52Sv)g&t+2cIoJnB5=JnlT<
zJn1~;JncN=JnKB?{Ka|RdBNH1yy(2-yzK0AUU6P^{_5;^UUOb|-f-S@{^q>pyzLxt
z{_ecv{KGluyz9K@{L^{g`M~+m`N;X$`Na9u`IqyV^SSed^QH5Z^R@GD=Nso+=R4<n
z=LhFU=O^c9=NIQ!=Qrn&6L;`h20VD7<D(|>TiLejxUTErbGxZ-nw##naWmYuZl>GL
z&2rnj9o&v?C%3cP#XZLD>UMLp-R|zOZjPIa@6z^kd%3;cK5m}d*X`#X=k|AxcL%rw
z-F&yejkvxWxKX#z9po0dgWY0xh&$9B=APgVcSpD*-BIpnx5SOPrEch+=#Fv6y5rpO
z?gV$DJIS5wPH|6ir@GVJ>Fx}7raQ}>?ap!My7S!m?gDqAyU0D+Epr#U<!*&r=`L}X
zx>atqyUbng*0{B9om=m&a96qwZll}eHoL3b)$S?o8uwK9H1~A(40kO)=yIlemiq_y
zZ1)`ZT=zV8y?eg9!QJRy;9lrn<X()=y<F;E=3eez;r`LR(!I*P+P%iT*1gWX-o3%S
z(Y?vN+1=#c;@;}s=5BUxcel8Ia_?~e>~3}MbnkNScJFcTb?<Yxx%aydxZB+a-5u^j
z?oM}?yW4%(-QzyuKI%T^KJGr@KIuN?KJ7l^KI=Z`{>6RXeZk%9zUaQ>zU=OEUvXb`
z|LX2{Uvpn~-*De_|K`5szU>}x|L(ry{=+@!zU#i{{?mQm{lNXu{mA{;{lxv${g?Zh
z`?>pt`=$Gp`?dRT_Z#<H_dEA{_Xqb!_b2yf_ZRn9_c!;D8+Tjq`d;DTu|?1HEWB04
z@m$aIQoK|z%}e*%co|+>FVk!1WqIwr4qivElh@hn;vM64^}2c4UU%<UFUQOEdU!p(
zUS4mnkC*55_4;|odHucPy#d}pFCXu0iFm#jcu}v=8{`#vgS}#Jh&R+5=AGaT_eOXl
zy;0t1uf&UarC#Wr=#BBldgHwD-UM%=H_4lfH$R``P4%XE)4dtqOmCJq+neLf_2zl=
zy#?MvZxP-IQ|2x9%DoD&(p%y!^{TvTZ<)8;tMO{RI<MYa;jQ!<yhg9dYxY)otG!da
zHQuS-Y2NAH8QxlNop+{pmiGtmZ0{WJT<<(@y?4I1!Q1Fv;9cll<X!Atg7?i_=3VYx
z;r-FO(!0vL+PlWP*1OKT-n+rO(YwjJ8E>Px#k<wJ&D-qV?rrh@<lW)@+1u*f>D}es
z?cL+u>)q#V^X~T^@V0vodON&_yq(@IZ@2fbx5s<Ld(?Z(d)#}%d(wN#d)j-(d)9l-
z`-}Iy_ky?Ad(nHzd)eEEcip_|{ngv=z2?2{z2Uv-{mpyJd)qtU{oQ-V`-gWBFUWq+
z`=|H5_ks7J_mTIp_lftZ_b=}=?{n`9?@RA1ygvKi-Z$R2-gn;j-Vff7-cR1o-Y?#-
z-f!L^FYdLZXm}&Bj(2^VDOQS|;-t7KUP?+zYD!v4dP<v=jFh%1nJMj3vQpZobV%u#
z(kZ2LN*ANHIbuw%s&$&{s(rs;kXhQ?Q18{R!hT43eM6;PTU}96-(-(k+<*-VyNoW*
zsQRV#b(PDVGIh0M<z)@^b#{fi#L64$%bJ{0E>y{dO4YBG>N26Myt%2;u2Gi>Dzk<z
z<^*swYb4uA>gPIjnWRe9(ItIyRde0avWDi`nzH7m^!jAXo~mwWP?xFdz6N!frZOAp
zk~SS1Dz#;0<=Dz-N^43&?CGj_6J4ws4cMx&u#r=@G<`-guk_|*%$}>LpGudMxu}Gq
zopNex(mJsWEUoEPl}%;Fl&Wg0tY$@3nN?9)(^TeEu4t^TsjsuJT~k|TG?g_QE2^r~
zX_tl?q+)T6S9wZ#O<Ao>)ipM+sBEaNZ?IQXHiDd2*3eMDx~6hTlS8TI6)AM3Ei?6F
zMg8hJm0DciRHahQD=O;J_=bwQ#f_CI^$kr`vfavR(yHsQq19MPyH}}|E1RoVmDN<%
zl~-C-_05fy>F5_V^-HVE%WAN#l_Co-Z78d0TG5(ZjM*A}tFWMeuRdQ()D<tLqu(P@
zz7FOq|L$|X&v?Liz&O6GMfVp*_{#JP1ID?0VIkv#_*%qQ=2uwE_$a=P=4*majPX*w
zhUz+q`43|LgP1>Fs!DPVV*Z1e{~+c+i1`m<{)3qRAm%@a`40mB6^m=?%a=Q78+o-9
zR<lH18=4qzYOKN*rA5%GSWZ`ONp($4WyRw9Q&Lo_0WIk?HB^@^ZC;_S4UAXRDZFNh
zU0&T#UQ_8+*R5LIjN6-Jit`$4tI@y8$}7<^R<$BVV{@Io1lyxEm8Jw%;|hpkme({d
zwyG-2z@nnM411XsskP0G+*vByB&E@t^|9mh>Sd{QWh?3%n;Pm@R7vYoC#?i}A8sXe
zMhcV~BN0~bC|3I@R@*36TS=HwzoN2E$?uG+ErV66bIQ~;wM5pYxpqlS<teG<htnw~
zt)n!hyfx{R^4+MPq+*vUYgkE_l+xCMDV43s)DsU=O<j68opNGpk(8ya$+Q!bEKl0f
zBqVjr;d@i74yVmAi_03!Dgb+IQ*}*6rHyTJTpa8wQ%$j9OtOwuvQ{h0J(i7fwYsK`
zJ4`Wk+2M5B_#_e1mLGvEZK$lQtHGvsb$Qx^<X>u%kx9u&T@qrH)-5$E>y|o`S<reG
zbg~k(o-S!qlWs|CNJ3Jl9TqdS@o?IlE)~)w6*5C9q**Cs2J>lVJ~I@bW~GoBtdM3_
z$gIN@Q&%UY=Om@q98O!X)k_;waAW{;k(|+BZxcypR4HXSWtDVIo!nSchCwNdrPd!#
zdu6bkl{J;sW%exCPE50_)nyhHwO7-{n^jSbg9VM%jo#`+%ATVNuAxi%%4X1!^EAwL
zg@@w`a-db7V%AhQlzEknP3RI$_yJRQr947WmDW^+wp8iH)Fsuc66v%?5UJxI+S25c
z)B;u$&LlLZCxjp@Wt5!5D4ABOrZ7U>(k7Mbjm1o;exF=hEqkUyW+W9(nOs}BR29ms
zM)4y!Sj52`jaklN4(41rgMx!8iCg2#R;(zqCzRDLt|-$dHtUm`_1V?vX2eaOQf*AF
zs<)=mygI$C*<sE`NmaEmrLj6q(nxU3;2#rs3Qf^UVxFN@^&kKxJSi`w+Bd5jC2plm
zb1@29OXa+8o+^cwC=Ojfba|t-oJ7Z@E=8|v)=#N+>XqC^Lsh*^&H(J3qHL5yVkE74
zsjf6hAi*r-DCTKQg@j1s9|=jJn<**nYC*Js>?p1@ec?*>6<3<Ra3#BoD@|Xx()5KZ
zO<%au^o1+gVO+@$<4V&ft~71pO4DXRR89N1GT#XERdyZu%s0Y(Bg{9#d?U;^!h9pl
zH^O`)%r`>QHs~?`2=n)8+AfIt%-?7JKG$2h9r&I3`^?{G{yy{fnZM8cede#+72MDK
zedg~o|A6@i%s*iM0rOXGPC+za{sHq3n18_h1Lhwv|A6@`_Xzhh|A6@i%s<Nfqs%|b
z{G-f2%KDEo|0wg1GXE&^k23!#^N%wBDC<AU{G-f2%KVkPRuC;@zRFz#&U}@-2Aug8
zGT%bxtK2pG&U_1*Zz1z7WPXLrubAswO!dW~F{+mzi400jvTbQg>YE!9PIa0zi3uc~
zY+@@$#xa3;G?xr4U(?W*Rtrf4Gn3K{(neIeWUL1^m%C)wkw`y0pU7+?fkbLzRLe}7
z%aF)OUTw%96zk@4@{S7BX!8pSNb9(g7H}mk_yww$;!4`WmCLE#37oWtbs*n2i0@;k
zw1Az`0_l{(sV^8r_lE^))Z<EYai!mJP5e&u!Z0kcCRf!rAec{Z2Ek?tQ<Pe;bch^I
z`iGN2ic%L9XifTubA$A%`ugQ%i?Mcv&KI|7#Rke-jzs+<(I7>smuR;peUFloSc=lJ
z{5>P7u_T@jCvI_NP5o+OV^+W)a52L+RaG}sculLZ#zLa;u$a-q$-=|6iylrE9w}S&
zNVM><s7X>s59cNo7<4$d=x}oI5fb}HV8Ibs^a!l*2yBo??Io4tQEQNzT6I^PmQah#
zKjO}!Bd{Z-DQ=UvjkH;CBpNvq^^Zh@Bhl!QXklurY>|SbbR;S5C#6XfHI<Ex)g*~G
zDj}FxmPn<HYVBevWv$7!qYifvQcT;jqcf69kP?$iP)7Tt60L;WC(&umOy))vOr}K{
zSxK}Kl4m86O5~-g5D$r*s^UB<t@24O&Zl&S%5Rk<L*3JgGd+@l@1t}Zbzg#Q8+BU(
z_2goThLb1PQj|(5Z6%sg*_yOViJV<Ym$s!xE4lLMjHD7u>q#Y)){{!KvT2`Gsx>p2
zn_{0-iZZg2XeH{Al~gE^mom1MXi9Z!(i@xj-K%a*O>RxqCsHY}rEKz2U{E>PcJk3x
zuRl5?sf5x+QVFGtq!O)!+b5N3%}nN|bdgj_=^}|%Lh`JnLWw+Cn+6r?leI}CDVKy&
zxs+@}xvfI9q4KS$qD0KqJ(NVm5JVH)5HU=`ycvmnuQ`!Q!R(aKE~cnNlIAQL8Ywh!
zsU+npDJfS;Nx7}JwxM5IQAxj{PDx3>C@Cp7Ap@d|$x_Zq<a=upsgyZ~39e~P+H;7Q
zy@oF2;YUhnE-r|aD9<QTqCBHWOnF9;nDPW8G3Aj(V#*VY#FR%Ci78Jo5>p;oB&IyF
zNKAQTk(lxXBQfQXMPkY$i^NJY<O(Aw7>vK@!1A&cNqFQayyPgnK;mkJQp}!WF?*=R
z>=_obXIRXhU@?1w#pHt&M2l6uqoer#QGEX>rHAM!_7F$2hd7!&;?Z1wG?yREp66)x
zct<n8(Ol2LijJS~OiQ_ZDeGl0>v=Hic`)mFFzb0R>v=Hic`)mFFzb0R>v?d39_x8<
zg1@S7WH7h$U~Xsjd?U*9Er_uGBE`(FnEA0jBdpIzG4m^CeyraJ>o>ysjj(<r#R-1g
zuUOv^)^}tS^BcwdMsfW{as5UyzfsIjMf3_HDx!xg*KZWpkJ~T8?G@qnig0^HMl-+B
z%x^UF8_oQ<JtN$n5pK^&qCH15ztPNZG}mu5*RO=zvxM8Tgxj-(+p~oEmoWbl=3m16
zOSrxzT;CFI&k}CW66POc{xRks3wit$CB~B)-=!>1Da%vJ@|3bXr7TY=%Tvnol(IbB
zUn7bBTFUa2vOJ|MPbte&%JP)5K0@XnGXIeIhs-}@{vq=ZnSaRqL)J&A^npbS)eB2C
zzAAb?M<#rZO!yp`z+!~UDSAFfCVY-e_#Bz=IWpmMWWrZ#lmee46h22N<QH?K-NF))
zugsq#6h22Ne2!4~9HH<dMQPLE^|tORVc(_|VM<D~KF2D2j#c;^tMEBi;d874`*P|&
zj#2m=qwqOK;d6|_=NN_0F$$k!6!?lJ-_Lyg(cFWABYKd}F$<q#7Cy%;e2!W89JBB_
zX5n+p!snO;_IMN@UfcV;w)c5$kIy*s@2Us*ytemwZSV8i-sd&F&ue<0*Ytj&>Uln|
z?R{R``)UiOz*k!^xN=LWEg0a;S8c%n=boarV1TQh=c_Fk;H)RL+6At9zOPohz*W!p
z)#|vwFXDO^aZf2?{&;C0^`Ii=U&Qq;V*W+kQ;V2?5w}wj^Dj~(&o5&BMO^<P=3m4!
z4$mw;&n!OAEI!XHKF=&Z&n!OAEI!XHKF=&Z&n*66=Fc;WKbZOR%;NLR;wNT2o?(2R
zVSJvceV%E2o@soZX?&h(e4c51o@wwgN2M>GX?&h(e4c51o@soZY5ZcY|0veK+6zLE
zgZ0ldkIyrY&ohtDGmp<RkIyrY&ohtDGmp<RkIyrY&ohtDo`TOakIyrY&ohtDGmp<R
zkIyrY&ohtDGmp<RkIyrY&ohtDGmp<RkIyrY&ohtDGmp<RkIyrY&ohtDGmp<RkIyrW
z&ohkAGmOtOjL)8-&z_;ro}tg4q0gS7&z_;ro}tg4q0gS7&z_;ro}te(mLKDG;u*^4
z8OrAw%I6u%=NZc98OrAw%I6u%=NZc98OrAw%I6u%=NZc98Okp$B|8Ut1?q3mQFzf&
z_~4`P;v{^Kq;V9UOi%uvOi$v;^dw%KO7?){Nxrw}DB2P~`uAko^7mxg5>KX`Tz2qL
zv?ZQQTjEETPo^z@Po|yxTk%n}C7w)M;>olne)Rpxv=jO!T_@2_;0f9ZJV85wCuk?|
z1Z~2(?PU7*@MK!@_hecUPnIpYz2tAn?Ulfj=_R*U;`e0PlFKHymn@syUJ3l@^2xF$
zw-=R9s&{gG$={OOD}g7|PHwNn@5yo}bVB+7y~OxP;EDE1;0f9ZJRx@iPtYcu<(6s5
zJDIk`lW9vlnYP4}X-hnrcJjSP^CEspyd|DYOXA7(PHrzMi{F#!%ioh_lXx<{<n}t6
zS8{t1-=k>D-;-%4w^yQka=jCBlgzj`q0<DOkUN1VXeaQ5+zC8En{d{dOiO(y)0TKL
zZHXt-mUuF4i6_%ezE{>OnYP4_{ymwt{5_dA>4ojElr_2R(e<FZB-QKp$|vhIxxHjr
zi6_gJ++K;_lVy{?C)Ybco9N=VM7<Muf_4H=)Fpu@XeaOlZNj-;GA;F;Ok3i~v?ZQQ
zTjI&IC7w(>`QGIAlDv}JD}g7|PHwNn@5!{2%Ss(4%PsL_-V#5$e6rls2HY1UujJn(
zo=jWf$+StfBpuTI<i7^IhmL3$<I3+3c!e79-Z>&-{JZkE174X1yfO`VWg76xG~ksf
zK6Ie&<CST^d*=bKOaoq-2D~y2cx4*!-g&@#=K=4X2fTM4@Om`h^=QEB(SX;Z0k1~`
zUXS9_s7elAmj=8Z4R}3@?~d^AYMm4CdNknmXux~s0q>ayy#5S${TcB3GvM`S!0XR|
z*Pj8eKk>a;#fSII1Ku+ac+WiGJ@bI~%mdyt4|vZ!;63wz_sj#{GY@#rJm5X^fcMM;
z-ZKw)&phBg^MLov1Ku+ac+WiGJ@bI~%mdyt4|vZ!;63wz_sj#{GY@#rJm5X^fY-SJ
zuX6)l=LWpa4S1a!@H#i(b#B1x+<@1)0k3ldUgrk9&JB2-8}K?e;B{`m>)e3Xu>r4R
z174>FyiN#soe=OkA>egF!0Uv7*9ify69Qf*1ROyQID#B-1UcXcau8GN&wwLg0k10p
zURMOXt_XNt5%9Vq;B`g7>xzKa6#=g+0$x`Hysij%T@moQBH(pJ!0U>D*A)Rrz5<SX
z1swSbIPw*6<SXFFSHO|4fFoZ4N4}yQ;fnG&k8=DZ%5jb;w|A7=JId{i53^E#k8*oQ
zxxJ&@-cfGvD7SZ%+dInb9p(0pa(hR)y`$XTQEu-j$2FoH*NAdl17Chu{JB3wxj#fX
zt`X(9MwH_kQI2awxxYj?t`X(9MzkoFfwL1hs9IgVsJ=<QV~6RhI7gJ@98r#QL^;k8
z<v2%_;~Y_rb3{4L5#=~Xl;aywj&DRcz7gg4MwH_lQI2m!Ild9)_(qiD7g3I1L^)m&
z<#<Ju;}KDgM?^Uu5#@M9l;aOkjz2^>{t)H(LzLqWQI0=EIsOpk_(PQA4^fUkL^-|?
z<@iFB;|o!aFGM+h5aswml;a0cjvquheh}sOL6qYMQH~!(Ierl3_(7B-*HMmKM>(Dl
z<;ZoE;|fuZD?~Z25aqZ+l;a9fwi8jd6H&GkQMMCNwi8jd6H&GkQMMCNwhK|V3sJTU
zQML<FwhK|V3sJTUQML<FwhK|V3sJTUQML<FwhK|V3sJTMQMLn7wgXYN15vgEQMLn7
zwgXYN15vgEQMLn7wgXYN15u86M>*onN8}3%IpU3|1&xD3j(8WcKT*gL??Uz`3fZ41
zWPhTNBi@A^@h)V)qLBTHLbf-B>{k>PBz6>V>aT!y+{mwi{{lRDhfc<ekH!Zl?bzWH
ztOZ3$c*#+?q(|jty&|Q`{^3e~1g=zHT*<!RO8yhB<Uip`{sgY%PvA=a6Rs3D#FhLg
zTq$mfE6p3YQrr|*vM0DwJStME{3u+Rzw)DiGk@hr0cZZoj{?s8l^+G1`71vPIP+J2
z6maIR{3zheU-?myQsqbC%Jo<Aec)Vw<xc_U`m6XpaIU}dr+{<)l|KcX>#zJN;9P&@
zPen?VKZPsTU-?tOx&F$Z0?zeU{uFSozw)PmbN!V+1)S@z{3+mEf8|dB=lUyuDpIQa
zDO|b!%AW$x^;iBBaIU}dr+{<)l|KcX>#zJN;9P&@PXXupD}O42Fr4a#YQF+F^H=*7
zz?r`~iwK<gtNjY#%wO&J0%!he-vT)ESMxb==CAfGB3O1Q{%U>)&ivK<4xIU``5id(
zSMxh?=C9^=;LKmm@4%VAn%{vle>J~HuoP4L)%*^e`K$RIIP+KYJ8<T&=6B%CU(N5p
znZKIffir)#ZvmY7tNA=qs^({0xj(6S8aVeSHBSTQ{-ow<;M||oJPn-tliG*C1}67s
zwGRP2Q1w*vIB@RIY99hP^H=jaaOSV}A%H9XIL=6PLbg{S+pCc6Rmk=#WP25|y$ac0
zg>0`vwpStBtB~zg$o48^dlj<13fW$TY_CGLS0UT0knL5-_9|q16|#K_**=AApF*}z
zA={^r?NiA1C}evSvONmf9))a=LbgXC+oO=}QONcvWP22{Jqp<#g=~*Pwnrh`qmb=U
z$o42?dla%g3fUfoY>z^=M<LszknK^(_9$d~6tX=E*&c;#k3zObA={&n?NP|~C}evS
zvONmf9))a=LbgXC+n<o_PssKsWcw4c{R!Frglum@wl^W$n~?2I$o3{=dlRy~3EAF+
zY-d8YFCp8NknKsx_9SF`60$uB*`9=KPeQgQA={IX?McY?BxHLMvONjeo`h^qLbfL%
z+mn#(NyzpjWP1{_Jqg*KgltbjwkILmlaTF6$o3>;dlIre3E7^6Y)?YAC!tyoL_)P5
zz*X6=P^|}mEBh6y^#E{Xze2V*A={gf?M=w`CS-dPvb_n}-h^y#Lbf*{+nbQ>P002p
zWP1~`y$RXgglum@wl^W$n~?2I$o3{o*c-L)841<CC$7qVhH9M=3Dr6SS7q-)weJaB
z*}G7!JAf;D7pip!aAog8weA3}>|LnV9l+V%sdWc%Wp6`u;s&^~x1rhxjf83+6j#>2
z+6M*B`d8}{;LKO;e*$N|YX1{B^Hu8?;LKO8Uw|`TwSI|&YW;#M^Hu8?;LKO8TYxiP
zwQd2<eAT)IIP+EO7U0ZRty_RIU$uUTglheQEAv(B7vS8#)OrQDnjb?I*8r~O$55?b
zfHNPpZUN4G)Vd`Ss&xyl%tx(TfOGxSx&=7%RqGbu%vZ%TfHPmUjsdRb<xs6-fOEf6
z>zGKW)-AYlKT_)!;LJyz*a6Ob)cOTD^9fm>A@d2jo+0tUK^&S#aixBXE7cEI>ZiC8
zA6$t(uGC(*5*=I<bVy$~&Y`Y_s{NoYqK_-l$Cc>g8l>U*!0LfGJ1LKLd&?3jIj!Sd
z5Q~-A*5~l1&tXNM!-_tK6@5N{=JNqUpO=9?F9UsE2Ku}V^m!TR^D@xqWuVXDAfFFH
z`MfOj69=J`S_^!oR$NJ~xRN?>C3WCRYA6Uej1=%OoPdwv1bhr9;A1!eKVlQ`F`R&p
z;RGCh3iy~!z{hL?mM`FDkFh%xV|OUV?of=~p%}YEF?NSy><-1)9g49#6k~TN#_mvz
z-Juw}Los%TV(bpZ*d2<oI}~GgD8}wkjNPFayF)Q{hhn^Zi}CU;#_my!-J=-0M=^Gf
zV(cEp*gcBz@-4>8w-~!iF?N??>@LOFU5c^06k~TO#_m##-K7}2OEGqrV(c!(*j<XT
zyA)%0DaP(njNPReyGt>4mtyQL#n@envAYywcPYm1QjFcD7`sa`c9&x8F2&egim|&C
zV|OXW?oy21r5L+QF?N??>@LOFU5c^06k~TO#>=-DFW+M9KE>F5in03?WA`b>?o*82
zrx-8aV!V8du{#xGcPhs2RE*uJ7`sz3cBf+OPQ}=rit+L-#%@)Nmv1q4uVTD>i?N#(
z<K<h7-K`kATQPRGV(f0k*xib;yA@-1E5`0tjNPpmyIV1Kw_?iOlJ7JB|HykEu&Ayx
zfBf8k!we!4Kte5{*0R=+VIT;`Sfa>Wff<HjfWcBlV*m{?#27=2&Ewa)*01YYV<@6O
z*LAJyQh#jfx~`?xwbZ4qvBtQrHN;qBTw|;;##+}BORZ(TpZC4z;z(kf-S6|=XP;-E
z%lVx5zUMvfdCz<P+{3+d@3H11tDoWbjy&Dt_mFaavc?<ErJOb1aBj=VY1A5T;Pd4V
zv7An=@rHArt`YNejo&%4T+Vno?~Ir8&UiVUoAS1Cu6&G=D<7lai|J%<POf~6k}Dsh
z<jTh=x$-eeu6&G=D<7le+K*A>&;G{CA5M>#KmQvqfBrXK{`_yeocG4dd2hU&_r}Y4
zFVDWME-z1}T&|jOxoXPgswtPNrd+O?a=B{C<*F%{tEOD8nsT{n%H^slm#d~+u9|YW
zYRcuRDVM9JT&|jOxoXOPe@*%CuPK+Wrd+<7a`|e?<*O-|uclnSnsWJS%H^vmm#?N=
zzM69RYRcuSDVMLNT)vue`D)7Lt0|YSrd+<7a`|e?<*O-|uclnSnsWJS%H^vmm#?N=
zzM69RYRcuSDVMLNT)vue`D)7Lt0|YSrd+<7a`|e?<*O-|uclnSnsWJS%H^vmm#?N=
zzM69RYRcuSDVMLNT)vue`D)7Lt0|YSrd+<7a`|e?<*O-|ucmdI9q%((%O6uNV@<h?
zHRUqal*?FCE@Mr(j5Xyl)|AUwQ!Zmoxr{aCGS-yKSkqd@;&;t*nPasRe#b1AOIADK
zoR?>a<+!)($2vyxE&Fk9%?G$`nMC7sd=cHI#jV(f>2_|;r|=#g!sFY*pTdiloA4?6
zY~E10q54RUc(&Z5pJHD$Z>U_fK3i_6KHC<%z9eV!qV?If43&%0=fw^Aq5ivzC-n{T
zqU^hi7cFPoBFkktn>SQ$s6N}~=z8$WHn20g9yV{N9P)ocj(E}K+Igexvw1`1qV#b+
zNRIVc*9rO9JXbz8&y|nObLC_6T>02MS3Wk+m5<GH<zw?)`Pe*HJ~q#lkIi%CWAj}3
z*gV&MY%U)+j+c)c$IG8l=gFVB=E>_^o?Kt&$?Hs>yw2pw>r9@!&g9FVU*yZ5U*ucY
z>zsUh-6{Y5G_A*Hc>hVx8}i>!Q~n!j%6~&m`ERIcmGiJ^m4o*StbcbNw(67nuysAi
z^;+u=#MXS^wbmUtx5mBKT6f^w8uwmn-GOs!9pJUr9XPlCt@6rshu6BkgU|n8<a({^
zA7ZJ;y8hvu^-O)lS}!2xbp>M9hnUv`Qy;O`$A}-Mw}J8Lk*D}wIVZjV!!Om^M6OMY
zcfK@t(X*5mgIB0I#v9ZWyZBQjL^<gVeT%@``7HDNQ%hKe-_U1@-_B>D1y4yuH1p-j
zAH3&V7NW&?<%8Jzk1F4OP-9)G@Fs}0;__N62-IA9+*&E%oIO7E5$g(!Sk~OS0^^+Z
z!XsP`V*8w17Uw*}Bj*3yAU|=$kXJRM&aGDp@1)bqeo@KRi-i25y7fvTlbp%=J^{&F
zFS4^};vG#a?`dv`VsSpO?z<yJ`R^8DJzx#LQ|jQEtssumWL`^fFdNzgHy?^U&*LS>
zmSOxc5{u?}BHy~+<>Xt}JH+g5#C*L&%>5EEk1xd5`ZZrZp3j$$=kw+31o`rHf_(Wp
zLB4#QAYVSd&zFzy^X23FeEIl3U%pO|FJC9fmyh%F<>UN(`8YpcKF-gVkMr~8<NSR2
zI6q%L&d-;R^Yi87{Cs&IA%AKyzTGu<@e{H5lFk$Jo}c^Vv&|N{5a&(9nEM>QVAb-x
zfsYD2^_<c2JU;hhu%N**4m<f-d`rf1V$oE`b1&4t(DJ;a@rftrKHp?KGq+{#lg2Yo
zJom&rebE#1<|60wbDxWOzUe7?Hx}QTp~(6Cv-7}z;W^g}3-N`y$BBh+9L!w=!qV%V
zFw83KIT*J<$A^aIY52;G@#Is_%xyLrao(af&D9n^vDkR&iLXDkK*QH=v=)S~KilY>
z_tb(XnxB4Ro`zt+)VY%N%-m-*1S@^P3kx&^$MZ;kx=AM`F`RMXTy^1Ge9jCyTAs(Z
zZ{P=@_T00m5NfDXRq*M&#SRpXKZ;PO1A(F^=_^W2E=2ei)7PJR#sQx{H@BH;g&UbX
zFcD9Sv&0`~zm7mjbMZoQ3#J^h!%5YB@u|kSF0Lq1j;6U3#h^x<z_lU@UlD<!s1=<!
zsce>meVhu-k1uR~0UsK8a=|dNTsA~3)7%*MF^gMICMHC2Sj0sJv8nh}(cF1f%P{kq
zCl)^SoC_^uHUBVfA4#+E7VT`BYY{GZOD1!>NiJGWQt*pK#oMhY6Hs%D8pd^(TvS|A
zXiJNVvs%<T87`aDI&&_RW(?ytl{wL}78OhGljI#2xZq2f9mY3t-$#Y1b5nCrjPD~-
z#2#Vm5*S%l>bt`jteE9S%R(sP!I?z<wPXiJY5X9M$Kst+9-s+Porg1W6IrG5Z%^~F
zAkQx{C5?6eAU&RF+U7^Wjy_K8;}b7pA`$H3qktC&cB(QOyZyMaG0=XYU?++n2@ShZ
z^nm_}`V-Ix)zhGVuATw?j`|Mhv+7yU@9KY!{oK~*YlNnM%NQ#Z<IBbqLZh#*gKjhy
zf_~0;4)h}9PeHFR-UQuiybbzv%yFUMYsM#qhHn}F67;p0e$c;lt`rKsyt`Ux`0nln
z(C<4hf&RdiB@}!=c7o7ckGTFf=vA&gpug|>KIkr27w8|jegJx}Yd`28xqbw?+tm&F
z$F6gr|IPJppwGv~3I$&?9VS$K(G)(w_e>K(<9nu{N5<aIyB?9RXrH7nvNu%rgUTLI
zt-7P8j|dfCt}j4c9y1;TJ;m^XE;dSmWkwBfrZF4%IDDeQ8}ooq8c%}LWHf<(%6J-d
zv#|g)zDf`J1$aqi|ETO4^2v3f#{7FsA3XDM%*R5dZxX{Bf9Cu%(D=qL@E6WsfO836
zQsJNRz&uwTYMSrL2R(s2#%(Xq^7YC%q2pI_&0-Y3!1uJsY{KUU#iZsZS{7iBB^`1C
zJ%i+R^prd2wEH0K+h?U?s~GGGWuIZg5bO{YD~3Id$xWDye#Q{vbowctsAH^WT+F!n
znWvw5TI^!n%Xk3l73?f^2dO}tlLXrNiCw1z_M%e$$X->So=@c+tEiPnVdpA4&cHrX
zRoF|a9{WWt!k$nou-DU8u@gHq9mFn7C&gv#jFgC-kH%nkqg?D@RD@lMs<0DLJ$4&f
zgdK%eVAr5F><qLWdR;<M=D<(bRLQvpwj*}c;XDTMYK!mMZpGMhi{;`}meb=C;xpnW
z#s}ot{`lkZ7vgVPXCrow=o!&F;<9y?Fg;;@!m@-mEB}4eiYO;B*NT&3S<0DoA?apv
zT=JOYiOIp_#^jfnJACAfkqbty7`buet0NDLJUQ~x$XhA#DPvM5r1&{qO}Tl09O?nf
z?=OHpw8hvyEB?v?D=sLs;>WgH@#Iz5J_K@sh1U6uA}gLbRyeTjm{Pw|IMBV6#;atd
zQ0DDGI>o!J_(|la^QIeCJRh?P9Z$E(cr)yw^MgWhyoz2au#;FbAIFtt*kfn{_Q+~h
z&udpivmQ{->o>)5)gzj*lYs+LoW|&ZEDo6$DWH#I@0|0NJn5jk#Dh$N>-EUnk+)s{
z%Gk?zit#<hON<{eUS<3x<2A<Hgs~c<!5GIloH2<|Jm5MI`RB+#yZ$M%IkMUH6Q=(e
zyQV$pI>hu(8ILd?WqgD2IO7S%pE178c#-iJj2|$5$oMg1KjZHhBZRSnQDJm2IvHJz
zv5fJIBM8}E^2k3$u12o9df3vRP)%Sj;ZGTlFdk)mgYh`y3C5o>LK^ZH8Gpg}0po{^
zA2aqd{*Ez12zv<?MhByl(Zv|c7|%F@5F_rNI8K9~sXRV|pNanOX|ek=S^7Hr|C1j6
zSLR3ixtBSo7*T7~`#q+kJ%5Qg(f<F4IcQ_F@-G>$F@CaLZZrRrt)me?)?mC>OT}^O
zaK@-si%lX9k3K5js#A15tQuHW-^)_A3#0Fj715<xB~Y)R5`MyHk2~W0lsQKjk21c&
zc%1PB<Ifo1X1vJw3&sx^KV<xvv7hmGj1fZgV?u?|!RTakF~%~+Gman>S@-M}uTlD4
z<L-Y#-}t=r$A9OMtcnz@L3@P2SN;E4==iSx>%zbn{ofF=^i6*;4BzxWA%^3t{wGB|
zzUu$B7(w6k7m4&8f00bz@rMR{$6uu4JN`GsD15uWPmIBr`}@V0@a_IvA_HIVzb*a*
z-|iP;EWX_D5MRc3`>}5_uW=vZ)onJen>(@dq=GenB2YAL5rM{@##TPI1Gh91(y<*!
zC&$*=9j=u|a=UQYskSub>*8SLu+u4*MUy1a_PMQ(auIJo4p4NBckRNp-hn+&j>B_5
zhCdYSZE#+E0bcn~jCOs5mHaraA6DFuPen+iH3~x7V16Arf5M)B8$Ktmj^g|zk-~D)
z8x4nq(y)*7?IooDPp~iPWS}jvOC&aIZ`jq))v&*zr{Om6FpgslCmT*ToNKt)aHZjT
z!_9`9tm7YGd#tqmkPEu8hr>~<$B(&=VQv1eu75>8p!PPff5RE!fK8W#i`zJ!_G+M2
zE%u^B4wPO+YvP7h1nk$^umxc|LZ=M75O*Q$kK&=PvFu^Q8CY$FI1V(J4XYZ~HeBVn
ztud`(Q$v5l)<(Udqj5~btBvCtb~k!B(D~lRJPwpj{O-m{EO)T6kk5}aR&jpPalEm%
zp|`P^&ne%T#*~Khje&+sjR|)JD%&oT<ZRtUlRV{%4kT{}vi)8*54D$Uwe6(xD14fI
zHyUmrrN3dIVW1Hk#<4wQldL<uKMXs7tU>?5?jLBeZ@a#Yw!+>YA_jYZY($IwmFurC
zim~ShBs*Lk7{&CzXgv1x_(zOl`kyo5GxuTzyM|ul7GI42Nkl#VAF4lua8%MKWPA!S
z1xo+4Z~=S@c79t2_3$wGml5_1hCqD~$08gnaje17ii3C?acsdsG#%S<bmAbHT{vuh
zSN-++{WyAX5bv-&j@92}>SX=N`qMbh$>U=E-3OIzml>@)I**-~;@b^s{cX1R58F)k
z54G2})3%Y~q4rTe+ZU8hb)|!J;ox4e%C!o;;#;n7VPv<uS~0T!Ki3wF?C-d~gI@7n
z*WaO6>~`%IN!aUU59aXwxGOP|??<HYU55KVbFZMetrj7KumC||k7W(HXJB_^1v@5N
zGam62{J*MTuVn>$Cf||E#SX{{c51fe@ZU1}=)XaOcGuiWv+5VXb^b?tJZa*YS@4{!
z@SOZbwx<;(lifSmo^<9d1zmv96~)7Ub8PpvDBdp6xF>`E!>KOmC?yv6eEwrzr~5x6
z+21MmtgrEhwIZLv?J2lDUEH3r+>*msGyRAB>GfB!fAm^dkJ*>&@CB~_63|rtg@Zg5
z`&L^m7cFPCnu7Z>RR8~6%lxsnzL(vtyiTy~9u2!ywAWU)+_KT)HQ}xZwOllBEq1xS
z)89rT=l^ZHeFp!3YES;-E&FNpr=EEfHHgC;j9V46t`3I4tc%uBmoV#MT^^wo*X7MR
z2Py$E@qv6sQVGPRV|M)PcseHuTN-EQDA;<f^x5$wMM#oXeoLdRZ+0?kxj1{&>`_z#
z_rP_ob(oR1y3k74ed=$(`>d-c1$&ay$|nvhBHW~z<v@rNfmzO3xii<zTsm_dsEM;C
z&oXgLoVf?bPDw9CjBVFuIUz?<{#l_}(`U}M4$6%b$V19MYx=A@q*BPGV~A!;FC=G5
zol*K0Lw1j)iL}8|6+3Wk_|Mj_ZlVx%lSQCzQr(J~y)%#0t*%>F*FN)L-DVu^b=&Gz
z&pcnZqi)B{<1>##W@p`=x_xyA>JH7k1WDqbw~o3MoYRu#6iUUhf{r1YZM`d4Cuy|x
ztw7nm(6o=VqV#QCzgKW)@Uym`H9Air-%dFaY4+8y_j)dm&rNr6$0*|<r{K<}HEJ!{
zR3%+(1h@GvZoHB#mV-O}F0QV`@~m7K%@wyWO@$$w8O2qx-#o3L?W@lhL95t9jq3Kt
zNA-QQ8yfmFc0)t1!>+?vfxXWEJN=96U$72)%k>u4VejLABqw${v)0d-G238oGpxq2
zw;5Jrzjgf<>oEH7C;_{h4T$^j-;pj7v9DQ-NWztBIA3EF*Wbc2#r0iA>S1@&R;tB+
zHA;s3sNnie_;-><Ybc|Yu~@(J9aDH?49%Z-%90L=>(V<GFF{EG@9bSXrxFj|k-K=f
z*$Ez2`9P^p^os$UZM%ziUC@6YYwzM+7T3UAau@HsxCCC~UA)uc9C-Ge&-RHEf_jy`
z#;|xta98xsoNw`Z#9{F4Rvv@a)$h8hZgSziEnhhe$k`sVyt;`w(O$J^i~l`NeTC7Y
zvEqUT%kx%yS)RAFS+pf%(N<oIwsczbU$7pFwp)-!68+CdPs4JhcfQ0|Kaa=*m;Ph4
z+Tcr^+tRU_X}anu_`i<uA8a~)CGKMj@w7OvIFvX%F);C@pha1w98*<wH1@1-#6I-P
z5!PT|`K{O!{uK6UzlFWl6M+TTzkDIWe(f@L<SxW6*DZM3){5Phml~_IdB#pH&bWbn
zahGAw*ej0PF%InGjsrWZ7Gt;6s+dhN7qI*0X6!t<2fIh!!j6sUcs4W}>zFIC&9T>p
zr4Gv-RyZs;tae!2u%2O;;zZn-xW>3OajkI&<9dh34o@3Cc6h<?*~3>3-#ol`__cUv
zd}e%J{N#8uetLXU{30z8PdG9nU7{fJj`FKWm(qv$H;8|W5Q)5_IuV9P@VrnYN17n3
zLG}?)k49b*lfW+k{WZih5b7e=#1D|JL+TwdVxV8#hmZk@80Or`N9CE2e+Tlfuzc5D
z@;b_R2W7k?%jm*?&m)i{0pUJ`2cR<@fpq6W$^@?%p%ftiE2<FJAZ<G0TEsID>JWxQ
zOB1v}AL0j)GaVrVHkja*A_Q<=g}4TBEdtpXgIrz6^$v1%L7K{Y2h#6wStG34qND`q
zw5;obUXmoeO^|#=>U~92gAOCqBK>O!iui#Dzyl+|vr8b3%9fIqM7;vNGzPkm16Kvm
z(@{G4+E5>gIMlqz1FC=Enp!dNwptZ=08e{H4BUeEZz(s$&(NNap*<f%dp@S7Mz*Pc
zB4%TQ@ZUr}1ouO5KUAHOZ=;pJjqA;CBD)9Abmig5n`$z8z?jHu>Y50i{HmiPuVZt`
ztjPO{2O$R`H}bw3k1!G;9bq&=2Ev1p_i-x={Y7~wvQcqI{#?}}8`YS|qpEYDUmcD>
zn$uYOJ3<{SH4)lhf%aFR{S|0`1$B4}b~VA;CRp2q(q2*FEA>8v6ogcS&mnvsAsuOd
zBIc`KhL46(>Exx)WP!uBb*P<U1oCf14ZaD>K7eH(z_Jfu*$0r^3Tr+<-9J$8M|c1s
z9U%kZ%LorfKEP8}j0Upc6M7vOaUXtaI~arQ7gcXujUJ91z?Eo3q!@jr7=5DH9tqI@
z4lH~J78b+8ZY3LW4ni)%Q2)Umbr?c?q*#S6H4#2dj&#D8P4MM)_^}D?(utZBt6u~?
z2K1LA)2ZL6V{!gv@W-KNrb<hw*OMjO>;FToM?K&VwV(=5z5_45gAHx7B5$E)Z=qIi
zp;m9f`nO==Tab7Q7QF?jx5Ry)x%59&Y6`S$Mp>`Hi{C_fo8k9wq0G%Fb2B{lP4vE(
z;j!0X`^#we*Wk66;j!0X&lGs<o3Lp!y!9OH+6+&96Si%}`1zKIgXX(?kkxx$L(iey
zA7J#nc31C7K#u6K_H)?qK3ePmkGBUv+hgvF;L*4ni}=fk$06o1I7Gvp(Hfl_Iq=l?
zVdT3r-rvWHhh_j8`NN>)UHIf(_~Tvp;$7JBE^K%g<-ZH7-$mK)qTF{;=DR$fjYqE-
zFFGSHi@!y{JcoIS(2u$N2a!2yfw*6t64{{^!*?Z-pQ%2?{>XT>EaF!Kkq)&2aSh_H
zVSbv0Fc0A=gr^ajBOi)Hbz-DjEr5NK5vCw`abAqrhv1LA2u&|T)6dj$@GC%9fmegv
zU&VPHN`D%1FN*uceNmdarKUGOMbn#7(|%|g4=r!9EzdyPvypDBDn_8bRObiauXI=_
z>kjRxEowRiWm`6O!^UpbP>Xm5YFURc3o>&M8W0*0<|534-A#y}MtB~f1#*iKUW{}I
z9ku#UtwBv57g_4lsEI;l;3++oWP73lc2;q1KNQ1YM>qV{J;YZX@KpzV^(Hj#XS*6$
zPciiP5Xg(<Ir9ArNKw@QG=2>w8p!dcT1)y7o(25^xUs17n<#7lU|D7Gz10p@y`f)y
z27XG$O!pI9seS^leaK$>TUcj#Yz}gh*QjM*R88dY!yA^RA3|FPEd3CkyVE~jgpPRG
zn$(h(zbPlx#1GBXC(5C*0-C8mu;oaD<zloLLA?_}+9EZfhoNqR+CY<U1JK633Foyq
zpMmpP2y+nX5gHI05#}L0iO_`b6vER8)MuVUcpjkzVKKss=tE?|99S?17Em90^G;n*
zikC~ZTKuaxpMmq42$l!lRA-|ek0Z=Ms7Gjk{~Hm{MVJS<ClNOxJO%n0#0wA>B0Pt%
z7=gS;E%!27?nRXLvh?{JcnxC`CEn>BZw~gd{pcb4*&9>_#+1<DRa2dXJ~>Zh@mUtm
zxQAdhgLwe$){S4V{QxVMiD(CF48IHyQ@?x@rPAo@fZh(Y*#l^=mr?R~c$@l82lry?
zSwDkxhguBH0hCoPdu|=*+2A!I(CBu_GG3N_@n!A{)T?QZu=->NYV$ZsrCv#1qBeRK
zsnpk<JXer!8?5?q>tV#Jix9|X3EciPPt`$U7Q$=<OCR-tH`)8-_4!hFGw5egt3|N?
zMR?2w4R?AnwINwTZD-GVB&E>!6LEvGc6(br&6*wWltANa2bF?(V!q{l>gDPp_+&Wi
zuq?Jlk6phzWl~#q(@ZNZ?S>wVc%FkvAB`B5ECSVyd4Q~rnxCcbEKk_Jqn=MS@1Rs!
z^E<V8lWS~`k2_KyLOV%OSyq1X{hR1PBjAtwz_q<MR2O;A>hY8ta}&;~#T>}_B67Zn
z8d<%C{7o~LgX>7Wm0Eiq`OUHz{eViLD-qSyZWpU1xjyiQoCgP~EVS9Pm``-JpEN#$
zUP~54bEvO%@H+ox*o5|ibr#i$TK+Bh8UMM`Z}bG_OS+$)fkUO=>wuSyLl@(57$P5s
zLp*{bMm#De;s1aF9I?WOW0<JH5huQerw+q$x4I6$9>wYy&$j*<M<RX;=N3tdN68i`
z%EP$pl&btn`IQ)@{95@~d|vsD@*9z^{8ss`_<}N^M8s%SQ#CP0HPm6^OX_fSxX4sT
zs3XKf>PU5@aI2qFN5QiXs9zA->KJv5$W=4c3^88)vifC_r#`4YDDqXe>J}5!Ty?y7
zM4hNk5s#`xswt+b#Te73TB-)cG_?}fu7Da=r;DIki|bsaT91+aHFX}^rcP~A7l>Kv
zbLw-VQEgEdi@EAbb){%hSE;MSQ}};;4c+5Pyp~i2KgB5r=+2lA&s=?Y-s;1h7~g)O
zR`(<BLBMlX-!X)f2&WOwAzVbbf`B_dzMC@KmgmUh$DLLgl!`0RH6YZmJ{TyU8jeN4
z-QB@}`?KLR1l(Z>k3;YvAf5B#{zMpIP|qZs7a|l}GGY8*$a<<+M);j5pF+H4lOK0)
z{G((V?%J~+OTX}sMVcES7dmPYJfJ6j#xOZb&IIj8z+EOk?kW1~WT=PE*$9mY^En7V
z{(EH}m9+q&1>q&|5)dy(z>^?9?sRcXbQ=dXyb!Soxy9<crI&(}tB#gl1)eCq5j3k#
zf%b#$4~DAFB6T`a2f)AJ(|tRuF8gB3)>d8fB?RlL`j8r`I_gU)TV8d`mlmwA7M2X;
zn;<_XxS-lWbak9137sv~iQtE-9a8cVbRPAM3%*pH3K<h+SsV`}<9vC+<<;rFNxn4b
z&-2X(T^O7UEDlnM0pDy`QWacPo#FEY*MeUgY^%;>%<;`GYXPSboC&`9!A-EOIJgSA
z7D8u%Z!xfl^OpLS`W8c`D!8>e=vxu&s1BptRme-4gTB?lSF6r~-VK^KGkoh{Nzm8s
z&w=HP<hSZMzRlz@-!|0ZGHCL^4))loV0U%1?=0hmPvB+dR6*w=-?d;jEbL>vbqD<-
zc(Cf4-w`|ljAI%IJ1+!}S2z0;gT0)K@D|fic&}7{YVZs^yfe7BdY){r`N8wm!k-?z
zgjVaXSd5zPxl>20M*f`OK=m^JgbKZSr9UHhwR(xafLqY=#y0lAX3k~NdziDY^eS5F
zKolMdq=9pky%dcn*kecUpueah7Lp$BW7NJA{H5qWiSSZyb<iISPDd^JDiW%LR=)-R
z1~{bQs6Ue|gqQl^rPM%db&)?@ky3TRKLh*>-+{7$s%zBGtJnCdD$=S;{d1`Q`%Xba
zI&1^&pNCS?{WJVI;IvnaL5rhZs?*U|Cs((kNA*^h`r2u{_-FWbLdL^mhsMP%PTlBl
zW)E;{`WI0x{7d|)=x-j3pj*CL-x#8;+LdiW?Uqs9Wvf~Jhg;LXl6>V~Q!x%2S}Q!L
z-NuSM$Zug<R7`@NqddMK&)x`CZ}D$Of8Orzq!H)eUOG@6_U~f-T@{6>*M9c%HS`43
zjz*k6l|1S1;nBxl^&iIgP4pkDD6XD?zHtNeN%DjLG<gQSg1j^XxomnK(f)H(YyZWH
z0Ia<N?{)evR3r?cTaotyTIWV}h95NA)S|D0-sQhZd}{>xZ&y@Rr<bX0?X8Mh&`zIT
zb*(JE0y98aGWDynQ8X@WKGUPi)>e1%46xr{0Gs=KjTMd6IW!klxBBOmwLpIrwI=z$
zdW)1ijCSk+|3>vjtHiRgsOiQsH~GITmq(>Fy17kR+u^c_74xf)l}%><_f-TiKX@#k
z^L(<6eLjQADl>^L^K-e;{1BB}HXZzovO1a%%jzo@!iUX}Kgzv&2F-ZYnSn8(Mb#I}
z>O)JyF9pUC?O(&RCyJjJT1Gu2v@*QBbf97>EFW930{u;|IE2}$s^Td1;fihHRp1B0
zYXg%)Yp8F-@^p;-Q{gt|Zvwxy`lL0h1PUuoRiC60QFSX&9NLIc*%;bVomn<I=nii!
z+Z);*?kF7yEepR&9t&>@1VWv5UY`#BZeLZ%5#9@(o#^57KzEm33hfH70>3MKFi;iR
zPc;p7Rc{H@hI(weY_c48)ZY&H62cRGjg`spLm&DW#&ShMO~Ahe@^Z9dHuj@mRZ)NQ
zO{!R3?I=@&{_4)st28h9XP~VesQWs))}Sw0sfndGD%#<trivBtfOQ2Ns7R?6@W$rq
zlVuC2*OAWZjo@snI^pwFtRp>W@h*6{z52ATuwq;Fxw4ju9n}|owG}(7GyQRNt;7iO
zqufl^!2Gh8e4grH+471#)mQjBc$WLvb!#35e;+JaRdJx|R_OqGMQ7Op*j!Y43F9cP
zv_EvX`efi%<tSXm#_&uVi+N*_HPWqXZrNI23a$=x{cSC4t2j}8liIZEGVpBG(Xvey
z7piBFH>%^xw(`h@9$XC>18J3`t8SG|tQ=b%EEkpTnyPX~Wo}Jvd0gehn%U)vm6K~4
z%Tp`On)&7FmHwKArTvwmn#JWAmD6jMmS<Mh)vWOCtgNqD?OPWrsCJa+R5sPDE1v*P
zJJluZE}I^TtIi1Y`F7T9Mq7i%*z{B<mKWfPlTI=<+aOa=vm>yWX#eR@M$Ha?PvwG|
zo#jQ9E!8t<)Yt4OFRgs3W?y-*a(T^x@^Iy<nnUF?f@aO;@;Nkbz^YZ~=hrIN)*KDg
zR<>20D(8M%-dwq<>S+0*N;l@Hg37g^msD=8PA^|p*->@2d|u_NsQcu~-MEfl2*p+1
zDqrclMOWU?1iF6t5~{A1uc5gmP*u6N>O%P<?qhuY!qpJtqP(@T8#=9-xgd0<>S*9V
z#pUV=<y$Hbk`0wds?!67=&P5ZzY9HT5@v~wn7fWtca?4O;TlxFz4Ca?3EvKqK`!)p
z)a4A1&01V#QY+7+*Ili|HQKihmfx1O=%m@0uVsfZcVWK5jEecH9DK~W=V%To-v!Ui
zz_`Y^KtIPUZP6I@7Uwdpa4N1rejfUEsc$ygg*Y^h)>ZT&R|l>#w{65#<2F)nRTq@K
z8WOO7chDbJ(e940S~lIvh4#H(Ha3(PcJkPd$4qjA^<x~B?WHkN)*VU>Czl-z9t@B2
zHI`k%Rjd*7HsPi4Xw-=2;Ul5+YC#wtE76*h8GU)7jIfhOP+ZyZP$v3VZzu;d!#u1B
zOEEJyVl14+hzplZ3{9xsUUmj$<@%OZ%&y)}7@mmIkANn>!6!U3qxYgN$Q7RK-&lGn
zZ2F5rMOaJp1?!NvG1vi{&jbCCzX1=74V7ZmK^h8B(}HlQY*i?T*%G53-m3~84~O8x
z0IeP|-%bZ6Fb(u);OgH;i0f}g=|EK<+T|8TsI`iQHnakbCSb(@%vV(Fg0f4#F=4ap
zs?;+ZsVVS(ysr<d<vv2l+z5rkb!Gh(dbqx<KQtrURCXM*%BivetX^gW^w6B}f<SC&
zUU+OEA$X?hLLep7T%8z5t5^&TDX<(Xd|V@r_!h$QjlMmh!&N5&v&;8m{%;H&4j(5v
z+{^S@rq5t)wg9~}gI4K*`N0L@RYYUXC;B+ky-c5HnGB}aGJg}zQQ=F}C&Oo$zDhKD
za%r#y<7i>|VT`-Q!KUzyvRw2ltgJ%EsxAkXmbIYO)X=f;?!bz&mhdKw9h+Z(>&~%o
ze_%EEy-W`TR>S5^Wuwcl!+U!}C&Q+12hGocrJ>UpL6_jewSjdN>uPkScQYMZdZ}!A
zO@gl$@*RQp;N+Twz-C_xu6N+$`UQSXO0<lBPUu{<2y6>o#EROYcMu)e89En!HLxdi
zG5o4E#<AwXnm@2F)I--?x^7~I?+N!a-5X8A&K8V%TAdd83y8)V9<;Ar&NF$qCe9CC
zfu4yKc{OQF_cJ|4u9?r$$^<?Sh1<9vZVDX2{FBJn{UEJWvAWBE&x6oUGFZvLpY61g
z2^{qmVjN+<LW`dWZ3%B>dKJ+%<A{b&i1zpohnCgkaWBmPeWhj+(;JCT?HlZ^iN#8(
z3D?97{QnZf7;g$6$DHq|DGZ##8Yb0uEp)x=Y*|ZaQB5(%^7U|=zaVrIbKqGTYyMKA
z14IY?oz^-5^bCJ6*b;VPRg4+QHwOK473z2keXkLGn_eAUi<QYyth&R23!&RprvjHN
zRrKw?N+){kwaR$>|5%0p4HJX8RfW|P7>|{0LW`fGR>ll~m0?&d?+SL*oW(WzXt>3~
z^8La3u)Dmc@@mb6(tf%wqfaiwSX)~Oo68T=3cvhVWk0ToC-J|=7WRKUjk0jJZwy9j
z9R4H1oLqjL{;Ms&Nxg;rMsrI>by4~4sub9x5@H5UL)~d@A0|CmON_;cC<;2O(yGJ3
z_^L708-vMJ<7)bXqpCdBnHI7(`k$9(kFoH4oG-<fR&y(mh7o$6%AHOn;_4Y3jWJbP
zwio|x?GKI(WlqPOgHfqk8iH!Ye2g8kp)}}5t~lR1_#__lUIwljG{31_3azetv6|h4
z>xe}c@wMZ+M4HEn%Fn^8`+e)G@=)R>pJ#fUWdoIk5<4mfYA$0fjk^=&r)lMk-a_{)
zFivreE`*=4#tYVAt#U5d7M@(z7Ft$)8hN{`3m_T7RqrBJ<`b;D3T0bi;f%75s!5oQ
z`K|@c0BCXR4#p(9Ux7OtA*}xktMr=1Wuvk7xaKRy+@4;3r7AY;#9hGze&1Q}`_9%I
z-`4xiI^K7FOc?x*a~i+n{6&7pIRo!FKOwUDUGE9}{<4?fUk>5T<&Q-eZ!7<qsN*-d
zALn<s8&F0r?ms?;yOE}tg<n|Ki$BHv$v?*t#+$a^#$Cqm;5SWQ72n12HSs<1_qgM@
zPyC~JT)ZZF#S`M+#6|HOe!cXOcu{<eUqJmYMNu9Uf2RDo@-4Aj*`V}_?<;4O_r<T(
ze^9%`@6?afYa*g)np4rVByE)9(z3N&<v#5(&998qp4OU`FKN$ef35t9_FZj<Qmb`p
zoyrXD@3g(jOs!k{NSUi$({3vp@cSE0>Chc|qq4(cVp(lCf{w4M!yR>w$JP5C^^WJ%
z&pTQiuc!|>HaWhdmN>RMexz35cR4>-pQ7KUs^7$0?!D^Dn73ojs;itYIlrl{b-v>K
zvAWTf==y^CnrotKqWY$5lB-bdb(OeE)OTEdmmhE0EAR{ML*m|RI_}g8Z;=rBxbx;M
zMF@&fkIwcMc}u;)M^}5p-WlFG-g(|;?;`IK?=tU7?;39_;*H)d-tFE_?=EkbcfYsC
zdl+q?@w@E87-!%vqLFQ6;~uAqr=poEe!Ztoz+1Em?y642z39i(#~@v(PQ_hky0_|3
z%hWOvqgJcc!l~BauC+^@g(oz_)j8@Dcz#CrRuj~x@kH-F^?CJq=zKw4B9i#t>izKd
z(;`*dtL+t^L!GQ&oXNLqyt=6O>fTsyf;YvRhGUF(oYw<Ro_CVB5OlFOfKcVFMcQnf
zH+tuL7kU?amwH!tS9{la+r68;+d%KYvD3T9yN^>=cn^3Fd5?NeAnla*toMTVGQ!fR
zqa8VMm_^nB4fb&gIq10N?epF;OHE;xLeAmcW;)C`P>E)$nQj)C8D^$;1wJ%-%ADZE
zI~Md!1b8#$u73WMSb%=M5WRMi_&WN05%=>l^zXkH<>=x2L=gSES5$}(afH}MmAX@p
z6;*ni9w%z_1U*4a*Aw+5@l}1KK2m&5|GfTrF+=}?{sl2p|DygyQK!50EHMke6q_m@
z*Wo&h7e#ak`aPZWa?v$W>P_^f7G3kE7hR*no8is$=HPQpncf0#5zb2yg5EIF`p~zc
z`_!VrUPXOsuvZn`D!SzrR^LJ_yvNYrg!d%zIYoFKTvlHZ4sRUjTO9hl0_XI5I>n&h
z+zq?SV_(N_;`7A+65kLL#NXj~l-|aM_fCkPiLZz^aXh9RQC=65wfnVEqL9Wly%7=D
zHyn4(QQu5F#}KHm$nOx!v{M#c)CU@)DrcOQTXc5Xp`r`Zjuu^>c7g-wuN;|ns_5FZ
zvwYq+?LyJ5X_raHE2drZI;Qn8pVBFxEobK=JtP}9?G~p?KIcV#(ltm!w@rH!iv<Nv
zCmQ7prct>RQi~mIi_FI~l}Gl;;7v!_6f&lr7>qNgo#k^|&ybk%exfXCk8Rf{(ue4<
z)5&+<oZ>hym03`nX!8f{B7PCl$v;%CZST-{0(=u4D4!juZgwC$$rg&CgLRgo{YW>-
zP@3cqwjt>uKJ;@NNm)A&$1)$u4dx?#!QxcApV+!N4nyCJ;&i6x6lZWeuQ=12fxQ?6
zzISiOcG;v0?a4M$EN%SCk>Y})zGBSh#RcBx;?lu7*mbe%X2*+)gWe^@Vehiy8SG24
z8?txRg?t-TpFug>78z4tW;rSg^`Uz5Ir)kD+>n@g<oA{EHDcSBgZ?9))bWTYp2NC^
zmPzS%)gNs~W!d!|65IN`YtVlvuifTkhs_%r+cK@i^Sm32o4x0XySx{R_Ybyflz+@i
zR(}~9lRpOiM)LOgz2fM86Q$p7hoSoI^Fh7TUey1|hvW~6?e>ZCA?L&S(3tf|IrFMj
z?|a2w>6by@N}roIEI-{Vj`kzBx$Wnu*zP}MKaXG8KbgO!coE0M+g`lH+gZGf&t=T^
z?2_{vwRKnVN?YbDy~S&|{m}1u&Y`;QFK+er6mMi-!Dn`V<Z~M1hl{t^b!1;2E8gxs
zS={M8UA&9RWqF#@N%l%{kN0}<Ve&m+4`l4US$vFj+%CqoZQ5l{lQG)?J!X9IMN=(4
zO**F~lpL9sQgVD+T1oG;F(qfbnAfL`D>=_RPsycec_ml5&NOFYzWhWRQ{Tb(BL1{V
zB{#^29Ao^Ot4ivqZqo|ylwtdLT5(A~*TEh?pV9}pT$?{+Y}<MUW6~2nU)g$PZ2O38
znieP-;PH#GF|DdppH^EMJ8gDpg6%7N91V^?*-r<@GWCb3Kz`;niQ<{g;&be0@^y0Y
z6?0Vabsi^D#vEOI(;QoT+jN(x(Ym-F!e?e~iPM}|5^qi}NhY3YmW-md84R`_f5~Xd
zZ-z?7n$t_%W?e}x`+<D%DZ#8SnMi@{CB020lUe_Q5|iw+Z8Td-{EsfgekfEo^lggG
zmr6n$FE5!+ex$(Zvi?k?ADC-P>Z!h5$F`Ctb5qFz&bPIsg>1F+m>nfAnXi^CH+Pq;
zGWV9OHM>jN%!4JH%p)aR&Eq8<W^c)>=9!Y+k4`GtJJ=SoKiKDX9DPmUGH5(fS@(#!
zjics9TaO*veZY%;%=4Vx2dF<GpRL#KNA~$(3}13v(i}MhbBjGr<oKm>$PZ*A%aJW4
zXP?X1?6=z7jtARc_Upm&hSZbC1$3GNB?kxRS}KF;L9soq?3nbSzp%cjaWr@iIc_)G
zZh206xE^*a{bi50q47QKm43DTY3m*I6RpRnj&^L9H#C;(4tp%yG5Zy5F-@O#Vp^>9
zJN%uOSlY<`r+KQeG{wX?m^QyOZQ8=pG3NP_ZVJ;DmyV;rw!j9v-E7@-K5c2Khs&To
zM{OUyK9=K<{YPWWZg<Szbe)*CxinzgKsspL(fEtjH*FjC&Z2y<bEs}Ee@AH*>xays
ze(FOq*mKdeou##;V^9~;c}`qWnrGK<+Un9tL{nZ{ZrZxiLO!Q9pnf9z!L&W4v$+hi
zi{y!K_eELPY3-%>eGk4Jx5&WnV`6T`;2V0*)%bdz1KhE9{Xg~p{7#GJ$DJ0sqw+Z4
zQF#J)R63P*zL&Cz@1<<#dnqURUdnrXFXesQOZmB4#CJ$e^Bt0(^Bt0R_zuZ?e23&C
zx<jIkqB|toIJ!fkJxF&*v>duaqCJfN_%6rY;Q#pe4#^a}|DKEADp8z~rsd{OoQgdf
z5GKn&bUgyT=+3+l;;jh8Uoh2tBvJAyop`pKozK?OA=7O>@=|`*Wz(eFrdvQ$pt2Bi
zId+<ir=-brJ0HnXc@*1$%A-JhJGN~cqHnNl$~!cT%7_j_)9-aozVjoX%qe3K(>cl7
zc9AWVPX3{CZT`?Wx@@8;pB<=fcAzxUPrf4^q?5{|m}Km->73H(ob*skdF?zTYv-ZZ
z&KDg+X399Ek*uxDj!BMeKs?1G<2=M9OKEm&mrc4RS$vLdJIHpj3-Oe~sC;&QyKXX`
zf{nAL1Q4nqYuiGyTV-B~ZT`^Mwq<B+mu1If&mRg@MzsIw-1djmF{M`WKBcTrt-oFN
zz2Xk&qcp11Rs<^F<_(Rd%p(r?X*R}I9O4}^FWEWNFaKT6$>&rrJ09x0&v-sqZ@d2Y
zhzI+q^ttV)!tIv7?DL`VU>n$N5gn6%ZToG%O8rwBkw)nVQ|2Qql(dZ59+KUPfOyK{
zD4C_;K_B;f8Vm5nlobf8LEApF?Vxk$n6eHr>7z19z8zsR!Zyhxd6{R*PVo2OoNOok
zGM=&zG}&?hF?0^jH6%lU>T&|%kVQX|In^xeMA(JUWzFk_`z5aj@nK7j=0u(^VV7+m
z$95ft@=;b{0c26P=rZiNt?(H1p$>!fB|TK{d&N}0=rFWAs&n*wg>%+t$I?e+Q{hRZ
zNq*sJoS#Fu2p-97MHp&>T^8{vo$QPb#2dn&auoKEpDCP@@?^ivH{~q&7Z5Jr;c*)E
z1%xTr5c&|(<oPYDZRolieeEq2R{lbanL^APg-9nq+$$8OLI#2DMLC7(mj1#F#I}E7
zV<Gy*I0TlPY{i8+GM<2R@*@JL+x4dyzA7w2D1{BEV_^^>Ec4AkO!b%Yg>#TL51|=h
z5yBFLWe6(~)*!SZY=j-uUgUeqd#`x1)JrkR{jvC7dWQ04zp?x6AJuD@OTL7E2YpI<
zw;~LU$ySoPM{KwE(D;wqVfWd4#Y5`}yN8aSyUvH&eXn!dU-yb_|NOCdsQwQ4i1OI+
z&~*Ep%H4`EG$#L2n~)Alm;Rng=j4Bc!Yc?F2-gvAB5aZ2Hev*ByXgFO8PGRXl{#fP
z(PPvei(D?*Aj_xud&*Me9c`6w_X8StH2&B|sc-67nGbdj)lK@Qx@9`)mih<tLx(*V
zP0d9*)t6)_MjDOdsZP-3!^xoIB~4{Zxv9yZ=^W|YFQmVxQcQfQ%htg>S=Xtfrs9nT
z`Mq>Jp#7inpB=t?Hv7)AOLw;zlboFFPR@0AC*4fio;=-s(0#;xJUJIsZ?c*^D(STQ
zjQf1@ME803CHGa}jbuO0`rZBb?lr}|IL`C)MjyO*KmI??z%LQT;-D{@;8{4H8fFR&
zU;l99X}bq+M;Z9ObS|DG=Ht5{E<9f}@%~dWj(B{Rs}yfR`EexRn+pNFnH<E^+eA@`
z?=>dlcMP?70^EXQlvs@8^I{o}G_f4V1L6%F>3EKL5^qEeSB8r(;sY;B9Lu8WnyTd{
zCnjBXr@GVK8Sc!aYwnyRJ;~#q;4W|%fm52)_s}VKFge2=cF#zf<euZ6kW}oR=PpR>
zPa5ZL2I}rb?q+wKdx?7na9L7bV!wN(dkyGtQi{9zp<79tlY88)$?3_7$%*cb&<U-O
zEr>d{C-z&1yVE*Ii+w=5b<A*YLC#%?{aK?}SE;+pz2DuMR1Cct6x<oGoe#*-F@ujD
zloZD`n3tUHPJieWYS5b0=U$209)|tL+}qu$s11c?=qYfYbf1Plni0++H3Kz*hQW}L
zl!ub?+@;_L!AD^2i`*Bv&NGmc0+oi4wAp>deVz5%rI1D$V8bE`?wbfX$c13nf@1gW
zEH%lK<#bO-PIb@7iqBF}*VLqIS;<_!WkV~MPyV*cruZg~IZ2zTwy+YE9hgHoAw_om
zM}j*eYprejC*!O(SR9wNDQjz1N7k!@7E)O<d>S9T-C28+<L<Iv)`a+3-PFofAX}*n
z)<-g_p3Tr+kaQV+5doecFQ;dXMhi7(jYa(n-7B-)?(JE*uxuiFHu`DS<SY|4@w-d2
zLRr&Cs#$ee^;QqbYRX#R4v$pb8?#!nUP>y4ztM(S%iSBZ@e}>5RqmD9;p`dNbF$}U
zH)l0vFUnq$y)1iW_L}V0!Iq>FPNOvuvaWg>Jtwj^W^c)!L+RPuvpcEp*dDh%h#GZL
zu)SpWE88R4yWF?4yRy5ecVzF+?(u9+&d5GYTC$I2pQK!5DY$X$jd0R9&o+0nXR~KB
z#w`wbWF;(G^w25K4vgoU@Y_arTv7shSYJ|~XTE!pXQyY6XCHia&Yhar?>XQ(<i7II
zt%q)*$JN0jah~~}qiBQMo)cMho>QK)Nn_C4n>`n@R%K20T=rb^^m%S&3wW<7+mRiY
zotT}9@rRN<o8d>*eJnfOeKR{FJ2N}SvoCvsyVP?kyCAy=J$bX|g6CRtV%9-wy{seX
z3CFW~v(98S(Fn}y&KjL{KI;-}FU`6No;`AoW!=c?&l>RPSvN3i={$mX^kj{;N0BGi
zli*45q_JPAO(wuQW3rB5>};iwwbwH)>xRdJd2ZQY;IZw=^GwP*f*#N`*dFjOdzoep
z1gm{Kh3=rI&{OOQP~Y)XWxYzVP19U}+HCUFdS;^+%=auDljd3MS;~54?@pQo4|jW3
z(8%<xPPzaadnoV-wdRi=&$_JLp7x{^jNew8gHYGFoax!8v(IH;%)XM19_(4|S&hCx
z{l35*&c2>~(=A{x<`J5YVQm}^ScCa!QH~RBeVI5}bvf~#%{j?ge)P#jIiuVwb4FuC
ztVBE(^Ub2H<eahDMcG9;?i@8IH)mqb<g8ISCQ|)5Ay{+SJp*N;J(4`xx3fYyD*1$a
z;RS1^gr9=wpBWF`%I@K7q5pr*ib83{Yq$6{6uz-mD8%s72zXa__(dTe%0ZX_`X&P2
z(~XB<Jl>Cuj|aa1F}}zfKN<n=!g9bpW;!2!9WlNYHW)|-ztH1=cV9V=i5Ty_#)lB_
z-fKMGdyTJ0X!=hC+~*%h_AN)id#~|$2bKfge~sUSuod<eNtxX^KZwwcuvZ2;r_dq_
zGmA3=nN^v!nX@w+Gv{Y6L_9llapuy@6$q;lh_;S#nd@-Yp1B$4+c<4p=D5rq_dIrH
z-Z}PwUYfZt^8mtK2l`#&Cx3Cud+X@DtIkN?Jtu{C&-onho0G;n<~+c^H66{rHO=B(
zavtXWaq@U)oP6FHX9DkuGm-bid6aj<nety=o`St%tY2^L7Y_;XAliQ90U1spMtBf?
zfnqy6SPvfh#e;a~dE{jT{DO_skncgXJ>`G!B^jd+qzD8Dc<2i$ah7aKqD)8MV0rWn
z(vgyi82Vg#R7e0n-Qu%M4s>l24~@G%?&gr=_JiuUn|S>mXvLtNpl{zT_h3A8NhTQ*
z$q$aQ(kUNWAf9(n61;bk!oMgs_!q^o{EOn@ylYY_@066rdn7%;yCaR}U697$7sac@
zSl;t!9Pe}VAn$OL`TtC>f-fK#__b;*&6M~e{g7{^8jV6A1f0v9E1hect<H_0wm7#t
zJ8^7r?&71%*#&w(u+!Ot<1mg+e39=YIF`gN<ffc-)`gTV=Q*TOSjk7U=8I8!NvEaJ
z)_28u8rpkoy|CB*+Vf}olD>kk6b5L9#O_C*!^TON&F&d66Aq?fc65H0fLYUt*)mEt
z;F#?wbm)#)hi)8qq&U)y<A}$^#DU{sy3sMoQ3&2RM{&$aN3o;IQHwmYac&*RjZ~JF
zDU>=p=5);Ip_(0I9BEP#I!R-cz7)2i*x|vE=D>Fr{;$7W{26_YuS3$8IpX;LN}=O7
z*xDg%!G%#tv;!ko!>DzfvUpk_=(Ff|n8h6zkhTZ$Wf8!aB6lHl;d_xi+F|XOb`r;7
z?KF<tpw5B5i1-T9_iNX+n?R)CX{^&akehN^(x-J5xvXOsQif`_^`2v$q;XK6V<Sph
zqb=jyC>?(M&wNw-Gy3lC{%T-$M2W(H|A^-JD0nA9!;gb}_|hOBk{kv2(ZFmw7~pRM
zel~8w=eU|1@UgLvLjb;L)xz2gZH|_%*J;gKI*w*z3^>b(Hri49R#3Y%^2A1CGu|p7
z4|egf5oyRNrL7dp!<0U#8G1?c9lfNJG~UtI%vNkfsmqKp#+d)Y{_4c{1Pgg?vA*R?
zz1Q*ki}o?F5VriGFTj#K9dVdbH;W^YiFD?ouc;Oo8-e2p6`g587+J=2i0R#g1HH^?
zH2xazD%3LFMTjrG)IvkL+70@I#O2U%oat_DG|_~rQ_)e%X6COURQ9Ruz+LJIM$*tv
zd~L7V44q5VG}3PrQ!YZWmgz8KD|5Cn?Pj`w@d#s=#08|mfnTKK+pVN$AEDaKc#%0B
zjD5`MXUrkgRx<xQb51ZeGqw|I3mHc<XF1bxRElzpQ0-={XS_%#jyU4MUrw~PkWksj
z*umIGsP;4F5Na!#f1Ww*%o)w}3C3o^$RYZ^kc#yK=+#66iEd$fi$ri#C-dhJ;;Yj@
z<ve4UQ0*j?Uo1YtG}bYY!L<XplyKlO^RE-)yFbJ~MyQoCr<t*vv6fJ2C5+6$y*veP
z6cI;fOl8DK2Vaoi#C66H;}Z7dWv1!=pc2_aD*=s5NB<=GM#4ydP@hPsG%+4yP6nY?
zM`$E7hb0Z}4|)cbtM(IWJ#0f4)3*unz6aq%=F~C0o9UH=>P4nUGhU{iug@XWcJe4#
z&U6o<(#M=MLRd&L3z_C|q^@B)z<eH4uof}~k2UQ!(T)z5*+Qtc6Ao;m)*RT$SjxDG
zEJ0h7ZE0*(9-&f5wN{;k%2LJ&j2#BXf)b{@Xjve>gH71QxQ+Quqyc^>{z*pb8&-`>
zFJN54Siq7Y!U0v^EtKDz4xQ{|TuB(&O?=>SLPsieE@93V=4{dTgTGoo4QyflYMHtk
zl8qJzZ!VEc3*}{<tF_y#=Md@C30Ld5j~iL0W8ELwLL8WM9$3JbPN^cDv;k?}D_{&U
zKSY**Lo$M~z|z2&PPQSJB||8P*5b$#^&%n0GT~@OuC+FqXr+}9Bbu<2Q+t>`L8yC}
z?q*z0wy9?<nz55Om>=BW*D~#Ax}8#$Fwt5M=W1u{W|{MhO~w(VmNGwwP@5c+1Ki6v
zkMSi!gZ-&qBU*J5DhC;t5^5_McM_r&WJwO=8pcjJBe8{&16t`LT1jPWC4{d?rkn8u
zTh(mQg!*o(5!OVzfup%}H`AF`xopEGrk9hvcA4pRrmL8)Csa<wv?KK#(RvY~R>v~i
zS;l0#jwP3}e^OZHrI=>e*6BC~`5u-$!TdaKg&^me9D{4G+R3@9m|jD)dYC1-x2tO$
zVQ|inHm#J~Xcwg_g``2*MY%94kxN<1nwz<fD_L7J^N%qnk9E#t{&FsH9?P4Qs!!+C
zQqrlW5eGdGw4T8-X>9FfqP09qMOzSE$Emf9i58!+i8bU9U-1))>&$N@)D|*sVjRu<
z4#u!$Eo*ZU$KYJX5u#O-__~8=J%doIV@%=HW=<VNwb17?&fyxxGuE;977~qqNS<8D
zIGQnz`06#T`!&*|WfCgqIqy35*cp~N!!m~%x3W*-*#AojwI1f|l}LK_vV~Qw?HKbH
z#?(S{E9YvZ`sx!|b3Lc#@%7gvRF28g$+pjN9TyWikCM&KJd$^uB8*|r7_U<)PVO@?
zPNIz^Y*jCnqBc`5)l2eDo-1N_Tsy3mvU>hsQmQ(Uv6JPUOmAWACyr9c*u<Q6rWY~Y
z&2*P#Cv$4KHJ5Q69b}L8GN<k#T78odV-)<UM58|wE@Dm`p>m!$+IFUwGVWsRFqS|=
zJ<)oA%2ITqRqoH)SD9uHh)YCAM$tSENoX?~8AFW8g!&;ut(VZz#QbfHf>1wA7{l`_
zzS~bFPGn3VzS2SHVB55vTy754*TMGS9Z$%|@H~tjdleRTGBy+Ha|of6=-q@49tGf2
zDFNnBWIRL|)5&G^5v{ZmYQ2QU5#pnC(E4hk^)1XVV167+mNNE|-?Vki?_v3gjzY*!
zB#wH5IJhDZb`zo&K<zfA#*8J@uQF#R({l(NJP+s>tW@T(PjG#q)MJdh2o1qHuQEN(
z($91{%Y>OeONbeU%6*B@Xk>a5p>mAr+l0D<@ig<B2pzMTlfZN;q0vRCwi9YA36=AN
z`g}qonJ^}ev7R|0#wCRMYUcB7;F!Stjbxkd;nb_-HzS=;ZD(9ge9WArc_XK;V);?b
zS<9TY%-KR{tRPg_Gx{>39g7&3vV1Pf9AJ6|)3=O9Y754L#K(03xzsg8YcDeLRbI<y
z`X32nC(!6{asP3$S21r;SqoTZJE4pFe+=t!6cQ(f_2@q&N$oo8d5CD&qnvt?P@hj6
z<9`u?Mk$!<z&FM*{Wp>(nQg=|av9fh>J3WOVp&gsJfr`T^*qS<J|X5M$mlIZ8ySS!
zWaeC8<l5=n_ta~|QF{rs!-S4_lE?e~#HnLkNn=X!6W%@+;q@5)n^Ca$goV8NiXc^_
zW6ewZw<a)c@pph0_<x9y?*A5$4Cnyi09K5Uw^C_EC-7edkk+o?67o7fav?(6a2E*H
znq&jM6HnO5xSX+@aWNrwcmOI*jOUr(&*)@MAJesj+C1j$v+(y9k#_~rVjR<Jna{OW
z`iP^nTFCrV#wOyZorGEsa}HX_l5Xa2B969@P_1QolT*(#?PNNY>5DAWO|<A@T*3Us
zjLVs`mg#1eJVU4y5=W~eT1#QhQkFSk(TvBKlf!fe(c&!AI-$74sr`i7Xy$BVnQcs`
zGrffIETPiDd7B1$(Z`aB)^`(Mze*gfmpE!Waq!)H&`OwT=RheqIgGW0N(Z4>!Wd%y
z2}YApX=U7HX=8qn^`tTX7~^^7r!l{o>1L)6bFRhA8OxHp822&u5sDRzjf_VaZ!umX
zRO?w!?eBjDOPYwIl`?-UX%@er)EMq{G29l8LgG8PSLn+qRoTTde?feM{iX+qqt79Z
zR>T-*A@S8j&h;LlNG6Qo_KkUhWE^fn1$UQ#I$5HeVtNDd)iX@bW*MDmZ6)(_h!(FB
zs{hV(F5y5gjr7PN8rS&m45)pB)*)IE&lrV_-(${SF#RRQ-GnM%*R)g2d4f65kOq}k
zr|OeT|2555Y9?#u^{r~HHh;;f>lpux^S;b8+y7>ouizqC<@v{03tz3H|Naa&$?Lx)
zTK^~F8#9T6I|-oi-!w`7CDToWxDQS;OIZFOYZ%V-YW)KE#grOTOQ`Q=e4lYXp|(j|
z3EazAr>%#K19wQVnj#MFdJ)~L2T-n?5c4F_Vd5J{IM+GisLMHZ7OkL^kD1;}Xsl&=
zA!84rBh0xj6FT-0DoZ)Fm-(fH>ItUf7*`T16G%oi35~Oa`054WeB6~mk0lyw8=xqr
z|IOj6WMCJec7yKw0U?QJis0xIiN-w>rWxIY#u7s1JfYUh{9h9~S_q95%-O<tm2o#=
zOgEts%UHnt3xv3<j&gBFoiIRaD&4_%AlFEmY`9DurH}3D;ks<5R7WB4aW5UHc5><_
zmON+(l+`6URQEo83u@iSd|sg$)2VkEKP7ZL$~}!yw^pjpGyhe>n3o9^mQ<Nz@c(zl
zPw9UO$D@Q!!T)zK9rFOmJ1sr$6JP&`IQsKME1XNMA&$yxKaC}g_lTo$&)45#dDa>8
zGUamcTF#h4e22k!AECjc^3kI#^AhJ8AjA_Q!qJ3|8-&JJnRYR<eq$!lI;U#GSmt+}
z>LJvA!JH47{vOlA3H1?-OBhwgUlFQ5XWYuTfcfhgn+YA&jBLNo|5@mk2a<`ezQK~#
zif$a!Va7T}uA}}m(VAu3SBQ?`HB}6!IxYLZ&oa*v8a;$~Rz<X*kuBGFb!~iuIQsLB
zCdiy+@4dzNDx*e-zJXNq2VgAoUEBwpjg;5P8ni7$$E+iCJj6OVHJ1B{vzRy<uSks@
zoXRt#&Z}9Yg*XPcntGk+m{gYeE}^!KQ)?M7G3F3Dd`x!{YAkQ$G5rytGMm<5ku9`p
zGA0hJ1WsrCDWU#8q2p0Pl~EVWf1dfT62`ntsIa`s94E`fJiwA4aq2!o^$ekwM`&~r
z>T{S*CRCdVwS~-ik7?Gdzr~!_2_0vdp2D=jcpq~LnSO~-Z($rDjEQ3$P3X8mXnd7v
z7o(+lCeb>lYQtFOcbw`W)PBL751IZR)58h%5sXV1RmNWtsy}Dk%D8~}?TlPIM>Ww7
zwqKve{2D^l^1vI+S<5(%G0a%U$aU18CR(#>`wG!9KV;-or)B^5S>{<nqleIu#<ZW2
zE!Qp(ty?Yr4VKXeW4Q%g+?vit;y5`~+d_2AI+lEhP`6TxiPn}88atSOig6WlxGfBB
z7xg-EVp2KvyM)>{mZ@dD#F#_q@DXY(Y2-2e5uv`DFmeIE6vnlTSMtjl4>JZC7ZYOD
zSBKeq0n_^!@r)AuRfPB^8sUt{O_cHy(dt%0eGc>Sq!aWq#`%QWPC}!RX}&X$YXdmy
zSmsRT)MP^4!JH~WwH8nA6p>44tRRkPBw9;h{#rt{o6ylmsmgigpC#Jhd+)e^M06MD
z#WPpPo1CkY5dECAEoAH=R0<jQG3Q4luf;J(CluQl3kb1(CcH?f>>||WvHpIhdx<uz
zrvR5&4?pEGt}{KFWQ>p{Nhp}s=hM1f=_8Jk%Bd#ne1oxxIO@Z!p-MEO#5zJ)b(B2=
z#QXqMjxqKTVoo453H4E|XA*PT8LJ32l{J5dIVFsXnKPELb6`6(jAcAS9DN7t2@(f(
z0>xQEJQYB#K|`n5NRrw@mh5NF3PSi3sJIE$<&5>r2{Y}aTu7ywuAv^NzQN_DaapY-
zW8|{V#VkLTv7I>DInH~G5YL3z|4b({zCawkjV0$23g)AqLmoC$iQnN|=`2%0s2pc{
zJEdx=%=uG7HGvUJ8_*@3_jyiT%Xo{>(aKmzi1i;MN$LqKKZ`i7y@bv)gfY(&I_d~9
zP9Yi7O|-$b>03A#kExhA=08s8`UatsJ@2R|8vn;pT@neE)`$a^-(b#rl!`q_2;XDQ
z!-U#p_N|jp`|$vFHB}y?=aTB5v&<<%kuD`k^BUzmkZXz-B+dy!gU6=YPPFb|`IUs?
z2y?D7eVyqdrY|v$V-)<K$O2je#5_Q#e?+L(Fj~)9cs-!;3e9+r_!_U%bY4XmuM@|Z
zLg+9U?_*9O)BH?FZy{PAAdKOA<}sr=^#-BwRi<4`&m`2DuMK0)?>N;%sQrRDA2R(t
zriT;iOBhwgUlFQ5XWYu1^^DDgj%r4>R_CWqx>eI;;;V14<XXmYjA2H8Mx%3$^byQ?
znozT>`U=r8KV)PXr)Bx~S>{<nqleIu#<ZW2^=KEE{syO>By{nb+1W_6llj^fqGQ&v
z%tOpCCe)S@8aoK}Q;e&a!`?R7^Xhft#H4cScL}v^EK|#Pi7|)J;bXdsP-A%`kLiyH
z_1%Q{vIKD8GOfNM$LYTeJnN)8R|V9I21@Da!|#{Vf6W7VgpmwF{3@xCkp4r21}E^k
z#c`lNBej+EFkWChL@18Xv$F`VU==rWt}`|=Zo`!aBTmwgzrC6M-^UKKbgwL#@5No<
zdvO9+UFhMp;sxst8{dUX=eu^vd>=2J@51r?c6&Bof5q?np+^uM*-doh0^=dZEsXOC
zF{)$vo27cg*B3R5QBN+K`?Sbtnp?j}<TO9gvH-gX>yQzV2*9Q&mrdiV9nfN*;dgpM
zZ)kXCp%}%O!RT&me(Fgv0l8=gCmp{;q_@9FHkw0Pop|$Tlo*4zmvZrq#3H<vgto#_
zDB}>m2!eApkxNw6IXK6>6m!fvcTTtDTv%TaKQ@dw5rJAwj~#|z5xx#eas3#x)fW6R
za3abGU|;Y#_&R9|-fUVeHsec^yF`yTBQ8QPR!LUUm2uedxIigZLP{I!83{dmn8Hp*
zlDdD8N(MzcC+jYJ&qGqb9;EsPsgIe$?&u;8_CgYSd8_=}OdWfE+d2EAq<%}Z>m2ZJ
z;YTOl-b!}eB3|qW;CEx=fwU8}?)n{ZrA!KT2Z!F+IH4i;F6<$0>;C;9g<YGZr4gHo
zMH^YXSo-xP*C<vUr0}Ix$-{0>pkna;SgIH;#^Qam38KLDOO&=3<x%_(pgw}sUe`68
z{SfCA{{yJ2;Qlby7}SODy+D_W{m^%~I`Qk?A7jsS&Gi~uE!Oph>kaII{x7cM*aQ89
z>t`a-^``4>{Axl&ORI=;P;(xs@F@Lm>&LDG&~U_c1Ui2PdChgkbq4)|>aY`j60R;+
z7o7=>zTCp4ok8EY;QCN}0W;Hl^wR`ojGCtv>$M_H_Qxvx?xr5SWf8vXxdQ#ARcykl
zwo~jDd&L3lAAVe%!VcsY#Z}QKZY#PHr~jqU^l$5Jm~SXvum2Ut?fO=ZH|XC%+=i5G
z9JlFz&GCADJIC$%-*CJ^?+_~FzKgT<klw*@oBscEyk76*xLrrjK>7y#RY<SbzlXDS
zNblshP5(QN*Xz4DZrA^w;|-YqRLG&nAm_LBJsh{`-{*L}jvbf5Z`Xgo@dkY_q&E!l
zNE5yayF@JiOdk0m^n4q~K91Y;f8=;Qez`*YcKt^jZ_v9@&bRd+<Ba@sfaCT0KXKfy
z_i(&H{|RF9$U%<Vbo3aUug9vA;&%NtjyLFs*&{#28F}Og$8GxS9Iw}pa@?-J!SM$D
z7<=Sja7G?E&T*UmuN<$}PjK9>qgNq)gMRXlcx0p4Dt2IAxmO>-j*%$k+j=j@ZTedr
zuh&m;+^)aP@djM2$Rj_;8F}Ok$8GvM9Iw~Ua@?-J%kc&sGX>=S4QJ$^^BlM7?{VCY
zd#S|VpudlpJaUoaHvJbIuh%be+^&DX@do`ed*nl$kw>m@+@^oT@p?RMvib<dJA35X
zf50P$#4&s`_$)@v6>&q{QdA{Y{}uF*N3L_+rvE#~>-8HPx9h*=c!Q4l6jC4Kj68Ca
z<2L;_9Iw~$9VzhJ_1|*5LC0)~^WWi&JaU`kHvRV;uh$1SZr39mZ@^^=W5`f&2LBkC
zClI$88prDmo#PD#zSFC3Fbtf*FNTBTHY0}P^@fw<cEiQ-9~w2$edLZuuG$_khCu^7
zVqhLe+-3~tc)bzNal0{s;|&IO(u34}ID<!wM2_2xB#zhPJ}!I27|HPl16MHUx*uoo
zh>^;1oAEi0*BhfaZZ|&9@dg9GCWl8Jz!`ZYo#Qs+3mmUEMswV5e39b~^jluN-S`sD
z$TJxnw;6xJ@p@w{$L*MZ71U<~W^tOyt?Ts|#8_<c>>R+Cr3HT<n&#^N+Ba<!T=B7Q
zqF4ZPXl;^)>st=41f~dzTIUU+<J;pC)So+lEvYlkKBgW4?_)`waoz-#$#TDu)EQ?#
zQzZ9WNu5DCqeKR-pPyKjIB)%*zRq0-VHk#@Z3Q$A@2zV$gy^3$@+qA>@dvQ;Ja#PD
zx>QG&8(&qie1}var&M|bX?i-@3a=ndZ>UuI1gY@xh><5a11FUXo#qE(%OI7N(~;OZ
zXhM-NVT&Tc(K#vq;}}^b4m~)jEFf1TZIDWGvOEb=*+50nHb`aXWQz7dYSX$N>Vekm
znhqz}H@)p3oFda2=g57UxPaoSZa(SnJlz%L1YO9TW%&`^TVisB&b&G09O%7jY{%B_
MBW-Yw|D9QV0dw54asU7T

literal 0
HcmV?d00001

diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-License.txt b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-License.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-License.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Regular.ttf b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..28ec29282a27590afa215020cc26b0d7798ff3f2
GIT binary patch
literal 436180
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%0Df{`o$d<fD;3JZPS}`REZJrTZw}
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%0A@3y9kE6}
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

literal 0
HcmV?d00001

diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-License.txt b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-License.txt
new file mode 100644
index 0000000..77b1731
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-License.txt
@@ -0,0 +1,91 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-Regular.ttf b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b7ee5140add475e37d19dbab023fe02166d10a6d
GIT binary patch
literal 36780
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
DjYV%S

literal 0
HcmV?d00001

diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/component/dynamicreports.png b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/component/dynamicreports.png
new file mode 100644
index 0000000000000000000000000000000000000000..126050a36ad3c968ea5eb0b63d33971dbc9242c9
GIT binary patch
literal 14987
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
V#)WFxOK|`I002ovPDHLkV1n*7yygG^

literal 0
HcmV?d00001

diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/datasource/data.xml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/datasource/data.xml
new file mode 100644
index 0000000..84e6f81
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/datasource/data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data>
+    <row1 field1="text1">
+        <field2>5</field2>
+        <field3>100</field3>
+    </row1>
+    <row2 field4="text2">
+        <field5>1</field5>
+        <field6>10</field6>
+    </row2>
+</data>
\ No newline at end of file
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/report/test.properties b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/report/test.properties
new file mode 100644
index 0000000..fb34caf
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/report/test.properties
@@ -0,0 +1 @@
+title=test title
\ No newline at end of file
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate1.jrtx b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate1.jrtx
new file mode 100644
index 0000000..614bc48
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate1.jrtx
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jasperTemplate PUBLIC "-//JasperReports//DTD Template//EN" "http://jasperreports.sourceforge.net/dtds/jaspertemplate.dtd">
+
+<jasperTemplate>
+	<style name="textStyle" forecolor="#000000">
+		<box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
+	</style>
+	<style name="columnStyle" style="textStyle" isItalic="true"/>
+	<style name="titleStyle0" style="textStyle" isBold="true"/>
+	<style name="titleStyle" style="titleStyle0" isBold="true">
+		<box>
+			<bottomPen lineWidth="2.0"/>
+		</box>
+	</style>
+	<style name="columnTitleStyle3" style="titleStyle">
+		<box>
+			<topPen lineWidth="2.0"/>
+			<leftPen lineWidth="2.0"/>
+			<bottomPen lineWidth="2.0"/>
+			<rightPen lineWidth="2.0"/>
+		</box>
+	</style>
+	<style name="subtotalStyle" style="textStyle" backcolor="#FFFF00" isBold="true">
+		<box>
+			<topPen lineWidth="1.0"/>
+		</box>
+	</style>
+	<style name="textFieldStyle" style="textStyle" fontSize="15" isBold="true"/>
+</jasperTemplate>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate2.jrtx b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate2.jrtx
new file mode 100644
index 0000000..35d2315
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate2.jrtx
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jasperTemplate PUBLIC "-//JasperReports//DTD Template//EN" "http://jasperreports.sourceforge.net/dtds/jaspertemplate.dtd">
+
+<jasperTemplate>
+	<style name="textStyle">
+		<box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
+	</style>
+	<style name="titleStyle" style="textStyle" isBold="true"/>
+	<style name="subtotalStyle" style="titleStyle">
+		<box>
+			<topPen lineWidth="1.0"/>
+		</box>
+	</style>
+	<style name="boldStyle" isBold="true"/>
+</jasperTemplate>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/detailsubreport.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/detailsubreport.jrxml
new file mode 100644
index 0000000..bba9783
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/detailsubreport.jrxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+    <style name="style_2_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
+        <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
+    </style>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <title>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="title.textField1" style="style_2_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA["Subreport" + $P{MASTER_REPORT_PARAMETERS}.getReportRowNumber()]]></textFieldExpression>
+            </textField>
+        </band>
+    </title>
+    <detail>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="detail.column_simpleExpression_0_1" style="style_2_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$P{MASTER_REPORT_PARAMETERS}.getReportRowNumber() + "_" + $V{REPORT_COUNT}]]></textFieldExpression>
+            </textField>
+        </band>
+    </detail>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport1.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport1.jrxml
new file mode 100644
index 0000000..d0d4e19
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport1.jrxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+    <style name="style_22_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
+        <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
+    </style>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <field name="column1" class="java.lang.String"/>
+    <title>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="title.textField1" style="style_22_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA["Subreport" + $P{MASTER_REPORT_PARAMETERS}.getReportRowNumber()]]></textFieldExpression>
+            </textField>
+        </band>
+    </title>
+    <columnHeader>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="columnHeader.column_column1.title1" style="style_22_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA["Column1"]]></textFieldExpression>
+            </textField>
+        </band>
+    </columnHeader>
+    <detail>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="detail.column_column11" style="style_22_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement textAlignment="Left"/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$F{column1}]]></textFieldExpression>
+            </textField>
+        </band>
+    </detail>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport2.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport2.jrxml
new file mode 100644
index 0000000..18b8fd3
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport2.jrxml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+    <style name="style_27_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
+        <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
+    </style>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <field name="column1" class="java.lang.String"/>
+    <field name="column2" class="java.lang.String"/>
+    <title>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="title.textField1" style="style_27_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA["Subreport" + $P{MASTER_REPORT_PARAMETERS}.getReportRowNumber()]]></textFieldExpression>
+            </textField>
+        </band>
+    </title>
+    <columnHeader>
+        <band height="16">
+            <frame>
+                <reportElement key="columnHeader.list1" positionType="Float" x="0" y="0" width="575" height="16"/>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="columnHeader.column_column1.title1" style="style_27_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="287" height="16"/>
+                    <textElement/>
+                    <textFieldExpression class="java.lang.String"><![CDATA["Column1"]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="columnHeader.column_column2.title1" style="style_27_" positionType="Float" stretchType="RelativeToTallestObject" x="287" y="0" width="288" height="16"/>
+                    <textElement/>
+                    <textFieldExpression class="java.lang.String"><![CDATA["Column2"]]></textFieldExpression>
+                </textField>
+            </frame>
+        </band>
+    </columnHeader>
+    <detail>
+        <band height="16">
+            <frame>
+                <reportElement key="detail.list1" positionType="Float" x="0" y="0" width="575" height="16"/>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="detail.column_column11" style="style_27_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="287" height="16"/>
+                    <textElement textAlignment="Left"/>
+                    <textFieldExpression class="java.lang.String"><![CDATA[$F{column1}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="detail.column_column21" style="style_27_" positionType="Float" stretchType="RelativeToTallestObject" x="287" y="0" width="288" height="16"/>
+                    <textElement textAlignment="Left"/>
+                    <textFieldExpression class="java.lang.String"><![CDATA[$F{column2}]]></textFieldExpression>
+                </textField>
+            </frame>
+        </band>
+    </detail>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport3.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport3.jrxml
new file mode 100644
index 0000000..e59aeb5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport3.jrxml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+    <style name="style_33_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
+        <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
+    </style>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <field name="column1" class="java.lang.String"/>
+    <field name="column2" class="java.lang.String"/>
+    <field name="column3" class="java.lang.String"/>
+    <title>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="title.textField1" style="style_33_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA["Subreport" + $P{MASTER_REPORT_PARAMETERS}.getReportRowNumber()]]></textFieldExpression>
+            </textField>
+        </band>
+    </title>
+    <columnHeader>
+        <band height="16">
+            <frame>
+                <reportElement key="columnHeader.list1" positionType="Float" x="0" y="0" width="575" height="16"/>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="columnHeader.column_column1.title1" style="style_33_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="191" height="16"/>
+                    <textElement/>
+                    <textFieldExpression class="java.lang.String"><![CDATA["Column1"]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="columnHeader.column_column2.title1" style="style_33_" positionType="Float" stretchType="RelativeToTallestObject" x="191" y="0" width="192" height="16"/>
+                    <textElement/>
+                    <textFieldExpression class="java.lang.String"><![CDATA["Column2"]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="columnHeader.column_column3.title1" style="style_33_" positionType="Float" stretchType="RelativeToTallestObject" x="383" y="0" width="192" height="16"/>
+                    <textElement/>
+                    <textFieldExpression class="java.lang.String"><![CDATA["Column3"]]></textFieldExpression>
+                </textField>
+            </frame>
+        </band>
+    </columnHeader>
+    <detail>
+        <band height="16">
+            <frame>
+                <reportElement key="detail.list1" positionType="Float" x="0" y="0" width="575" height="16"/>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="detail.column_column11" style="style_33_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="191" height="16"/>
+                    <textElement textAlignment="Left"/>
+                    <textFieldExpression class="java.lang.String"><![CDATA[$F{column1}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="detail.column_column21" style="style_33_" positionType="Float" stretchType="RelativeToTallestObject" x="191" y="0" width="192" height="16"/>
+                    <textElement textAlignment="Left"/>
+                    <textFieldExpression class="java.lang.String"><![CDATA[$F{column2}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                    <reportElement key="detail.column_column31" style="style_33_" positionType="Float" stretchType="RelativeToTallestObject" x="383" y="0" width="192" height="16"/>
+                    <textElement textAlignment="Left"/>
+                    <textFieldExpression class="java.lang.String"><![CDATA[$F{column3}]]></textFieldExpression>
+                </textField>
+            </frame>
+        </band>
+    </detail>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport4.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport4.jrxml
new file mode 100644
index 0000000..948d0ea
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport4.jrxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="575" pageHeight="842"
+              columnWidth="575" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenNoDataType="AllSectionsNoDetail">
+    <style name="style_22_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
+        <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
+    </style>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <parameter name="parameter3" class="java.lang.String"/>
+    <parameter name="parameter5" class="java.lang.String"/>
+    <summary>
+        <band height="48">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="summary.textField1" style="style_22_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$P{parameter3}]]></textFieldExpression>
+            </textField>
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="summary.textField2" style="style_22_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="16" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$P{MASTER_REPORT_PARAMETERS}.getValue("parameter4")]]></textFieldExpression>
+            </textField>
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="summary.textField3" style="style_22_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="32" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$P{parameter5}]]></textFieldExpression>
+            </textField>
+        </band>
+    </summary>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/titlesubreport.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/titlesubreport.jrxml
new file mode 100644
index 0000000..06d3276
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/titlesubreport.jrxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+    <style name="style_21_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
+        <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
+    </style>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <field name="field1" class="java.lang.String"/>
+    <columnHeader>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="columnHeader.column_field1.title1" style="style_21_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA["Column1"]]></textFieldExpression>
+            </textField>
+        </band>
+    </columnHeader>
+    <detail>
+        <band height="16">
+            <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+                <reportElement key="detail.column_field11" style="style_21_" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="16"/>
+                <textElement textAlignment="Left"/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$F{field1}]]></textFieldExpression>
+            </textField>
+        </band>
+    </detail>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml
new file mode 100644
index 0000000..e7c0461
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templatedesign1" pageWidth="595" pageHeight="842"
+              columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+    <property name="ireport.zoom" value="1.0"/>
+    <property name="ireport.x" value="0"/>
+    <property name="ireport.y" value="0"/>
+    <parameter name="parameter" class="java.lang.String"/>
+    <field name="field1" class="java.lang.String"/>
+    <background>
+        <band splitType="Stretch"/>
+    </background>
+    <title>
+        <band height="79" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.title1" x="126" y="28" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[title]]></text>
+            </staticText>
+            <textField>
+                <reportElement key="templateDesign.title2" x="336" y="27" width="100" height="20"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$P{parameter}]]></textFieldExpression>
+            </textField>
+        </band>
+    </title>
+    <pageHeader>
+        <band height="35" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.pageHeader" x="126" y="13" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[pageHeader]]></text>
+            </staticText>
+        </band>
+    </pageHeader>
+    <columnHeader>
+        <band height="61" splitType="Stretch"/>
+    </columnHeader>
+    <detail>
+        <band height="21" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.detail" x="126" y="0" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[detail]]></text>
+            </staticText>
+        </band>
+    </detail>
+    <columnFooter>
+        <band height="45" splitType="Stretch"/>
+    </columnFooter>
+    <pageFooter>
+        <band height="54" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.pageFooter" x="126" y="17" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[pageFooter]]></text>
+            </staticText>
+        </band>
+    </pageFooter>
+    <summary>
+        <band height="42" splitType="Stretch"/>
+    </summary>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml
new file mode 100644
index 0000000..eb9e3d1
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templatedesign2" pageWidth="595" pageHeight="842"
+              columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+    <background>
+        <band splitType="Stretch"/>
+    </background>
+    <title>
+        <band height="79" splitType="Stretch">
+        </band>
+    </title>
+    <pageHeader>
+        <band height="35" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.pageHeader" x="126" y="13" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[pageHeader]]></text>
+            </staticText>
+        </band>
+    </pageHeader>
+    <columnHeader>
+        <band height="61" splitType="Stretch"/>
+    </columnHeader>
+    <columnFooter>
+        <band height="45" splitType="Stretch"/>
+    </columnFooter>
+    <summary>
+        <band height="42" splitType="Stretch"/>
+    </summary>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml
new file mode 100644
index 0000000..de505ac
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templatedesign2" pageWidth="555" pageHeight="200"
+              columnWidth="515" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+    <background>
+        <band splitType="Stretch"/>
+    </background>
+    <title>
+        <band height="10" splitType="Stretch">
+        </band>
+    </title>
+    <columnHeader>
+        <band height="10" splitType="Stretch"/>
+    </columnHeader>
+    <columnFooter>
+        <band height="10" splitType="Stretch"/>
+    </columnFooter>
+    <pageFooter>
+        <band height="35" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.pageFooter" x="126" y="13" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[pageFooter]]></text>
+            </staticText>
+        </band>
+    </pageFooter>
+    <summary>
+        <band height="10" splitType="Stretch"/>
+    </summary>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml
new file mode 100644
index 0000000..e541950
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templatedesign4" pageWidth="595" pageHeight="842"
+              whenNoDataType="AllSectionsNoDetail" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10"
+              scriptletClass="net.sf.dynamicreports.test.jasper.templatedesign.ReportScriptlet">
+    <property name="ireport.zoom" value="1.5"/>
+    <property name="ireport.x" value="0"/>
+    <property name="ireport.y" value="0"/>
+    <field name="item" class="java.lang.String"/>
+    <detail>
+        <band height="103">
+            <staticText>
+                <reportElement key="templateDesign.detail.text1" x="30" y="10" width="515" height="20"/>
+                <textElement textAlignment="Center"/>
+                <text><![CDATA[detail text 1]]></text>
+            </staticText>
+            <staticText>
+                <reportElement key="templateDesign.detail.text2" positionType="Float" x="30" y="70" width="515" height="20"/>
+                <textElement textAlignment="Center"/>
+                <text><![CDATA[detail text 2]]></text>
+            </staticText>
+            <subreport>
+                <reportElement x="30" y="40" width="515" height="20"/>
+                <parametersMapExpression><![CDATA[$P{REPORT_SCRIPTLET}.getDynamicSubreportParameters()]]></parametersMapExpression>
+                <dataSourceExpression><![CDATA[$P{REPORT_SCRIPTLET}.getDynamicSubreportDataSource()]]></dataSourceExpression>
+                <subreportExpression class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{REPORT_SCRIPTLET}.getDynamicSubreport()]]></subreportExpression>
+            </subreport>
+        </band>
+    </detail>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml
new file mode 100644
index 0000000..b6ec40d
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templatedesign1" pageWidth="575" pageHeight="842"
+              columnWidth="555" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20">
+    <property name="ireport.zoom" value="1.0"/>
+    <property name="ireport.x" value="0"/>
+    <property name="ireport.y" value="0"/>
+    <parameter name="parameter" class="java.lang.String"/>
+    <field name="field1" class="java.lang.String"/>
+    <background>
+        <band splitType="Stretch"/>
+    </background>
+    <title>
+        <band height="79" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.title1" x="126" y="28" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[title]]></text>
+            </staticText>
+            <textField>
+                <reportElement key="templateDesign.title2" x="336" y="27" width="100" height="20"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$P{parameter}]]></textFieldExpression>
+            </textField>
+        </band>
+    </title>
+    <pageHeader>
+        <band height="35" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.pageHeader" x="126" y="13" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[pageHeader]]></text>
+            </staticText>
+        </band>
+    </pageHeader>
+    <columnHeader>
+        <band height="61" splitType="Stretch"/>
+    </columnHeader>
+    <detail>
+        <band height="21" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.detail" x="126" y="0" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[detail]]></text>
+            </staticText>
+        </band>
+    </detail>
+    <columnFooter>
+        <band height="45" splitType="Stretch"/>
+    </columnFooter>
+    <pageFooter>
+        <band height="54" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.pageFooter" x="126" y="17" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[pageFooter]]></text>
+            </staticText>
+        </band>
+    </pageFooter>
+    <summary>
+        <band height="42" splitType="Stretch"/>
+    </summary>
+</jasperReport>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml
new file mode 100644
index 0000000..30cbd15
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templatedesign6" pageWidth="595" pageHeight="842"
+              columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+    <property name="ireport.zoom" value="1.0"/>
+    <property name="ireport.x" value="0"/>
+    <property name="ireport.y" value="0"/>
+    <background>
+        <band splitType="Stretch"/>
+    </background>
+    <title>
+        <band height="79" splitType="Stretch">
+            <staticText>
+                <reportElement key="templateDesign.title1" style="columnTitleStyle3" x="126" y="28" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[title1]]></text>
+            </staticText>
+            <staticText>
+                <reportElement key="templateDesign.title2" style="style1" x="336" y="27" width="100" height="20"/>
+                <textElement/>
+                <text><![CDATA[title2]]></text>
+            </staticText>
+        </band>
+    </title>
+</jasperReport>

From 1456dd57cafd607513a66a5c645d8cc8facc1186 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 13:12:06 +0200
Subject: [PATCH 08/21] Changed package to ``software.xdev``

---
 .../design/base/DRDesignBand.java             |  26 +-
 .../design/base/DRDesignDataset.java          |  40 +-
 .../design/base/DRDesignField.java            |   6 +-
 .../design/base/DRDesignGroup.java            |  20 +-
 .../design/base/DRDesignHyperLink.java        |  16 +-
 .../design/base/DRDesignMargin.java           |   6 +-
 .../design/base/DRDesignPage.java             |  12 +-
 .../design/base/DRDesignParameter.java        |   6 +-
 .../design/base/DRDesignQuery.java            |   6 +-
 .../design/base/DRDesignReport.java           |  90 +--
 .../design/base/DRDesignSort.java             |  14 +-
 .../base/DRDesignTableOfContentsHeading.java  |  10 +-
 .../design/base/DRDesignTemplateDesign.java   |  12 +-
 .../design/base/DRDesignVariable.java         |  24 +-
 .../design/base/component/DRDesignBreak.java  |  10 +-
 .../base/component/DRDesignComponent.java     |  34 +-
 .../base/component/DRDesignEllipse.java       |  10 +-
 .../design/base/component/DRDesignFiller.java |   6 +-
 .../component/DRDesignGenericElement.java     |  16 +-
 .../component/DRDesignHyperlinkComponent.java |  14 +-
 .../design/base/component/DRDesignImage.java  |  18 +-
 .../design/base/component/DRDesignLine.java   |  14 +-
 .../design/base/component/DRDesignList.java   |  38 +-
 .../base/component/DRDesignListCell.java      |  26 +-
 .../design/base/component/DRDesignMap.java    |  22 +-
 .../base/component/DRDesignRectangle.java     |  10 +-
 .../base/component/DRDesignSubreport.java     |  16 +-
 .../base/component/DRDesignTextField.java     |  32 +-
 .../base/crosstab/DRDesignCrosstab.java       |  20 +-
 .../base/crosstab/DRDesignCrosstabCell.java   |   8 +-
 .../crosstab/DRDesignCrosstabCellContent.java |  20 +-
 .../crosstab/DRDesignCrosstabColumnGroup.java |   6 +-
 .../crosstab/DRDesignCrosstabDataset.java     |  18 +-
 .../base/crosstab/DRDesignCrosstabGroup.java  |  26 +-
 .../crosstab/DRDesignCrosstabMeasure.java     |  20 +-
 .../crosstab/DRDesignCrosstabRowGroup.java    |   6 +-
 .../AbstractDesignComplexExpression.java      |  12 +-
 .../AbstractDesignSimpleExpression.java       |   8 +-
 .../expression/DRDesignComplexExpression.java |  10 +-
 .../expression/DRDesignJasperExpression.java  |  10 +-
 .../DRDesignParameterExpression.java          |  10 +-
 .../DRDesignPropertyExpression.java           |  10 +-
 .../expression/DRDesignSimpleExpression.java  |  10 +-
 .../expression/DRDesignSystemExpression.java  |  10 +-
 .../expression/DRDesignValueFormatter.java    |  14 +-
 .../design/base/style/DRDesignBaseStyle.java  |  46 +-
 .../design/base/style/DRDesignBorder.java     |  14 +-
 .../base/style/DRDesignConditionalStyle.java  |  14 +-
 .../design/base/style/DRDesignFont.java       |   6 +-
 .../design/base/style/DRDesignPadding.java    |   6 +-
 .../design/base/style/DRDesignParagraph.java  |  12 +-
 .../design/base/style/DRDesignPen.java        |  10 +-
 .../design/base/style/DRDesignStyle.java      |  12 +-
 .../design/base/style/DRDesignTabStop.java    |  10 +-
 .../design/constant/ComponentGroupType.java   |   2 +-
 .../design/constant/DefaultStyleType.java     |   2 +-
 .../design/constant/EvaluationTime.java       |   2 +-
 .../design/constant/ResetType.java            |   2 +-
 .../design/definition/DRIDesignBand.java      |  18 +-
 .../design/definition/DRIDesignDataset.java   |  20 +-
 .../design/definition/DRIDesignField.java     |   4 +-
 .../design/definition/DRIDesignGroup.java     |  10 +-
 .../design/definition/DRIDesignHyperLink.java |  12 +-
 .../design/definition/DRIDesignMargin.java    |   2 +-
 .../design/definition/DRIDesignPage.java      |   8 +-
 .../design/definition/DRIDesignParameter.java |   2 +-
 .../design/definition/DRIDesignQuery.java     |   2 +-
 .../design/definition/DRIDesignReport.java    |  66 +-
 .../design/definition/DRIDesignSort.java      |  10 +-
 .../DRIDesignTableOfContentsHeading.java      |   6 +-
 .../definition/DRIDesignTemplateDesign.java   |   6 +-
 .../design/definition/DRIDesignVariable.java  |  18 +-
 .../definition/component/DRIDesignBreak.java  |   6 +-
 .../component/DRIDesignComponent.java         |  28 +-
 .../component/DRIDesignEllipse.java           |   6 +-
 .../definition/component/DRIDesignFiller.java |   2 +-
 .../component/DRIDesignGenericElement.java    |  12 +-
 .../DRIDesignHyperLinkComponent.java          |  10 +-
 .../definition/component/DRIDesignImage.java  |  14 +-
 .../definition/component/DRIDesignLine.java   |  10 +-
 .../definition/component/DRIDesignList.java   |  12 +-
 .../definition/component/DRIDesignMap.java    |  18 +-
 .../component/DRIDesignRectangle.java         |   6 +-
 .../component/DRIDesignSubreport.java         |  12 +-
 .../component/DRIDesignTextField.java         |  28 +-
 .../crosstab/DRIDesignCrosstab.java           |  14 +-
 .../crosstab/DRIDesignCrosstabCell.java       |   4 +-
 .../DRIDesignCrosstabCellContent.java         |  10 +-
 .../DRIDesignCrosstabColumnGroup.java         |   2 +-
 .../crosstab/DRIDesignCrosstabDataset.java    |  14 +-
 .../crosstab/DRIDesignCrosstabGroup.java      |  22 +-
 .../crosstab/DRIDesignCrosstabMeasure.java    |  14 +-
 .../crosstab/DRIDesignCrosstabRowGroup.java   |   2 +-
 .../DRIDesignComplexExpression.java           |   6 +-
 .../expression/DRIDesignExpression.java       |   2 +-
 .../expression/DRIDesignJasperExpression.java |   2 +-
 .../DRIDesignParameterExpression.java         |   4 +-
 .../DRIDesignPropertyExpression.java          |   4 +-
 .../expression/DRIDesignSimpleExpression.java |   6 +-
 .../expression/DRIDesignSystemExpression.java |   2 +-
 .../definition/style/DRIDesignBaseStyle.java  |  40 +-
 .../definition/style/DRIDesignBorder.java     |  10 +-
 .../style/DRIDesignConditionalStyle.java      |  10 +-
 .../definition/style/DRIDesignFont.java       |   2 +-
 .../definition/style/DRIDesignPadding.java    |   2 +-
 .../definition/style/DRIDesignParagraph.java  |   6 +-
 .../design/definition/style/DRIDesignPen.java |   6 +-
 .../definition/style/DRIDesignStyle.java      |   4 +-
 .../definition/style/DRIDesignTabStop.java    |   6 +-
 .../exception/DRDesignReportException.java    |   4 +-
 .../AbstractExpressionTransform.java          | 136 ++--
 .../BandComponentsTransform.java              |  42 +-
 .../design/transformation/BandTransform.java  |  90 +--
 .../design/transformation/ColumnGrid.java     |  32 +-
 .../transformation/ColumnGridTransform.java   |  60 +-
 .../transformation/ColumnTransform.java       |  50 +-
 .../transformation/ComponentPosition.java     |  30 +-
 .../transformation/ComponentTransform.java    | 300 ++++-----
 .../transformation/ConstantTransform.java     |  64 +-
 .../transformation/CrosstabTransform.java     | 114 ++--
 .../DatasetExpressionTransform.java           |  18 +-
 .../transformation/DatasetTransform.java      |  30 +-
 .../DesignTransformAccessor.java              |  44 +-
 .../design/transformation/GroupTransform.java |  72 +-
 .../MainDatasetExpressionTransform.java       |  22 +-
 .../design/transformation/PageTransform.java  |  18 +-
 .../transformation/ReportTransform.java       |  48 +-
 .../design/transformation/StyleResolver.java  |  62 +-
 .../design/transformation/StyleTransform.java |  98 +--
 .../transformation/SubtotalTransform.java     |  48 +-
 .../TableOfContentsTransform.java             |  46 +-
 .../transformation/TemplateTransform.java     | 630 +++++++++---------
 .../BooleanTextValueFormatter.java            |   8 +-
 .../expressions/CrosstabExpression.java       |  28 +-
 .../CrosstabMeasureExpression.java            |  12 +-
 .../expressions/CrosstabPrintInEvenRow.java   |   8 +-
 .../expressions/CrosstabPrintInOddRow.java    |   8 +-
 .../expressions/CrosstabRowCount.java         |   8 +-
 .../expressions/CrosstabRowCounter.java       |   8 +-
 .../expressions/CurrentDateExpression.java    |  14 +-
 .../GroupByDataTypeExpression.java            |  16 +-
 .../MultiPageListDataSourceExpression.java    |   8 +-
 .../MultiPageListSubreportExpression.java     |  24 +-
 .../expressions/PageNumberExpression.java     |  12 +-
 .../expressions/PageXofYNumberExpression.java |  12 +-
 .../expressions/SerieValueExpression.java     |  24 +-
 .../expressions/TocPrintWhenExpression.java   |  12 +-
 .../expressions/TocReferenceExpression.java   |  18 +-
 .../TocReferenceLinkExpression.java           |  12 +-
 .../jasper/base/CustomScriptlet.java          |   8 +-
 .../base/DefaultJasperScriptletManager.java   |   4 +-
 .../jasper/base/JasperCustomValues.java       |  32 +-
 .../jasper/base/JasperReportDesign.java       |  28 +-
 .../jasper/base/JasperReportParameters.java   |  22 +-
 .../jasper/base/JasperScriptlet.java          |  18 +-
 .../jasper/base/JasperScriptletManager.java   |  14 +-
 ...erSystemFontExtensionsRegistryFactory.java |   4 +-
 .../base/JasperTemplateStyleLoader.java       |  64 +-
 .../jasper/base/StartPageNumberScriptlet.java |   4 +-
 .../ThreadSafeJasperScriptletManager.java     |   4 +-
 .../export/AbstractJasperExcelExporter.java   |  14 +-
 .../base/export/AbstractJasperExporter.java   |   6 +-
 .../jasper/base/export/JasperCsvExporter.java |   6 +-
 .../base/export/JasperDocxExporter.java       |   6 +-
 .../base/export/JasperHtmlExporter.java       |  10 +-
 .../base/export/JasperImageExporter.java      |  10 +-
 .../jasper/base/export/JasperOdsExporter.java |   6 +-
 .../jasper/base/export/JasperOdtExporter.java |   6 +-
 .../jasper/base/export/JasperPdfExporter.java |  22 +-
 .../base/export/JasperPptxExporter.java       |   6 +-
 .../jasper/base/export/JasperRtfExporter.java |   6 +-
 .../base/export/JasperTextExporter.java       |   6 +-
 .../base/export/JasperXlsxExporter.java       |   6 +-
 .../jasper/base/export/JasperXmlExporter.java |   6 +-
 .../AbstractPrintListHandler.java             |   6 +-
 .../JasperPrintListFileHandler.java           |   4 +-
 .../reporthandler/JasperPrintListHandler.java |   2 +-
 .../JasperReportBuilderHandler.java           |   8 +-
 .../tableofcontents/JasperTocHeading.java     |   4 +-
 .../base/tableofcontents/JasperTocReport.java |  32 +-
 .../JasperEmptyTemplateDesign.java            |   8 +-
 .../templatedesign/JasperTemplateDesign.java  |  36 +-
 .../JasperConcatenatedReportBuilder.java      | 174 ++---
 .../jasper/builder/JasperReportBuilder.java   | 260 ++++----
 .../AbstractJasperExcelExporterBuilder.java   |  14 +-
 .../export/AbstractJasperExporterBuilder.java |   8 +-
 .../builder/export/ExporterBuilders.java      | 104 +--
 .../jasper/builder/export/Exporters.java      | 104 +--
 .../export/JasperCsvExporterBuilder.java      |  10 +-
 .../export/JasperDocxExporterBuilder.java     |  12 +-
 .../export/JasperHtmlExporterBuilder.java     |  46 +-
 .../export/JasperImageExporterBuilder.java    |  18 +-
 .../export/JasperOdsExporterBuilder.java      |   8 +-
 .../export/JasperOdtExporterBuilder.java      |  10 +-
 .../export/JasperPdfExporterBuilder.java      |  80 +--
 .../export/JasperPptxExporterBuilder.java     |   8 +-
 .../export/JasperRtfExporterBuilder.java      |   8 +-
 .../export/JasperTextExporterBuilder.java     |  28 +-
 .../export/JasperXlsxExporterBuilder.java     |   8 +-
 .../export/JasperXmlExporterBuilder.java      |   8 +-
 .../jasper/constant/ImageType.java            |   2 +-
 .../jasper/constant/JasperProperty.java       |   2 +-
 .../jasper/constant/PdfPermission.java        |   2 +-
 .../jasper/constant/PdfVersion.java           |   2 +-
 .../jasper/constant/SizeUnit.java             |   2 +-
 .../jasper/constant/ValueType.java            |   2 +-
 .../definition/JasperReportHandler.java       |  10 +-
 .../definition/export/JasperICsvExporter.java |   2 +-
 .../export/JasperIDocxExporter.java           |   2 +-
 .../export/JasperIExcelExporter.java          |  10 +-
 .../definition/export/JasperIExporter.java    |   2 +-
 .../export/JasperIHtmlExporter.java           |   6 +-
 .../export/JasperIImageExporter.java          |   6 +-
 .../definition/export/JasperIOdsExporter.java |   2 +-
 .../definition/export/JasperIOdtExporter.java |   2 +-
 .../definition/export/JasperIPdfExporter.java |  16 +-
 .../export/JasperIPptxExporter.java           |   2 +-
 .../definition/export/JasperIRtfExporter.java |   2 +-
 .../export/JasperITextExporter.java           |   2 +-
 .../export/JasperIXlsxExporter.java           |   2 +-
 .../definition/export/JasperIXmlExporter.java |   2 +-
 .../exception/JasperDesignException.java      |   4 +-
 .../AbstractExpressionTransform.java          |  50 +-
 .../jasper/transformation/BandTransform.java  |  14 +-
 .../transformation/ComponentTransform.java    |  74 +-
 .../transformation/ConstantTransform.java     | 158 ++---
 .../transformation/CrosstabTransform.java     |  32 +-
 .../DatasetExpressionTransform.java           |  24 +-
 .../transformation/DatasetTransform.java      |  22 +-
 .../transformation/ExporterTransform.java     |  42 +-
 .../jasper/transformation/GroupTransform.java |  10 +-
 .../transformation/JasperTransform.java       |  20 +-
 .../JasperTransformAccessor.java              |  36 +-
 .../MainDatasetExpressionTransform.java       |  24 +-
 .../transformation/ReportTransform.java       |  40 +-
 .../jasper/transformation/StyleTransform.java |  32 +-
 .../CrosstabParametersExpression.java         |  12 +-
 .../DatasetParametersExpression.java          |  12 +-
 .../JasperSubreportParametersExpression.java  |  16 +-
 .../expression/SubreportExpression.java       |  36 +-
 .../SubreportParametersExpression.java        |  18 +-
 .../expression/SubreportWidthExpression.java  |  10 +-
 .../dynamicreports/report/ReportUtils.java    |   6 +-
 .../report/base/AbstractScriptlet.java        |   8 +-
 .../report/base/AbstractTemplateDesign.java   |  20 +-
 .../dynamicreports/report/base/DRBand.java    |  22 +-
 .../dynamicreports/report/base/DRDataset.java |  22 +-
 .../dynamicreports/report/base/DRField.java   |  10 +-
 .../dynamicreports/report/base/DRGroup.java   |  34 +-
 .../report/base/DRHyperLink.java              |  16 +-
 .../dynamicreports/report/base/DRMargin.java  |   6 +-
 .../dynamicreports/report/base/DRPage.java    |  24 +-
 .../report/base/DRParameter.java              |   6 +-
 .../dynamicreports/report/base/DRQuery.java   |   6 +-
 .../dynamicreports/report/base/DRReport.java  |  98 +--
 .../report/base/DRReportTemplate.java         | 188 +++---
 .../dynamicreports/report/base/DRSort.java    |  14 +-
 .../report/base/DRSubtotal.java               |  38 +-
 .../report/base/DRTableOfContentsHeading.java |  14 +-
 .../report/base/DRVariable.java               |  28 +-
 .../report/base/column/DRBooleanColumn.java   |  12 +-
 .../report/base/column/DRColumn.java          |  30 +-
 .../report/base/column/DRValueColumn.java     |  12 +-
 .../report/base/component/DRBooleanField.java |  24 +-
 .../report/base/component/DRBreak.java        |  10 +-
 .../report/base/component/DRComponent.java    |  24 +-
 .../report/base/component/DRCurrentDate.java  |   6 +-
 .../base/component/DRDimensionComponent.java  |  26 +-
 .../report/base/component/DREllipse.java      |  10 +-
 .../report/base/component/DRFiller.java       |   6 +-
 .../report/base/component/DRFormatField.java  |  14 +-
 .../base/component/DRGenericElement.java      |  10 +-
 .../base/component/DRHyperLinkComponent.java  |  14 +-
 .../report/base/component/DRImage.java        |  18 +-
 .../report/base/component/DRLine.java         |  14 +-
 .../report/base/component/DRList.java         |  28 +-
 .../report/base/component/DRListCell.java     |  22 +-
 .../report/base/component/DRMap.java          |  14 +-
 .../base/component/DRMultiPageList.java       |  14 +-
 .../report/base/component/DRPageNumber.java   |   6 +-
 .../report/base/component/DRPageXofY.java     |  12 +-
 .../report/base/component/DRRectangle.java    |  10 +-
 .../report/base/component/DRSubreport.java    |  16 +-
 .../report/base/component/DRTextField.java    |  40 +-
 .../report/base/component/DRTotalPages.java   |   6 +-
 .../report/base/component/DRXyList.java       |  10 +-
 .../report/base/component/DRXyListCell.java   |   8 +-
 .../report/base/crosstab/DRCrosstab.java      |  48 +-
 .../base/crosstab/DRCrosstabCellContent.java  |  18 +-
 .../base/crosstab/DRCrosstabCellStyle.java    |  26 +-
 .../base/crosstab/DRCrosstabColumnGroup.java  |   6 +-
 .../base/crosstab/DRCrosstabDataset.java      |  10 +-
 .../report/base/crosstab/DRCrosstabGroup.java |  60 +-
 .../base/crosstab/DRCrosstabMeasure.java      |  44 +-
 .../base/crosstab/DRCrosstabRowGroup.java     |   6 +-
 .../base/crosstab/DRCrosstabVariable.java     |  20 +-
 .../base/datatype/AbstractDataType.java       |  18 +-
 .../report/base/datatype/DRDataType.java      |  14 +-
 .../expression/AbstractSimpleExpression.java  |   8 +-
 .../expression/AbstractSystemExpression.java  |   8 +-
 .../expression/AbstractValueFormatter.java    |   8 +-
 .../report/base/grid/DRColumnGrid.java        |  14 +-
 .../report/base/grid/DRColumnGridList.java    |  28 +-
 .../base/grid/DRColumnGridListCell.java       |  24 +-
 .../report/base/grid/DRColumnTitleGroup.java  |  38 +-
 .../report/base/style/DRBaseStyle.java        |  46 +-
 .../report/base/style/DRBorder.java           |  16 +-
 .../report/base/style/DRConditionalStyle.java |  10 +-
 .../report/base/style/DRFont.java             |   6 +-
 .../report/base/style/DRPadding.java          |   6 +-
 .../report/base/style/DRParagraph.java        |  12 +-
 .../report/base/style/DRPen.java              |  12 +-
 .../report/base/style/DRSimpleStyle.java      |   6 +-
 .../report/base/style/DRStyle.java            |  12 +-
 .../report/base/style/DRTabStop.java          |  10 +-
 .../report/base/style/DRTemplateStyle.java    |   6 +-
 .../report/builder/AbstractBuilder.java       |   4 +-
 .../report/builder/DatasetBuilder.java        |  80 +--
 .../report/builder/DynamicReports.java        | 166 ++---
 .../report/builder/FieldBuilder.java          |  18 +-
 .../report/builder/HyperLinkBuilder.java      |  62 +-
 .../report/builder/MarginBuilder.java         |  16 +-
 .../report/builder/ParameterBuilder.java      |   8 +-
 .../report/builder/QueryBuilder.java          |   8 +-
 .../report/builder/ReportBuilder.java         |  70 +-
 .../report/builder/ReportTemplateBuilder.java | 468 ++++++-------
 .../report/builder/SortBuilder.java           |  24 +-
 .../dynamicreports/report/builder/Units.java  |   2 +-
 .../report/builder/VariableBuilder.java       |  60 +-
 .../builder/column/BooleanColumnBuilder.java  |  48 +-
 .../report/builder/column/ColumnBuilder.java  |  34 +-
 .../report/builder/column/ColumnBuilders.java |  10 +-
 .../report/builder/column/Columns.java        |  16 +-
 .../column/ComponentColumnBuilder.java        |  32 +-
 .../column/PercentageColumnBuilder.java       |  30 +-
 .../builder/column/TextColumnBuilder.java     |  30 +-
 .../builder/column/ValueColumnBuilder.java    |  52 +-
 .../component/AbstractFormatFieldBuilder.java |  20 +-
 .../component/BooleanFieldBuilder.java        |  48 +-
 .../builder/component/BreakBuilder.java       |  12 +-
 .../builder/component/ComponentBuilder.java   |  30 +-
 .../builder/component/ComponentBuilders.java  | 168 ++---
 .../report/builder/component/Components.java  | 174 ++---
 .../builder/component/CurrentDateBuilder.java |  10 +-
 .../component/DimensionComponentBuilder.java  |  38 +-
 .../builder/component/EllipseBuilder.java     |  12 +-
 .../builder/component/FillerBuilder.java      |   6 +-
 .../component/GenericElementBuilder.java      |  22 +-
 .../component/HorizontalFlowListBuilder.java  |   4 +-
 .../component/HorizontalListBuilder.java      |  62 +-
 .../component/HorizontalListCellBuilder.java  |  30 +-
 .../component/HyperLinkComponentBuilder.java  |  16 +-
 .../builder/component/ImageBuilder.java       |  44 +-
 .../report/builder/component/LineBuilder.java |  18 +-
 .../report/builder/component/MapBuilder.java  |  28 +-
 .../component/MultiPageListBuilder.java       |  22 +-
 .../builder/component/PageNumberBuilder.java  |   8 +-
 .../builder/component/PageXofYBuilder.java    |  34 +-
 .../builder/component/PageXslashYBuilder.java |  34 +-
 .../builder/component/RectangleBuilder.java   |  14 +-
 .../builder/component/SubreportBuilder.java   |  42 +-
 .../builder/component/TextFieldBuilder.java   | 104 +--
 .../builder/component/TotalPagesBuilder.java  |   8 +-
 .../component/VerticalListBuilder.java        |  32 +-
 .../component/VerticalListCellBuilder.java    |  30 +-
 .../builder/component/XyListBuilder.java      |  20 +-
 .../builder/component/XyListCellBuilder.java  |  14 +-
 .../AbstractBetweenValueExpression.java       |  12 +-
 .../condition/AbstractValueExpression.java    |  12 +-
 .../condition/AbstractValuesExpression.java   |  12 +-
 .../condition/BetweenValueExpression.java     |   8 +-
 .../builder/condition/ConditionBuilders.java  |  44 +-
 .../report/builder/condition/Conditions.java  |  44 +-
 .../builder/condition/EqualExpression.java    |  12 +-
 .../condition/EqualValueExpression.java       |   8 +-
 .../GreaterOrEqualsValueExpression.java       |   8 +-
 .../condition/GreaterValueExpression.java     |   8 +-
 .../condition/NotBetweenValueExpression.java  |   8 +-
 .../SmallerOrEqualsValueExpression.java       |   8 +-
 .../condition/SmallerValueExpression.java     |   8 +-
 .../builder/condition/UnEqualExpression.java  |  12 +-
 .../condition/UnEqualValueExpression.java     |   8 +-
 .../AbstractCrosstabGroupBuilder.java         |  78 +--
 .../builder/crosstab/CrosstabBuilder.java     | 132 ++--
 .../builder/crosstab/CrosstabBuilders.java    | 114 ++--
 .../crosstab/CrosstabColumnGroupBuilder.java  |  22 +-
 .../crosstab/CrosstabMeasureBuilder.java      | 124 ++--
 .../crosstab/CrosstabRowGroupBuilder.java     |  22 +-
 .../crosstab/CrosstabVariableBuilder.java     |  36 +-
 .../report/builder/crosstab/Crosstabs.java    | 116 ++--
 .../builder/datatype/BigDecimalType.java      |   8 +-
 .../builder/datatype/BigIntegerType.java      |   8 +-
 .../report/builder/datatype/BooleanType.java  |  12 +-
 .../report/builder/datatype/ByteType.java     |   8 +-
 .../builder/datatype/CharacterType.java       |  12 +-
 .../builder/datatype/DataTypeBuilders.java    |  60 +-
 .../report/builder/datatype/DataTypes.java    |  60 +-
 .../report/builder/datatype/DateDayType.java  |   8 +-
 .../builder/datatype/DateMonthType.java       |   8 +-
 .../report/builder/datatype/DateType.java     |  12 +-
 .../datatype/DateYearToFractionType.java      |   8 +-
 .../builder/datatype/DateYearToHourType.java  |   8 +-
 .../datatype/DateYearToMinuteType.java        |   8 +-
 .../builder/datatype/DateYearToMonthType.java |   8 +-
 .../datatype/DateYearToSecondType.java        |   8 +-
 .../report/builder/datatype/DateYearType.java |   8 +-
 .../report/builder/datatype/DoubleType.java   |   8 +-
 .../report/builder/datatype/FloatType.java    |   8 +-
 .../report/builder/datatype/IntegerType.java  |   8 +-
 .../report/builder/datatype/ListType.java     |  16 +-
 .../report/builder/datatype/LongType.java     |   8 +-
 .../report/builder/datatype/NumberType.java   |  10 +-
 .../builder/datatype/PercentageType.java      |   8 +-
 .../report/builder/datatype/ShortType.java    |   8 +-
 .../report/builder/datatype/StringType.java   |  12 +-
 .../datatype/TimeHourToFractionType.java      |   8 +-
 .../datatype/TimeHourToMinuteType.java        |   8 +-
 .../datatype/TimeHourToSecondType.java        |   8 +-
 .../expression/AbstractComplexExpression.java |  38 +-
 .../AbstractSubDatasourceExpression.java      |  12 +-
 .../builder/expression/AddExpression.java     |   8 +-
 .../BeanArraySubDatasourceExpression.java     |   8 +-
 ...BeanCollectionSubDatasourceExpression.java |   8 +-
 .../expression/CalculationExpression.java     |  10 +-
 .../expression/ColumnNumberExpression.java    |   8 +-
 .../expression/ColumnRowNumberExpression.java |   8 +-
 .../expression/CrosstabValueExpression.java   |  28 +-
 .../expression/DataSourceExpression.java      |   8 +-
 .../builder/expression/DivideExpression.java  |   8 +-
 .../expression/ExpressionBuilders.java        | 132 ++--
 .../builder/expression/Expressions.java       | 130 ++--
 .../expression/GroupRowNumberExpression.java  |   8 +-
 .../builder/expression/JasperExpression.java  |   8 +-
 .../MapArraySubDatasourceExpression.java      |   8 +-
 .../MapCollectionSubDatasourceExpression.java |   8 +-
 .../builder/expression/MessageExpression.java |   8 +-
 .../expression/MultiplyExpression.java        |   8 +-
 .../builder/expression/OrderByExpression.java |  12 +-
 .../expression/PageNumberExpression.java      |   8 +-
 .../expression/PageRowNumberExpression.java   |   8 +-
 .../expression/ParameterExpression.java       |  12 +-
 .../expression/PercentageExpression.java      |  12 +-
 .../expression/PrintInEvenRowExpression.java  |   8 +-
 .../PrintInFirstPageExpression.java           |   8 +-
 .../expression/PrintInOddRowExpression.java   |   8 +-
 .../PrintNotInFirstPageExpression.java        |   8 +-
 ...tWhenGroupHasMoreThanOneRowExpression.java |   8 +-
 .../expression/PropertyExpression.java        |  12 +-
 .../expression/ReportRowNumberExpression.java |   8 +-
 .../expression/SubtractExpression.java        |   8 +-
 .../expression/SystemMessageExpression.java   |   8 +-
 .../builder/expression/ValueExpression.java   |   8 +-
 .../grid/ColumnGridComponentBuilder.java      |   6 +-
 .../builder/grid/ColumnTitleGroupBuilder.java |  76 +--
 .../report/builder/grid/GridBuilders.java     |  50 +-
 .../report/builder/grid/Grids.java            |  50 +-
 .../grid/HorizontalColumnGridListBuilder.java |  28 +-
 .../HorizontalColumnGridListCellBuilder.java  |  30 +-
 .../HorizontalFlowColumnGridListBuilder.java  |   4 +-
 .../grid/VerticalColumnGridListBuilder.java   |  22 +-
 .../VerticalColumnGridListCellBuilder.java    |  30 +-
 .../builder/group/ColumnGroupBuilder.java     |  16 +-
 .../builder/group/CustomGroupBuilder.java     |  26 +-
 .../report/builder/group/GroupBuilder.java    |  70 +-
 .../report/builder/group/GroupBuilders.java   |  36 +-
 .../report/builder/group/Groups.java          |  38 +-
 .../builder/style/BaseStyleBuilder.java       |  86 +--
 .../report/builder/style/BorderBuilder.java   |  28 +-
 .../style/ConditionalStyleBuilder.java        |  10 +-
 .../report/builder/style/FontBuilder.java     |  38 +-
 .../report/builder/style/PaddingBuilder.java  |  18 +-
 .../report/builder/style/PenBuilder.java      |  22 +-
 .../builder/style/ReportStyleBuilder.java     |   8 +-
 .../builder/style/SimpleStyleBuilder.java     |   6 +-
 .../report/builder/style/StyleBuilder.java    |  22 +-
 .../report/builder/style/StyleBuilders.java   |  88 +--
 .../report/builder/style/Styles.java          |  90 +--
 .../builder/style/TemplateStyleBuilder.java   |   8 +-
 .../builder/style/TemplateStylesBuilder.java  |  32 +-
 .../subtotal/AggregationSubtotalBuilder.java  |  46 +-
 .../builder/subtotal/BaseSubtotalBuilder.java |  70 +-
 .../subtotal/CustomSubtotalBuilder.java       |  14 +-
 .../subtotal/PercentageSubtotalBuilder.java   |  50 +-
 .../builder/subtotal/SubtotalBuilder.java     |   8 +-
 .../builder/subtotal/SubtotalBuilders.java    |  12 +-
 .../report/builder/subtotal/Subtotals.java    |  18 +-
 .../TableOfContentsCustomizer.java            |  62 +-
 .../TableOfContentsCustomizerBuilder.java     |  34 +-
 .../TableOfContentsHeadingBuilder.java        |  30 +-
 .../component/CustomComponentTransform.java   |  26 +-
 .../report/component/CustomComponents.java    |   4 +-
 .../report/component/DRICustomComponent.java  |   4 +-
 .../component/DRIDesignCustomComponent.java   |   4 +-
 .../report/constant/AxisPosition.java         |   2 +-
 .../report/constant/BooleanComponentType.java |   2 +-
 .../report/constant/BreakType.java            |   2 +-
 .../report/constant/Calculation.java          |   2 +-
 .../constant/ComponentDimensionType.java      |   2 +-
 .../constant/ComponentPositionType.java       |   2 +-
 .../report/constant/Constants.java            |   2 +-
 .../constant/CrosstabPercentageType.java      |   2 +-
 .../constant/CrosstabTotalPosition.java       |   2 +-
 .../report/constant/Evaluation.java           |   2 +-
 .../report/constant/FontName.java             |   2 +-
 .../report/constant/GroupFooterPosition.java  |   2 +-
 .../report/constant/GroupHeaderLayout.java    |   2 +-
 .../report/constant/HorizontalAlignment.java  |   2 +-
 .../HorizontalCellComponentAlignment.java     |   2 +-
 .../constant/HorizontalImageAlignment.java    |   2 +-
 .../constant/HorizontalTextAlignment.java     |   2 +-
 .../report/constant/HyperLinkTarget.java      |   2 +-
 .../report/constant/HyperLinkType.java        |   2 +-
 .../report/constant/ImageAnchorType.java      |   2 +-
 .../report/constant/ImageScale.java           |   2 +-
 .../report/constant/Language.java             |   2 +-
 .../report/constant/LineDirection.java        |   2 +-
 .../report/constant/LineSpacing.java          |   2 +-
 .../report/constant/LineStyle.java            |   2 +-
 .../report/constant/ListType.java             |   2 +-
 .../report/constant/Markup.java               |   2 +-
 .../report/constant/MeterShape.java           |   2 +-
 .../report/constant/OrderType.java            |   2 +-
 .../report/constant/Orientation.java          |   2 +-
 .../report/constant/PageOrientation.java      |   2 +-
 .../report/constant/PageType.java             |   2 +-
 .../report/constant/PdfEncoding.java          |   2 +-
 .../report/constant/PdfPrintScaling.java      |   2 +-
 .../report/constant/PdfaConformance.java      |   2 +-
 .../report/constant/PercentageTotalType.java  |   2 +-
 .../report/constant/Position.java             |   2 +-
 .../constant/QrCodeErrorCorrectionLevel.java  |   2 +-
 .../report/constant/QueryLanguage.java        |   2 +-
 .../report/constant/RectangleAnchor.java      |   2 +-
 .../report/constant/Rotation.java             |   2 +-
 .../report/constant/RunDirection.java         |   2 +-
 .../report/constant/ScaleType.java            |   2 +-
 .../report/constant/SpiderRotation.java       |   2 +-
 .../report/constant/SplitType.java            |   2 +-
 .../report/constant/StretchType.java          |   2 +-
 .../report/constant/SubtotalPosition.java     |   2 +-
 .../report/constant/SystemExpression.java     |   2 +-
 .../report/constant/TabStopAlignment.java     |   2 +-
 .../constant/TableOfContentsPosition.java     |   2 +-
 .../report/constant/TableOrder.java           |   2 +-
 .../report/constant/TextAdjust.java           |   2 +-
 .../report/constant/TimePeriod.java           |   2 +-
 .../report/constant/ValueLocation.java        |   2 +-
 .../report/constant/VerticalAlignment.java    |   2 +-
 .../VerticalCellComponentAlignment.java       |   2 +-
 .../constant/VerticalImageAlignment.java      |   2 +-
 .../constant/VerticalTextAlignment.java       |   2 +-
 .../report/constant/WhenNoDataType.java       |   2 +-
 .../constant/WhenResourceMissingType.java     |   2 +-
 .../report/datasource/DRDataSource.java       |   4 +-
 .../report/defaults/Default.java              | 226 +++----
 .../report/defaults/DefaultBinder.java        |  20 +-
 .../report/defaults/Defaults.java             |   6 +-
 .../report/definition/DRIBand.java            |  14 +-
 .../report/definition/DRICrosstabValue.java   |   2 +-
 .../report/definition/DRICustomValues.java    |   4 +-
 .../report/definition/DRIDataset.java         |  12 +-
 .../report/definition/DRIField.java           |   8 +-
 .../report/definition/DRIGroup.java           |  28 +-
 .../report/definition/DRIHyperLink.java       |  12 +-
 .../report/definition/DRIMargin.java          |   2 +-
 .../report/definition/DRIPage.java            |   8 +-
 .../report/definition/DRIParameter.java       |   2 +-
 .../report/definition/DRIQuery.java           |   2 +-
 .../report/definition/DRIReport.java          |  92 +--
 .../report/definition/DRIReportTemplate.java  | 176 ++---
 .../report/definition/DRIScriptlet.java       |  22 +-
 .../report/definition/DRISort.java            |  10 +-
 .../report/definition/DRISubtotal.java        |  32 +-
 .../DRITableOfContentsCustomizer.java         |  12 +-
 .../definition/DRITableOfContentsHeading.java |  10 +-
 .../report/definition/DRITemplateDesign.java  |  20 +-
 .../report/definition/DRIValue.java           |   2 +-
 .../report/definition/DRIVariable.java        |  18 +-
 .../report/definition/ReportParameters.java   |   8 +-
 .../definition/column/DRIBooleanColumn.java   |   8 +-
 .../report/definition/column/DRIColumn.java   |  24 +-
 .../definition/column/DRIValueColumn.java     |   8 +-
 .../definition/component/DRIBooleanField.java |  18 +-
 .../report/definition/component/DRIBreak.java |   6 +-
 .../definition/component/DRIComponent.java    |  16 +-
 .../definition/component/DRICurrentDate.java  |   2 +-
 .../component/DRIDimensionComponent.java      |  20 +-
 .../definition/component/DRIEllipse.java      |   6 +-
 .../definition/component/DRIFiller.java       |   2 +-
 .../definition/component/DRIFormatField.java  |  10 +-
 .../component/DRIGenericElement.java          |   4 +-
 .../component/DRIHyperLinkComponent.java      |  10 +-
 .../report/definition/component/DRIImage.java |  14 +-
 .../report/definition/component/DRILine.java  |  10 +-
 .../report/definition/component/DRIList.java  |   8 +-
 .../definition/component/DRIListCell.java     |  12 +-
 .../report/definition/component/DRIMap.java   |  10 +-
 .../component/DRIMultiPageList.java           |   6 +-
 .../definition/component/DRIPageNumber.java   |   2 +-
 .../definition/component/DRIPageXofY.java     |   8 +-
 .../definition/component/DRIRectangle.java    |   6 +-
 .../definition/component/DRISubreport.java    |  12 +-
 .../definition/component/DRITextField.java    |  36 +-
 .../definition/component/DRITotalPages.java   |   2 +-
 .../definition/component/DRIXyList.java       |   2 +-
 .../definition/component/DRIXyListCell.java   |   4 +-
 .../definition/crosstab/DRICrosstab.java      |  32 +-
 .../crosstab/DRICrosstabCellContent.java      |  10 +-
 .../crosstab/DRICrosstabCellStyle.java        |  10 +-
 .../crosstab/DRICrosstabColumnGroup.java      |   2 +-
 .../crosstab/DRICrosstabDataset.java          |   6 +-
 .../definition/crosstab/DRICrosstabGroup.java |  52 +-
 .../crosstab/DRICrosstabMeasure.java          |  34 +-
 .../crosstab/DRICrosstabRowGroup.java         |   2 +-
 .../crosstab/DRICrosstabVariable.java         |  18 +-
 .../definition/datatype/DRIDataType.java      |  34 +-
 .../expression/DRIComplexExpression.java      |   4 +-
 .../definition/expression/DRIExpression.java  |   2 +-
 .../expression/DRIJasperExpression.java       |   2 +-
 .../expression/DRIParameterExpression.java    |   4 +-
 .../expression/DRIPropertyExpression.java     |   4 +-
 .../expression/DRISimpleExpression.java       |   6 +-
 .../expression/DRISystemExpression.java       |   2 +-
 .../expression/DRIValueFormatter.java         |   4 +-
 .../report/definition/grid/DRIColumnGrid.java |   4 +-
 .../grid/DRIColumnGridComponent.java          |   2 +-
 .../definition/grid/DRIColumnGridList.java    |   6 +-
 .../grid/DRIColumnGridListCell.java           |  12 +-
 .../definition/grid/DRIColumnTitleGroup.java  |  24 +-
 .../report/definition/style/DRIBaseStyle.java |  40 +-
 .../report/definition/style/DRIBorder.java    |  10 +-
 .../definition/style/DRIConditionalStyle.java |   6 +-
 .../report/definition/style/DRIFont.java      |   2 +-
 .../report/definition/style/DRIPadding.java   |   2 +-
 .../report/definition/style/DRIParagraph.java |   6 +-
 .../report/definition/style/DRIPen.java       |   6 +-
 .../definition/style/DRIReportStyle.java      |   2 +-
 .../definition/style/DRISimpleStyle.java      |   2 +-
 .../report/definition/style/DRIStyle.java     |   4 +-
 .../report/definition/style/DRITabStop.java   |   6 +-
 .../definition/style/DRITemplateStyle.java    |   2 +-
 .../report/exception/DRException.java         |   4 +-
 .../report/exception/DRReportException.java   |   4 +-
 .../jasperreports_extension.properties        |   4 +-
 .../report/defaults/schema/dynamicreports.xjb |   2 +-
 .../report/defaults/schema/dynamicreports.xsd |   0
 .../report/images/ball_green.svg              |   0
 .../dynamicreports/report/images/ball_red.svg |   0
 .../report/images/boolean1_false.svg          |   0
 .../report/images/boolean1_true.svg           |   0
 .../report/images/boolean2_false.svg          |   0
 .../report/images/boolean2_true.svg           |   0
 .../report/images/boolean3_false.svg          |   0
 .../report/images/boolean3_true.svg           |   0
 .../report/images/boolean4_false.svg          |   0
 .../report/images/checkbox1_true.svg          |   0
 .../report/images/checkbox2_true.svg          |   0
 .../report/images/checkbox_false.svg          |   0
 .../jasper/base/JasperCustomValuesTest.java   |   4 +-
 .../report/ReportUtilsTest.java               |   2 +-
 .../builder/style/StyleBuildersTest.java      |   8 +-
 .../test/base/ConditionsTest.java             |  16 +-
 .../test/base/DataTypeTest.java               |  12 +-
 .../test/base/DefaultsTest.java               |  14 +-
 .../test/bugs/Bug_2997586_Test.java           |   6 +-
 .../test/design/AbstractBandTest.java         |  12 +-
 .../test/design/DesignReportBuilder.java      |   6 +-
 .../test/design/DesignTestTemplateDesign.java |   4 +-
 .../design/position/ColumnPosition1Test.java  |  18 +-
 .../design/position/ColumnPosition2Test.java  |  20 +-
 .../position/HorizontalListPositionTest.java  |  20 +-
 .../design/position/SubtotalPositionTest.java |  26 +-
 .../position/VerticalListPositionTest.java    |  18 +-
 .../design/report/BandBackgroundTest.java     |  34 +-
 .../test/design/report/ExceptionTest.java     |  26 +-
 .../design/report/ReportTemplateTest.java     |  64 +-
 .../design/report/TemplateDesignTest.java     |  24 +-
 .../AbstractJasperCrosstabPositionTest.java   |  10 +-
 .../AbstractJasperCrosstabStyleTest.java      |  10 +-
 .../AbstractJasperCrosstabValueTest.java      |  10 +-
 .../jasper/AbstractJasperPositionTest.java    |   8 +-
 .../test/jasper/AbstractJasperStyleTest.java  |   8 +-
 .../test/jasper/AbstractJasperTest.java       |   8 +-
 .../test/jasper/AbstractJasperValueTest.java  |   8 +-
 .../test/jasper/JasperTestUtils.java          |  18 +-
 .../jasper/column/BooleanColumn1Test.java     |  12 +-
 .../jasper/column/BooleanColumn2Test.java     |  14 +-
 .../column/BooleanColumnPosition1Test.java    |  14 +-
 .../column/BooleanColumnPosition2Test.java    |  12 +-
 .../column/BooleanColumnPosition3Test.java    |  12 +-
 .../column/BooleanColumnPosition4Test.java    |  12 +-
 .../column/BooleanColumnPosition5Test.java    |  12 +-
 .../test/jasper/column/Column1Test.java       |  20 +-
 .../test/jasper/column/Column2Test.java       |  14 +-
 .../test/jasper/column/Column3Test.java       |  24 +-
 .../test/jasper/column/Column4Test.java       |  14 +-
 .../test/jasper/column/ColumnGridTest.java    |  18 +-
 .../jasper/column/ColumnPosition1Test.java    |  14 +-
 .../jasper/column/ColumnPosition2Test.java    |  14 +-
 .../jasper/column/ColumnTitleGroup1Test.java  |  14 +-
 .../jasper/column/ColumnTitleGroup2Test.java  |  18 +-
 .../jasper/column/ColumnTitleGroup3Test.java  |  20 +-
 .../column/ColumnTitleGroupPosition1Test.java |  18 +-
 .../column/ColumnTitleGroupPosition2Test.java |  18 +-
 .../column/ColumnTitleGroupPosition3Test.java |  18 +-
 .../column/ColumnTitleGroupPosition4Test.java |  18 +-
 .../column/ColumnTitleGroupPosition5Test.java |  20 +-
 .../column/ColumnTitleGroupPosition6Test.java |  14 +-
 .../column/ComponentColumnPositionTest.java   |  26 +-
 .../test/jasper/column/EmptyColumnTest.java   |  12 +-
 .../jasper/column/ExpressionColumnTest.java   |  22 +-
 .../jasper/column/PercentageColumnTest.java   |  20 +-
 .../test/jasper/component/BreakTest.java      |  16 +-
 .../test/jasper/component/Component1Test.java |  14 +-
 .../test/jasper/component/Component2Test.java |  10 +-
 .../test/jasper/component/Component3Test.java |  24 +-
 .../jasper/component/ComponentStyleTest.java  |  12 +-
 .../test/jasper/component/Image1Test.java     |  14 +-
 .../test/jasper/component/Image2Test.java     |  12 +-
 .../test/jasper/component/List1Test.java      |  14 +-
 .../test/jasper/component/List2Test.java      |  10 +-
 .../test/jasper/component/List3Test.java      |  12 +-
 .../ListBackgroundComponentTest.java          |  22 +-
 .../component/ListComponentGroupTypeTest.java |  14 +-
 .../component/ListFixedComponents1Test.java   |   8 +-
 .../component/ListFixedComponents2Test.java   |  10 +-
 .../test/jasper/component/ListGapTest.java    |  12 +-
 .../jasper/component/MultiPageList1Test.java  |  16 +-
 .../jasper/component/MultiPageList2Test.java  |  16 +-
 .../jasper/component/MultiPageList3Test.java  |  20 +-
 .../jasper/component/MultiPageList4Test.java  |  22 +-
 .../jasper/component/PageNumber1Test.java     |  10 +-
 .../jasper/component/PageNumber2Test.java     |  12 +-
 .../jasper/component/PageNumber3Test.java     |  26 +-
 .../jasper/component/PageNumber4Test.java     |  14 +-
 .../jasper/component/PageNumber5Test.java     |  14 +-
 .../jasper/component/PageNumber6Test.java     |   8 +-
 .../component/PageNumberPositionTest.java     |  18 +-
 .../test/jasper/component/TextField1Test.java |  18 +-
 .../test/jasper/component/TextField2Test.java |  14 +-
 .../test/jasper/component/TextField3Test.java |  16 +-
 .../test/jasper/component/TextField4Test.java |  28 +-
 .../test/jasper/component/TextField5Test.java |  14 +-
 .../test/jasper/component/TextField6Test.java |  16 +-
 .../test/jasper/component/TextField7Test.java |  18 +-
 .../jasper/component/VerticalListTest.java    |  12 +-
 .../test/jasper/component/XyListTest.java     |  14 +-
 .../test/jasper/crosstab/Crosstab1Test.java   |  30 +-
 .../test/jasper/crosstab/Crosstab2Test.java   |  32 +-
 .../test/jasper/crosstab/Crosstab3Test.java   |  26 +-
 .../test/jasper/crosstab/Crosstab4Test.java   |  24 +-
 .../test/jasper/crosstab/Crosstab5Test.java   |  36 +-
 .../test/jasper/crosstab/Crosstab6Test.java   |  22 +-
 .../test/jasper/crosstab/Crosstab7Test.java   |  24 +-
 .../crosstab/CrosstabPosition10Test.java      |  28 +-
 .../crosstab/CrosstabPosition1Test.java       |  30 +-
 .../crosstab/CrosstabPosition2Test.java       |  30 +-
 .../crosstab/CrosstabPosition3Test.java       |  30 +-
 .../crosstab/CrosstabPosition4Test.java       |  28 +-
 .../crosstab/CrosstabPosition5Test.java       |  32 +-
 .../crosstab/CrosstabPosition6Test.java       |  28 +-
 .../crosstab/CrosstabPosition7Test.java       |  28 +-
 .../crosstab/CrosstabPosition8Test.java       |  28 +-
 .../crosstab/CrosstabPosition9Test.java       |  28 +-
 .../jasper/crosstab/CrosstabStyle1Test.java   |  32 +-
 .../jasper/crosstab/CrosstabStyle2Test.java   |  32 +-
 .../jasper/crosstab/CrosstabStyle3Test.java   |  24 +-
 .../jasper/crosstab/CrosstabStyle4Test.java   |  26 +-
 .../jasper/crosstab/CrosstabStyle5Test.java   |  28 +-
 .../jasper/crosstab/CrosstabStyle6Test.java   |  34 +-
 .../test/jasper/crosstab/CrosstabTest.java    |  18 +-
 .../crosstab/CrosstabWhenNoDataTest.java      |  24 +-
 .../crosstab/ExpressionCrosstabTest.java      |  28 +-
 .../crosstab/GroupExpressionCrosstabTest.java |  32 +-
 .../crosstab/HyperLinkCrosstabTest.java       |  30 +-
 .../jasper/crosstab/OrderCrosstabTest.java    |  22 +-
 .../jasper/dataset/CrosstabDataset1Test.java  |  32 +-
 .../jasper/dataset/CrosstabDataset2Test.java  |  24 +-
 .../jasper/dataset/CrosstabDataset3Test.java  |  26 +-
 .../dataset/CrosstabDatasetStyleTest.java     |  32 +-
 .../jasper/datasource/DatabaseReportTest.java |  12 +-
 .../datasource/DatabaseSubreportTest.java     |  28 +-
 .../test/jasper/datasource/FilterTest.java    |  36 +-
 .../jasper/datasource/SubDatasourceTest.java  |  20 +-
 .../test/jasper/datasource/XmlReportTest.java |  20 +-
 .../test/jasper/group/CustomGroupTest.java    |  20 +-
 .../test/jasper/group/DataTypeGroupTest.java  |  18 +-
 .../test/jasper/group/Group1Test.java         |  28 +-
 .../test/jasper/group/Group2Test.java         |  26 +-
 .../test/jasper/group/Group3Test.java         |  14 +-
 .../test/jasper/group/GroupPosition1Test.java |  16 +-
 .../test/jasper/group/GroupPosition2Test.java |  24 +-
 .../test/jasper/group/GroupPosition3Test.java |  22 +-
 .../jasper/group/PercentageGroup1Test.java    |  16 +-
 .../jasper/group/PercentageGroup2Test.java    |  26 +-
 .../test/jasper/report/BandTest.java          |  24 +-
 .../test/jasper/report/ColumnGridTest.java    |  24 +-
 .../jasper/report/ColumnsPerPageTest.java     |  24 +-
 .../report/ConcatenatedReport1Test.java       |  14 +-
 .../report/ConcatenatedReport2Test.java       |  18 +-
 .../report/ConcatenatedReport3Test.java       |  16 +-
 .../report/ConcatenatedReport4Test.java       |  16 +-
 .../report/ConcatenatedReport5Test.java       |  16 +-
 .../test/jasper/report/CustomFontTest.java    |  22 +-
 .../test/jasper/report/DetailBand1Test.java   |  14 +-
 .../test/jasper/report/DetailBand2Test.java   |  14 +-
 .../test/jasper/report/ExportTest.java        |  18 +-
 .../test/jasper/report/ExpressionTest.java    |  14 +-
 .../test/jasper/report/FieldDataTypeTest.java |  24 +-
 .../test/jasper/report/HyperLinkTest.java     |  16 +-
 .../jasper/report/IgnorePageWidthTest.java    |  14 +-
 .../jasper/report/IgnorePaginationTest.java   |  10 +-
 .../jasper/report/JasperExpressionTest.java   |  18 +-
 .../test/jasper/report/ListDataTypeTest.java  |  14 +-
 .../test/jasper/report/MarkupTest.java        |  24 +-
 .../test/jasper/report/NoDataSectionTest.java |   8 +-
 .../jasper/report/NoDetailSectionTest.java    |   8 +-
 .../test/jasper/report/ParametersTest.java    |  14 +-
 .../report/PrintWhenExpressionTest.java       |  10 +-
 .../test/jasper/report/Report1Test.java       |  28 +-
 .../test/jasper/report/Report2Test.java       |  18 +-
 .../test/jasper/report/Report3Test.java       |  10 +-
 .../test/jasper/report/Report4Test.java       |  18 +-
 .../test/jasper/report/Report5Test.java       |  18 +-
 .../jasper/report/ReportBackground1Test.java  |  14 +-
 .../jasper/report/ReportBackground2Test.java  |  12 +-
 .../jasper/report/ReportBackground3Test.java  |  12 +-
 .../test/jasper/report/TitleTest.java         |  18 +-
 .../jasper/report/ValueTypeNamesTest.java     |  20 +-
 .../test/jasper/report/VariableTest.java      |  16 +-
 .../test/jasper/report/VirtualizerTest.java   |   8 +-
 .../test/jasper/style/BandStyle1Test.java     |  26 +-
 .../test/jasper/style/BandStyle2Test.java     |  28 +-
 .../test/jasper/style/BandStyle3Test.java     |  24 +-
 .../test/jasper/style/DefaultFontTest.java    |  18 +-
 .../test/jasper/style/Style1Test.java         |  26 +-
 .../test/jasper/style/Style2Test.java         |  26 +-
 .../test/jasper/style/Style3Test.java         |  24 +-
 .../test/jasper/style/Style4Test.java         |  24 +-
 .../test/jasper/style/Style5Test.java         |  12 +-
 .../test/jasper/style/Style6Test.java         |  24 +-
 .../test/jasper/style/Style7Test.java         |  16 +-
 .../test/jasper/style/Style8Test.java         |  22 +-
 .../test/jasper/style/Style9Test.java         |  12 +-
 .../test/jasper/style/StyleNamesTest.java     |  16 +-
 .../test/jasper/style/TemplateStyle1Test.java |  26 +-
 .../test/jasper/style/TemplateStyle2Test.java |  30 +-
 .../test/jasper/style/TemplateStyle3Test.java |  26 +-
 .../test/jasper/style/TemplateStyle4Test.java |  32 +-
 .../test/jasper/style/TemplateStyle5Test.java |  16 +-
 .../test/jasper/style/TemplateStyle6Test.java |  18 +-
 .../subreport/JasperSubreport2Test.java       |  16 +-
 .../jasper/subreport/JasperSubreportTest.java |  16 +-
 .../test/jasper/subreport/Subreport2Test.java |  26 +-
 .../test/jasper/subreport/Subreport3Test.java |  24 +-
 .../test/jasper/subreport/Subreport4Test.java |  16 +-
 .../test/jasper/subreport/Subreport5Test.java |  30 +-
 .../test/jasper/subreport/Subreport6Test.java |  20 +-
 .../subreport/SubreportPositionTest.java      |  28 +-
 .../test/jasper/subreport/SubreportTest.java  |  28 +-
 .../subtotal/GroupCustomSubtotal1Test.java    |  36 +-
 .../subtotal/GroupCustomSubtotal2Test.java    |  24 +-
 .../jasper/subtotal/GroupSubtotal1Test.java   |  22 +-
 .../jasper/subtotal/GroupSubtotal2Test.java   |  22 +-
 .../subtotal/PercentageSubtotalTest.java      |  20 +-
 .../test/jasper/subtotal/Subtotal1Test.java   |  26 +-
 .../test/jasper/subtotal/Subtotal2Test.java   |  18 +-
 .../subtotal/SubtotalPosition1Test.java       |  20 +-
 .../subtotal/SubtotalPosition2Test.java       |  26 +-
 .../subtotal/SubtotalPosition3Test.java       |  22 +-
 .../subtotal/SubtotalPosition4Test.java       |  22 +-
 .../subtotal/SubtotalPosition5Test.java       |  18 +-
 .../tableofcontents/TableOfContents1Test.java |  28 +-
 .../tableofcontents/TableOfContents2Test.java |  26 +-
 .../tableofcontents/TableOfContents3Test.java |  16 +-
 .../tableofcontents/TableOfContents4Test.java |  24 +-
 .../tableofcontents/TableOfContents5Test.java |  16 +-
 .../tableofcontents/TableOfContents6Test.java |  38 +-
 .../tableofcontents/TableOfContents7Test.java |  18 +-
 .../tableofcontents/TableOfContents8Test.java |  18 +-
 .../tableofcontents/TableOfContents9Test.java |  18 +-
 .../TableOfContentsPosition1Test.java         |  18 +-
 .../TableOfContentsPosition2Test.java         |  18 +-
 .../TableOfContentsPosition3Test.java         |  20 +-
 .../TableOfContentsPosition4Test.java         |  24 +-
 .../TableOfContentsPosition5Test.java         |  14 +-
 .../TableOfContentsStyleTest.java             |  24 +-
 .../templatedesign/ReportScriptlet.java       |  22 +-
 .../templatedesign/TemplateDesign1Test.java   |  18 +-
 .../templatedesign/TemplateDesign2Test.java   |  20 +-
 .../templatedesign/TemplateDesign3Test.java   |   8 +-
 .../templatedesign/TemplateDesign4Test.java   |  14 +-
 .../templatedesign/TemplateDesign5Test.java   |  20 +-
 .../TemplateDesignPosition1Test.java          |  14 +-
 .../TemplateDesignPosition2Test.java          |  14 +-
 .../TemplateDesignPosition3Test.java          |  16 +-
 .../TemplateDesignPosition4Test.java          |  20 +-
 .../test/base/dynamicreports-defaults.xml     |   0
 .../dynamicreports/test/fonts/Arimo-Bold.ttf  | Bin
 .../test/fonts/Arimo-Italic.ttf               | Bin
 .../test/fonts/Arimo-License.txt              |   0
 .../test/fonts/Arimo-Regular.ttf              | Bin
 .../test/fonts/FreeUniversal-License.txt      |   0
 .../test/fonts/FreeUniversal-Regular.ttf      | Bin
 .../test/jasper/component/dynamicreports.png  | Bin
 .../test/jasper/datasource/data.xml           |   0
 .../test/jasper/report/test.properties        |   0
 .../test/jasper/style/StyleTemplate1.jrtx     |   0
 .../test/jasper/style/StyleTemplate2.jrtx     |   0
 .../jasper/subreport/detailsubreport.jrxml    |   4 +-
 .../test/jasper/subreport/subreport1.jrxml    |   4 +-
 .../test/jasper/subreport/subreport2.jrxml    |   4 +-
 .../test/jasper/subreport/subreport3.jrxml    |   4 +-
 .../test/jasper/subreport/subreport4.jrxml    |   2 +-
 .../jasper/subreport/titlesubreport.jrxml     |   4 +-
 .../templatedesign/templatedesign1.jrxml      |   0
 .../templatedesign/templatedesign2.jrxml      |   0
 .../templatedesign/templatedesign3.jrxml      |   0
 .../templatedesign/templatedesign4.jrxml      |   2 +-
 .../templatedesign/templatedesign5.jrxml      |   0
 .../templatedesign/templatedesign6.jrxml      |   0
 921 files changed, 9496 insertions(+), 9496 deletions(-)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignBand.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignDataset.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignField.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignGroup.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignHyperLink.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignMargin.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignPage.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignParameter.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignQuery.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignReport.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignSort.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignTableOfContentsHeading.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignTemplateDesign.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/DRDesignVariable.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignBreak.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignComponent.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignEllipse.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignFiller.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignGenericElement.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignImage.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignLine.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignList.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignListCell.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignMap.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignRectangle.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignSubreport.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/component/DRDesignTextField.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/crosstab/DRDesignCrosstab.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/DRDesignComplexExpression.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/DRDesignJasperExpression.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/DRDesignParameterExpression.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/DRDesignPropertyExpression.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/DRDesignSimpleExpression.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/DRDesignSystemExpression.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/expression/DRDesignValueFormatter.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignBaseStyle.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignBorder.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignConditionalStyle.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignFont.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignPadding.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignParagraph.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignPen.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignStyle.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/base/style/DRDesignTabStop.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/constant/ComponentGroupType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/constant/DefaultStyleType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/constant/EvaluationTime.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/constant/ResetType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignBand.java (68%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignDataset.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignField.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignGroup.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignHyperLink.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignMargin.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignPage.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignParameter.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignQuery.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignReport.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignSort.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignTemplateDesign.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/DRIDesignVariable.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignBreak.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignComponent.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignEllipse.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignFiller.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignGenericElement.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignImage.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignLine.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignList.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignMap.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignRectangle.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignSubreport.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/component/DRIDesignTextField.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java (64%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/expression/DRIDesignExpression.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignBaseStyle.java (61%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignBorder.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignFont.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignPadding.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignParagraph.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignPen.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignStyle.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/definition/style/DRIDesignTabStop.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/exception/DRDesignReportException.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/AbstractExpressionTransform.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/BandComponentsTransform.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/BandTransform.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/ColumnGrid.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/ColumnGridTransform.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/ColumnTransform.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/ComponentPosition.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/ComponentTransform.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/ConstantTransform.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/CrosstabTransform.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/DatasetExpressionTransform.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/DatasetTransform.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/DesignTransformAccessor.java (64%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/GroupTransform.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/MainDatasetExpressionTransform.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/PageTransform.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/ReportTransform.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/StyleResolver.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/StyleTransform.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/SubtotalTransform.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/TableOfContentsTransform.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/TemplateTransform.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/CrosstabExpression.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/CrosstabRowCount.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/CurrentDateExpression.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/PageNumberExpression.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/SerieValueExpression.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/TocReferenceExpression.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/CustomScriptlet.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/DefaultJasperScriptletManager.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/JasperCustomValues.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/JasperReportDesign.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/JasperReportParameters.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/JasperScriptlet.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/JasperScriptletManager.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/JasperTemplateStyleLoader.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/StartPageNumberScriptlet.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/AbstractJasperExporter.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperCsvExporter.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperDocxExporter.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperHtmlExporter.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperImageExporter.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperOdsExporter.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperOdtExporter.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperPdfExporter.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperPptxExporter.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperRtfExporter.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperTextExporter.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperXlsxExporter.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/export/JasperXmlExporter.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java (98%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java (61%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/JasperReportBuilder.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/ExporterBuilders.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/Exporters.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/constant/ImageType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/constant/JasperProperty.java (99%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/constant/PdfPermission.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/constant/PdfVersion.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/constant/SizeUnit.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/constant/ValueType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/JasperReportHandler.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperICsvExporter.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIDocxExporter.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIExcelExporter.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIExporter.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIImageExporter.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIOdsExporter.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIOdtExporter.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIPdfExporter.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIPptxExporter.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIRtfExporter.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperITextExporter.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/definition/export/JasperIXmlExporter.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/exception/JasperDesignException.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/AbstractExpressionTransform.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/BandTransform.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/ComponentTransform.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/ConstantTransform.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/CrosstabTransform.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/DatasetExpressionTransform.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/DatasetTransform.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/ExporterTransform.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/GroupTransform.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/JasperTransform.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/JasperTransformAccessor.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/ReportTransform.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/StyleTransform.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/expression/SubreportExpression.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/ReportUtils.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/AbstractScriptlet.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/AbstractTemplateDesign.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRBand.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRDataset.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRField.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRGroup.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRHyperLink.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRMargin.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRPage.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRParameter.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRQuery.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRReport.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRReportTemplate.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRSort.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRSubtotal.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRTableOfContentsHeading.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/DRVariable.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/column/DRBooleanColumn.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/column/DRColumn.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/column/DRValueColumn.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRBooleanField.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRBreak.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRComponent.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRCurrentDate.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRDimensionComponent.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DREllipse.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRFiller.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRFormatField.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRGenericElement.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRHyperLinkComponent.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRImage.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRLine.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRList.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRListCell.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRMap.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRMultiPageList.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRPageNumber.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRPageXofY.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRRectangle.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRSubreport.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRTextField.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRTotalPages.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRXyList.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/component/DRXyListCell.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstab.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java (67%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstabDataset.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstabGroup.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/crosstab/DRCrosstabVariable.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/datatype/AbstractDataType.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/datatype/DRDataType.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/expression/AbstractSimpleExpression.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/expression/AbstractSystemExpression.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/expression/AbstractValueFormatter.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/grid/DRColumnGrid.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/grid/DRColumnGridList.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/grid/DRColumnGridListCell.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/grid/DRColumnTitleGroup.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRBaseStyle.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRBorder.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRConditionalStyle.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRFont.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRPadding.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRParagraph.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRPen.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRSimpleStyle.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRStyle.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRTabStop.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/base/style/DRTemplateStyle.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/AbstractBuilder.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/DatasetBuilder.java (66%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/DynamicReports.java (64%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/FieldBuilder.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/HyperLinkBuilder.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/MarginBuilder.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/ParameterBuilder.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/QueryBuilder.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/ReportBuilder.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/ReportTemplateBuilder.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/SortBuilder.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/Units.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/VariableBuilder.java (58%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/column/BooleanColumnBuilder.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/column/ColumnBuilder.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/column/ColumnBuilders.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/column/Columns.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/column/ComponentColumnBuilder.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/column/PercentageColumnBuilder.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/column/TextColumnBuilder.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/column/ValueColumnBuilder.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/BooleanFieldBuilder.java (67%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/BreakBuilder.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/ComponentBuilder.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/ComponentBuilders.java (58%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/Components.java (61%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/CurrentDateBuilder.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/DimensionComponentBuilder.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/EllipseBuilder.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/FillerBuilder.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/GenericElementBuilder.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/HorizontalListBuilder.java (67%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/HorizontalListCellBuilder.java (67%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/ImageBuilder.java (66%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/LineBuilder.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/MapBuilder.java (66%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/MultiPageListBuilder.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/PageNumberBuilder.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/PageXofYBuilder.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/PageXslashYBuilder.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/RectangleBuilder.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/SubreportBuilder.java (66%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/TextFieldBuilder.java (66%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/TotalPagesBuilder.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/VerticalListBuilder.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/VerticalListCellBuilder.java (67%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/XyListBuilder.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/component/XyListCellBuilder.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/AbstractValueExpression.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/AbstractValuesExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/BetweenValueExpression.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/ConditionBuilders.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/Conditions.java (64%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/EqualExpression.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/EqualValueExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/GreaterValueExpression.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/NotBetweenValueExpression.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/SmallerValueExpression.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/UnEqualExpression.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/condition/UnEqualValueExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/crosstab/CrosstabBuilder.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/crosstab/CrosstabBuilders.java (55%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java (58%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/crosstab/Crosstabs.java (58%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/BigDecimalType.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/BigIntegerType.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/BooleanType.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/ByteType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/CharacterType.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DataTypeBuilders.java (64%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DataTypes.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateDayType.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateMonthType.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateYearToFractionType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateYearToHourType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateYearToMinuteType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateYearToMonthType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateYearToSecondType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DateYearType.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/DoubleType.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/FloatType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/IntegerType.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/ListType.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/LongType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/NumberType.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/PercentageType.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/ShortType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/StringType.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/TimeHourToFractionType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/datatype/TimeHourToSecondType.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/AbstractComplexExpression.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/AddExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/CalculationExpression.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/ColumnNumberExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/CrosstabValueExpression.java (60%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/DataSourceExpression.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/DivideExpression.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/ExpressionBuilders.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/Expressions.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/GroupRowNumberExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/JasperExpression.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/MessageExpression.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/MultiplyExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/OrderByExpression.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PageNumberExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PageRowNumberExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/ParameterExpression.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PercentageExpression.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PrintInOddRowExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/PropertyExpression.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/ReportRowNumberExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/SubtractExpression.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/SystemMessageExpression.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/expression/ValueExpression.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/GridBuilders.java (59%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/Grids.java (61%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java (68%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java (68%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/group/ColumnGroupBuilder.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/group/CustomGroupBuilder.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/group/GroupBuilder.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/group/GroupBuilders.java (61%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/group/Groups.java (62%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/BaseStyleBuilder.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/BorderBuilder.java (68%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/ConditionalStyleBuilder.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/FontBuilder.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/PaddingBuilder.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/PenBuilder.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/ReportStyleBuilder.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/SimpleStyleBuilder.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/StyleBuilder.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/StyleBuilders.java (60%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/Styles.java (62%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/TemplateStyleBuilder.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/TemplateStylesBuilder.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java (67%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/subtotal/SubtotalBuilder.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/subtotal/SubtotalBuilders.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/subtotal/Subtotals.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java (64%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/component/CustomComponentTransform.java (62%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/component/CustomComponents.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/component/DRICustomComponent.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/component/DRIDesignCustomComponent.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/AxisPosition.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/BooleanComponentType.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/BreakType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/Calculation.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/ComponentDimensionType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/ComponentPositionType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/Constants.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/CrosstabPercentageType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/CrosstabTotalPosition.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/Evaluation.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/FontName.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/GroupFooterPosition.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/GroupHeaderLayout.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/HorizontalAlignment.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/HorizontalCellComponentAlignment.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/HorizontalImageAlignment.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/HorizontalTextAlignment.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/HyperLinkTarget.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/HyperLinkType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/ImageAnchorType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/ImageScale.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/Language.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/LineDirection.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/LineSpacing.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/LineStyle.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/ListType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/Markup.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/MeterShape.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/OrderType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/Orientation.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/PageOrientation.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/PageType.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/PdfEncoding.java (98%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/PdfPrintScaling.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/PdfaConformance.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/PercentageTotalType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/Position.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/QueryLanguage.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/RectangleAnchor.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/Rotation.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/RunDirection.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/ScaleType.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/SpiderRotation.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/SplitType.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/StretchType.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/SubtotalPosition.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/SystemExpression.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/TabStopAlignment.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/TableOfContentsPosition.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/TableOrder.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/TextAdjust.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/TimePeriod.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/ValueLocation.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/VerticalAlignment.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/VerticalCellComponentAlignment.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/VerticalImageAlignment.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/VerticalTextAlignment.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/WhenNoDataType.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/constant/WhenResourceMissingType.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/datasource/DRDataSource.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/defaults/Default.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/defaults/DefaultBinder.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/defaults/Defaults.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIBand.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRICrosstabValue.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRICustomValues.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIDataset.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIField.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIGroup.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIHyperLink.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIMargin.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIPage.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIParameter.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIQuery.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIReport.java (68%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIReportTemplate.java (66%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIScriptlet.java (68%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRISort.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRISubtotal.java (58%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRITableOfContentsCustomizer.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRITableOfContentsHeading.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRITemplateDesign.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIValue.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/DRIVariable.java (66%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/ReportParameters.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/column/DRIBooleanColumn.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/column/DRIColumn.java (69%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/column/DRIValueColumn.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIBooleanField.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIBreak.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIComponent.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRICurrentDate.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIDimensionComponent.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIEllipse.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIFiller.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIFormatField.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIGenericElement.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIHyperLinkComponent.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIImage.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRILine.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIList.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIListCell.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIMap.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIMultiPageList.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIPageNumber.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIPageXofY.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIRectangle.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRISubreport.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRITextField.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRITotalPages.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIXyList.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/component/DRIXyListCell.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstab.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java (61%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java (63%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/datatype/DRIDataType.java (65%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/expression/DRIComplexExpression.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/expression/DRIExpression.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/expression/DRIJasperExpression.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/expression/DRIParameterExpression.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/expression/DRIPropertyExpression.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/expression/DRISimpleExpression.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/expression/DRISystemExpression.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/expression/DRIValueFormatter.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/grid/DRIColumnGrid.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/grid/DRIColumnGridComponent.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/grid/DRIColumnGridList.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/grid/DRIColumnGridListCell.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java (70%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIBaseStyle.java (61%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIBorder.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIConditionalStyle.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIFont.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIPadding.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIParagraph.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIPen.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIReportStyle.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRISimpleStyle.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRIStyle.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRITabStop.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/definition/style/DRITemplateStyle.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/exception/DRException.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/java/{net/sf => software/xdev}/dynamicreports/report/exception/DRReportException.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/defaults/schema/dynamicreports.xjb (88%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/defaults/schema/dynamicreports.xsd (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/ball_green.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/ball_red.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/boolean1_false.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/boolean1_true.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/boolean2_false.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/boolean2_true.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/boolean3_false.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/boolean3_true.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/boolean4_false.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/checkbox1_true.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/checkbox2_true.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/main/resources/{net/sf => software/xdev}/dynamicreports/report/images/checkbox_false.svg (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/jasper/base/JasperCustomValuesTest.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/report/ReportUtilsTest.java (98%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/report/builder/style/StyleBuildersTest.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/base/ConditionsTest.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/base/DataTypeTest.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/base/DefaultsTest.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/bugs/Bug_2997586_Test.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/AbstractBandTest.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/DesignReportBuilder.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/DesignTestTemplateDesign.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/position/ColumnPosition1Test.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/position/ColumnPosition2Test.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/position/HorizontalListPositionTest.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/position/SubtotalPositionTest.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/position/VerticalListPositionTest.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/report/BandBackgroundTest.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/report/ExceptionTest.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/report/ReportTemplateTest.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/design/report/TemplateDesignTest.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/AbstractJasperPositionTest.java (93%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/AbstractJasperStyleTest.java (98%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/AbstractJasperTest.java (96%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/AbstractJasperValueTest.java (97%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/JasperTestUtils.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/BooleanColumn1Test.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/BooleanColumn2Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/Column1Test.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/Column2Test.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/Column3Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/Column4Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnGridTest.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnPosition1Test.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnPosition2Test.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/EmptyColumnTest.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/ExpressionColumnTest.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/column/PercentageColumnTest.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/BreakTest.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/Component1Test.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/Component2Test.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/Component3Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/ComponentStyleTest.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/Image1Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/Image2Test.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/List1Test.java (95%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/List2Test.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/List3Test.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/ListFixedComponents1Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/ListFixedComponents2Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/ListGapTest.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/MultiPageList1Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/MultiPageList2Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/MultiPageList3Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/MultiPageList4Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/PageNumber1Test.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/PageNumber2Test.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/PageNumber3Test.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/PageNumber4Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/PageNumber5Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/PageNumber6Test.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/PageNumberPositionTest.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/TextField1Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/TextField2Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/TextField3Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/TextField4Test.java (67%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/TextField5Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/TextField6Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/TextField7Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/VerticalListTest.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/component/XyListTest.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/Crosstab1Test.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/Crosstab2Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/Crosstab3Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/Crosstab4Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/Crosstab5Test.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/Crosstab6Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/Crosstab7Test.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabTest.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/datasource/DatabaseReportTest.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/datasource/FilterTest.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/datasource/SubDatasourceTest.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/datasource/XmlReportTest.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/CustomGroupTest.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/DataTypeGroupTest.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/Group1Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/Group2Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/Group3Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/GroupPosition1Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/GroupPosition2Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/GroupPosition3Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/PercentageGroup1Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/group/PercentageGroup2Test.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/BandTest.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ColumnGridTest.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ColumnsPerPageTest.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/CustomFontTest.java (71%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/DetailBand1Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/DetailBand2Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ExportTest.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ExpressionTest.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/FieldDataTypeTest.java (91%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/HyperLinkTest.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/IgnorePageWidthTest.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/IgnorePaginationTest.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/JasperExpressionTest.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ListDataTypeTest.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/MarkupTest.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/NoDataSectionTest.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/NoDetailSectionTest.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ParametersTest.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/Report1Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/Report2Test.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/Report3Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/Report4Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/Report5Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ReportBackground1Test.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ReportBackground2Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ReportBackground3Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/TitleTest.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/ValueTypeNamesTest.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/VariableTest.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/report/VirtualizerTest.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/BandStyle1Test.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/BandStyle2Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/BandStyle3Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/DefaultFontTest.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style1Test.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style2Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style3Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style4Test.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style5Test.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style6Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style7Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style8Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/Style9Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/StyleNamesTest.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/TemplateStyle1Test.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/TemplateStyle2Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/TemplateStyle3Test.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/TemplateStyle4Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/TemplateStyle5Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/style/TemplateStyle6Test.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/JasperSubreportTest.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/Subreport2Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/Subreport3Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/Subreport4Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/Subreport5Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/Subreport6Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/SubreportPositionTest.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/SubreportTest.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/Subtotal1Test.java (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/Subtotal2Test.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java (73%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java (85%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java (89%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java (92%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java (94%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java (75%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java (76%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java (87%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java (82%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java (78%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java (72%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java (86%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java (77%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java (74%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java (81%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java (90%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java (84%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java (79%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java (83%)
 rename dynamicreports-core-for-grid-exporter/src/test/java/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java (80%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/base/dynamicreports-defaults.xml (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/fonts/Arimo-Bold.ttf (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/fonts/Arimo-Italic.ttf (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/fonts/Arimo-License.txt (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/fonts/Arimo-Regular.ttf (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/fonts/FreeUniversal-License.txt (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/fonts/FreeUniversal-Regular.ttf (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/component/dynamicreports.png (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/datasource/data.xml (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/report/test.properties (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/style/StyleTemplate1.jrtx (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/style/StyleTemplate2.jrtx (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/detailsubreport.jrxml (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/subreport1.jrxml (90%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/subreport2.jrxml (93%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/subreport3.jrxml (95%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/subreport4.jrxml (94%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/subreport/titlesubreport.jrxml (88%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml (94%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml (100%)
 rename dynamicreports-core-for-grid-exporter/src/test/resources/{net/sf => software/xdev}/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml (100%)

diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignBand.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignBand.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignBand.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignBand.java
index 049dd10..769f7af 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignBand.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignBand.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.definition.DRIDesignBand;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.definition.DRIDesignBand;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.SplitType;
 
 /**
  * <p>DRDesignBand class.</p>
@@ -64,7 +64,7 @@ public SplitType getSplitType() {
     /**
      * <p>Setter for the field <code>splitType</code>.</p>
      *
-     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public void setSplitType(SplitType splitType) {
         this.splitType = splitType;
@@ -79,7 +79,7 @@ public DRDesignList getList() {
     /**
      * <p>Setter for the field <code>list</code>.</p>
      *
-     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @param list a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     public void setList(DRDesignList list) {
         this.list = list;
@@ -88,7 +88,7 @@ public void setList(DRDesignList list) {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void addComponent(DRDesignComponent component) {
         list.addComponent(component);
@@ -98,7 +98,7 @@ public void addComponent(DRDesignComponent component) {
      * <p>addComponent.</p>
      *
      * @param index     a int.
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void addComponent(int index, DRDesignComponent component) {
         list.addComponent(index, component);
@@ -113,7 +113,7 @@ public DRDesignComponent getBandComponent() {
     /**
      * <p>Setter for the field <code>bandComponent</code>.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void setBandComponent(DRDesignComponent component) {
         this.bandComponent = component;
@@ -143,7 +143,7 @@ public DRIDesignExpression getPrintWhenExpression() {
     /**
      * <p>Setter for the field <code>printWhenExpression</code>.</p>
      *
-     * @param printWhenExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param printWhenExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setPrintWhenExpression(DRIDesignExpression printWhenExpression) {
         this.printWhenExpression = printWhenExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignDataset.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignDataset.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignDataset.java
index ffa2968..37530e7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignDataset.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignDataset.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
-
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.DRIDesignField;
-import net.sf.dynamicreports.design.definition.DRIDesignSort;
-import net.sf.dynamicreports.design.definition.DRIDesignVariable;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.design.transformation.DatasetExpressionTransform;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
+package software.xdev.dynamicreports.design.base;
+
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.DRIDesignField;
+import software.xdev.dynamicreports.design.definition.DRIDesignSort;
+import software.xdev.dynamicreports.design.definition.DRIDesignVariable;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.design.transformation.DatasetExpressionTransform;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 import java.util.Collection;
 
@@ -51,7 +51,7 @@ public class DRDesignDataset implements DRIDesignDataset {
     /**
      * <p>Constructor for DRDesignDataset.</p>
      *
-     * @param datasetExpressionTransform a {@link net.sf.dynamicreports.design.transformation.DatasetExpressionTransform} object.
+     * @param datasetExpressionTransform a {@link software.xdev.dynamicreports.design.transformation.DatasetExpressionTransform} object.
      */
     public DRDesignDataset(DatasetExpressionTransform datasetExpressionTransform) {
         this.datasetExpressionTransform = datasetExpressionTransform;
@@ -67,7 +67,7 @@ public String getName() {
     /**
      * <p>Getter for the field <code>datasetExpressionTransform</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.DatasetExpressionTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.DatasetExpressionTransform} object.
      */
     public DatasetExpressionTransform getDatasetExpressionTransform() {
         return datasetExpressionTransform;
@@ -124,7 +124,7 @@ public DRDesignQuery getQuery() {
     /**
      * <p>Setter for the field <code>query</code>.</p>
      *
-     * @param query a {@link net.sf.dynamicreports.design.base.DRDesignQuery} object.
+     * @param query a {@link software.xdev.dynamicreports.design.base.DRDesignQuery} object.
      */
     public void setQuery(DRDesignQuery query) {
         this.query = query;
@@ -139,7 +139,7 @@ public DRIDesignExpression getConnectionExpression() {
     /**
      * <p>Setter for the field <code>connectionExpression</code>.</p>
      *
-     * @param connectionExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param connectionExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setConnectionExpression(DRIDesignExpression connectionExpression) {
         this.connectionExpression = connectionExpression;
@@ -154,7 +154,7 @@ public DRIDesignExpression getDataSourceExpression() {
     /**
      * <p>Setter for the field <code>dataSourceExpression</code>.</p>
      *
-     * @param dataSourceExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param dataSourceExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setDataSourceExpression(DRIDesignExpression dataSourceExpression) {
         this.dataSourceExpression = dataSourceExpression;
@@ -169,7 +169,7 @@ public DRIDesignExpression getFilterExpression() {
     /**
      * <p>Setter for the field <code>filterExpression</code>.</p>
      *
-     * @param filterExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param filterExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setFilterExpression(DRIDesignExpression filterExpression) {
         this.filterExpression = filterExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignField.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignField.java
index 7d24b9e..f8d022c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignField.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignField;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.DRIDesignField;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignField class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignGroup.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignGroup.java
index ba46ba9..9884830 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignGroup.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -77,7 +77,7 @@ public DRIDesignExpression getGroupExpression() {
     /**
      * <p>Setter for the field <code>groupExpression</code>.</p>
      *
-     * @param groupExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param groupExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setGroupExpression(DRIDesignExpression groupExpression) {
         this.groupExpression = groupExpression;
@@ -101,7 +101,7 @@ public void setHeaderBands(List<DRDesignBand> headerBands) {
     /**
      * <p>addHeaderBand.</p>
      *
-     * @param headerBand a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @param headerBand a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public void addHeaderBand(DRDesignBand headerBand) {
         this.headerBands.add(headerBand);
@@ -125,7 +125,7 @@ public void setFooterBands(List<DRDesignBand> footerBands) {
     /**
      * <p>addFooterBand.</p>
      *
-     * @param footerBand a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @param footerBand a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public void addFooterBand(DRDesignBand footerBand) {
         this.footerBands.add(footerBand);
@@ -135,7 +135,7 @@ public void addFooterBand(DRDesignBand footerBand) {
      * <p>addFooterBand.</p>
      *
      * @param index      a int.
-     * @param footerBand a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @param footerBand a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public void addFooterBand(int index, DRDesignBand footerBand) {
         this.footerBands.add(index, footerBand);
@@ -225,7 +225,7 @@ public GroupFooterPosition getFooterPosition() {
     /**
      * <p>Setter for the field <code>footerPosition</code>.</p>
      *
-     * @param footerPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     * @param footerPosition a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
      */
     public void setFooterPosition(GroupFooterPosition footerPosition) {
         this.footerPosition = footerPosition;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignHyperLink.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignHyperLink.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignHyperLink.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignHyperLink.java
index a1485cf..fd015c4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignHyperLink.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignHyperLink.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignHyperLink;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.DRIDesignHyperLink;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignHyperLink class.</p>
@@ -46,7 +46,7 @@ public DRIDesignExpression getAnchorExpression() {
     /**
      * <p>Setter for the field <code>anchorExpression</code>.</p>
      *
-     * @param anchorExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param anchorExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setAnchorExpression(DRIDesignExpression anchorExpression) {
         this.anchorExpression = anchorExpression;
@@ -61,7 +61,7 @@ public DRIDesignExpression getPageExpression() {
     /**
      * <p>Setter for the field <code>pageExpression</code>.</p>
      *
-     * @param pageExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param pageExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setPageExpression(DRIDesignExpression pageExpression) {
         this.pageExpression = pageExpression;
@@ -76,7 +76,7 @@ public DRIDesignExpression getReferenceExpression() {
     /**
      * <p>Setter for the field <code>referenceExpression</code>.</p>
      *
-     * @param referenceExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param referenceExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setReferenceExpression(DRIDesignExpression referenceExpression) {
         this.referenceExpression = referenceExpression;
@@ -91,7 +91,7 @@ public DRIDesignExpression getTooltipExpression() {
     /**
      * <p>Setter for the field <code>tooltipExpression</code>.</p>
      *
-     * @param tooltipExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param tooltipExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setTooltipExpression(DRIDesignExpression tooltipExpression) {
         this.tooltipExpression = tooltipExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignMargin.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignMargin.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignMargin.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignMargin.java
index b987582..b4bf8f0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignMargin.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignMargin.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignMargin;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.DRIDesignMargin;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignMargin class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignPage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignPage.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignPage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignPage.java
index 7d9f932..c7d5792 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignPage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignPage.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignPage;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.design.definition.DRIDesignPage;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
 
 /**
  * <p>DRDesignPage class.</p>
@@ -77,7 +77,7 @@ public PageOrientation getOrientation() {
     /**
      * <p>Setter for the field <code>orientation</code>.</p>
      *
-     * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     * @param orientation a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
      */
     public void setOrientation(PageOrientation orientation) {
         this.orientation = orientation;
@@ -92,7 +92,7 @@ public DRDesignMargin getMargin() {
     /**
      * <p>Setter for the field <code>margin</code>.</p>
      *
-     * @param margin a {@link net.sf.dynamicreports.design.base.DRDesignMargin} object.
+     * @param margin a {@link software.xdev.dynamicreports.design.base.DRDesignMargin} object.
      */
     public void setMargin(DRDesignMargin margin) {
         this.margin = margin;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignParameter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignParameter.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignParameter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignParameter.java
index 7ec0c46..781dcd6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignParameter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignParameter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignParameter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.DRIDesignParameter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignParameter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignQuery.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignQuery.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignQuery.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignQuery.java
index 87c635a..8d67edc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignQuery.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignQuery.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignQuery;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.DRIDesignQuery;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignQuery class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignReport.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignReport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignReport.java
index 939bc1e..af473f0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignReport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignReport.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
 import java.util.Collection;
 import java.util.List;
@@ -24,46 +24,46 @@
 import java.util.Properties;
 import java.util.ResourceBundle;
 
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.DRIDesignField;
-import net.sf.dynamicreports.design.definition.DRIDesignParameter;
-import net.sf.dynamicreports.design.definition.DRIDesignReport;
-import net.sf.dynamicreports.design.definition.DRIDesignSort;
-import net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign;
-import net.sf.dynamicreports.design.definition.DRIDesignVariable;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.design.transformation.AbstractExpressionTransform;
-import net.sf.dynamicreports.design.transformation.BandTransform;
-import net.sf.dynamicreports.design.transformation.ColumnGridTransform;
-import net.sf.dynamicreports.design.transformation.ColumnTransform;
-import net.sf.dynamicreports.design.transformation.ComponentTransform;
-import net.sf.dynamicreports.design.transformation.CrosstabTransform;
-import net.sf.dynamicreports.design.transformation.DatasetTransform;
-import net.sf.dynamicreports.design.transformation.DesignTransformAccessor;
-import net.sf.dynamicreports.design.transformation.GroupTransform;
-import net.sf.dynamicreports.design.transformation.MainDatasetExpressionTransform;
-import net.sf.dynamicreports.design.transformation.PageTransform;
-import net.sf.dynamicreports.design.transformation.ReportTransform;
-import net.sf.dynamicreports.design.transformation.StyleTransform;
-import net.sf.dynamicreports.design.transformation.SubtotalTransform;
-import net.sf.dynamicreports.design.transformation.TableOfContentsTransform;
-import net.sf.dynamicreports.design.transformation.TemplateTransform;
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRIDataset;
-import net.sf.dynamicreports.report.definition.DRIReport;
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.DRIDesignField;
+import software.xdev.dynamicreports.design.definition.DRIDesignParameter;
+import software.xdev.dynamicreports.design.definition.DRIDesignReport;
+import software.xdev.dynamicreports.design.definition.DRIDesignSort;
+import software.xdev.dynamicreports.design.definition.DRIDesignTemplateDesign;
+import software.xdev.dynamicreports.design.definition.DRIDesignVariable;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.design.transformation.AbstractExpressionTransform;
+import software.xdev.dynamicreports.design.transformation.BandTransform;
+import software.xdev.dynamicreports.design.transformation.ColumnGridTransform;
+import software.xdev.dynamicreports.design.transformation.ColumnTransform;
+import software.xdev.dynamicreports.design.transformation.ComponentTransform;
+import software.xdev.dynamicreports.design.transformation.CrosstabTransform;
+import software.xdev.dynamicreports.design.transformation.DatasetTransform;
+import software.xdev.dynamicreports.design.transformation.DesignTransformAccessor;
+import software.xdev.dynamicreports.design.transformation.GroupTransform;
+import software.xdev.dynamicreports.design.transformation.MainDatasetExpressionTransform;
+import software.xdev.dynamicreports.design.transformation.PageTransform;
+import software.xdev.dynamicreports.design.transformation.ReportTransform;
+import software.xdev.dynamicreports.design.transformation.StyleTransform;
+import software.xdev.dynamicreports.design.transformation.SubtotalTransform;
+import software.xdev.dynamicreports.design.transformation.TableOfContentsTransform;
+import software.xdev.dynamicreports.design.transformation.TemplateTransform;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRIDataset;
+import software.xdev.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * <p>DRDesignReport class.</p>
@@ -96,8 +96,8 @@ public class DRDesignReport implements DesignTransformAccessor, DRIDesignReport
     /**
      * <p>Constructor for DRDesignReport.</p>
      *
-     * @param report a {@link net.sf.dynamicreports.report.definition.DRIReport} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param report a {@link software.xdev.dynamicreports.report.definition.DRIReport} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public DRDesignReport(final DRIReport report) throws DRException {
         this(report, null, null);
@@ -106,10 +106,10 @@ public DRDesignReport(final DRIReport report) throws DRException {
     /**
      * <p>Constructor for DRDesignReport.</p>
      *
-     * @param report      a {@link net.sf.dynamicreports.report.definition.DRIReport} object.
+     * @param report      a {@link software.xdev.dynamicreports.report.definition.DRIReport} object.
      * @param pageWidth   a {@link java.lang.Integer} object.
      * @param tocHeadings a {@link java.util.Map} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public DRDesignReport(final DRIReport report, final Integer pageWidth, final Map<String, JasperTocHeading> tocHeadings) throws DRException {
         this.report = report;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignSort.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignSort.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignSort.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignSort.java
index c107b64..639c812 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignSort.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignSort.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignSort;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.design.definition.DRIDesignSort;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.OrderType;
 
 /**
  * <p>DRDesignSort class.</p>
@@ -43,7 +43,7 @@ public DRIDesignExpression getExpression() {
     /**
      * <p>Setter for the field <code>expression</code>.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setExpression(DRIDesignExpression expression) {
         this.expression = expression;
@@ -58,7 +58,7 @@ public OrderType getOrderType() {
     /**
      * <p>Setter for the field <code>orderType</code>.</p>
      *
-     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @param orderType a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      */
     public void setOrderType(OrderType orderType) {
         this.orderType = orderType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTableOfContentsHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignTableOfContentsHeading.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTableOfContentsHeading.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignTableOfContentsHeading.java
index a098b94..009daec 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTableOfContentsHeading.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignTableOfContentsHeading.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignTableOfContentsHeading class.</p>
@@ -41,7 +41,7 @@ public DRDesignTextField getReferenceField() {
     /**
      * <p>Setter for the field <code>referenceField</code>.</p>
      *
-     * @param referenceField a {@link net.sf.dynamicreports.design.base.component.DRDesignTextField} object.
+     * @param referenceField a {@link software.xdev.dynamicreports.design.base.component.DRDesignTextField} object.
      */
     public void setReferenceField(DRDesignTextField referenceField) {
         this.referenceField = referenceField;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignTemplateDesign.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTemplateDesign.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignTemplateDesign.java
index 96827da..fd9da2f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignTemplateDesign.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignTemplateDesign.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRITemplateDesign;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.definition.DRIDesignTemplateDesign;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * <p>DRDesignTemplateDesign class.</p>
@@ -36,7 +36,7 @@ public class DRDesignTemplateDesign implements DRIDesignTemplateDesign {
     /**
      * <p>Constructor for DRDesignTemplateDesign.</p>
      *
-     * @param templateDesign a {@link net.sf.dynamicreports.report.definition.DRITemplateDesign} object.
+     * @param templateDesign a {@link software.xdev.dynamicreports.report.definition.DRITemplateDesign} object.
      */
     public DRDesignTemplateDesign(DRITemplateDesign<?> templateDesign) {
         this.templateDesign = templateDesign;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignVariable.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignVariable.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignVariable.java
index 732b912..0372080 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/DRDesignVariable.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/DRDesignVariable.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base;
+package software.xdev.dynamicreports.design.base;
 
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.DRIDesignVariable;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.DRIDesignVariable;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignVariable class.</p>
@@ -71,7 +71,7 @@ public DRIDesignExpression getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setValueExpression(DRIDesignExpression valueExpression) {
         this.valueExpression = valueExpression;
@@ -86,7 +86,7 @@ public DRIDesignExpression getInitialValueExpression() {
     /**
      * <p>Setter for the field <code>initialValueExpression</code>.</p>
      *
-     * @param initialValueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param initialValueExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setInitialValueExpression(DRIDesignExpression initialValueExpression) {
         this.initialValueExpression = initialValueExpression;
@@ -101,7 +101,7 @@ public Calculation getCalculation() {
     /**
      * <p>Setter for the field <code>calculation</code>.</p>
      *
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public void setCalculation(Calculation calculation) {
         this.calculation = calculation;
@@ -116,7 +116,7 @@ public ResetType getResetType() {
     /**
      * <p>Setter for the field <code>resetType</code>.</p>
      *
-     * @param resetType a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetType a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
      */
     public void setResetType(ResetType resetType) {
         this.resetType = resetType;
@@ -131,7 +131,7 @@ public DRDesignGroup getResetGroup() {
     /**
      * <p>Setter for the field <code>resetGroup</code>.</p>
      *
-     * @param resetGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param resetGroup a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
      */
     public void setResetGroup(DRDesignGroup resetGroup) {
         this.resetGroup = resetGroup;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignBreak.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignBreak.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignBreak.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignBreak.java
index 01d6493..97e731d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignBreak.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignBreak.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.definition.component.DRIDesignBreak;
-import net.sf.dynamicreports.report.constant.BreakType;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignBreak;
+import software.xdev.dynamicreports.report.constant.BreakType;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignBreak class.</p>
@@ -48,7 +48,7 @@ public BreakType getType() {
     /**
      * <p>setType.</p>
      *
-     * @param breakType a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     * @param breakType a {@link software.xdev.dynamicreports.report.constant.BreakType} object.
      */
     public void setType(BreakType breakType) {
         this.breakType = breakType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignComponent.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignComponent.java
index e3cd547..4b36819 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignComponent.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
-
-import net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading;
-import net.sf.dynamicreports.design.base.style.DRDesignStyle;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.StretchType;
+package software.xdev.dynamicreports.design.base.component;
+
+import software.xdev.dynamicreports.design.base.DRDesignTableOfContentsHeading;
+import software.xdev.dynamicreports.design.base.style.DRDesignStyle;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignComponent;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.StretchType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -104,7 +104,7 @@ public DRDesignStyle getStyle() {
     /**
      * <p>Setter for the field <code>style</code>.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      */
     public void setStyle(DRDesignStyle style) {
         this.style = style;
@@ -179,7 +179,7 @@ public DRIDesignExpression getPrintWhenExpression() {
     /**
      * <p>Setter for the field <code>printWhenExpression</code>.</p>
      *
-     * @param printWhenExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param printWhenExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setPrintWhenExpression(DRIDesignExpression printWhenExpression) {
         this.printWhenExpression = printWhenExpression;
@@ -224,7 +224,7 @@ public ComponentPositionType getPositionType() {
     /**
      * <p>Setter for the field <code>positionType</code>.</p>
      *
-     * @param positionType a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     * @param positionType a {@link software.xdev.dynamicreports.report.constant.ComponentPositionType} object.
      */
     public void setPositionType(ComponentPositionType positionType) {
         this.positionType = positionType;
@@ -239,7 +239,7 @@ public StretchType getStretchType() {
     /**
      * <p>Setter for the field <code>stretchType</code>.</p>
      *
-     * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     * @param stretchType a {@link software.xdev.dynamicreports.report.constant.StretchType} object.
      */
     public void setStretchType(StretchType stretchType) {
         this.stretchType = stretchType;
@@ -284,7 +284,7 @@ public DRIDesignGroup getPrintWhenGroupChanges() {
     /**
      * <p>Setter for the field <code>printWhenGroupChanges</code>.</p>
      *
-     * @param printWhenGroupChanges a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @param printWhenGroupChanges a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      */
     public void setPrintWhenGroupChanges(DRIDesignGroup printWhenGroupChanges) {
         this.printWhenGroupChanges = printWhenGroupChanges;
@@ -299,7 +299,7 @@ public DRDesignTableOfContentsHeading getTableOfContentsHeading() {
     /**
      * <p>Setter for the field <code>tableOfContentsHeading</code>.</p>
      *
-     * @param tableOfContentsHeading a {@link net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
+     * @param tableOfContentsHeading a {@link software.xdev.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
      */
     public void setTableOfContentsHeading(DRDesignTableOfContentsHeading tableOfContentsHeading) {
         this.tableOfContentsHeading = tableOfContentsHeading;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignEllipse.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignEllipse.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignEllipse.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignEllipse.java
index 092f2c5..7970bca 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignEllipse.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignEllipse.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.base.style.DRDesignPen;
-import net.sf.dynamicreports.design.definition.component.DRIDesignEllipse;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.base.style.DRDesignPen;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignEllipse;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignEllipse class.</p>
@@ -48,7 +48,7 @@ public DRDesignPen getPen() {
     /**
      * <p>Setter for the field <code>pen</code>.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     * @param pen a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
      */
     public void setPen(DRDesignPen pen) {
         this.pen = pen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignFiller.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignFiller.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignFiller.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignFiller.java
index 287b03b..bdb15b5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignFiller.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignFiller.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.definition.component.DRIDesignFiller;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignFiller;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignFiller class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignGenericElement.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignGenericElement.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignGenericElement.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignGenericElement.java
index 01b980b..2c274dc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignGenericElement.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignGenericElement.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.definition.component.DRIDesignGenericElement;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignGenericElement;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -94,7 +94,7 @@ public EvaluationTime getEvaluationTime() {
     /**
      * <p>Setter for the field <code>evaluationTime</code>.</p>
      *
-     * @param evaluationTime a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @param evaluationTime a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     public void setEvaluationTime(EvaluationTime evaluationTime) {
         this.evaluationTime = evaluationTime;
@@ -109,7 +109,7 @@ public DRDesignGroup getEvaluationGroup() {
     /**
      * <p>Setter for the field <code>evaluationGroup</code>.</p>
      *
-     * @param evaluationGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param evaluationGroup a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
      */
     public void setEvaluationGroup(DRDesignGroup evaluationGroup) {
         this.evaluationGroup = evaluationGroup;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java
index 2b524b2..cebccdf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignHyperlinkComponent.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.base.DRDesignHyperLink;
-import net.sf.dynamicreports.design.definition.component.DRIDesignHyperLinkComponent;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.base.DRDesignHyperLink;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignHyperLinkComponent;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>Abstract DRDesignHyperlinkComponent class.</p>
@@ -53,7 +53,7 @@ public DRIDesignExpression getAnchorNameExpression() {
     /**
      * <p>Setter for the field <code>anchorNameExpression</code>.</p>
      *
-     * @param anchorNameExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param anchorNameExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setAnchorNameExpression(DRIDesignExpression anchorNameExpression) {
         this.anchorNameExpression = anchorNameExpression;
@@ -83,7 +83,7 @@ public DRDesignHyperLink getHyperLink() {
     /**
      * <p>Setter for the field <code>hyperLink</code>.</p>
      *
-     * @param hyperLink a {@link net.sf.dynamicreports.design.base.DRDesignHyperLink} object.
+     * @param hyperLink a {@link software.xdev.dynamicreports.design.base.DRDesignHyperLink} object.
      */
     public void setHyperLink(DRDesignHyperLink hyperLink) {
         this.hyperLink = hyperLink;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignImage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignImage.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignImage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignImage.java
index 32d1932..2ac7531 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignImage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignImage.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.definition.component.DRIDesignImage;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignImage;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
 
 /**
  * <p>DRDesignImage class.</p>
@@ -54,7 +54,7 @@ public DRIDesignExpression getImageExpression() {
     /**
      * <p>Setter for the field <code>imageExpression</code>.</p>
      *
-     * @param imageExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param imageExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setImageExpression(DRIDesignExpression imageExpression) {
         this.imageExpression = imageExpression;
@@ -69,7 +69,7 @@ public ImageScale getImageScale() {
     /**
      * <p>Setter for the field <code>imageScale</code>.</p>
      *
-     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @param imageScale a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      */
     public void setImageScale(ImageScale imageScale) {
         this.imageScale = imageScale;
@@ -114,7 +114,7 @@ public HorizontalImageAlignment getHorizontalImageAlignment() {
     /**
      * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
         this.horizontalImageAlignment = horizontalImageAlignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignLine.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignLine.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignLine.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignLine.java
index 4fbbd0c..ecc2ac7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignLine.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignLine.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.base.style.DRDesignPen;
-import net.sf.dynamicreports.design.definition.component.DRIDesignLine;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.LineDirection;
+import software.xdev.dynamicreports.design.base.style.DRDesignPen;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignLine;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.LineDirection;
 
 /**
  * <p>DRDesignLine class.</p>
@@ -50,7 +50,7 @@ public LineDirection getDirection() {
     /**
      * <p>Setter for the field <code>direction</code>.</p>
      *
-     * @param direction a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     * @param direction a {@link software.xdev.dynamicreports.report.constant.LineDirection} object.
      */
     public void setDirection(LineDirection direction) {
         this.direction = direction;
@@ -65,7 +65,7 @@ public DRDesignPen getPen() {
     /**
      * <p>Setter for the field <code>pen</code>.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     * @param pen a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
      */
     public void setPen(DRDesignPen pen) {
         this.pen = pen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignList.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignList.java
index 6ba15b5..5630630 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignList.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.constant.ComponentGroupType;
-import net.sf.dynamicreports.design.definition.component.DRIDesignList;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.design.constant.ComponentGroupType;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignList;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,7 +55,7 @@ public DRDesignList() {
     /**
      * <p>Constructor for DRDesignList.</p>
      *
-     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @param type a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public DRDesignList(ListType type) {
         super("list");
@@ -80,7 +80,7 @@ public List<DRDesignComponent> getComponents() {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void addComponent(DRDesignComponent component) {
         components.add(component);
@@ -91,7 +91,7 @@ public void addComponent(DRDesignComponent component) {
      * <p>addComponent.</p>
      *
      * @param index     a int.
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void addComponent(int index, DRDesignComponent component) {
         components.add(index, component);
@@ -102,9 +102,9 @@ public void addComponent(int index, DRDesignComponent component) {
      * <p>addComponent.</p>
      *
      * @param index               a int.
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
-     * @param component           a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void addComponent(int index, HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRDesignComponent component) {
         components.add(index, component);
@@ -114,9 +114,9 @@ public void addComponent(int index, HorizontalCellComponentAlignment horizontalA
     /**
      * <p>addComponent.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
-     * @param component           a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void addComponent(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRDesignComponent component) {
         components.add(component);
@@ -150,7 +150,7 @@ public ListType getType() {
     /**
      * <p>Setter for the field <code>type</code>.</p>
      *
-     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @param type a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public void setType(ListType type) {
         this.type = type;
@@ -165,7 +165,7 @@ public ComponentGroupType getComponentGroupType() {
     /**
      * <p>Setter for the field <code>componentGroupType</code>.</p>
      *
-     * @param componentGroupType a {@link net.sf.dynamicreports.design.constant.ComponentGroupType} object.
+     * @param componentGroupType a {@link software.xdev.dynamicreports.design.constant.ComponentGroupType} object.
      */
     public void setComponentGroupType(ComponentGroupType componentGroupType) {
         this.componentGroupType = componentGroupType;
@@ -238,7 +238,7 @@ public DRDesignComponent getBackgroundComponent() {
     /**
      * <p>Setter for the field <code>backgroundComponent</code>.</p>
      *
-     * @param backgroundComponent a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param backgroundComponent a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void setBackgroundComponent(DRDesignComponent backgroundComponent) {
         this.backgroundComponent = backgroundComponent;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignListCell.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignListCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignListCell.java
index d1049f6..e706bea 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignListCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignListCell.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 
 import java.io.Serializable;
 
@@ -43,7 +43,7 @@ public class DRDesignListCell implements Serializable {
     /**
      * <p>Constructor for DRDesignListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     protected DRDesignListCell(DRDesignComponent component) {
         this(null, null, component);
@@ -52,9 +52,9 @@ protected DRDesignListCell(DRDesignComponent component) {
     /**
      * <p>Constructor for DRDesignListCell.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
-     * @param component           a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     protected DRDesignListCell(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRDesignComponent component) {
         this.horizontalAlignment = horizontalAlignment;
@@ -65,7 +65,7 @@ protected DRDesignListCell(HorizontalCellComponentAlignment horizontalAlignment,
     /**
      * <p>Getter for the field <code>horizontalAlignment</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
      */
     public HorizontalCellComponentAlignment getHorizontalAlignment() {
         return horizontalAlignment;
@@ -74,7 +74,7 @@ public HorizontalCellComponentAlignment getHorizontalAlignment() {
     /**
      * <p>Setter for the field <code>horizontalAlignment</code>.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
      */
     public void setHorizontalAlignment(HorizontalCellComponentAlignment horizontalAlignment) {
         this.horizontalAlignment = horizontalAlignment;
@@ -83,7 +83,7 @@ public void setHorizontalAlignment(HorizontalCellComponentAlignment horizontalAl
     /**
      * <p>Getter for the field <code>verticalAlignment</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
      */
     public VerticalCellComponentAlignment getVerticalAlignment() {
         return verticalAlignment;
@@ -92,7 +92,7 @@ public VerticalCellComponentAlignment getVerticalAlignment() {
     /**
      * <p>Setter for the field <code>verticalAlignment</code>.</p>
      *
-     * @param verticalAlignment a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param verticalAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
      */
     public void setVerticalAlignment(VerticalCellComponentAlignment verticalAlignment) {
         this.verticalAlignment = verticalAlignment;
@@ -101,7 +101,7 @@ public void setVerticalAlignment(VerticalCellComponentAlignment verticalAlignmen
     /**
      * <p>Getter for the field <code>component</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public DRDesignComponent getComponent() {
         return component;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignMap.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignMap.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignMap.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignMap.java
index e7f436a..6f17ab1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignMap.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignMap.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.definition.component.DRIDesignMap;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignMap;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignMap class.</p>
@@ -54,7 +54,7 @@ public EvaluationTime getEvaluationTime() {
     /**
      * <p>Setter for the field <code>evaluationTime</code>.</p>
      *
-     * @param evaluationTime a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @param evaluationTime a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     public void setEvaluationTime(EvaluationTime evaluationTime) {
         this.evaluationTime = evaluationTime;
@@ -69,7 +69,7 @@ public DRDesignGroup getEvaluationGroup() {
     /**
      * <p>Setter for the field <code>evaluationGroup</code>.</p>
      *
-     * @param evaluationGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param evaluationGroup a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
      */
     public void setEvaluationGroup(DRDesignGroup evaluationGroup) {
         this.evaluationGroup = evaluationGroup;
@@ -84,7 +84,7 @@ public DRIDesignExpression getLatitudeExpression() {
     /**
      * <p>Setter for the field <code>latitudeExpression</code>.</p>
      *
-     * @param latitudeExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param latitudeExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setLatitudeExpression(DRIDesignExpression latitudeExpression) {
         this.latitudeExpression = latitudeExpression;
@@ -99,7 +99,7 @@ public DRIDesignExpression getLongitudeExpression() {
     /**
      * <p>Setter for the field <code>longitudeExpression</code>.</p>
      *
-     * @param longitudeExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param longitudeExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setLongitudeExpression(DRIDesignExpression longitudeExpression) {
         this.longitudeExpression = longitudeExpression;
@@ -114,7 +114,7 @@ public DRIDesignExpression getZoomExpression() {
     /**
      * <p>Setter for the field <code>zoomExpression</code>.</p>
      *
-     * @param zoomExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param zoomExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setZoomExpression(DRIDesignExpression zoomExpression) {
         this.zoomExpression = zoomExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignRectangle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignRectangle.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignRectangle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignRectangle.java
index 840487d..faa074e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignRectangle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignRectangle.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.base.style.DRDesignPen;
-import net.sf.dynamicreports.design.definition.component.DRIDesignRectangle;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.base.style.DRDesignPen;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignRectangle;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignRectangle class.</p>
@@ -64,7 +64,7 @@ public DRDesignPen getPen() {
     /**
      * <p>Setter for the field <code>pen</code>.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     * @param pen a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
      */
     public void setPen(DRDesignPen pen) {
         this.pen = pen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignSubreport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignSubreport.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignSubreport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignSubreport.java
index 03e5b6d..7141510 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignSubreport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignSubreport.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.definition.component.DRIDesignSubreport;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignSubreport;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignSubreport class.</p>
@@ -52,7 +52,7 @@ public DRIDesignExpression getReportExpression() {
     /**
      * <p>Setter for the field <code>reportExpression</code>.</p>
      *
-     * @param reportExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param reportExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setReportExpression(DRIDesignExpression reportExpression) {
         this.reportExpression = reportExpression;
@@ -67,7 +67,7 @@ public DRIDesignExpression getParametersExpression() {
     /**
      * <p>Setter for the field <code>parametersExpression</code>.</p>
      *
-     * @param parametersExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param parametersExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setParametersExpression(DRIDesignExpression parametersExpression) {
         this.parametersExpression = parametersExpression;
@@ -82,7 +82,7 @@ public DRIDesignExpression getConnectionExpression() {
     /**
      * <p>Setter for the field <code>connectionExpression</code>.</p>
      *
-     * @param connectionExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param connectionExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setConnectionExpression(DRIDesignExpression connectionExpression) {
         this.connectionExpression = connectionExpression;
@@ -97,7 +97,7 @@ public DRIDesignExpression getDataSourceExpression() {
     /**
      * <p>Setter for the field <code>dataSourceExpression</code>.</p>
      *
-     * @param dataSourceExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param dataSourceExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setDataSourceExpression(DRIDesignExpression dataSourceExpression) {
         this.dataSourceExpression = dataSourceExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignTextField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignTextField.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignTextField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignTextField.java
index b3f1e7b..747915d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/component/DRDesignTextField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/component/DRDesignTextField.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.component;
+package software.xdev.dynamicreports.design.base.component;
 
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.definition.component.DRIDesignTextField;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignTextField;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
 
 /**
  * <p>DRDesignTextField class.</p>
@@ -78,7 +78,7 @@ public DRIDesignExpression getPatternExpression() {
     /**
      * <p>Setter for the field <code>patternExpression</code>.</p>
      *
-     * @param patternExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param patternExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setPatternExpression(final DRIDesignExpression patternExpression) {
         this.patternExpression = patternExpression;
@@ -93,7 +93,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
         this.horizontalTextAlignment = horizontalTextAlignment;
@@ -108,7 +108,7 @@ public DRIDesignExpression getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setValueExpression(final DRIDesignExpression valueExpression) {
         this.valueExpression = valueExpression;
@@ -138,7 +138,7 @@ public EvaluationTime getEvaluationTime() {
     /**
      * <p>Setter for the field <code>evaluationTime</code>.</p>
      *
-     * @param evaluationTime a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @param evaluationTime a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     public void setEvaluationTime(final EvaluationTime evaluationTime) {
         this.evaluationTime = evaluationTime;
@@ -153,7 +153,7 @@ public DRDesignGroup getEvaluationGroup() {
     /**
      * <p>Setter for the field <code>evaluationGroup</code>.</p>
      *
-     * @param evaluationGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param evaluationGroup a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
      */
     public void setEvaluationGroup(final DRDesignGroup evaluationGroup) {
         this.evaluationGroup = evaluationGroup;
@@ -168,7 +168,7 @@ public Markup getMarkup() {
     /**
      * <p>Setter for the field <code>markup</code>.</p>
      *
-     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @param markup a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      */
     public void setMarkup(final Markup markup) {
         this.markup = markup;
@@ -201,7 +201,7 @@ public TextAdjust getTextAdjust() {
     /**
      * <p>Setter for the field <code>textAdjust</code>.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     public void setTextAdjust(final TextAdjust textAdjust) {
         this.textAdjust = textAdjust;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstab.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstab.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstab.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstab.java
index 929defb..cb46de4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstab.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstab.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.crosstab;
+package software.xdev.dynamicreports.design.base.crosstab;
 
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.RunDirection;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -74,7 +74,7 @@ public DRDesignCrosstabDataset getDataset() {
     /**
      * <p>Setter for the field <code>dataset</code>.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabDataset} object.
+     * @param dataset a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabDataset} object.
      */
     public void setDataset(DRDesignCrosstabDataset dataset) {
         this.dataset = dataset;
@@ -149,7 +149,7 @@ public RunDirection getRunDirection() {
     /**
      * <p>Setter for the field <code>runDirection</code>.</p>
      *
-     * @param runDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @param runDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public void setRunDirection(RunDirection runDirection) {
         this.runDirection = runDirection;
@@ -164,7 +164,7 @@ public DRDesignCrosstabCellContent getWhenNoDataCell() {
     /**
      * <p>Setter for the field <code>whenNoDataCell</code>.</p>
      *
-     * @param whenNoDataCell a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     * @param whenNoDataCell a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
      */
     public void setWhenNoDataCell(DRDesignCrosstabCellContent whenNoDataCell) {
         this.whenNoDataCell = whenNoDataCell;
@@ -179,7 +179,7 @@ public DRDesignCrosstabCellContent getHeaderCell() {
     /**
      * <p>Setter for the field <code>headerCell</code>.</p>
      *
-     * @param headerCell a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     * @param headerCell a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
      */
     public void setHeaderCell(DRDesignCrosstabCellContent headerCell) {
         this.headerCell = headerCell;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java
index 4c5ac91..f3010cd 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabCell.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.crosstab;
+package software.xdev.dynamicreports.design.base.crosstab;
 
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCell;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCell;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignCrosstabCell class.</p>
@@ -88,7 +88,7 @@ public DRDesignCrosstabCellContent getContent() {
     /**
      * <p>Setter for the field <code>content</code>.</p>
      *
-     * @param content a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     * @param content a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
      */
     public void setContent(DRDesignCrosstabCellContent content) {
         this.content = content;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java
index 7d122ba..f7ed65b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabCellContent.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.crosstab;
+package software.xdev.dynamicreports.design.base.crosstab;
 
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignCrosstabCellContent class.</p>
@@ -71,7 +71,7 @@ public void setHeight(int height) {
     /**
      * <p>Getter for the field <code>list</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     public DRDesignList getList() {
         return list;
@@ -80,7 +80,7 @@ public DRDesignList getList() {
     /**
      * <p>Setter for the field <code>list</code>.</p>
      *
-     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @param list a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     public void setList(DRDesignList list) {
         this.list = list;
@@ -95,7 +95,7 @@ public DRDesignComponent getComponent() {
     /**
      * <p>Setter for the field <code>component</code>.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void setComponent(DRDesignComponent component) {
         this.component = component;
@@ -110,7 +110,7 @@ public DRIDesignStyle getStyle() {
     /**
      * <p>Setter for the field <code>style</code>.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignStyle} object.
      */
     public void setStyle(DRIDesignStyle style) {
         this.style = style;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java
index 8f382eb..c41cfef 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabColumnGroup.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.crosstab;
+package software.xdev.dynamicreports.design.base.crosstab;
 
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabColumnGroup;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabColumnGroup;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignCrosstabColumnGroup class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java
index 354d292..80c65f2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabDataset.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.crosstab;
+package software.xdev.dynamicreports.design.base.crosstab;
 
-import net.sf.dynamicreports.design.base.DRDesignDataset;
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.base.DRDesignDataset;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignCrosstabDataset class.</p>
@@ -46,7 +46,7 @@ public DRDesignDataset getSubDataset() {
     /**
      * <p>Setter for the field <code>subDataset</code>.</p>
      *
-     * @param subDataset a {@link net.sf.dynamicreports.design.base.DRDesignDataset} object.
+     * @param subDataset a {@link software.xdev.dynamicreports.design.base.DRDesignDataset} object.
      */
     public void setSubDataset(DRDesignDataset subDataset) {
         this.subDataset = subDataset;
@@ -76,7 +76,7 @@ public ResetType getResetType() {
     /**
      * <p>Setter for the field <code>resetType</code>.</p>
      *
-     * @param resetType a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetType a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
      */
     public void setResetType(ResetType resetType) {
         this.resetType = resetType;
@@ -91,7 +91,7 @@ public DRDesignGroup getResetGroup() {
     /**
      * <p>Setter for the field <code>resetGroup</code>.</p>
      *
-     * @param resetGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param resetGroup a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
      */
     public void setResetGroup(DRDesignGroup resetGroup) {
         this.resetGroup = resetGroup;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java
index 22a2154..9cf10d8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabGroup.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.crosstab;
+package software.xdev.dynamicreports.design.base.crosstab;
 
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabGroup;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
-import net.sf.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabGroup;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.CrosstabTotalPosition;
+import software.xdev.dynamicreports.report.constant.OrderType;
 
 /**
  * <p>Abstract DRDesignCrosstabGroup class.</p>
@@ -65,7 +65,7 @@ public CrosstabTotalPosition getTotalPosition() {
     /**
      * <p>Setter for the field <code>totalPosition</code>.</p>
      *
-     * @param totalPosition a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     * @param totalPosition a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
      */
     public void setTotalPosition(CrosstabTotalPosition totalPosition) {
         this.totalPosition = totalPosition;
@@ -80,7 +80,7 @@ public OrderType getOrderType() {
     /**
      * <p>Setter for the field <code>orderType</code>.</p>
      *
-     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @param orderType a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      */
     public void setOrderType(OrderType orderType) {
         this.orderType = orderType;
@@ -95,7 +95,7 @@ public DRIDesignExpression getExpression() {
     /**
      * <p>Setter for the field <code>expression</code>.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setExpression(DRIDesignExpression expression) {
         this.expression = expression;
@@ -110,7 +110,7 @@ public DRIDesignExpression getOrderByExpression() {
     /**
      * <p>Setter for the field <code>orderByExpression</code>.</p>
      *
-     * @param orderByExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param orderByExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setOrderByExpression(DRIDesignExpression orderByExpression) {
         this.orderByExpression = orderByExpression;
@@ -125,7 +125,7 @@ public DRIDesignExpression getComparatorExpression() {
     /**
      * <p>Setter for the field <code>comparatorExpression</code>.</p>
      *
-     * @param comparatorExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param comparatorExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setComparatorExpression(DRIDesignExpression comparatorExpression) {
         this.comparatorExpression = comparatorExpression;
@@ -140,7 +140,7 @@ public DRDesignCrosstabCellContent getHeader() {
     /**
      * <p>Setter for the field <code>header</code>.</p>
      *
-     * @param header a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     * @param header a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
      */
     public void setHeader(DRDesignCrosstabCellContent header) {
         this.header = header;
@@ -155,7 +155,7 @@ public DRDesignCrosstabCellContent getTotalHeader() {
     /**
      * <p>Setter for the field <code>totalHeader</code>.</p>
      *
-     * @param totalHeader a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+     * @param totalHeader a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
      */
     public void setTotalHeader(DRDesignCrosstabCellContent totalHeader) {
         this.totalHeader = totalHeader;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java
index 50e03a0..cacbfe5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabMeasure.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.crosstab;
+package software.xdev.dynamicreports.design.base.crosstab;
 
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
 
 /**
  * <p>DRDesignCrosstabMeasure class.</p>
@@ -62,7 +62,7 @@ public DRIDesignExpression getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setValueExpression(DRIDesignExpression valueExpression) {
         this.valueExpression = valueExpression;
@@ -77,7 +77,7 @@ public Calculation getCalculation() {
     /**
      * <p>Setter for the field <code>calculation</code>.</p>
      *
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public void setCalculation(Calculation calculation) {
         this.calculation = calculation;
@@ -92,7 +92,7 @@ public CrosstabPercentageType getPercentageType() {
     /**
      * <p>Setter for the field <code>percentageType</code>.</p>
      *
-     * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     * @param percentageType a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
      */
     public void setPercentageType(CrosstabPercentageType percentageType) {
         this.percentageType = percentageType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java
index 8c20e72..308eaf6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/crosstab/DRDesignCrosstabRowGroup.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.crosstab;
+package software.xdev.dynamicreports.design.base.crosstab;
 
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabRowGroup;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabRowGroup;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignCrosstabRowGroup class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java
index 582f0e8..6e9d927 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/AbstractDesignComplexExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,7 +63,7 @@ public String getName() {
     /**
      * <p>addExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void addExpression(DRIDesignExpression expression) {
         this.expressions.add(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java
index c1536a3..6fad413 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/AbstractDesignSimpleExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>Abstract AbstractDesignSimpleExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignComplexExpression.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignComplexExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignComplexExpression.java
index e494aec..2596bd9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignComplexExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignComplexExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIComplexExpression;
 
 import java.util.List;
 
@@ -38,7 +38,7 @@ public class DRDesignComplexExpression extends AbstractDesignComplexExpression {
     /**
      * <p>Constructor for DRDesignComplexExpression.</p>
      *
-     * @param complexExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIComplexExpression} object.
+     * @param complexExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIComplexExpression} object.
      * @param parameterName     a {@link java.lang.String} object.
      */
     public DRDesignComplexExpression(DRIComplexExpression<?> complexExpression, String parameterName) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignJasperExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignJasperExpression.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignJasperExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignJasperExpression.java
index cf75b64..0626940 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignJasperExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignJasperExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIJasperExpression;
 
 /**
  * <p>DRDesignJasperExpression class.</p>
@@ -35,7 +35,7 @@ public class DRDesignJasperExpression implements DRIDesignJasperExpression {
     /**
      * <p>Constructor for DRDesignJasperExpression.</p>
      *
-     * @param jasperExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIJasperExpression} object.
+     * @param jasperExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIJasperExpression} object.
      */
     public DRDesignJasperExpression(DRIJasperExpression<?> jasperExpression) {
         this.jasperExpression = jasperExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignParameterExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignParameterExpression.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignParameterExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignParameterExpression.java
index 10ce7ce..4a0ea5a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignParameterExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignParameterExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignParameterExpression class.</p>
@@ -57,7 +57,7 @@ public DRIDesignExpression getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setValueExpression(DRIDesignExpression valueExpression) {
         this.valueExpression = valueExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignPropertyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignPropertyExpression.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignPropertyExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignPropertyExpression.java
index 99d0e4e..64d90a7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignPropertyExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignPropertyExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignPropertyExpression class.</p>
@@ -57,7 +57,7 @@ public DRIDesignExpression getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setValueExpression(DRIDesignExpression valueExpression) {
         this.valueExpression = valueExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignSimpleExpression.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSimpleExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignSimpleExpression.java
index 4eb4d73..7aa1a43 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSimpleExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignSimpleExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression;
 
 /**
  * <p>DRDesignSimpleExpression class.</p>
@@ -36,7 +36,7 @@ public class DRDesignSimpleExpression extends AbstractDesignSimpleExpression {
     /**
      * <p>Constructor for DRDesignSimpleExpression.</p>
      *
-     * @param simpleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRISimpleExpression} object.
+     * @param simpleExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression} object.
      * @param parameterName    a {@link java.lang.String} object.
      */
     public DRDesignSimpleExpression(DRISimpleExpression<?> simpleExpression, String parameterName) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignSystemExpression.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSystemExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignSystemExpression.java
index ba335f3..844c3a5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignSystemExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignSystemExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRISystemExpression;
 
 /**
  * <p>DRDesignSystemExpression class.</p>
@@ -35,7 +35,7 @@ public class DRDesignSystemExpression implements DRIDesignSystemExpression {
     /**
      * <p>Constructor for DRDesignSystemExpression.</p>
      *
-     * @param systemExpression a {@link net.sf.dynamicreports.report.definition.expression.DRISystemExpression} object.
+     * @param systemExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRISystemExpression} object.
      */
     public DRDesignSystemExpression(DRISystemExpression<?> systemExpression) {
         this.systemExpression = systemExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignValueFormatter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignValueFormatter.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignValueFormatter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignValueFormatter.java
index 3ef49a8..52a2678 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/expression/DRDesignValueFormatter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/expression/DRDesignValueFormatter.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.expression;
+package software.xdev.dynamicreports.design.base.expression;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 
 import java.util.List;
 
@@ -39,8 +39,8 @@ public class DRDesignValueFormatter extends AbstractDesignComplexExpression {
     /**
      * Constructor for DRDesignValueFormatter.
      *
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRDesignValueFormatter(DRIValueFormatter<?, ?> valueFormatter, DRIDesignExpression valueExpression) {
         this.valueFormatter = (DRIValueFormatter<?, Object>) valueFormatter;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBaseStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignBaseStyle.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBaseStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignBaseStyle.java
index dd7a217..1572013 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBaseStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignBaseStyle.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
-
-import net.sf.dynamicreports.design.definition.style.DRIDesignBaseStyle;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.Rotation;
-import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
-import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+package software.xdev.dynamicreports.design.base.style;
+
+import software.xdev.dynamicreports.design.definition.style.DRIDesignBaseStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.Rotation;
+import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 import java.awt.Color;
@@ -110,7 +110,7 @@ public ImageScale getImageScale() {
     /**
      * <p>Setter for the field <code>imageScale</code>.</p>
      *
-     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @param imageScale a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      */
     public void setImageScale(ImageScale imageScale) {
         this.imageScale = imageScale;
@@ -125,7 +125,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
         this.horizontalTextAlignment = horizontalTextAlignment;
@@ -140,7 +140,7 @@ public VerticalTextAlignment getVerticalTextAlignment() {
     /**
      * <p>Setter for the field <code>verticalTextAlignment</code>.</p>
      *
-     * @param verticalTextAlignment a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     * @param verticalTextAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalTextAlignment} object.
      */
     public void setVerticalTextAlignment(VerticalTextAlignment verticalTextAlignment) {
         this.verticalTextAlignment = verticalTextAlignment;
@@ -155,7 +155,7 @@ public HorizontalImageAlignment getHorizontalImageAlignment() {
     /**
      * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
         this.horizontalImageAlignment = horizontalImageAlignment;
@@ -170,7 +170,7 @@ public VerticalImageAlignment getVerticalImageAlignment() {
     /**
      * <p>Setter for the field <code>verticalImageAlignment</code>.</p>
      *
-     * @param verticalImageAlignment a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     * @param verticalImageAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalImageAlignment} object.
      */
     public void setVerticalImageAlignment(VerticalImageAlignment verticalImageAlignment) {
         this.verticalImageAlignment = verticalImageAlignment;
@@ -185,7 +185,7 @@ public DRDesignBorder getBorder() {
     /**
      * <p>Setter for the field <code>border</code>.</p>
      *
-     * @param border a {@link net.sf.dynamicreports.design.base.style.DRDesignBorder} object.
+     * @param border a {@link software.xdev.dynamicreports.design.base.style.DRDesignBorder} object.
      */
     public void setBorder(DRDesignBorder border) {
         this.border = border;
@@ -200,7 +200,7 @@ public DRDesignPadding getPadding() {
     /**
      * <p>Setter for the field <code>padding</code>.</p>
      *
-     * @param padding a {@link net.sf.dynamicreports.design.base.style.DRDesignPadding} object.
+     * @param padding a {@link software.xdev.dynamicreports.design.base.style.DRDesignPadding} object.
      */
     public void setPadding(DRDesignPadding padding) {
         this.padding = padding;
@@ -215,7 +215,7 @@ public DRDesignFont getFont() {
     /**
      * <p>Setter for the field <code>font</code>.</p>
      *
-     * @param font a {@link net.sf.dynamicreports.design.base.style.DRDesignFont} object.
+     * @param font a {@link software.xdev.dynamicreports.design.base.style.DRDesignFont} object.
      */
     public void setFont(DRDesignFont font) {
         this.font = font;
@@ -230,7 +230,7 @@ public Rotation getRotation() {
     /**
      * <p>Setter for the field <code>rotation</code>.</p>
      *
-     * @param rotation a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     * @param rotation a {@link software.xdev.dynamicreports.report.constant.Rotation} object.
      */
     public void setRotation(Rotation rotation) {
         this.rotation = rotation;
@@ -260,7 +260,7 @@ public Markup getMarkup() {
     /**
      * <p>Setter for the field <code>markup</code>.</p>
      *
-     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @param markup a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      */
     public void setMarkup(Markup markup) {
         this.markup = markup;
@@ -275,7 +275,7 @@ public DRDesignParagraph getParagraph() {
     /**
      * <p>Setter for the field <code>paragraph</code>.</p>
      *
-     * @param paragraph a {@link net.sf.dynamicreports.design.base.style.DRDesignParagraph} object.
+     * @param paragraph a {@link software.xdev.dynamicreports.design.base.style.DRDesignParagraph} object.
      */
     public void setParagraph(DRDesignParagraph paragraph) {
         this.paragraph = paragraph;
@@ -290,7 +290,7 @@ public DRDesignPen getLinePen() {
     /**
      * <p>Setter for the field <code>linePen</code>.</p>
      *
-     * @param linePen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     * @param linePen a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
      */
     public void setLinePen(DRDesignPen linePen) {
         this.linePen = linePen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBorder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignBorder.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBorder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignBorder.java
index 27de0e4..674191d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignBorder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignBorder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
+package software.xdev.dynamicreports.design.base.style;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignBorder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignBorder;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 /**
@@ -44,7 +44,7 @@ public DRDesignPen getTopPen() {
     /**
      * <p>Setter for the field <code>topPen</code>.</p>
      *
-     * @param topPen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     * @param topPen a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
      */
     public void setTopPen(DRDesignPen topPen) {
         this.topPen = topPen;
@@ -59,7 +59,7 @@ public DRDesignPen getLeftPen() {
     /**
      * <p>Setter for the field <code>leftPen</code>.</p>
      *
-     * @param leftPen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     * @param leftPen a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
      */
     public void setLeftPen(DRDesignPen leftPen) {
         this.leftPen = leftPen;
@@ -74,7 +74,7 @@ public DRDesignPen getBottomPen() {
     /**
      * <p>Setter for the field <code>bottomPen</code>.</p>
      *
-     * @param bottomPen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     * @param bottomPen a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
      */
     public void setBottomPen(DRDesignPen bottomPen) {
         this.bottomPen = bottomPen;
@@ -89,7 +89,7 @@ public DRDesignPen getRightPen() {
     /**
      * <p>Setter for the field <code>rightPen</code>.</p>
      *
-     * @param rightPen a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+     * @param rightPen a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
      */
     public void setRightPen(DRDesignPen rightPen) {
         this.rightPen = rightPen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignConditionalStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignConditionalStyle.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignConditionalStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignConditionalStyle.java
index 5e73959..b3497f1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignConditionalStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignConditionalStyle.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
+package software.xdev.dynamicreports.design.base.style;
 
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.style.DRIDesignConditionalStyle;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignConditionalStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 /**
@@ -44,7 +44,7 @@ public DRIDesignExpression getConditionExpression() {
     /**
      * <p>Setter for the field <code>conditionExpression</code>.</p>
      *
-     * @param conditionExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param conditionExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public void setConditionExpression(DRIDesignExpression conditionExpression) {
         this.conditionExpression = conditionExpression;
@@ -59,7 +59,7 @@ public DRIDesignDataset getDataset() {
     /**
      * <p>Setter for the field <code>dataset</code>.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @param dataset a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
      */
     public void setDataset(DRIDesignDataset dataset) {
         this.dataset = dataset;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignFont.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignFont.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignFont.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignFont.java
index 911a243..9dc7ec7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignFont.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignFont.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
+package software.xdev.dynamicreports.design.base.style;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignFont;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignFont;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPadding.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignPadding.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPadding.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignPadding.java
index 445b403..9eeb7d1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPadding.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignPadding.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
+package software.xdev.dynamicreports.design.base.style;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignPadding;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignPadding;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignParagraph.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignParagraph.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignParagraph.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignParagraph.java
index 7d79889..29e4ad6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignParagraph.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignParagraph.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
+package software.xdev.dynamicreports.design.base.style;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignParagraph;
-import net.sf.dynamicreports.design.definition.style.DRIDesignTabStop;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.LineSpacing;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignParagraph;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignTabStop;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.LineSpacing;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 import java.util.List;
@@ -53,7 +53,7 @@ public LineSpacing getLineSpacing() {
     /**
      * <p>Setter for the field <code>lineSpacing</code>.</p>
      *
-     * @param lineSpacing a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     * @param lineSpacing a {@link software.xdev.dynamicreports.report.constant.LineSpacing} object.
      */
     public void setLineSpacing(LineSpacing lineSpacing) {
         this.lineSpacing = lineSpacing;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPen.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignPen.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPen.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignPen.java
index 922b42d..2bc67c6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignPen.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignPen.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
+package software.xdev.dynamicreports.design.base.style;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignPen;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.LineStyle;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 import java.awt.Color;
@@ -61,7 +61,7 @@ public LineStyle getLineStyle() {
     /**
      * <p>Setter for the field <code>lineStyle</code>.</p>
      *
-     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @param lineStyle a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
      */
     public void setLineStyle(LineStyle lineStyle) {
         this.lineStyle = lineStyle;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignStyle.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignStyle.java
index 6131af4..a62527c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignStyle.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
+package software.xdev.dynamicreports.design.base.style;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
@@ -71,7 +71,7 @@ public DRDesignStyle getParentStyle() {
     /**
      * <p>Setter for the field <code>parentStyle</code>.</p>
      *
-     * @param parentStyle a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param parentStyle a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      */
     public void setParentStyle(DRDesignStyle parentStyle) {
         this.parentStyle = parentStyle;
@@ -95,7 +95,7 @@ public void setConditionalStyles(List<DRDesignConditionalStyle> conditionalStyle
     /**
      * <p>addConditionalStyle.</p>
      *
-     * @param conditionalStyle a {@link net.sf.dynamicreports.design.base.style.DRDesignConditionalStyle} object.
+     * @param conditionalStyle a {@link software.xdev.dynamicreports.design.base.style.DRDesignConditionalStyle} object.
      */
     public void addConditionalStyle(DRDesignConditionalStyle conditionalStyle) {
         this.conditionalStyles.add(conditionalStyle);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignTabStop.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignTabStop.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignTabStop.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignTabStop.java
index c819611..5399d39 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/base/style/DRDesignTabStop.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/base/style/DRDesignTabStop.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.base.style;
+package software.xdev.dynamicreports.design.base.style;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignTabStop;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignTabStop;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.TabStopAlignment;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 /**
@@ -58,7 +58,7 @@ public TabStopAlignment getAlignment() {
     /**
      * <p>Setter for the field <code>alignment</code>.</p>
      *
-     * @param alignment a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     * @param alignment a {@link software.xdev.dynamicreports.report.constant.TabStopAlignment} object.
      */
     public void setAlignment(TabStopAlignment alignment) {
         this.alignment = alignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ComponentGroupType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/ComponentGroupType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ComponentGroupType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/ComponentGroupType.java
index 0384504..18e6546 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ComponentGroupType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/ComponentGroupType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.constant;
+package software.xdev.dynamicreports.design.constant;
 
 /**
  * <p>ComponentGroupType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/DefaultStyleType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/DefaultStyleType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/DefaultStyleType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/DefaultStyleType.java
index 50b6f80..d93750f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/DefaultStyleType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/DefaultStyleType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.constant;
+package software.xdev.dynamicreports.design.constant;
 
 /**
  * <p>DefaultStyleType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/EvaluationTime.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/EvaluationTime.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/EvaluationTime.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/EvaluationTime.java
index eb6aa28..96e902d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/EvaluationTime.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/EvaluationTime.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.constant;
+package software.xdev.dynamicreports.design.constant;
 
 /**
  * <p>EvaluationTime class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ResetType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/ResetType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ResetType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/ResetType.java
index 8858a2c..e2f40ca 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/constant/ResetType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/constant/ResetType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.constant;
+package software.xdev.dynamicreports.design.constant;
 
 /**
  * <p>ResetType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignBand.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignBand.java
similarity index 68%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignBand.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignBand.java
index 20b74fe..01f28f2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignBand.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignBand.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignComponent;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.SplitType;
 
 import java.io.Serializable;
 
@@ -42,21 +42,21 @@ public interface DRIDesignBand extends Serializable {
     /**
      * <p>getSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getSplitType();
 
     /**
      * <p>getBandComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.component.DRIDesignComponent} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.component.DRIDesignComponent} object.
      */
     public DRIDesignComponent getBandComponent();
 
     /**
      * <p>getList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     public DRDesignList getList();
 
@@ -70,7 +70,7 @@ public interface DRIDesignBand extends Serializable {
     /**
      * <p>getPrintWhenExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getPrintWhenExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignDataset.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignDataset.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignDataset.java
index 247c25f..e435f7b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignDataset.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignDataset.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -93,28 +93,28 @@ public interface DRIDesignDataset extends Serializable {
     /**
      * <p>getQuery.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignQuery} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignQuery} object.
      */
     public DRIDesignQuery getQuery();
 
     /**
      * <p>getConnectionExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getConnectionExpression();
 
     /**
      * <p>getDataSourceExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getDataSourceExpression();
 
     /**
      * <p>getFilterExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getFilterExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignField.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignField.java
index d6f60b0..7f341bb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignField.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
 
 /**
  * <p>DRIDesignField interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignGroup.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignGroup.java
index 602c1c4..6cc0cba 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignGroup.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
 
 import java.io.Serializable;
 import java.util.List;
@@ -41,7 +41,7 @@ public interface DRIDesignGroup extends Serializable {
     /**
      * <p>getGroupExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getGroupExpression();
 
@@ -97,7 +97,7 @@ public interface DRIDesignGroup extends Serializable {
     /**
      * <p>getFooterPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
      */
     public GroupFooterPosition getFooterPosition();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignHyperLink.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignHyperLink.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignHyperLink.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignHyperLink.java
index 18ac736..87243da 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignHyperLink.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignHyperLink.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
 
 import java.io.Serializable;
 
@@ -32,28 +32,28 @@ public interface DRIDesignHyperLink extends Serializable {
     /**
      * <p>getAnchorExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getAnchorExpression();
 
     /**
      * <p>getPageExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getPageExpression();
 
     /**
      * <p>getReferenceExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getReferenceExpression();
 
     /**
      * <p>getTooltipExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getTooltipExpression();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignMargin.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignMargin.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignMargin.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignMargin.java
index 4e2216c..aecc420 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignMargin.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignMargin.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignPage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignPage.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignPage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignPage.java
index d570d93..e40b9f1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignPage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignPage.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
 
 import java.io.Serializable;
 
@@ -46,14 +46,14 @@ public interface DRIDesignPage extends Serializable {
     /**
      * <p>getOrientation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
      */
     public PageOrientation getOrientation();
 
     /**
      * <p>getMargin.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignMargin} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignMargin} object.
      */
     public DRIDesignMargin getMargin();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignParameter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignParameter.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignParameter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignParameter.java
index 0a53014..086dd37 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignParameter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignParameter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignQuery.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignQuery.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignQuery.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignQuery.java
index 74286e2..7a46c7f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignQuery.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignQuery.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignReport.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignReport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignReport.java
index 18462e1..980fbc9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignReport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignReport.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
-
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+package software.xdev.dynamicreports.design.definition;
+
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -50,7 +50,7 @@ public interface DRIDesignReport extends Serializable {
     /**
      * <p>getTemplateDesign.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignTemplateDesign} object.
      */
     public DRIDesignTemplateDesign getTemplateDesign();
 
@@ -99,28 +99,28 @@ public interface DRIDesignReport extends Serializable {
     /**
      * <p>getQuery.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignQuery} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignQuery} object.
      */
     public DRIDesignQuery getQuery();
 
     /**
      * <p>getPage.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignPage} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignPage} object.
      */
     public DRIDesignPage getPage();
 
     /**
      * <p>getWhenNoDataType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
      */
     public WhenNoDataType getWhenNoDataType();
 
     /**
      * <p>getWhenResourceMissingType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
      */
     public WhenResourceMissingType getWhenResourceMissingType();
 
@@ -155,14 +155,14 @@ public interface DRIDesignReport extends Serializable {
     /**
      * <p>getPrintOrder.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
      */
     public Orientation getPrintOrder();
 
     /**
      * <p>getColumnDirection.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public RunDirection getColumnDirection();
 
@@ -190,14 +190,14 @@ public interface DRIDesignReport extends Serializable {
     /**
      * <p>getTableOfContentsCustomizer.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
      */
     public DRITableOfContentsCustomizer getTableOfContentsCustomizer();
 
     /**
      * <p>getFilterExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getFilterExpression();
 
@@ -295,35 +295,35 @@ public interface DRIDesignReport extends Serializable {
     /**
      * <p>getTitleBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getTitleBand();
 
     /**
      * <p>getPageHeaderBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getPageHeaderBand();
 
     /**
      * <p>getPageFooterBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getPageFooterBand();
 
     /**
      * <p>getColumnHeaderBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getColumnHeaderBand();
 
     /**
      * <p>getColumnFooterBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getColumnFooterBand();
 
@@ -337,28 +337,28 @@ public interface DRIDesignReport extends Serializable {
     /**
      * <p>getLastPageFooterBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getLastPageFooterBand();
 
     /**
      * <p>getSummaryBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getSummaryBand();
 
     /**
      * <p>getNoDataBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getNoDataBand();
 
     /**
      * <p>getBackgroundBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
      */
     public DRIDesignBand getBackgroundBand();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignSort.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignSort.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignSort.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignSort.java
index 89944ea..e355151 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignSort.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignSort.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.OrderType;
 
 import java.io.Serializable;
 
@@ -33,14 +33,14 @@ public interface DRIDesignSort extends Serializable {
     /**
      * <p>getExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getExpression();
 
     /**
      * <p>getOrderType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      */
     public OrderType getOrderType();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java
index f726b05..bda7e33 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignTableOfContentsHeading.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.design.definition.component.DRIDesignTextField;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignTextField;
 
 import java.io.Serializable;
 
@@ -32,7 +32,7 @@ public interface DRIDesignTableOfContentsHeading extends Serializable {
     /**
      * <p>getReferenceField.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.component.DRIDesignTextField} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.component.DRIDesignTextField} object.
      */
     public DRIDesignTextField getReferenceField();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignTemplateDesign.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTemplateDesign.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignTemplateDesign.java
index ed646f8..e1dee4f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignTemplateDesign.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignTemplateDesign.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.io.Serializable;
 
@@ -96,7 +96,7 @@ public interface DRIDesignTemplateDesign extends Serializable {
      * <p>getDesign.</p>
      *
      * @return a {@link java.lang.Object} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public Object getDesign() throws DRException;
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignVariable.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignVariable.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignVariable.java
index eba69a5..a7d736a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/DRIDesignVariable.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/DRIDesignVariable.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition;
+package software.xdev.dynamicreports.design.definition;
 
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Calculation;
 
 /**
  * <p>DRIDesignVariable interface.</p>
@@ -32,35 +32,35 @@ public interface DRIDesignVariable extends DRIDesignExpression {
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getValueExpression();
 
     /**
      * <p>getInitialValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getInitialValueExpression();
 
     /**
      * <p>getCalculation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public Calculation getCalculation();
 
     /**
      * <p>getResetType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
      */
     public ResetType getResetType();
 
     /**
      * <p>getResetGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      */
     public DRIDesignGroup getResetGroup();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignBreak.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignBreak.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignBreak.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignBreak.java
index fd0b34d..0870add 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignBreak.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignBreak.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.report.constant.BreakType;
+import software.xdev.dynamicreports.report.constant.BreakType;
 
 /**
  * <p>DRIDesignBreak interface.</p>
@@ -30,7 +30,7 @@ public interface DRIDesignBreak extends DRIDesignComponent {
     /**
      * <p>getType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.BreakType} object.
      */
     public BreakType getType();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignComponent.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignComponent.java
index 6c1c809..362046f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignComponent.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.StretchType;
 
 import java.io.Serializable;
 import java.util.List;
@@ -52,7 +52,7 @@ public interface DRIDesignComponent extends Serializable {
     /**
      * <p>getStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignStyle} object.
      */
     public DRIDesignStyle getStyle();
 
@@ -87,7 +87,7 @@ public interface DRIDesignComponent extends Serializable {
     /**
      * <p>getPrintWhenExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getPrintWhenExpression();
 
@@ -108,14 +108,14 @@ public interface DRIDesignComponent extends Serializable {
     /**
      * <p>getPositionType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentPositionType} object.
      */
     public ComponentPositionType getPositionType();
 
     /**
      * <p>getStretchType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.StretchType} object.
      */
     public StretchType getStretchType();
 
@@ -136,14 +136,14 @@ public interface DRIDesignComponent extends Serializable {
     /**
      * <p>getPrintWhenGroupChanges.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      */
     public DRIDesignGroup getPrintWhenGroupChanges();
 
     /**
      * <p>getTableOfContentsHeading.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignTableOfContentsHeading} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignTableOfContentsHeading} object.
      */
     public DRIDesignTableOfContentsHeading getTableOfContentsHeading();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignEllipse.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignEllipse.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignEllipse.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignEllipse.java
index 68948b8..1a7b90d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignEllipse.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignEllipse.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignPen;
 
 /**
  * <p>DRIDesignEllipse interface.</p>
@@ -30,7 +30,7 @@ public interface DRIDesignEllipse extends DRIDesignComponent {
     /**
      * <p>getPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     public DRIDesignPen getPen();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignFiller.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignFiller.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignFiller.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignFiller.java
index c061d08..7d56efc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignFiller.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignFiller.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
 /**
  * <p>DRIDesignFiller interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignGenericElement.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignGenericElement.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignGenericElement.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignGenericElement.java
index 8e2d6a3..e032b67 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignGenericElement.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignGenericElement.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
 
 import java.util.List;
 
@@ -48,14 +48,14 @@ public interface DRIDesignGenericElement extends DRIDesignComponent {
     /**
      * <p>getEvaluationTime.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     public EvaluationTime getEvaluationTime();
 
     /**
      * <p>getEvaluationGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      */
     public DRIDesignGroup getEvaluationGroup();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java
index 89bf29e..20d6e68 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignHyperLinkComponent.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.definition.DRIDesignHyperLink;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.DRIDesignHyperLink;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
 
 /**
  * <p>DRIDesignHyperLinkComponent interface.</p>
@@ -31,7 +31,7 @@ public interface DRIDesignHyperLinkComponent extends DRIDesignComponent {
     /**
      * <p>getAnchorNameExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getAnchorNameExpression();
 
@@ -45,7 +45,7 @@ public interface DRIDesignHyperLinkComponent extends DRIDesignComponent {
     /**
      * <p>getHyperLink.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignHyperLink} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignHyperLink} object.
      */
     public DRIDesignHyperLink getHyperLink();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignImage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignImage.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignImage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignImage.java
index 02b235f..f5476d5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignImage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignImage.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
 
 /**
  * <p>DRIDesignImage interface.</p>
@@ -32,14 +32,14 @@ public interface DRIDesignImage extends DRIDesignHyperLinkComponent {
     /**
      * <p>getImageExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getImageExpression();
 
     /**
      * <p>getImageScale.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      */
     public ImageScale getImageScale();
 
@@ -60,7 +60,7 @@ public interface DRIDesignImage extends DRIDesignHyperLinkComponent {
     /**
      * <p>getHorizontalImageAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public HorizontalImageAlignment getHorizontalImageAlignment();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignLine.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignLine.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignLine.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignLine.java
index ec0808d..7e04475 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignLine.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignLine.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
-import net.sf.dynamicreports.report.constant.LineDirection;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignPen;
+import software.xdev.dynamicreports.report.constant.LineDirection;
 
 /**
  * <p>DRIDesignLine interface.</p>
@@ -31,14 +31,14 @@ public interface DRIDesignLine extends DRIDesignComponent {
     /**
      * <p>getDirection.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.LineDirection} object.
      */
     public LineDirection getDirection();
 
     /**
      * <p>getPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     public DRIDesignPen getPen();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignList.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignList.java
index fd61417..d55c66c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignList.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.constant.ComponentGroupType;
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.design.constant.ComponentGroupType;
+import software.xdev.dynamicreports.report.constant.ListType;
 
 import java.util.List;
 
@@ -40,21 +40,21 @@ public interface DRIDesignList extends DRIDesignComponent {
     /**
      * <p>getType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public ListType getType();
 
     /**
      * <p>getComponentGroupType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.constant.ComponentGroupType} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.ComponentGroupType} object.
      */
     public ComponentGroupType getComponentGroupType();
 
     /**
      * <p>getBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.component.DRIDesignComponent} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.component.DRIDesignComponent} object.
      */
     public DRIDesignComponent getBackgroundComponent();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignMap.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignMap.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignMap.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignMap.java
index 20c4523..e18491a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignMap.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignMap.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
 
 /**
  * <p>DRIDesignMap interface.</p>
@@ -32,35 +32,35 @@ public interface DRIDesignMap extends DRIDesignComponent {
     /**
      * <p>getEvaluationTime.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     public EvaluationTime getEvaluationTime();
 
     /**
      * <p>getEvaluationGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      */
     public DRIDesignGroup getEvaluationGroup();
 
     /**
      * <p>getLatitudeExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getLatitudeExpression();
 
     /**
      * <p>getLongitudeExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getLongitudeExpression();
 
     /**
      * <p>getZoomExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getZoomExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignRectangle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignRectangle.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignRectangle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignRectangle.java
index de26fd2..311aab2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignRectangle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignRectangle.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignPen;
 
 /**
  * <p>DRIDesignRectangle interface.</p>
@@ -37,7 +37,7 @@ public interface DRIDesignRectangle extends DRIDesignComponent {
     /**
      * <p>getPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     public DRIDesignPen getPen();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignSubreport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignSubreport.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignSubreport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignSubreport.java
index 4c9c0ac..6ef679f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignSubreport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignSubreport.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
 
 /**
  * <p>DRIDesignSubreport interface.</p>
@@ -30,28 +30,28 @@ public interface DRIDesignSubreport extends DRIDesignComponent {
     /**
      * <p>getReportExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getReportExpression();
 
     /**
      * <p>getParametersExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getParametersExpression();
 
     /**
      * <p>getConnectionExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getConnectionExpression();
 
     /**
      * <p>getDataSourceExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getDataSourceExpression();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignTextField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignTextField.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignTextField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignTextField.java
index 3adac56..9137b87 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/component/DRIDesignTextField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/component/DRIDesignTextField.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.component;
+package software.xdev.dynamicreports.design.definition.component;
 
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
 
 /**
  * <p>DRIDesignTextField interface.</p>
@@ -42,21 +42,21 @@ public interface DRIDesignTextField extends DRIDesignHyperLinkComponent {
     /**
      * <p>getPatternExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     DRIDesignExpression getPatternExpression();
 
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     HorizontalTextAlignment getHorizontalTextAlignment();
 
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     DRIDesignExpression getValueExpression();
 
@@ -70,21 +70,21 @@ public interface DRIDesignTextField extends DRIDesignHyperLinkComponent {
     /**
      * <p>getEvaluationTime.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     EvaluationTime getEvaluationTime();
 
     /**
      * <p>getEvaluationGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      */
     DRIDesignGroup getEvaluationGroup();
 
     /**
      * <p>getMarkup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      */
     Markup getMarkup();
 
@@ -98,7 +98,7 @@ public interface DRIDesignTextField extends DRIDesignHyperLinkComponent {
     boolean isStretchWithOverflow();
 
     /**
-     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     TextAdjust getTextAdjust();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java
index 9c35f2a..a861fa2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstab.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.crosstab;
+package software.xdev.dynamicreports.design.definition.crosstab;
 
-import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
-import net.sf.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignComponent;
+import software.xdev.dynamicreports.report.constant.RunDirection;
 
 import java.util.List;
 
@@ -33,7 +33,7 @@ public interface DRIDesignCrosstab extends DRIDesignComponent {
     /**
      * <p>getDataset.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset} object.
      */
     public DRIDesignCrosstabDataset getDataset();
 
@@ -68,21 +68,21 @@ public interface DRIDesignCrosstab extends DRIDesignComponent {
     /**
      * <p>getRunDirection.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public RunDirection getRunDirection();
 
     /**
      * <p>getWhenNoDataCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
      */
     public DRIDesignCrosstabCellContent getWhenNoDataCell();
 
     /**
      * <p>getHeaderCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
      */
     public DRIDesignCrosstabCellContent getHeaderCell();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java
index fa820b0..0b30565 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCell.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.crosstab;
+package software.xdev.dynamicreports.design.definition.crosstab;
 
 import java.io.Serializable;
 
@@ -51,7 +51,7 @@ public interface DRIDesignCrosstabCell extends Serializable {
     /**
      * <p>getContent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
      */
     public DRIDesignCrosstabCellContent getContent();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java
index c2b56c7..8c0d275 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabCellContent.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.crosstab;
+package software.xdev.dynamicreports.design.definition.crosstab;
 
-import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignComponent;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
 
 import java.io.Serializable;
 
@@ -47,14 +47,14 @@ public interface DRIDesignCrosstabCellContent extends Serializable {
     /**
      * <p>getComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.component.DRIDesignComponent} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.component.DRIDesignComponent} object.
      */
     public DRIDesignComponent getComponent();
 
     /**
      * <p>getStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignStyle} object.
      */
     public DRIDesignStyle getStyle();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java
index 807ed05..fbc8b1e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabColumnGroup.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.crosstab;
+package software.xdev.dynamicreports.design.definition.crosstab;
 
 /**
  * <p>DRIDesignCrosstabColumnGroup interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java
index 523a5aa..79cc1c4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabDataset.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.crosstab;
+package software.xdev.dynamicreports.design.definition.crosstab;
 
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
 
 import java.io.Serializable;
 
@@ -34,7 +34,7 @@ public interface DRIDesignCrosstabDataset extends Serializable {
     /**
      * <p>getSubDataset.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
      */
     public DRIDesignDataset getSubDataset();
 
@@ -48,14 +48,14 @@ public interface DRIDesignCrosstabDataset extends Serializable {
     /**
      * <p>getResetType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
      */
     public ResetType getResetType();
 
     /**
      * <p>getResetGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      */
     public DRIDesignGroup getResetGroup();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java
similarity index 64%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java
index d438a41..d7b3d5a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabGroup.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.crosstab;
+package software.xdev.dynamicreports.design.definition.crosstab;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
-import net.sf.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.CrosstabTotalPosition;
+import software.xdev.dynamicreports.report.constant.OrderType;
 
 import java.io.Serializable;
 
@@ -41,49 +41,49 @@ public interface DRIDesignCrosstabGroup extends Serializable {
     /**
      * <p>getTotalPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
      */
     public CrosstabTotalPosition getTotalPosition();
 
     /**
      * <p>getOrderType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      */
     public OrderType getOrderType();
 
     /**
      * <p>getExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getExpression();
 
     /**
      * <p>getOrderByExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getOrderByExpression();
 
     /**
      * <p>getComparatorExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getComparatorExpression();
 
     /**
      * <p>getHeader.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
      */
     public DRIDesignCrosstabCellContent getHeader();
 
     /**
      * <p>getTotalHeader.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent} object.
      */
     public DRIDesignCrosstabCellContent getTotalHeader();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java
index 6fe585e..b07bddc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabMeasure.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.crosstab;
+package software.xdev.dynamicreports.design.definition.crosstab;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
 
 import java.io.Serializable;
 
@@ -48,21 +48,21 @@ public interface DRIDesignCrosstabMeasure extends Serializable {
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getValueExpression();
 
     /**
      * <p>getCalculation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public Calculation getCalculation();
 
     /**
      * <p>getPercentageType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
      */
     public CrosstabPercentageType getPercentageType();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java
index 40eef39..cce6190 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/crosstab/DRIDesignCrosstabRowGroup.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.crosstab;
+package software.xdev.dynamicreports.design.definition.crosstab;
 
 /**
  * <p>DRIDesignCrosstabRowGroup interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java
index ce3e6f8..6ed3d19 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignComplexExpression.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.expression;
+package software.xdev.dynamicreports.design.definition.expression;
 
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.List;
 
@@ -40,7 +40,7 @@ public interface DRIDesignComplexExpression extends DRIDesignExpression {
      * <p>evaluate.</p>
      *
      * @param values           a {@link java.util.List} object.
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      * @return a {@link java.lang.Object} object.
      */
     public Object evaluate(List<?> values, ReportParameters reportParameters);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignExpression.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignExpression.java
index d6fb653..2c9bed7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.expression;
+package software.xdev.dynamicreports.design.definition.expression;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java
index 8f8b161..82b5617 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignJasperExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.expression;
+package software.xdev.dynamicreports.design.definition.expression;
 
 /**
  * <p>DRIDesignJasperExpression interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java
index d0fa3ea..65dd9f6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignParameterExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.expression;
+package software.xdev.dynamicreports.design.definition.expression;
 
 import java.io.Serializable;
 
@@ -37,7 +37,7 @@ public interface DRIDesignParameterExpression extends Serializable {
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getValueExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java
index 9ae6985..dd7a962 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignPropertyExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.expression;
+package software.xdev.dynamicreports.design.definition.expression;
 
 import java.io.Serializable;
 
@@ -37,7 +37,7 @@ public interface DRIDesignPropertyExpression extends Serializable {
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getValueExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java
index 5a668eb..9664e67 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignSimpleExpression.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.expression;
+package software.xdev.dynamicreports.design.definition.expression;
 
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>DRIDesignSimpleExpression interface.</p>
@@ -30,7 +30,7 @@ public interface DRIDesignSimpleExpression extends DRIDesignExpression {
     /**
      * <p>evaluate.</p>
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      * @return a {@link java.lang.Object} object.
      */
     public Object evaluate(ReportParameters reportParameters);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java
index cd3c018..39f6ccb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/expression/DRIDesignSystemExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.expression;
+package software.xdev.dynamicreports.design.definition.expression;
 
 /**
  * <p>DRIDesignSystemExpression interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBaseStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignBaseStyle.java
similarity index 61%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBaseStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignBaseStyle.java
index 8a996da..26953d3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBaseStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignBaseStyle.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.Rotation;
-import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
-import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.Rotation;
+import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
 
 import java.awt.Color;
 import java.io.Serializable;
@@ -60,63 +60,63 @@ public interface DRIDesignBaseStyle extends Serializable {
     /**
      * <p>getImageScale.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      */
     public ImageScale getImageScale();
 
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public HorizontalTextAlignment getHorizontalTextAlignment();
 
     /**
      * <p>getVerticalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.VerticalTextAlignment} object.
      */
     public VerticalTextAlignment getVerticalTextAlignment();
 
     /**
      * <p>getHorizontalImageAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public HorizontalImageAlignment getHorizontalImageAlignment();
 
     /**
      * <p>getVerticalImageAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.VerticalImageAlignment} object.
      */
     public VerticalImageAlignment getVerticalImageAlignment();
 
     /**
      * <p>getBorder.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignBorder} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignBorder} object.
      */
     public DRIDesignBorder getBorder();
 
     /**
      * <p>getPadding.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPadding} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPadding} object.
      */
     public DRIDesignPadding getPadding();
 
     /**
      * <p>getFont.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignFont} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignFont} object.
      */
     public DRIDesignFont getFont();
 
     /**
      * <p>getRotation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Rotation} object.
      */
     public Rotation getRotation();
 
@@ -130,21 +130,21 @@ public interface DRIDesignBaseStyle extends Serializable {
     /**
      * <p>getMarkup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      */
     public Markup getMarkup();
 
     /**
      * <p>getParagraph.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignParagraph} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignParagraph} object.
      */
     public DRIDesignParagraph getParagraph();
 
     /**
      * <p>getLinePen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     public DRIDesignPen getLinePen();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBorder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignBorder.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBorder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignBorder.java
index bdebce7..e5945a1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignBorder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignBorder.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
 import java.io.Serializable;
 
@@ -30,28 +30,28 @@ public interface DRIDesignBorder extends Serializable {
     /**
      * <p>getTopPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     public DRIDesignPen getTopPen();
 
     /**
      * <p>getLeftPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     public DRIDesignPen getLeftPen();
 
     /**
      * <p>getBottomPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     public DRIDesignPen getBottomPen();
 
     /**
      * <p>getRightPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     public DRIDesignPen getRightPen();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java
index e3b3a45..9b880f6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignConditionalStyle.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
 
 /**
  * <p>DRIDesignConditionalStyle interface.</p>
@@ -31,14 +31,14 @@ public interface DRIDesignConditionalStyle extends DRIDesignBaseStyle {
     /**
      * <p>getConditionExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getConditionExpression();
 
     /**
      * <p>getDataset.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
      */
     public DRIDesignDataset getDataset();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignFont.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignFont.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignFont.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignFont.java
index 6360c32..35789c3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignFont.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignFont.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPadding.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignPadding.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPadding.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignPadding.java
index 20e68de..3d64ced 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPadding.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignPadding.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignParagraph.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignParagraph.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignParagraph.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignParagraph.java
index e06cf16..764f5bb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignParagraph.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignParagraph.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
-import net.sf.dynamicreports.report.constant.LineSpacing;
+import software.xdev.dynamicreports.report.constant.LineSpacing;
 
 import java.io.Serializable;
 import java.util.List;
@@ -33,7 +33,7 @@ public interface DRIDesignParagraph extends Serializable {
     /**
      * <p>getLineSpacing.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.LineSpacing} object.
      */
     public LineSpacing getLineSpacing();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPen.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignPen.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPen.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignPen.java
index 2352c31..055ad43 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignPen.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignPen.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
-import net.sf.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.report.constant.LineStyle;
 
 import java.awt.Color;
 import java.io.Serializable;
@@ -40,7 +40,7 @@ public interface DRIDesignPen extends Serializable {
     /**
      * <p>getLineStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
      */
     public LineStyle getLineStyle();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignStyle.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignStyle.java
index f8d3707..ce5531b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignStyle.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
 import java.util.List;
 
@@ -37,7 +37,7 @@ public interface DRIDesignStyle extends DRIDesignBaseStyle {
     /**
      * <p>getParentStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignStyle} object.
      */
     public DRIDesignStyle getParentStyle();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignTabStop.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignTabStop.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignTabStop.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignTabStop.java
index addc56f..29b78c1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/definition/style/DRIDesignTabStop.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/definition/style/DRIDesignTabStop.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.definition.style;
+package software.xdev.dynamicreports.design.definition.style;
 
-import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import software.xdev.dynamicreports.report.constant.TabStopAlignment;
 
 import java.io.Serializable;
 
@@ -39,7 +39,7 @@ public interface DRIDesignTabStop extends Serializable {
     /**
      * <p>getAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TabStopAlignment} object.
      */
     public TabStopAlignment getAlignment();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/exception/DRDesignReportException.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/exception/DRDesignReportException.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/exception/DRDesignReportException.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/exception/DRDesignReportException.java
index a0777b0..131455c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/exception/DRDesignReportException.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/exception/DRDesignReportException.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.exception;
+package software.xdev.dynamicreports.design.exception;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRDesignReportException class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/AbstractExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/AbstractExpressionTransform.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/AbstractExpressionTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/AbstractExpressionTransform.java
index e1a1fa5..94bfb02 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/AbstractExpressionTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/AbstractExpressionTransform.java
@@ -15,50 +15,50 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
-
-import net.sf.dynamicreports.design.base.DRDesignField;
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.base.DRDesignSort;
-import net.sf.dynamicreports.design.base.DRDesignVariable;
-import net.sf.dynamicreports.design.base.expression.DRDesignComplexExpression;
-import net.sf.dynamicreports.design.base.expression.DRDesignJasperExpression;
-import net.sf.dynamicreports.design.base.expression.DRDesignParameterExpression;
-import net.sf.dynamicreports.design.base.expression.DRDesignPropertyExpression;
-import net.sf.dynamicreports.design.base.expression.DRDesignSimpleExpression;
-import net.sf.dynamicreports.design.base.expression.DRDesignSystemExpression;
-import net.sf.dynamicreports.design.base.expression.DRDesignValueFormatter;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.DRIDesignField;
-import net.sf.dynamicreports.design.definition.DRIDesignSort;
-import net.sf.dynamicreports.design.definition.DRIDesignVariable;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.report.base.DRVariable;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.DRISort;
-import net.sf.dynamicreports.report.definition.DRISubtotal;
-import net.sf.dynamicreports.report.definition.DRIVariable;
-import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
-import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
-import net.sf.dynamicreports.report.definition.expression.DRIComplexExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
-import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.exception.DRException;
+package software.xdev.dynamicreports.design.transformation;
+
+import software.xdev.dynamicreports.design.base.DRDesignField;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.base.DRDesignSort;
+import software.xdev.dynamicreports.design.base.DRDesignVariable;
+import software.xdev.dynamicreports.design.base.expression.DRDesignComplexExpression;
+import software.xdev.dynamicreports.design.base.expression.DRDesignJasperExpression;
+import software.xdev.dynamicreports.design.base.expression.DRDesignParameterExpression;
+import software.xdev.dynamicreports.design.base.expression.DRDesignPropertyExpression;
+import software.xdev.dynamicreports.design.base.expression.DRDesignSimpleExpression;
+import software.xdev.dynamicreports.design.base.expression.DRDesignSystemExpression;
+import software.xdev.dynamicreports.design.base.expression.DRDesignValueFormatter;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.DRIDesignField;
+import software.xdev.dynamicreports.design.definition.DRIDesignSort;
+import software.xdev.dynamicreports.design.definition.DRIDesignVariable;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.report.base.DRVariable;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.DRISort;
+import software.xdev.dynamicreports.report.definition.DRISubtotal;
+import software.xdev.dynamicreports.report.definition.DRIVariable;
+import software.xdev.dynamicreports.report.definition.column.DRIBooleanColumn;
+import software.xdev.dynamicreports.report.definition.column.DRIValueColumn;
+import software.xdev.dynamicreports.report.definition.expression.DRIComplexExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIJasperExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRISystemExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -87,7 +87,7 @@ public abstract class AbstractExpressionTransform {
     /**
      * <p>Constructor for AbstractExpressionTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public AbstractExpressionTransform(DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -108,7 +108,7 @@ private void init() {
     /**
      * <p>transform.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transform() throws DRException {
         for (DRIField<?> field : transformFields()) {
@@ -125,9 +125,9 @@ public void transform() throws DRException {
     /**
      * <p>transformExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public DRIDesignExpression transformExpression(DRIExpression<?> expression) throws DRException {
         return transformExpression(expression, null, null);
@@ -136,10 +136,10 @@ public DRIDesignExpression transformExpression(DRIExpression<?> expression) thro
     /**
      * <p>transformExpression.</p>
      *
-     * @param expression    a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression    a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param parameterName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRIDesignExpression transformExpression(DRIExpression<?> expression, String parameterName) throws DRException {
         return transformExpression(expression, null, parameterName);
@@ -148,11 +148,11 @@ protected DRIDesignExpression transformExpression(DRIExpression<?> expression, S
     /**
      * <p>transformExpression.</p>
      *
-     * @param expression     a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param expression     a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      * @param parameterName  a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRIDesignExpression transformExpression(DRIExpression<?> expression, DRIValueFormatter<?, ?> valueFormatter, String parameterName) throws DRException {
         if (expression == null) {
@@ -224,8 +224,8 @@ private DRIDesignExpression transformVariable(DRIVariable<?> variable) throws DR
     /**
      * <p>getVariableResetType.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.definition.DRIVariable} object.
-     * @return a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.definition.DRIVariable} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
      */
     protected ResetType getVariableResetType(DRIVariable<?> variable) {
         return null;
@@ -234,9 +234,9 @@ protected ResetType getVariableResetType(DRIVariable<?> variable) {
     /**
      * <p>getVariableResetGroup.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.definition.DRIVariable} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param variable a {@link software.xdev.dynamicreports.report.definition.DRIVariable} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignGroup getVariableResetGroup(DRIVariable<?> variable) throws DRException {
         return null;
@@ -263,9 +263,9 @@ private void transformSort(DRISort sort) throws DRException {
     /**
      * <p>transformPropertyExpression.</p>
      *
-     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param propertyExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignPropertyExpression} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRIDesignPropertyExpression transformPropertyExpression(DRIPropertyExpression propertyExpression) throws DRException {
         DRDesignPropertyExpression designPropertyExpression = new DRDesignPropertyExpression();
@@ -277,9 +277,9 @@ protected DRIDesignPropertyExpression transformPropertyExpression(DRIPropertyExp
     /**
      * <p>transformParameterExpression.</p>
      *
-     * @param parameterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIParameterExpression} object.
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param parameterExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignParameterExpression} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRIDesignParameterExpression transformParameterExpression(DRIParameterExpression parameterExpression) throws DRException {
         DRDesignParameterExpression designParameterExpression = new DRDesignParameterExpression();
@@ -453,7 +453,7 @@ public Collection<DRIDesignSort> getSorts() {
     /**
      * <p>getDataset.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
      */
     protected abstract DRIDesignDataset getDataset();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandComponentsTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/BandComponentsTransform.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandComponentsTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/BandComponentsTransform.java
index 166c70f..e0076f1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandComponentsTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/BandComponentsTransform.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
-
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignFiller;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
-import net.sf.dynamicreports.design.constant.ComponentGroupType;
-import net.sf.dynamicreports.report.constant.StretchType;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
-import net.sf.dynamicreports.report.exception.DRException;
+package software.xdev.dynamicreports.design.transformation;
+
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignFiller;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
+import software.xdev.dynamicreports.design.constant.ComponentGroupType;
+import software.xdev.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,7 +48,7 @@ class BandComponentsTransform {
     /**
      * <p>Constructor for BandComponentsTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public BandComponentsTransform(DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -58,11 +58,11 @@ public BandComponentsTransform(DesignTransformAccessor accessor) {
     /**
      * <p>prepareBand.</p>
      *
-     * @param band                     a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @param band                     a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      * @param maxWidth                 a int.
      * @param templateDesignComponents a int.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public DRDesignBand prepareBand(DRDesignBand band, int maxWidth, int templateDesignComponents) throws DRException {
         if (band == null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/BandTransform.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/BandTransform.java
index 9641ea2..8649974 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/BandTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/BandTransform.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
-
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.base.component.DRDesignFiller;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.DRIDesignPage;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.definition.DRIBand;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.DRIReport;
-import net.sf.dynamicreports.report.definition.DRITemplateDesign;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.exception.DRException;
+package software.xdev.dynamicreports.design.transformation;
+
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.base.component.DRDesignFiller;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.DRIDesignPage;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.definition.DRIBand;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,7 +61,7 @@ public class BandTransform {
     /**
      * <p>Constructor for BandTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public BandTransform(DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -71,7 +71,7 @@ public BandTransform(DesignTransformAccessor accessor) {
     /**
      * <p>transform.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transform() throws DRException {
         TemplateTransform templateTransform = accessor.getTemplateTransform();
@@ -143,7 +143,7 @@ public void transform() throws DRException {
     /**
      * <p>prepareBands.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void prepareBands() throws DRException {
         BandComponentsTransform bandComponents = new BandComponentsTransform(accessor);
@@ -212,14 +212,14 @@ public void prepareBands() throws DRException {
      *
      * @param bandName                   a {@link java.lang.String} object.
      * @param bandName                   a {@link java.lang.String} object.
-     * @param band                       a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-     * @param splitType                  a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-     * @param defaultStyle               a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
-     * @param defaultBackgroundComponent a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
-     * @param resetType                  a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup                 a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param band                       a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+     * @param splitType                  a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+     * @param defaultStyle               a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param defaultBackgroundComponent a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
+     * @param resetType                  a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup                 a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignBand band(String bandName, DRIBand band, SplitType splitType, DRIReportStyle defaultStyle, DRIComponent defaultBackgroundComponent, ResetType resetType, DRDesignGroup resetGroup)
         throws DRException {
@@ -243,12 +243,12 @@ protected DRDesignBand band(String bandName, DRIBand band, SplitType splitType,
      *
      * @param bandName                   a {@link java.lang.String} object.
      * @param bandName                   a {@link java.lang.String} object.
-     * @param band                       a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-     * @param splitType                  a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-     * @param defaultStyle               a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
-     * @param defaultBackgroundComponent a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param band                       a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+     * @param splitType                  a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+     * @param defaultStyle               a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param defaultBackgroundComponent a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignBand band(String bandName, DRIBand band, SplitType splitType, DRIReportStyle defaultStyle, DRIComponent defaultBackgroundComponent) throws DRException {
         DRDesignBand designBand = new DRDesignBand(bandName);
@@ -274,7 +274,7 @@ protected DRDesignBand band(String bandName, DRIBand band, SplitType splitType,
     /**
      * <p>Getter for the field <code>titleBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getTitleBand() {
         return titleBand;
@@ -283,7 +283,7 @@ public DRDesignBand getTitleBand() {
     /**
      * <p>Getter for the field <code>pageHeaderBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getPageHeaderBand() {
         return pageHeaderBand;
@@ -292,7 +292,7 @@ public DRDesignBand getPageHeaderBand() {
     /**
      * <p>Getter for the field <code>pageFooterBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getPageFooterBand() {
         return pageFooterBand;
@@ -301,7 +301,7 @@ public DRDesignBand getPageFooterBand() {
     /**
      * <p>Getter for the field <code>columnHeaderBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getColumnHeaderBand() {
         return columnHeaderBand;
@@ -310,7 +310,7 @@ public DRDesignBand getColumnHeaderBand() {
     /**
      * <p>Getter for the field <code>columnHeaderForGroupBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getColumnHeaderForGroupBand() {
         return columnHeaderForGroupBand;
@@ -319,7 +319,7 @@ public DRDesignBand getColumnHeaderForGroupBand() {
     /**
      * <p>Getter for the field <code>columnFooterBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getColumnFooterBand() {
         return columnFooterBand;
@@ -337,7 +337,7 @@ public List<DRDesignBand> getDetailBands() {
     /**
      * <p>Getter for the field <code>detailBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getDetailBand() {
         return detailBand;
@@ -346,7 +346,7 @@ public DRDesignBand getDetailBand() {
     /**
      * <p>Getter for the field <code>lastPageFooterBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getLastPageFooterBand() {
         return lastPageFooterBand;
@@ -355,7 +355,7 @@ public DRDesignBand getLastPageFooterBand() {
     /**
      * <p>Getter for the field <code>summaryBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getSummaryBand() {
         return summaryBand;
@@ -364,7 +364,7 @@ public DRDesignBand getSummaryBand() {
     /**
      * <p>Getter for the field <code>noDataBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getNoDataBand() {
         return noDataBand;
@@ -373,7 +373,7 @@ public DRDesignBand getNoDataBand() {
     /**
      * <p>Getter for the field <code>backgroundBand</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignBand} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignBand} object.
      */
     public DRDesignBand getBackgroundBand() {
         return backgroundBand;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGrid.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnGrid.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGrid.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnGrid.java
index 53ebb13..256f795 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGrid.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnGrid.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.column.DRIColumn;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.column.DRIColumn;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -45,8 +45,8 @@ public ColumnGrid() {
     /**
      * <p>addList.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
-     * @param list   a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @param column a {@link software.xdev.dynamicreports.report.definition.column.DRIColumn} object.
+     * @param list   a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     public void addList(DRIColumn<?> column, DRDesignList list) {
         columnsLists.put(column, list);
@@ -55,8 +55,8 @@ public void addList(DRIColumn<?> column, DRDesignList list) {
     /**
      * <p>addComponent.</p>
      *
-     * @param column    a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param column    a {@link software.xdev.dynamicreports.report.definition.column.DRIColumn} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void addComponent(DRIColumn<?> column, DRDesignComponent component) {
         if (columnsLists.containsKey(column)) {
@@ -67,10 +67,10 @@ public void addComponent(DRIColumn<?> column, DRDesignComponent component) {
     /**
      * <p>addComponent.</p>
      *
-     * @param column              a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
-     * @param component           a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param column              a {@link software.xdev.dynamicreports.report.definition.column.DRIColumn} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      */
     public void addComponent(DRIColumn<?> column, HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRDesignComponent component) {
         if (columnsLists.containsKey(column)) {
@@ -81,7 +81,7 @@ public void addComponent(DRIColumn<?> column, HorizontalCellComponentAlignment h
     /**
      * <p>Getter for the field <code>list</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     public DRDesignList getList() {
         return list;
@@ -90,7 +90,7 @@ public DRDesignList getList() {
     /**
      * <p>Setter for the field <code>list</code>.</p>
      *
-     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @param list a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     public void setList(DRDesignList list) {
         this.list = list;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGridTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnGridTransform.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGridTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnGridTransform.java
index b408141..a1b05d8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnGridTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnGridTransform.java
@@ -15,31 +15,31 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.component.DRDesignFiller;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignListCell;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.base.style.DRDesignStyle;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.base.grid.DRColumnGridList;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.DRIReport;
-import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
-import net.sf.dynamicreports.report.definition.column.DRIColumn;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGrid;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridList;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridListCell;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnTitleGroup;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.component.DRDesignFiller;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignListCell;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.base.style.DRDesignStyle;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.base.grid.DRColumnGridList;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.report.definition.column.DRIBooleanColumn;
+import software.xdev.dynamicreports.report.definition.column.DRIColumn;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGrid;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridList;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridListCell;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnTitleGroup;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * <p>ColumnGridTransform class.</p>
@@ -54,7 +54,7 @@ public class ColumnGridTransform {
     /**
      * <p>Constructor for ColumnGridTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public ColumnGridTransform(final DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -92,8 +92,8 @@ private void addColumnsToGridList(final DRColumnGridList columnGridList) {
     /**
      * <p>createColumnGrid.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.ColumnGrid} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.ColumnGrid} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected ColumnGrid createColumnGrid() throws DRException {
         return createColumnGrid(columnGridList, null, false);
@@ -102,9 +102,9 @@ protected ColumnGrid createColumnGrid() throws DRException {
     /**
      * <p>createColumnTitleGrid.</p>
      *
-     * @param groupPaddingStyle a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
-     * @return a {@link net.sf.dynamicreports.design.transformation.ColumnGrid} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param groupPaddingStyle a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.ColumnGrid} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected ColumnGrid createColumnTitleGrid(final DRDesignStyle groupPaddingStyle) throws DRException {
         return createColumnGrid(columnGridList, groupPaddingStyle, true);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnTransform.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnTransform.java
index 9f36779..b5f9233 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ColumnTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ColumnTransform.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -23,26 +23,26 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.base.style.DRDesignStyle;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.report.base.component.DRBooleanField;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
-import net.sf.dynamicreports.report.base.style.DRPadding;
-import net.sf.dynamicreports.report.base.style.DRStyle;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
-import net.sf.dynamicreports.report.definition.column.DRIColumn;
-import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.base.style.DRDesignStyle;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.report.base.component.DRBooleanField;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.base.style.DRConditionalStyle;
+import software.xdev.dynamicreports.report.base.style.DRPadding;
+import software.xdev.dynamicreports.report.base.style.DRStyle;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.definition.column.DRIBooleanColumn;
+import software.xdev.dynamicreports.report.definition.column.DRIColumn;
+import software.xdev.dynamicreports.report.definition.column.DRIValueColumn;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIConditionalStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRISimpleStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * <p>ColumnTransform class.</p>
@@ -57,7 +57,7 @@ public class ColumnTransform {
     /**
      * <p>Constructor for ColumnTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public ColumnTransform(final DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -68,7 +68,7 @@ public ColumnTransform(final DesignTransformAccessor accessor) {
     /**
      * <p>transform.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transform() throws DRException {
         columnComponents = getColumnComponents();
@@ -263,8 +263,8 @@ private DRConditionalStyle detailRowConditionalStyle(final DRISimpleStyle style,
     /**
      * <p>getColumnComponent.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @param column a {@link software.xdev.dynamicreports.report.definition.column.DRIColumn} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getColumnComponent(final DRIColumn<?> column) {
         return columnComponents.get(column);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ComponentPosition.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentPosition.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ComponentPosition.java
index 8db992c..77f815c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentPosition.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ComponentPosition.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
-
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignListCell;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.exception.DRException;
+package software.xdev.dynamicreports.design.transformation;
+
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignListCell;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,10 +39,10 @@ class ComponentPosition {
      * <p>component.</p>
      *
      * @param name      a {@link java.lang.String} object.
-     * @param component a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
      * @param maxWidth  a int.
      * @param maxHeight a int.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected static void component(String name, DRDesignComponent component, int maxWidth, int maxHeight) throws DRException {
         if (component instanceof DRDesignList) {
@@ -210,7 +210,7 @@ private static VerticalCellComponentAlignment detectVerticalCellComponentAlignme
     /**
      * <p>width.</p>
      *
-     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @param list a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     protected static void width(DRDesignList list) {
         int maxWidth = 0;
@@ -403,7 +403,7 @@ private static int splitHorizontalListWhenOverflowWidth(String name, DRDesignLis
     /**
      * <p>height.</p>
      *
-     * @param list a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
+     * @param list a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
      */
     protected static void height(DRDesignList list) {
         int maxHeight = 0;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ComponentTransform.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ComponentTransform.java
index a2a47ba..71015af 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ComponentTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ComponentTransform.java
@@ -15,97 +15,97 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
-
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.base.DRDesignHyperLink;
-import net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading;
-import net.sf.dynamicreports.design.base.DRDesignVariable;
-import net.sf.dynamicreports.design.base.component.DRDesignBreak;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignEllipse;
-import net.sf.dynamicreports.design.base.component.DRDesignFiller;
-import net.sf.dynamicreports.design.base.component.DRDesignGenericElement;
-import net.sf.dynamicreports.design.base.component.DRDesignHyperlinkComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignImage;
-import net.sf.dynamicreports.design.base.component.DRDesignLine;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignMap;
-import net.sf.dynamicreports.design.base.component.DRDesignRectangle;
-import net.sf.dynamicreports.design.base.component.DRDesignSubreport;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
-import net.sf.dynamicreports.design.base.style.DRDesignStyle;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.DRIDesignField;
-import net.sf.dynamicreports.design.definition.DRIDesignVariable;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.design.transformation.expressions.BooleanTextValueFormatter;
-import net.sf.dynamicreports.design.transformation.expressions.CurrentDateExpression;
-import net.sf.dynamicreports.design.transformation.expressions.MultiPageListDataSourceExpression;
-import net.sf.dynamicreports.design.transformation.expressions.MultiPageListSubreportExpression;
-import net.sf.dynamicreports.design.transformation.expressions.PageNumberExpression;
-import net.sf.dynamicreports.design.transformation.expressions.PageXofYNumberExpression;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.DRGroup;
-import net.sf.dynamicreports.report.base.DRHyperLink;
-import net.sf.dynamicreports.report.base.component.DRHyperLinkComponent;
-import net.sf.dynamicreports.report.base.component.DRList;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.base.style.DRPen;
-import net.sf.dynamicreports.report.base.style.DRStyle;
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.component.Components;
-import net.sf.dynamicreports.report.builder.datatype.DataTypes;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.component.CustomComponentTransform;
-import net.sf.dynamicreports.report.component.CustomComponents;
-import net.sf.dynamicreports.report.component.DRICustomComponent;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.DRIHyperLink;
-import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
-import net.sf.dynamicreports.report.definition.component.DRIBreak;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.component.DRICurrentDate;
-import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
-import net.sf.dynamicreports.report.definition.component.DRIEllipse;
-import net.sf.dynamicreports.report.definition.component.DRIFiller;
-import net.sf.dynamicreports.report.definition.component.DRIFormatField;
-import net.sf.dynamicreports.report.definition.component.DRIGenericElement;
-import net.sf.dynamicreports.report.definition.component.DRIHyperLinkComponent;
-import net.sf.dynamicreports.report.definition.component.DRIImage;
-import net.sf.dynamicreports.report.definition.component.DRILine;
-import net.sf.dynamicreports.report.definition.component.DRIList;
-import net.sf.dynamicreports.report.definition.component.DRIListCell;
-import net.sf.dynamicreports.report.definition.component.DRIMap;
-import net.sf.dynamicreports.report.definition.component.DRIMultiPageList;
-import net.sf.dynamicreports.report.definition.component.DRIPageNumber;
-import net.sf.dynamicreports.report.definition.component.DRIPageXofY;
-import net.sf.dynamicreports.report.definition.component.DRIRectangle;
-import net.sf.dynamicreports.report.definition.component.DRISubreport;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.component.DRITotalPages;
-import net.sf.dynamicreports.report.definition.component.DRIXyList;
-import net.sf.dynamicreports.report.definition.component.DRIXyListCell;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.exception.DRException;
+package software.xdev.dynamicreports.design.transformation;
+
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.base.DRDesignHyperLink;
+import software.xdev.dynamicreports.design.base.DRDesignTableOfContentsHeading;
+import software.xdev.dynamicreports.design.base.DRDesignVariable;
+import software.xdev.dynamicreports.design.base.component.DRDesignBreak;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignEllipse;
+import software.xdev.dynamicreports.design.base.component.DRDesignFiller;
+import software.xdev.dynamicreports.design.base.component.DRDesignGenericElement;
+import software.xdev.dynamicreports.design.base.component.DRDesignHyperlinkComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignImage;
+import software.xdev.dynamicreports.design.base.component.DRDesignLine;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignMap;
+import software.xdev.dynamicreports.design.base.component.DRDesignRectangle;
+import software.xdev.dynamicreports.design.base.component.DRDesignSubreport;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import software.xdev.dynamicreports.design.base.style.DRDesignStyle;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.DRIDesignField;
+import software.xdev.dynamicreports.design.definition.DRIDesignVariable;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.design.transformation.expressions.BooleanTextValueFormatter;
+import software.xdev.dynamicreports.design.transformation.expressions.CurrentDateExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.MultiPageListDataSourceExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.MultiPageListSubreportExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.PageNumberExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.PageXofYNumberExpression;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.DRGroup;
+import software.xdev.dynamicreports.report.base.DRHyperLink;
+import software.xdev.dynamicreports.report.base.component.DRHyperLinkComponent;
+import software.xdev.dynamicreports.report.base.component.DRList;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.base.style.DRPen;
+import software.xdev.dynamicreports.report.base.style.DRStyle;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.component.Components;
+import software.xdev.dynamicreports.report.builder.datatype.DataTypes;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.component.CustomComponentTransform;
+import software.xdev.dynamicreports.report.component.CustomComponents;
+import software.xdev.dynamicreports.report.component.DRICustomComponent;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.DRIHyperLink;
+import software.xdev.dynamicreports.report.definition.component.DRIBooleanField;
+import software.xdev.dynamicreports.report.definition.component.DRIBreak;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.component.DRICurrentDate;
+import software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent;
+import software.xdev.dynamicreports.report.definition.component.DRIEllipse;
+import software.xdev.dynamicreports.report.definition.component.DRIFiller;
+import software.xdev.dynamicreports.report.definition.component.DRIFormatField;
+import software.xdev.dynamicreports.report.definition.component.DRIGenericElement;
+import software.xdev.dynamicreports.report.definition.component.DRIHyperLinkComponent;
+import software.xdev.dynamicreports.report.definition.component.DRIImage;
+import software.xdev.dynamicreports.report.definition.component.DRILine;
+import software.xdev.dynamicreports.report.definition.component.DRIList;
+import software.xdev.dynamicreports.report.definition.component.DRIListCell;
+import software.xdev.dynamicreports.report.definition.component.DRIMap;
+import software.xdev.dynamicreports.report.definition.component.DRIMultiPageList;
+import software.xdev.dynamicreports.report.definition.component.DRIPageNumber;
+import software.xdev.dynamicreports.report.definition.component.DRIPageXofY;
+import software.xdev.dynamicreports.report.definition.component.DRIRectangle;
+import software.xdev.dynamicreports.report.definition.component.DRISubreport;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.component.DRITotalPages;
+import software.xdev.dynamicreports.report.definition.component.DRIXyList;
+import software.xdev.dynamicreports.report.definition.component.DRIXyListCell;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * <p>ComponentTransform class.</p>
@@ -119,7 +119,7 @@ public class ComponentTransform {
     /**
      * <p>Constructor for ComponentTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public ComponentTransform(final DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -130,12 +130,12 @@ public ComponentTransform(final DesignTransformAccessor accessor) {
     /**
      * <p>component.</p>
      *
-     * @param component        a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
-     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
-     * @param resetType        a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup       a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param component        a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
+     * @param defaultStyleType a {@link software.xdev.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType        a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup       a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignComponent component(final DRIComponent component, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
         if (component instanceof DRITextField<?>) {
@@ -251,12 +251,12 @@ private void hyperlink(final DRDesignHyperlinkComponent designHyperlinkComponent
     /**
      * <p>list.</p>
      *
-     * @param list             a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
-     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
-     * @param resetType        a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup       a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param list             a {@link software.xdev.dynamicreports.report.definition.component.DRIList} object.
+     * @param defaultStyleType a {@link software.xdev.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType        a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup       a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignList list(final DRIList list, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
         final DRDesignList designList = new DRDesignList();
@@ -290,12 +290,12 @@ protected DRDesignList list(final DRIList list, final DefaultStyleType defaultSt
     /**
      * <p>xyList.</p>
      *
-     * @param xyList           a {@link net.sf.dynamicreports.report.definition.component.DRIXyList} object.
-     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
-     * @param resetType        a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup       a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignList} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param xyList           a {@link software.xdev.dynamicreports.report.definition.component.DRIXyList} object.
+     * @param defaultStyleType a {@link software.xdev.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType        a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup       a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignList} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignList xyList(final DRIXyList xyList, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
         final DRDesignList designList = new DRDesignList(null);
@@ -318,12 +318,12 @@ protected DRDesignList xyList(final DRIXyList xyList, final DefaultStyleType def
     /**
      * <p>listBackgroundComponent.</p>
      *
-     * @param backgroundComponent a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
-     * @param defaultStyleType    a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
-     * @param resetType           a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup          a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param backgroundComponent a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
+     * @param defaultStyleType    a {@link software.xdev.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType           a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup          a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignComponent listBackgroundComponent(final DRIComponent backgroundComponent, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
         if (backgroundComponent != null) {
@@ -366,10 +366,10 @@ private DRDesignSubreport multiPageList(final DRIMultiPageList multiPageList) th
     /**
      * <p>textField.</p>
      *
-     * @param textField        a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
-     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignTextField} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param textField        a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
+     * @param defaultStyleType a {@link software.xdev.dynamicreports.design.constant.DefaultStyleType} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignTextField} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignTextField textField(final DRITextField<?> textField, final DefaultStyleType defaultStyleType) throws DRException {
         final DRDesignTextField designTextField = new DRDesignTextField();
@@ -408,9 +408,9 @@ protected DRDesignTextField textField(final DRITextField<?> textField, final Def
     /**
      * <p>filler.</p>
      *
-     * @param filler a {@link net.sf.dynamicreports.report.definition.component.DRIFiller} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignFiller} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param filler a {@link software.xdev.dynamicreports.report.definition.component.DRIFiller} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignFiller} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignFiller filler(final DRIFiller filler) throws DRException {
         final DRDesignFiller designFiller = new DRDesignFiller();
@@ -606,9 +606,9 @@ private DRTextField<String> formatField(final DRIFormatField formatField, final
     /**
      * <p>line.</p>
      *
-     * @param line a {@link net.sf.dynamicreports.report.definition.component.DRILine} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignLine} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param line a {@link software.xdev.dynamicreports.report.definition.component.DRILine} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignLine} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignLine line(final DRILine line) throws DRException {
         final DRDesignLine designLine = new DRDesignLine();
@@ -625,9 +625,9 @@ protected DRDesignLine line(final DRILine line) throws DRException {
     /**
      * <p>ellipse.</p>
      *
-     * @param ellipse a {@link net.sf.dynamicreports.report.definition.component.DRIEllipse} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignEllipse} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param ellipse a {@link software.xdev.dynamicreports.report.definition.component.DRIEllipse} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignEllipse} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignEllipse ellipse(final DRIEllipse ellipse) throws DRException {
         final DRDesignEllipse designEllipse = new DRDesignEllipse();
@@ -643,9 +643,9 @@ protected DRDesignEllipse ellipse(final DRIEllipse ellipse) throws DRException {
     /**
      * <p>rectangle.</p>
      *
-     * @param rectangle a {@link net.sf.dynamicreports.report.definition.component.DRIRectangle} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignRectangle} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param rectangle a {@link software.xdev.dynamicreports.report.definition.component.DRIRectangle} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignRectangle} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignRectangle rectangle(final DRIRectangle rectangle) throws DRException {
         final DRDesignRectangle designRectangle = new DRDesignRectangle();
@@ -662,12 +662,12 @@ protected DRDesignRectangle rectangle(final DRIRectangle rectangle) throws DRExc
     /**
      * <p>booleanField.</p>
      *
-     * @param booleanField     a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
-     * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
-     * @param resetType        a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup       a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignComponent} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param booleanField     a {@link software.xdev.dynamicreports.report.definition.component.DRIBooleanField} object.
+     * @param defaultStyleType a {@link software.xdev.dynamicreports.design.constant.DefaultStyleType} object.
+     * @param resetType        a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup       a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignComponent} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignComponent booleanField(final DRIBooleanField booleanField, final DefaultStyleType defaultStyleType, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
         final BooleanComponentType componentType =
@@ -728,9 +728,9 @@ protected DRDesignComponent booleanField(final DRIBooleanField booleanField, fin
     /**
      * <p>breakComponent.</p>
      *
-     * @param breakComponent a {@link net.sf.dynamicreports.report.definition.component.DRIBreak} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignBreak} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param breakComponent a {@link software.xdev.dynamicreports.report.definition.component.DRIBreak} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignBreak} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignBreak breakComponent(final DRIBreak breakComponent) throws DRException {
         final DRDesignBreak designBreak = new DRDesignBreak();
@@ -746,11 +746,11 @@ protected DRDesignBreak breakComponent(final DRIBreak breakComponent) throws DRE
     /**
      * <p>genericElement.</p>
      *
-     * @param genericElement a {@link net.sf.dynamicreports.report.definition.component.DRIGenericElement} object.
-     * @param resetType      a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup     a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.component.DRDesignGenericElement} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param genericElement a {@link software.xdev.dynamicreports.report.definition.component.DRIGenericElement} object.
+     * @param resetType      a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup     a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.component.DRDesignGenericElement} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignGenericElement genericElement(final DRIGenericElement genericElement, final ResetType resetType, final DRDesignGroup resetGroup) throws DRException {
         final DRDesignGenericElement designGenericElement = new DRDesignGenericElement();
@@ -811,8 +811,8 @@ private DRDesignComponent customComponent(final DRICustomComponent component, fi
     /**
      * <p>detectEvaluationTime.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
-     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @param expression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     protected EvaluationTime detectEvaluationTime(final DRIDesignExpression expression) {
         if (expression == null) {
@@ -835,8 +835,8 @@ protected EvaluationTime detectEvaluationTime(final DRIDesignExpression expressi
     /**
      * <p>evaluationTimeFromResetType.</p>
      *
-     * @param resetType a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @param resetType a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     public EvaluationTime evaluationTimeFromResetType(final ResetType resetType) {
         if (resetType == null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ConstantTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ConstantTransform.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ConstantTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ConstantTransform.java
index 7ea19de..80118ee 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ConstantTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ConstantTransform.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * @author Ricardo Mariaca
@@ -35,10 +35,10 @@ class ConstantTransform {
     /**
      * <p>variableResetType.</p>
      *
-     * @param resetType  a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
-     * @param resetGroup a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-     * @param accessor   a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
-     * @return a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+     * @param resetType  a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
+     * @param resetGroup a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+     * @param accessor   a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
      */
     public static ResetType variableResetType(Evaluation resetType, DRIGroup resetGroup, DesignTransformAccessor accessor) {
         if (resetType == null) {
@@ -80,11 +80,11 @@ public static ResetType variableResetType(Evaluation resetType, DRIGroup resetGr
      * <p>variableResetGroup.</p>
      *
      * @param name       a {@link java.lang.String} object.
-     * @param resetType  a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
-     * @param resetGroup a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-     * @param accessor   a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param resetType  a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
+     * @param resetGroup a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+     * @param accessor   a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public static DRIGroup variableResetGroup(String name, Evaluation resetType, DRIGroup resetGroup, DesignTransformAccessor accessor) throws DRException {
         if (resetType == null) {
@@ -128,10 +128,10 @@ public static DRIGroup variableResetGroup(String name, Evaluation resetType, DRI
     /**
      * <p>textFieldEvaluationTime.</p>
      *
-     * @param evaluationTime  a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
-     * @param evaluationGroup a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-     * @param accessor        a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
-     * @return a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+     * @param evaluationTime  a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
+     * @param evaluationGroup a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+     * @param accessor        a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @return a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
      */
     public static EvaluationTime textFieldEvaluationTime(Evaluation evaluationTime, DRIGroup evaluationGroup, DesignTransformAccessor accessor) {
         if (evaluationTime == null) {
@@ -172,11 +172,11 @@ public static EvaluationTime textFieldEvaluationTime(Evaluation evaluationTime,
     /**
      * <p>textFieldEvaluationGroup.</p>
      *
-     * @param evaluationTime  a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
-     * @param evaluationGroup a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-     * @param accessor        a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param evaluationTime  a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
+     * @param evaluationGroup a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+     * @param accessor        a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public static DRIGroup textFieldEvaluationGroup(Evaluation evaluationTime, DRIGroup evaluationGroup, DesignTransformAccessor accessor) throws DRException {
         if (evaluationTime == null) {
@@ -220,8 +220,8 @@ public static DRIGroup textFieldEvaluationGroup(Evaluation evaluationTime, DRIGr
     /**
      * <p>toHorizontalCellComponentAlignment.</p>
      *
-     * @param widthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param widthType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
      */
     public static HorizontalCellComponentAlignment toHorizontalCellComponentAlignment(ComponentDimensionType widthType) {
         if (widthType == null) {
@@ -243,8 +243,8 @@ public static HorizontalCellComponentAlignment toHorizontalCellComponentAlignmen
     /**
      * <p>toVerticalCellComponentAlignment.</p>
      *
-     * @param heightType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
-     * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param heightType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
      */
     public static VerticalCellComponentAlignment toVerticalCellComponentAlignment(ComponentDimensionType heightType) {
         if (heightType == null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CrosstabTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/CrosstabTransform.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CrosstabTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/CrosstabTransform.java
index c1549b2..9399756 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/CrosstabTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/CrosstabTransform.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -23,54 +23,54 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabDataset;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabGroup;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabMeasure;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.transformation.expressions.CrosstabExpression;
-import net.sf.dynamicreports.design.transformation.expressions.CrosstabMeasureExpression;
-import net.sf.dynamicreports.design.transformation.expressions.CrosstabPrintInEvenRow;
-import net.sf.dynamicreports.design.transformation.expressions.CrosstabPrintInOddRow;
-import net.sf.dynamicreports.design.transformation.expressions.CrosstabRowCount;
-import net.sf.dynamicreports.design.transformation.expressions.CrosstabRowCounter;
-import net.sf.dynamicreports.report.base.DRHyperLink;
-import net.sf.dynamicreports.report.base.component.DRFiller;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabCellContent;
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabCellStyle;
-import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
-import net.sf.dynamicreports.report.base.style.DRStyle;
-import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.constant.StretchType;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellContent;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabDataset;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
-import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
-import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabDataset;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabGroup;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabMeasure;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.transformation.expressions.CrosstabExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.CrosstabMeasureExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.CrosstabPrintInEvenRow;
+import software.xdev.dynamicreports.design.transformation.expressions.CrosstabPrintInOddRow;
+import software.xdev.dynamicreports.design.transformation.expressions.CrosstabRowCount;
+import software.xdev.dynamicreports.design.transformation.expressions.CrosstabRowCounter;
+import software.xdev.dynamicreports.report.base.DRHyperLink;
+import software.xdev.dynamicreports.report.base.component.DRFiller;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabCellContent;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabCellStyle;
+import software.xdev.dynamicreports.report.base.style.DRConditionalStyle;
+import software.xdev.dynamicreports.report.base.style.DRStyle;
+import software.xdev.dynamicreports.report.builder.expression.SystemMessageExpression;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabCellContent;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabDataset;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIJasperExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIConditionalStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRISimpleStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * <p>CrosstabTransform class.</p>
@@ -86,7 +86,7 @@ public class CrosstabTransform {
     /**
      * <p>Constructor for CrosstabTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public CrosstabTransform(final DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -101,11 +101,11 @@ private void init() {
     /**
      * <p>transform.</p>
      *
-     * @param crosstab   a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-     * @param resetType  a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param crosstab   a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+     * @param resetType  a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignCrosstab transform(final DRICrosstab crosstab, ResetType resetType, DRDesignGroup resetGroup) throws DRException {
         final DRDesignCrosstab designCrosstab = new DRDesignCrosstab();
@@ -556,8 +556,8 @@ private void addMeasure(final DRDesignCrosstab designCrosstab, final DRICrosstab
     /**
      * <p>getCrosstab.</p>
      *
-     * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
-     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+     * @param designCrosstab a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
      */
     protected DRICrosstab getCrosstab(final DRDesignCrosstab designCrosstab) {
         return crosstabs.get(designCrosstab);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DatasetExpressionTransform.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetExpressionTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DatasetExpressionTransform.java
index 78da367..075e923 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetExpressionTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DatasetExpressionTransform.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.report.definition.DRIDataset;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.DRISort;
-import net.sf.dynamicreports.report.definition.DRIVariable;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.report.definition.DRIDataset;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.DRISort;
+import software.xdev.dynamicreports.report.definition.DRIVariable;
 
 import java.util.List;
 
@@ -38,8 +38,8 @@ public class DatasetExpressionTransform extends AbstractExpressionTransform {
     /**
      * <p>Constructor for DatasetExpressionTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
-     * @param dataset  a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param dataset  a {@link software.xdev.dynamicreports.report.definition.DRIDataset} object.
      */
     public DatasetExpressionTransform(DesignTransformAccessor accessor, DRIDataset dataset) {
         super(accessor);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DatasetTransform.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DatasetTransform.java
index 7839eca..0bb2539 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DatasetTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DatasetTransform.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.DRDesignDataset;
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.jasper.base.JasperScriptlet;
-import net.sf.dynamicreports.report.definition.DRIDataset;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignDataset;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.jasper.base.JasperScriptlet;
+import software.xdev.dynamicreports.report.definition.DRIDataset;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -42,7 +42,7 @@ public class DatasetTransform {
     /**
      * <p>Constructor for DatasetTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public DatasetTransform(DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -53,9 +53,9 @@ public DatasetTransform(DesignTransformAccessor accessor) {
     /**
      * <p>transform.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignDataset} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param dataset a {@link software.xdev.dynamicreports.report.definition.DRIDataset} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignDataset} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public DRDesignDataset transform(DRIDataset dataset) throws DRException {
         if (dataset == null) {
@@ -83,8 +83,8 @@ public DRDesignDataset transform(DRIDataset dataset) throws DRException {
     /**
      * <p>getDatasetExpressionTransform.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
-     * @return a {@link net.sf.dynamicreports.design.transformation.DatasetExpressionTransform} object.
+     * @param dataset a {@link software.xdev.dynamicreports.report.definition.DRIDataset} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.DatasetExpressionTransform} object.
      */
     public DatasetExpressionTransform getDatasetExpressionTransform(DRIDataset dataset) {
         return designDatasets.get(dataset).getDatasetExpressionTransform();
@@ -93,8 +93,8 @@ public DatasetExpressionTransform getDatasetExpressionTransform(DRIDataset datas
     /**
      * <p>getDesignDataset.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignDataset} object.
+     * @param dataset a {@link software.xdev.dynamicreports.report.definition.DRIDataset} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignDataset} object.
      */
     protected DRDesignDataset getDesignDataset(DRIDataset dataset) {
         return designDatasets.get(dataset);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DesignTransformAccessor.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DesignTransformAccessor.java
similarity index 64%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DesignTransformAccessor.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DesignTransformAccessor.java
index c774804..0a23b63 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/DesignTransformAccessor.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/DesignTransformAccessor.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import net.sf.dynamicreports.design.base.DRDesignPage;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRIDataset;
-import net.sf.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.design.base.DRDesignPage;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRIDataset;
+import software.xdev.dynamicreports.report.definition.DRIReport;
 
 /**
  * <p>DesignTransformAccessor interface.</p>
@@ -36,7 +36,7 @@ public interface DesignTransformAccessor {
     /**
      * <p>getReport.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIReport} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIReport} object.
      */
     public DRIReport getReport();
 
@@ -50,14 +50,14 @@ public interface DesignTransformAccessor {
     /**
      * <p>getReportTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.ReportTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.ReportTransform} object.
      */
     public ReportTransform getReportTransform();
 
     /**
      * <p>getTemplateTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.TemplateTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.TemplateTransform} object.
      */
     public TemplateTransform getTemplateTransform();
 
@@ -69,84 +69,84 @@ public interface DesignTransformAccessor {
     /**
      * <p>transformToDataset.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     * @param dataset a {@link software.xdev.dynamicreports.report.definition.DRIDataset} object.
      */
     public void transformToDataset(DRIDataset dataset);
 
     /**
      * <p>getExpressionTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.AbstractExpressionTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.AbstractExpressionTransform} object.
      */
     public AbstractExpressionTransform getExpressionTransform();
 
     /**
      * <p>getPageTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.PageTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.PageTransform} object.
      */
     public PageTransform getPageTransform();
 
     /**
      * <p>getBandTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.BandTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.BandTransform} object.
      */
     public BandTransform getBandTransform();
 
     /**
      * <p>getComponentTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.ComponentTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.ComponentTransform} object.
      */
     public ComponentTransform getComponentTransform();
 
     /**
      * <p>getGroupTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.GroupTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.GroupTransform} object.
      */
     public GroupTransform getGroupTransform();
 
     /**
      * <p>getColumnTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.ColumnTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.ColumnTransform} object.
      */
     public ColumnTransform getColumnTransform();
 
     /**
      * <p>getColumnGridTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.ColumnGridTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.ColumnGridTransform} object.
      */
     public ColumnGridTransform getColumnGridTransform();
 
     /**
      * <p>getStyleTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.StyleTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.StyleTransform} object.
      */
     public StyleTransform getStyleTransform();
 
     /**
      * <p>getCrosstabTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.CrosstabTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.CrosstabTransform} object.
      */
     public CrosstabTransform getCrosstabTransform();
 
     /**
      * <p>getDatasetTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.DatasetTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.DatasetTransform} object.
      */
     public DatasetTransform getDatasetTransform();
 
     /**
      * <p>getTableOfContentsTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.transformation.TableOfContentsTransform} object.
+     * @return a {@link software.xdev.dynamicreports.design.transformation.TableOfContentsTransform} object.
      */
     public TableOfContentsTransform getTableOfContentsTransform();
 
@@ -160,7 +160,7 @@ public interface DesignTransformAccessor {
     /**
      * <p>getPage.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignPage} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignPage} object.
      */
     public DRDesignPage getPage();
 
@@ -188,7 +188,7 @@ public interface DesignTransformAccessor {
     /**
      * <p>getWhenResourceMissingType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
      */
     public WhenResourceMissingType getWhenResourceMissingType();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/GroupTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/GroupTransform.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/GroupTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/GroupTransform.java
index 6b79ca0..29be44d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/GroupTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/GroupTransform.java
@@ -15,33 +15,33 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignFiller;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.design.transformation.expressions.GroupByDataTypeExpression;
-import net.sf.dynamicreports.report.base.DRVariable;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.definition.DRIBand;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.DRIReport;
-import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.base.DRDesignTableOfContentsHeading;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignFiller;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.design.transformation.expressions.GroupByDataTypeExpression;
+import software.xdev.dynamicreports.report.base.DRVariable;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.definition.DRIBand;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.report.definition.column.DRIValueColumn;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -66,7 +66,7 @@ public class GroupTransform {
     /**
      * <p>Constructor for GroupTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public GroupTransform(DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -84,7 +84,7 @@ private void init() {
     /**
      * <p>transform.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transform() throws DRException {
         for (DRIGroup group : groups) {
@@ -107,7 +107,7 @@ private void addGroup(DRIGroup group, DRDesignGroup designGroup) {
     /**
      * <p>transformHeaderAndFooter.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transformHeaderAndFooter() throws DRException {
         int groupPadding = 0;
@@ -248,8 +248,8 @@ private DRDesignGroup group(DRIGroup group) throws DRException {
     /**
      * <p>getGroup.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
      */
     protected DRDesignGroup getGroup(DRIGroup group) {
         return designGroups.get(group);
@@ -258,7 +258,7 @@ protected DRDesignGroup getGroup(DRIGroup group) {
     /**
      * <p>getFirstGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     protected DRIGroup getFirstGroup() {
         if (!groups.isEmpty()) {
@@ -270,8 +270,8 @@ protected DRIGroup getFirstGroup() {
     /**
      * <p>getBeforeGroup.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     protected DRIGroup getBeforeGroup(DRIGroup group) {
         if (groups.size() > 1 && groups.indexOf(group) > 0) {
@@ -283,7 +283,7 @@ protected DRIGroup getBeforeGroup(DRIGroup group) {
     /**
      * <p>getLastGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     protected DRIGroup getLastGroup() {
         if (!groups.isEmpty()) {
@@ -295,7 +295,7 @@ protected DRIGroup getLastGroup() {
     /**
      * <p>Getter for the field <code>firstResetPageNumberGroup</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     protected DRIGroup getFirstResetPageNumberGroup() {
         return firstResetPageNumberGroup;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/MainDatasetExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/MainDatasetExpressionTransform.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/MainDatasetExpressionTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/MainDatasetExpressionTransform.java
index 4eab178..17ff9e1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/MainDatasetExpressionTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/MainDatasetExpressionTransform.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.DRDesignField;
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.DRIReport;
-import net.sf.dynamicreports.report.definition.DRISort;
-import net.sf.dynamicreports.report.definition.DRIVariable;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignField;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.report.definition.DRISort;
+import software.xdev.dynamicreports.report.definition.DRIVariable;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.List;
 
@@ -40,7 +40,7 @@ public class MainDatasetExpressionTransform extends AbstractExpressionTransform
     /**
      * <p>Constructor for MainDatasetExpressionTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public MainDatasetExpressionTransform(DesignTransformAccessor accessor) {
         super(accessor);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/PageTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/PageTransform.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/PageTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/PageTransform.java
index 6e4320c..270015f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/PageTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/PageTransform.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.DRDesignMargin;
-import net.sf.dynamicreports.design.base.DRDesignPage;
-import net.sf.dynamicreports.report.definition.DRIMargin;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignMargin;
+import software.xdev.dynamicreports.design.base.DRDesignPage;
+import software.xdev.dynamicreports.report.definition.DRIMargin;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * <p>PageTransform class.</p>
@@ -36,7 +36,7 @@ public class PageTransform {
     /**
      * <p>Constructor for PageTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public PageTransform(DesignTransformAccessor accessor) {
         this.templateTransform = accessor.getTemplateTransform();
@@ -46,7 +46,7 @@ public PageTransform(DesignTransformAccessor accessor) {
     /**
      * <p>transform.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transform() throws DRException {
         this.page.setHeight(templateTransform.getPageHeight());
@@ -68,7 +68,7 @@ private DRDesignMargin margin(DRIMargin margin) {
     /**
      * <p>Getter for the field <code>page</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignPage} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignPage} object.
      */
     public DRDesignPage getPage() {
         return page;
@@ -77,7 +77,7 @@ public DRDesignPage getPage() {
     /**
      * <p>transformPageWidth.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transformPageWidth() throws DRException {
         int pageWidth = templateTransform.getPageWidth();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ReportTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ReportTransform.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ReportTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ReportTransform.java
index d002f18..1b32383 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/ReportTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/ReportTransform.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.DRDesignHyperLink;
-import net.sf.dynamicreports.design.base.DRDesignParameter;
-import net.sf.dynamicreports.design.base.DRDesignQuery;
-import net.sf.dynamicreports.design.base.DRDesignTemplateDesign;
-import net.sf.dynamicreports.design.definition.DRIDesignParameter;
-import net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.jasper.base.JasperScriptlet;
-import net.sf.dynamicreports.report.definition.DRIHyperLink;
-import net.sf.dynamicreports.report.definition.DRIParameter;
-import net.sf.dynamicreports.report.definition.DRIQuery;
-import net.sf.dynamicreports.report.definition.DRIReport;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignHyperLink;
+import software.xdev.dynamicreports.design.base.DRDesignParameter;
+import software.xdev.dynamicreports.design.base.DRDesignQuery;
+import software.xdev.dynamicreports.design.base.DRDesignTemplateDesign;
+import software.xdev.dynamicreports.design.definition.DRIDesignParameter;
+import software.xdev.dynamicreports.design.definition.DRIDesignTemplateDesign;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.jasper.base.JasperScriptlet;
+import software.xdev.dynamicreports.report.definition.DRIHyperLink;
+import software.xdev.dynamicreports.report.definition.DRIParameter;
+import software.xdev.dynamicreports.report.definition.DRIQuery;
+import software.xdev.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,7 +50,7 @@ public class ReportTransform {
     /**
      * <p>Constructor for ReportTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public ReportTransform(DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -60,7 +60,7 @@ public ReportTransform(DesignTransformAccessor accessor) {
     /**
      * <p>transform.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transform() throws DRException {
         DRIReport report = accessor.getReport();
@@ -77,8 +77,8 @@ public void transform() throws DRException {
     /**
      * <p>query.</p>
      *
-     * @param query a {@link net.sf.dynamicreports.report.definition.DRIQuery} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignQuery} object.
+     * @param query a {@link software.xdev.dynamicreports.report.definition.DRIQuery} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignQuery} object.
      */
     protected DRDesignQuery query(DRIQuery query) {
         DRDesignQuery designQuery = new DRDesignQuery();
@@ -99,9 +99,9 @@ private DRDesignParameter parameter(DRIParameter<?> parameter) {
     /**
      * <p>hyperlink.</p>
      *
-     * @param hyperLink a {@link net.sf.dynamicreports.report.definition.DRIHyperLink} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignHyperLink} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param hyperLink a {@link software.xdev.dynamicreports.report.definition.DRIHyperLink} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignHyperLink} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public DRDesignHyperLink hyperlink(DRIHyperLink hyperLink) throws DRException {
         if (hyperLink == null) {
@@ -122,7 +122,7 @@ public DRDesignHyperLink hyperlink(DRIHyperLink hyperLink) throws DRException {
     /**
      * <p>Getter for the field <code>templateDesign</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignTemplateDesign} object.
      */
     public DRIDesignTemplateDesign getTemplateDesign() {
         return templateDesign;
@@ -131,7 +131,7 @@ public DRIDesignTemplateDesign getTemplateDesign() {
     /**
      * <p>Getter for the field <code>query</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignQuery} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignQuery} object.
      */
     public DRDesignQuery getQuery() {
         return query;
@@ -149,7 +149,7 @@ public List<DRIDesignParameter> getParameters() {
     /**
      * <p>Getter for the field <code>filterExpression</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public DRIDesignExpression getFilterExpression() {
         return filterExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleResolver.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/StyleResolver.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleResolver.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/StyleResolver.java
index 1968ea7..e921d46 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleResolver.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/StyleResolver.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
-
-import net.sf.dynamicreports.design.base.style.DRDesignStyle;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.report.base.style.DRFont;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
+package software.xdev.dynamicreports.design.transformation;
+
+import software.xdev.dynamicreports.design.base.style.DRDesignStyle;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.fonts.FontUtil;
 
@@ -45,7 +45,7 @@ public class StyleResolver {
     /**
      * <p>getFontWidth.</p>
      *
-     * @param style   a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style   a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @param columns a int.
      * @return a int.
      */
@@ -57,7 +57,7 @@ protected static int getFontWidth(DRDesignStyle style, int columns) {
     /**
      * <p>getFontHeight.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @param rows  a int.
      * @return a int.
      */
@@ -69,7 +69,7 @@ protected static int getFontHeight(DRDesignStyle style, int rows) {
     /**
      * <p>getFontWidth.</p>
      *
-     * @param font a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+     * @param font a {@link software.xdev.dynamicreports.report.base.style.DRFont} object.
      * @return a double.
      */
     public static double getFontWidth(DRFont font) {
@@ -80,7 +80,7 @@ public static double getFontWidth(DRFont font) {
     /**
      * <p>getFontHeight.</p>
      *
-     * @param font a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+     * @param font a {@link software.xdev.dynamicreports.report.base.style.DRFont} object.
      * @return a double.
      */
     public static double getFontHeight(DRFont font) {
@@ -125,7 +125,7 @@ private static Font getFont(String fontName, Boolean bold, Boolean italic, Integ
     /**
      * <p>getFontName.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.String} object.
      */
     protected static String getFontName(DRDesignStyle style) {
@@ -144,7 +144,7 @@ protected static String getFontName(DRDesignStyle style) {
     /**
      * <p>getFontSize.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.Integer} object.
      */
     protected static Integer getFontSize(DRDesignStyle style) {
@@ -163,7 +163,7 @@ protected static Integer getFontSize(DRDesignStyle style) {
     /**
      * <p>getFontBold.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.Boolean} object.
      */
     protected static Boolean getFontBold(DRDesignStyle style) {
@@ -182,7 +182,7 @@ protected static Boolean getFontBold(DRDesignStyle style) {
     /**
      * <p>getFontItalic.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.Boolean} object.
      */
     protected static Boolean getFontItalic(DRDesignStyle style) {
@@ -201,7 +201,7 @@ protected static Boolean getFontItalic(DRDesignStyle style) {
     /**
      * <p>getFontUnderline.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.Boolean} object.
      */
     protected static Boolean getFontUnderline(DRDesignStyle style) {
@@ -220,7 +220,7 @@ protected static Boolean getFontUnderline(DRDesignStyle style) {
     /**
      * <p>getFontStrikeThrough.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.Boolean} object.
      */
     protected static Boolean getFontStrikeThrough(DRDesignStyle style) {
@@ -239,7 +239,7 @@ protected static Boolean getFontStrikeThrough(DRDesignStyle style) {
     /**
      * <p>getPdfFontName.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.String} object.
      */
     protected static String getPdfFontName(DRDesignStyle style) {
@@ -258,7 +258,7 @@ protected static String getPdfFontName(DRDesignStyle style) {
     /**
      * <p>getPdfEncoding.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.String} object.
      */
     protected static String getPdfEncoding(DRDesignStyle style) {
@@ -277,7 +277,7 @@ protected static String getPdfEncoding(DRDesignStyle style) {
     /**
      * <p>getPdfEmbedded.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.Boolean} object.
      */
     protected static Boolean getPdfEmbedded(DRDesignStyle style) {
@@ -296,7 +296,7 @@ protected static Boolean getPdfEmbedded(DRDesignStyle style) {
     /**
      * <p>getHorizontalPadding.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignStyle} object.
      * @return a int.
      */
     public static int getHorizontalPadding(DRIDesignStyle style) {
@@ -306,7 +306,7 @@ public static int getHorizontalPadding(DRIDesignStyle style) {
     /**
      * <p>getVerticalPadding.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignStyle} object.
      * @return a int.
      */
     public static int getVerticalPadding(DRIDesignStyle style) {
@@ -407,7 +407,7 @@ private static Integer getRightIndent(DRIDesignStyle style) {
     /**
      * <p>getPattern.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
      * @return a {@link java.lang.String} object.
      */
     public static String getPattern(DRDesignStyle style) {
@@ -426,8 +426,8 @@ public static String getPattern(DRDesignStyle style) {
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public static HorizontalTextAlignment getHorizontalTextAlignment(DRDesignStyle style) {
         if (style == null) {
@@ -445,8 +445,8 @@ public static HorizontalTextAlignment getHorizontalTextAlignment(DRDesignStyle s
     /**
      * <p>getHorizontalImageAlignment.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param style a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public static HorizontalImageAlignment getHorizontalImageAlignment(DRDesignStyle style) {
         if (style == null) {
@@ -464,8 +464,8 @@ public static HorizontalImageAlignment getHorizontalImageAlignment(DRDesignStyle
     /**
      * <p>getBackgroundColor.</p>
      *
-     * @param reportStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
-     * @param transform   a {@link net.sf.dynamicreports.design.transformation.StyleTransform} object.
+     * @param reportStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param transform   a {@link software.xdev.dynamicreports.design.transformation.StyleTransform} object.
      * @return a {@link java.awt.Color} object.
      */
     public static Color getBackgroundColor(DRIReportStyle reportStyle, StyleTransform transform) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/StyleTransform.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/StyleTransform.java
index edce792..05ebc57 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/StyleTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/StyleTransform.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,37 +26,37 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import net.sf.dynamicreports.design.base.style.DRDesignBaseStyle;
-import net.sf.dynamicreports.design.base.style.DRDesignBorder;
-import net.sf.dynamicreports.design.base.style.DRDesignConditionalStyle;
-import net.sf.dynamicreports.design.base.style.DRDesignFont;
-import net.sf.dynamicreports.design.base.style.DRDesignPadding;
-import net.sf.dynamicreports.design.base.style.DRDesignParagraph;
-import net.sf.dynamicreports.design.base.style.DRDesignPen;
-import net.sf.dynamicreports.design.base.style.DRDesignStyle;
-import net.sf.dynamicreports.design.base.style.DRDesignTabStop;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.design.definition.style.DRIDesignTabStop;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.report.base.style.DRBaseStyle;
-import net.sf.dynamicreports.report.base.style.DRBorder;
-import net.sf.dynamicreports.report.base.style.DRFont;
-import net.sf.dynamicreports.report.base.style.DRPadding;
-import net.sf.dynamicreports.report.base.style.DRParagraph;
-import net.sf.dynamicreports.report.base.style.DRPen;
-import net.sf.dynamicreports.report.definition.style.DRIBaseStyle;
-import net.sf.dynamicreports.report.definition.style.DRIBorder;
-import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
-import net.sf.dynamicreports.report.definition.style.DRIFont;
-import net.sf.dynamicreports.report.definition.style.DRIPadding;
-import net.sf.dynamicreports.report.definition.style.DRIParagraph;
-import net.sf.dynamicreports.report.definition.style.DRIPen;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
-import net.sf.dynamicreports.report.definition.style.DRITabStop;
-import net.sf.dynamicreports.report.definition.style.DRITemplateStyle;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.style.DRDesignBaseStyle;
+import software.xdev.dynamicreports.design.base.style.DRDesignBorder;
+import software.xdev.dynamicreports.design.base.style.DRDesignConditionalStyle;
+import software.xdev.dynamicreports.design.base.style.DRDesignFont;
+import software.xdev.dynamicreports.design.base.style.DRDesignPadding;
+import software.xdev.dynamicreports.design.base.style.DRDesignParagraph;
+import software.xdev.dynamicreports.design.base.style.DRDesignPen;
+import software.xdev.dynamicreports.design.base.style.DRDesignStyle;
+import software.xdev.dynamicreports.design.base.style.DRDesignTabStop;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignTabStop;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.report.base.style.DRBaseStyle;
+import software.xdev.dynamicreports.report.base.style.DRBorder;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.base.style.DRPadding;
+import software.xdev.dynamicreports.report.base.style.DRParagraph;
+import software.xdev.dynamicreports.report.base.style.DRPen;
+import software.xdev.dynamicreports.report.definition.style.DRIBaseStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIBorder;
+import software.xdev.dynamicreports.report.definition.style.DRIConditionalStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIFont;
+import software.xdev.dynamicreports.report.definition.style.DRIPadding;
+import software.xdev.dynamicreports.report.definition.style.DRIParagraph;
+import software.xdev.dynamicreports.report.definition.style.DRIPen;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.definition.style.DRITabStop;
+import software.xdev.dynamicreports.report.definition.style.DRITemplateStyle;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 
 /**
@@ -74,7 +74,7 @@ public class StyleTransform
 	/**
 	 * <p>Constructor for StyleTransform.</p>
 	 *
-	 * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+	 * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
 	 */
 	public StyleTransform(final DesignTransformAccessor accessor)
 	{
@@ -97,11 +97,11 @@ private DRDesignStyle transformStyle(final DRIReportStyle style, final boolean t
 	/**
 	 * <p>transformStyle.</p>
 	 *
-	 * @param style            a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param style            a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 * @param textStyle        a boolean.
-	 * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
-	 * @return a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @param defaultStyleType a {@link software.xdev.dynamicreports.design.constant.DefaultStyleType} object.
+	 * @return a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected DRDesignStyle transformStyle(
 		final DRIReportStyle style,
@@ -166,8 +166,8 @@ protected DRDesignStyle transformStyle(
 	/**
 	 * <p>transformFont.</p>
 	 *
-	 * @param font a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
-	 * @return a {@link net.sf.dynamicreports.design.base.style.DRDesignFont} object.
+	 * @param font a {@link software.xdev.dynamicreports.report.definition.style.DRIFont} object.
+	 * @return a {@link software.xdev.dynamicreports.design.base.style.DRDesignFont} object.
 	 */
 	protected DRDesignFont transformFont(final DRIFont font)
 	{
@@ -216,8 +216,8 @@ private DRDesignStyle style(final DRIStyle style, final boolean textStyle, final
 	/**
 	 * <p>getStyle.</p>
 	 *
-	 * @param reportStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 * @param reportStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIStyle} object.
 	 */
 	protected DRIStyle getStyle(final DRIReportStyle reportStyle)
 	{
@@ -245,7 +245,7 @@ protected DRIStyle getStyle(final DRIReportStyle reportStyle)
 	/**
 	 * <p>transformTemplateStyles.</p>
 	 *
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	public void transformTemplateStyles() throws DRException
 	{
@@ -335,8 +335,8 @@ private DRDesignPadding padding(final DRIPadding padding)
 	/**
 	 * <p>pen.</p>
 	 *
-	 * @param pen a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
-	 * @return a {@link net.sf.dynamicreports.design.base.style.DRDesignPen} object.
+	 * @param pen a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
+	 * @return a {@link software.xdev.dynamicreports.design.base.style.DRDesignPen} object.
 	 */
 	protected DRDesignPen pen(final DRIPen pen)
 	{
@@ -354,9 +354,9 @@ protected DRDesignPen pen(final DRIPen pen)
 	/**
 	 * <p>getDefaultStyle.</p>
 	 *
-	 * @param defaultStyleType a {@link net.sf.dynamicreports.design.constant.DefaultStyleType} object.
-	 * @return a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @param defaultStyleType a {@link software.xdev.dynamicreports.design.constant.DefaultStyleType} object.
+	 * @return a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected DRDesignStyle getDefaultStyle(final DefaultStyleType defaultStyleType) throws DRException
 	{
@@ -405,8 +405,8 @@ private void addStyle(final String styleName, final DRDesignStyle designStyle)
 	/**
 	 * <p>copyStyle.</p>
 	 *
-	 * @param toStyle   a {@link net.sf.dynamicreports.report.base.style.DRBaseStyle} object.
-	 * @param fromStyle a {@link net.sf.dynamicreports.report.definition.style.DRIBaseStyle} object.
+	 * @param toStyle   a {@link software.xdev.dynamicreports.report.base.style.DRBaseStyle} object.
+	 * @param fromStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIBaseStyle} object.
 	 */
 	public void copyStyle(final DRBaseStyle toStyle, final DRIBaseStyle fromStyle)
 	{
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/SubtotalTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/SubtotalTransform.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/SubtotalTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/SubtotalTransform.java
index 5e35149..36e46cc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/SubtotalTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/SubtotalTransform.java
@@ -15,29 +15,29 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.report.base.component.DRFiller;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.SubtotalPosition;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.DRIBand;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.DRISubtotal;
-import net.sf.dynamicreports.report.definition.column.DRIColumn;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.report.base.component.DRFiller;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.SubtotalPosition;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.DRIBand;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.DRISubtotal;
+import software.xdev.dynamicreports.report.definition.column.DRIColumn;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -55,7 +55,7 @@ public class SubtotalTransform {
     /**
      * <p>Constructor for SubtotalTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public SubtotalTransform(DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -66,7 +66,7 @@ public SubtotalTransform(DesignTransformAccessor accessor) {
     /**
      * <p>transform.</p>
      *
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public void transform() throws DRException {
         ColumnGrid title = accessor.getColumnGridTransform().createColumnGrid();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TableOfContentsTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/TableOfContentsTransform.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TableOfContentsTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/TableOfContentsTransform.java
index 23a50f1..5b7583e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TableOfContentsTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/TableOfContentsTransform.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
-import net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.transformation.expressions.TocPrintWhenExpression;
-import net.sf.dynamicreports.design.transformation.expressions.TocReferenceExpression;
-import net.sf.dynamicreports.design.transformation.expressions.TocReferenceLinkExpression;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsHeading;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.component.DRIHyperLinkComponent;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignTableOfContentsHeading;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.transformation.expressions.TocPrintWhenExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.TocReferenceExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.TocReferenceLinkExpression;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsHeading;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.component.DRIHyperLinkComponent;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -49,7 +49,7 @@ public class TableOfContentsTransform {
     /**
      * <p>Constructor for TableOfContentsTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      */
     public TableOfContentsTransform(DesignTransformAccessor accessor) {
         this.accessor = accessor;
@@ -59,9 +59,9 @@ public TableOfContentsTransform(DesignTransformAccessor accessor) {
     /**
      * <p>componentHeading.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignTableOfContentsHeading componentHeading(DRIComponent component) throws DRException {
         DRITableOfContentsHeading tocHeading = component.getTableOfContentsHeading();
@@ -113,10 +113,10 @@ private int getLevel(DRITableOfContentsHeading tocHeading) {
     /**
      * <p>groupHeading.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      * @param level a int.
-     * @return a {@link net.sf.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.design.base.DRDesignTableOfContentsHeading} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     protected DRDesignTableOfContentsHeading groupHeading(DRIGroup group, int level) throws DRException {
         boolean tableOfContents = accessor.isTableOfContents();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TemplateTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/TemplateTransform.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TemplateTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/TemplateTransform.java
index 0501506..450e8f9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/TemplateTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/TemplateTransform.java
@@ -15,82 +15,82 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation;
+package software.xdev.dynamicreports.design.transformation;
 
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
-import net.sf.dynamicreports.design.base.style.DRDesignStyle;
-import net.sf.dynamicreports.design.constant.DefaultStyleType;
-import net.sf.dynamicreports.design.definition.DRIDesignBand;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.DRIDesignPage;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.StretchType;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.definition.DRIBand;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.DRIMargin;
-import net.sf.dynamicreports.report.definition.DRIReport;
-import net.sf.dynamicreports.report.definition.DRIReportTemplate;
-import net.sf.dynamicreports.report.definition.DRISubtotal;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.definition.DRITemplateDesign;
-import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
-import net.sf.dynamicreports.report.definition.column.DRIColumn;
-import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
-import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
-import net.sf.dynamicreports.report.definition.component.DRIBreak;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
-import net.sf.dynamicreports.report.definition.component.DRIEllipse;
-import net.sf.dynamicreports.report.definition.component.DRIFiller;
-import net.sf.dynamicreports.report.definition.component.DRIGenericElement;
-import net.sf.dynamicreports.report.definition.component.DRIImage;
-import net.sf.dynamicreports.report.definition.component.DRILine;
-import net.sf.dynamicreports.report.definition.component.DRIList;
-import net.sf.dynamicreports.report.definition.component.DRIMap;
-import net.sf.dynamicreports.report.definition.component.DRIMultiPageList;
-import net.sf.dynamicreports.report.definition.component.DRIPageXofY;
-import net.sf.dynamicreports.report.definition.component.DRIRectangle;
-import net.sf.dynamicreports.report.definition.component.DRISubreport;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.component.DRIXyList;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCell;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabColumnGroup;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabRowGroup;
+import software.xdev.dynamicreports.design.base.style.DRDesignStyle;
+import software.xdev.dynamicreports.design.constant.DefaultStyleType;
+import software.xdev.dynamicreports.design.definition.DRIDesignBand;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.DRIDesignPage;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.constant.CrosstabTotalPosition;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.definition.DRIBand;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.DRIMargin;
+import software.xdev.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.report.definition.DRIReportTemplate;
+import software.xdev.dynamicreports.report.definition.DRISubtotal;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
+import software.xdev.dynamicreports.report.definition.column.DRIBooleanColumn;
+import software.xdev.dynamicreports.report.definition.column.DRIColumn;
+import software.xdev.dynamicreports.report.definition.column.DRIValueColumn;
+import software.xdev.dynamicreports.report.definition.component.DRIBooleanField;
+import software.xdev.dynamicreports.report.definition.component.DRIBreak;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent;
+import software.xdev.dynamicreports.report.definition.component.DRIEllipse;
+import software.xdev.dynamicreports.report.definition.component.DRIFiller;
+import software.xdev.dynamicreports.report.definition.component.DRIGenericElement;
+import software.xdev.dynamicreports.report.definition.component.DRIImage;
+import software.xdev.dynamicreports.report.definition.component.DRILine;
+import software.xdev.dynamicreports.report.definition.component.DRIList;
+import software.xdev.dynamicreports.report.definition.component.DRIMap;
+import software.xdev.dynamicreports.report.definition.component.DRIMultiPageList;
+import software.xdev.dynamicreports.report.definition.component.DRIPageXofY;
+import software.xdev.dynamicreports.report.definition.component.DRIRectangle;
+import software.xdev.dynamicreports.report.definition.component.DRISubreport;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.component.DRIXyList;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRISimpleStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 
 /**
@@ -108,7 +108,7 @@ public class TemplateTransform
 	/**
 	 * <p>Constructor for TemplateTransform.</p>
 	 *
-	 * @param accessor a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+	 * @param accessor a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
 	 */
 	public TemplateTransform(final DesignTransformAccessor accessor)
 	{
@@ -234,8 +234,8 @@ public boolean isIgnorePagination()
 	 * <p>getWhenNoDataType.</p>
 	 *
 	 * @param emptyDetail a boolean.
-	 * @param noDataBand  a {@link net.sf.dynamicreports.design.definition.DRIDesignBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @param noDataBand  a {@link software.xdev.dynamicreports.design.definition.DRIDesignBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
 	 */
 	public WhenNoDataType getWhenNoDataType(final boolean emptyDetail, final DRIDesignBand noDataBand)
 	{
@@ -265,7 +265,7 @@ public WhenNoDataType getWhenNoDataType(final boolean emptyDetail, final DRIDesi
 	/**
 	 * <p>getWhenResourceMissingType.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
 	 */
 	public WhenResourceMissingType getWhenResourceMissingType()
 	{
@@ -375,7 +375,7 @@ public boolean isFloatColumnFooter()
 	/**
 	 * <p>getPrintOrder.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
 	 */
 	public Orientation getPrintOrder()
 	{
@@ -393,7 +393,7 @@ public Orientation getPrintOrder()
 	/**
 	 * <p>getColumnDirection.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
 	 */
 	public RunDirection getColumnDirection()
 	{
@@ -429,7 +429,7 @@ public String getLanguage()
 	/**
 	 * <p>getFieldDescription.</p>
 	 *
-	 * @param field a {@link net.sf.dynamicreports.report.definition.DRIField} object.
+	 * @param field a {@link software.xdev.dynamicreports.report.definition.DRIField} object.
 	 * @return a {@link java.lang.String} object.
 	 */
 	public String getFieldDescription(final DRIField<?> field)
@@ -486,7 +486,7 @@ public boolean isTableOfContents(final Map<String, JasperTocHeading> tocHeadings
 	/**
 	 * <p>getTableOfContentsCustomizer.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
 	 */
 	public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
 	{
@@ -504,7 +504,7 @@ public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
 	/**
 	 * <p>isAddGroupToTableOfContents.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	public boolean isAddGroupToTableOfContents(final DRIGroup group)
@@ -521,7 +521,7 @@ public boolean isAddGroupToTableOfContents(final DRIGroup group)
 	/**
 	 * <p>getDetailOddRowStyle.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
 	 */
 	protected DRISimpleStyle getDetailOddRowStyle()
 	{
@@ -543,7 +543,7 @@ protected DRISimpleStyle getDetailOddRowStyle()
 	/**
 	 * <p>getDetailEvenRowStyle.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
 	 */
 	protected DRISimpleStyle getDetailEvenRowStyle()
 	{
@@ -753,7 +753,7 @@ protected Boolean getDefaultFontPdfEmbedded()
 	/**
 	 * <p>getTextStyle.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getTextStyle()
 	{
@@ -771,7 +771,7 @@ protected DRIReportStyle getTextStyle()
 	/**
 	 * <p>getColumnTitleStyle.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getColumnTitleStyle()
 	{
@@ -794,7 +794,7 @@ protected DRIReportStyle getColumnTitleStyle()
 	 * <p>getColumnStyle.</p>
 	 *
 	 * @param textStyle a boolean.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getColumnStyle(final boolean textStyle)
 	{
@@ -820,7 +820,7 @@ protected DRIReportStyle getColumnStyle(final boolean textStyle)
 	/**
 	 * <p>getGroupTitleStyle.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getGroupTitleStyle()
 	{
@@ -842,7 +842,7 @@ protected DRIReportStyle getGroupTitleStyle()
 	/**
 	 * <p>getGroupStyle.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getGroupStyle()
 	{
@@ -864,7 +864,7 @@ protected DRIReportStyle getGroupStyle()
 	/**
 	 * <p>getSubtotalStyle.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getSubtotalStyle()
 	{
@@ -886,7 +886,7 @@ protected DRIReportStyle getSubtotalStyle()
 	/**
 	 * <p>getImageStyle.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getImageStyle()
 	{
@@ -907,7 +907,7 @@ protected DRIReportStyle getImageStyle()
 	 * <p>getPageWidth.</p>
 	 *
 	 * @return a int.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected int getPageWidth() throws DRException
 	{
@@ -989,7 +989,7 @@ private int getStaticPageWidth() throws DRException
 	 * <p>getPageHeight.</p>
 	 *
 	 * @return a int.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected int getPageHeight() throws DRException
 	{
@@ -1011,8 +1011,8 @@ protected int getPageHeight() throws DRException
 	/**
 	 * <p>getPageOrientation.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected PageOrientation getPageOrientation() throws DRException
 	{
@@ -1034,8 +1034,8 @@ protected PageOrientation getPageOrientation() throws DRException
 	/**
 	 * <p>getPageMargin.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.DRIMargin} object.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.DRIMargin} object.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected DRIMargin getPageMargin() throws DRException
 	{
@@ -1062,7 +1062,7 @@ protected DRIMargin getPageMargin() throws DRException
 	 * <p>getPageColumnsPerPage.</p>
 	 *
 	 * @return a int.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected int getPageColumnsPerPage() throws DRException
 	{
@@ -1085,7 +1085,7 @@ protected int getPageColumnsPerPage() throws DRException
 	 * <p>getPageColumnSpace.</p>
 	 *
 	 * @return a int.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected int getPageColumnSpace() throws DRException
 	{
@@ -1107,7 +1107,7 @@ protected int getPageColumnSpace() throws DRException
 	/**
 	 * <p>getPageColumnWidth.</p>
 	 *
-	 * @param page a {@link net.sf.dynamicreports.design.definition.DRIDesignPage} object.
+	 * @param page a {@link software.xdev.dynamicreports.design.definition.DRIDesignPage} object.
 	 * @return a int.
 	 */
 	protected int getPageColumnWidth(final DRIDesignPage page)
@@ -1128,7 +1128,7 @@ protected int getPageColumnWidth(final DRIDesignPage page)
 	/**
 	 * <p>isColumnPrintRepeatedDetailValues.</p>
 	 *
-	 * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIValueColumn} object.
+	 * @param column a {@link software.xdev.dynamicreports.report.definition.column.DRIValueColumn} object.
 	 * @return a boolean.
 	 */
 	protected boolean isColumnPrintRepeatedDetailValues(final DRIValueColumn<?> column)
@@ -1147,10 +1147,10 @@ protected boolean isColumnPrintRepeatedDetailValues(final DRIValueColumn<?> colu
 	/**
 	 * <p>getColumnWidth.</p>
 	 *
-	 * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
-	 * @param style  a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @param column a {@link software.xdev.dynamicreports.report.definition.column.DRIColumn} object.
+	 * @param style  a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
 	 * @return a int.
-	 * @throws net.sf.dynamicreports.report.exception.DRException if any.
+	 * @throws software.xdev.dynamicreports.report.exception.DRException if any.
 	 */
 	protected int getColumnWidth(final DRIColumn<?> column, final DRDesignStyle style) throws DRException
 	{
@@ -1204,7 +1204,7 @@ protected int getColumnWidth()
 	/**
 	 * <p>getRemoveLineWhenBlank.</p>
 	 *
-	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 * @return a boolean.
 	 */
 	protected boolean getRemoveLineWhenBlank(final DRIComponent component)
@@ -1219,8 +1219,8 @@ protected boolean getRemoveLineWhenBlank(final DRIComponent component)
 	/**
 	 * <p>getPositionType.</p>
 	 *
-	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+	 * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.ComponentPositionType} object.
 	 */
 	protected ComponentPositionType getPositionType(final DRIComponent component)
 	{
@@ -1234,8 +1234,8 @@ protected ComponentPositionType getPositionType(final DRIComponent component)
 	/**
 	 * <p>getStretchType.</p>
 	 *
-	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+	 * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.StretchType} object.
 	 */
 	protected StretchType getStretchType(final DRIComponent component)
 	{
@@ -1249,7 +1249,7 @@ protected StretchType getStretchType(final DRIComponent component)
 	/**
 	 * <p>getPrintInFirstWholeBand.</p>
 	 *
-	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 * @return a boolean.
 	 */
 	protected boolean getPrintInFirstWholeBand(final DRIComponent component)
@@ -1265,7 +1265,7 @@ protected boolean getPrintInFirstWholeBand(final DRIComponent component)
 	/**
 	 * <p>getPrintWhenDetailOverflows.</p>
 	 *
-	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 * @return a boolean.
 	 */
 	protected boolean getPrintWhenDetailOverflows(final DRIComponent component)
@@ -1281,8 +1281,8 @@ protected boolean getPrintWhenDetailOverflows(final DRIComponent component)
 	/**
 	 * <p>getPrintWhenGroupChanges.</p>
 	 *
-	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
-	 * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+	 * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
 	 */
 	protected DRIDesignGroup getPrintWhenGroupChanges(final DRIComponent component)
 	{
@@ -1299,8 +1299,8 @@ protected DRIDesignGroup getPrintWhenGroupChanges(final DRIComponent component)
 	/**
 	 * <p>getGroupHeaderLayout.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.GroupHeaderLayout} object.
 	 */
 	protected GroupHeaderLayout getGroupHeaderLayout(final DRIGroup group)
 	{
@@ -1318,7 +1318,7 @@ protected GroupHeaderLayout getGroupHeaderLayout(final DRIGroup group)
 	/**
 	 * <p>isGroupHideColumn.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupHideColumn(final DRIGroup group)
@@ -1337,7 +1337,7 @@ protected boolean isGroupHideColumn(final DRIGroup group)
 	/**
 	 * <p>isGroupShowColumnHeaderAndFooter.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupShowColumnHeaderAndFooter(final DRIGroup group)
@@ -1356,7 +1356,7 @@ protected boolean isGroupShowColumnHeaderAndFooter(final DRIGroup group)
 	/**
 	 * <p>getGroupPadding.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a int.
 	 */
 	protected int getGroupPadding(final DRIGroup group)
@@ -1375,7 +1375,7 @@ protected int getGroupPadding(final DRIGroup group)
 	/**
 	 * <p>isGroupStartInNewPage.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupStartInNewPage(final DRIGroup group)
@@ -1394,7 +1394,7 @@ protected boolean isGroupStartInNewPage(final DRIGroup group)
 	/**
 	 * <p>isGroupStartInNewColumn.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupStartInNewColumn(final DRIGroup group)
@@ -1413,7 +1413,7 @@ protected boolean isGroupStartInNewColumn(final DRIGroup group)
 	/**
 	 * <p>isGroupReprintHeaderOnEachPage.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupReprintHeaderOnEachPage(final DRIGroup group)
@@ -1432,7 +1432,7 @@ protected boolean isGroupReprintHeaderOnEachPage(final DRIGroup group)
 	/**
 	 * <p>isGroupResetPageNumber.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupResetPageNumber(final DRIGroup group)
@@ -1451,7 +1451,7 @@ protected boolean isGroupResetPageNumber(final DRIGroup group)
 	/**
 	 * <p>getGroupMinHeightToStartNewPage.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a {@link java.lang.Integer} object.
 	 */
 	protected Integer getGroupMinHeightToStartNewPage(final DRIGroup group)
@@ -1466,8 +1466,8 @@ protected Integer getGroupMinHeightToStartNewPage(final DRIGroup group)
 	/**
 	 * <p>getGroupFooterPosition.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
 	 */
 	protected GroupFooterPosition getGroupFooterPosition(final DRIGroup group)
 	{
@@ -1485,7 +1485,7 @@ protected GroupFooterPosition getGroupFooterPosition(final DRIGroup group)
 	/**
 	 * <p>isGroupKeepTogether.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupKeepTogether(final DRIGroup group)
@@ -1504,7 +1504,7 @@ protected boolean isGroupKeepTogether(final DRIGroup group)
 	/**
 	 * <p>isGroupHeaderWithSubtotal.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupHeaderWithSubtotal(final DRIGroup group)
@@ -1523,7 +1523,7 @@ protected boolean isGroupHeaderWithSubtotal(final DRIGroup group)
 	/**
 	 * <p>isGroupByDataType.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
 	 * @return a boolean.
 	 */
 	protected boolean isGroupByDataType(final DRIGroup group)
@@ -1540,8 +1540,8 @@ protected boolean isGroupByDataType(final DRIGroup group)
 	/**
 	 * <p>getSubtotalLabelPosition.</p>
 	 *
-	 * @param subtotal a {@link net.sf.dynamicreports.report.definition.DRISubtotal} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.Position} object.
+	 * @param subtotal a {@link software.xdev.dynamicreports.report.definition.DRISubtotal} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.Position} object.
 	 */
 	public Position getSubtotalLabelPosition(final DRISubtotal<?> subtotal)
 	{
@@ -1561,8 +1561,8 @@ public Position getSubtotalLabelPosition(final DRISubtotal<?> subtotal)
 	/**
 	 * <p>getTextFieldWidth.</p>
 	 *
-	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
-	 * @param style     a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @param textField a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param style     a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
 	 * @return a int.
 	 */
 	protected int getTextFieldWidth(final DRITextField<?> textField, final DRDesignStyle style)
@@ -1585,8 +1585,8 @@ protected int getTextFieldWidth(final DRITextField<?> textField, final DRDesignS
 	/**
 	 * <p>getTextFieldHeight.</p>
 	 *
-	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
-	 * @param style     a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @param textField a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param style     a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
 	 * @return a int.
 	 */
 	protected int getTextFieldHeight(final DRITextField<?> textField, final DRDesignStyle style)
@@ -1605,8 +1605,8 @@ protected int getTextFieldHeight(final DRITextField<?> textField, final DRDesign
 	/**
 	 * <p>getTextFieldPattern.</p>
 	 *
-	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
-	 * @param style     a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @param textField a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param style     a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
 	 * @return a {@link java.lang.String} object.
 	 */
 	protected String getTextFieldPattern(final DRITextField<?> textField, final DRDesignStyle style)
@@ -1629,9 +1629,9 @@ protected String getTextFieldPattern(final DRITextField<?> textField, final DRDe
 	/**
 	 * <p>getTextFieldHorizontalTextAlignment.</p>
 	 *
-	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
-	 * @param style     a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+	 * @param textField a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param style     a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
 	 */
 	protected HorizontalTextAlignment getTextFieldHorizontalTextAlignment(
 		final DRITextField<?> textField,
@@ -1655,8 +1655,8 @@ protected HorizontalTextAlignment getTextFieldHorizontalTextAlignment(
 	/**
 	 * <p>getTextFieldValueFormatter.</p>
 	 *
-	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+	 * @param textField a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
 	 */
 	protected DRIValueFormatter<?, ?> getTextFieldValueFormatter(final DRITextField<?> textField)
 	{
@@ -1674,7 +1674,7 @@ protected HorizontalTextAlignment getTextFieldHorizontalTextAlignment(
 	/**
 	 * <p>getTextFieldStretchWithOverflow.</p>
 	 *
-	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param textField a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
 	 * @return a boolean.
 	 * @deprecated replaced by {@link #getTextFieldTextAdjust(DRITextField)}
 	 */
@@ -1691,8 +1691,8 @@ protected boolean getTextFieldStretchWithOverflow(final DRITextField<?> textFiel
 	/**
 	 * <p>getTextFieldTextAdjust.</p>
 	 *
-	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+	 * @param textField a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
 	 */
 	protected TextAdjust getTextFieldTextAdjust(final DRITextField<?> textField)
 	{
@@ -1706,7 +1706,7 @@ protected TextAdjust getTextFieldTextAdjust(final DRITextField<?> textField)
 	/**
 	 * <p>isTextFieldPrintRepeatedValues.</p>
 	 *
-	 * @param textField a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+	 * @param textField a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
 	 * @return a boolean.
 	 */
 	protected boolean isTextFieldPrintRepeatedValues(final DRITextField<?> textField)
@@ -1723,8 +1723,8 @@ protected boolean isTextFieldPrintRepeatedValues(final DRITextField<?> textField
 	/**
 	 * <p>getBooleanFieldWidth.</p>
 	 *
-	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
-	 * @param style        a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @param booleanField a {@link software.xdev.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param style        a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
 	 * @return a int.
 	 */
 	protected int getBooleanFieldWidth(final DRIBooleanField booleanField, final DRDesignStyle style)
@@ -1743,8 +1743,8 @@ protected int getBooleanFieldWidth(final DRIBooleanField booleanField, final DRD
 	/**
 	 * <p>getBooleanFieldHeight.</p>
 	 *
-	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
-	 * @param style        a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @param booleanField a {@link software.xdev.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param style        a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
 	 * @return a int.
 	 */
 	protected int getBooleanFieldHeight(final DRIBooleanField booleanField, final DRDesignStyle style)
@@ -1761,7 +1761,7 @@ protected int getBooleanFieldHeight(final DRIBooleanField booleanField, final DR
 	/**
 	 * <p>getPageXofYWidth.</p>
 	 *
-	 * @param pageXofY a {@link net.sf.dynamicreports.report.definition.component.DRIPageXofY} object.
+	 * @param pageXofY a {@link software.xdev.dynamicreports.report.definition.component.DRIPageXofY} object.
 	 * @return a int.
 	 */
 	protected int getPageXofYWidth(final DRIPageXofY pageXofY)
@@ -1780,8 +1780,8 @@ protected int getPageXofYWidth(final DRIPageXofY pageXofY)
 	/**
 	 * <p>getPageXofYHeight.</p>
 	 *
-	 * @param pageXofY a {@link net.sf.dynamicreports.report.definition.component.DRIPageXofY} object.
-	 * @param style    a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @param pageXofY a {@link software.xdev.dynamicreports.report.definition.component.DRIPageXofY} object.
+	 * @param style    a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
 	 * @return a int.
 	 */
 	protected int getPageXofYHeight(final DRIPageXofY pageXofY, final DRDesignStyle style)
@@ -1796,9 +1796,9 @@ protected int getPageXofYHeight(final DRIPageXofY pageXofY, final DRDesignStyle
 	/**
 	 * <p>getPageXofYHorizontalTextAlignment.</p>
 	 *
-	 * @param pageXofY a {@link net.sf.dynamicreports.report.definition.component.DRIPageXofY} object.
-	 * @param style    a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+	 * @param pageXofY a {@link software.xdev.dynamicreports.report.definition.component.DRIPageXofY} object.
+	 * @param style    a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
 	 */
 	protected HorizontalTextAlignment getPageXofYHorizontalTextAlignment(
 		final DRIPageXofY pageXofY,
@@ -1820,7 +1820,7 @@ protected HorizontalTextAlignment getPageXofYHorizontalTextAlignment(
 	/**
 	 * <p>getImageWidth.</p>
 	 *
-	 * @param image a {@link net.sf.dynamicreports.report.definition.component.DRIImage} object.
+	 * @param image a {@link software.xdev.dynamicreports.report.definition.component.DRIImage} object.
 	 * @return a int.
 	 */
 	protected int getImageWidth(final DRIImage image)
@@ -1839,10 +1839,10 @@ protected int getImageWidth(final DRIImage image)
 	/**
 	 * <p>getImageHeight.</p>
 	 *
-	 * @param image       a {@link net.sf.dynamicreports.report.definition.component.DRIImage} object.
+	 * @param image       a {@link software.xdev.dynamicreports.report.definition.component.DRIImage} object.
 	 * @param imageHeight a {@link java.lang.Integer} object.
 	 * @param imageHeight a {@link java.lang.Integer} object.
-	 * @param style       a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @param style       a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
 	 * @return a int.
 	 */
 	protected int getImageHeight(final DRIImage image, final Integer imageHeight, final DRDesignStyle style)
@@ -1867,7 +1867,7 @@ protected int getImageHeight(final DRIImage image, final Integer imageHeight, fi
 	/**
 	 * <p>getFillerWidth.</p>
 	 *
-	 * @param filler a {@link net.sf.dynamicreports.report.definition.component.DRIFiller} object.
+	 * @param filler a {@link software.xdev.dynamicreports.report.definition.component.DRIFiller} object.
 	 * @return a int.
 	 */
 	protected int getFillerWidth(final DRIFiller filler)
@@ -1882,7 +1882,7 @@ protected int getFillerWidth(final DRIFiller filler)
 	/**
 	 * <p>getFillerHeight.</p>
 	 *
-	 * @param filler a {@link net.sf.dynamicreports.report.definition.component.DRIFiller} object.
+	 * @param filler a {@link software.xdev.dynamicreports.report.definition.component.DRIFiller} object.
 	 * @return a int.
 	 */
 	protected int getFillerHeight(final DRIFiller filler)
@@ -1899,7 +1899,7 @@ protected int getFillerHeight(final DRIFiller filler)
 	/**
 	 * <p>getLineWidth.</p>
 	 *
-	 * @param line a {@link net.sf.dynamicreports.report.definition.component.DRILine} object.
+	 * @param line a {@link software.xdev.dynamicreports.report.definition.component.DRILine} object.
 	 * @return a int.
 	 */
 	protected int getLineWidth(final DRILine line)
@@ -1914,7 +1914,7 @@ protected int getLineWidth(final DRILine line)
 	/**
 	 * <p>getLineHeight.</p>
 	 *
-	 * @param line a {@link net.sf.dynamicreports.report.definition.component.DRILine} object.
+	 * @param line a {@link software.xdev.dynamicreports.report.definition.component.DRILine} object.
 	 * @return a int.
 	 */
 	protected int getLineHeight(final DRILine line)
@@ -1931,7 +1931,7 @@ protected int getLineHeight(final DRILine line)
 	/**
 	 * <p>getEllipseWidth.</p>
 	 *
-	 * @param ellipse a {@link net.sf.dynamicreports.report.definition.component.DRIEllipse} object.
+	 * @param ellipse a {@link software.xdev.dynamicreports.report.definition.component.DRIEllipse} object.
 	 * @return a int.
 	 */
 	protected int getEllipseWidth(final DRIEllipse ellipse)
@@ -1946,7 +1946,7 @@ protected int getEllipseWidth(final DRIEllipse ellipse)
 	/**
 	 * <p>getEllipseHeight.</p>
 	 *
-	 * @param ellipse a {@link net.sf.dynamicreports.report.definition.component.DRIEllipse} object.
+	 * @param ellipse a {@link software.xdev.dynamicreports.report.definition.component.DRIEllipse} object.
 	 * @return a int.
 	 */
 	protected int getEllipseHeight(final DRIEllipse ellipse)
@@ -1963,7 +1963,7 @@ protected int getEllipseHeight(final DRIEllipse ellipse)
 	/**
 	 * <p>getRectangleRadius.</p>
 	 *
-	 * @param rectangle a {@link net.sf.dynamicreports.report.definition.component.DRIRectangle} object.
+	 * @param rectangle a {@link software.xdev.dynamicreports.report.definition.component.DRIRectangle} object.
 	 * @return a {@link java.lang.Integer} object.
 	 */
 	protected Integer getRectangleRadius(final DRIRectangle rectangle)
@@ -1978,7 +1978,7 @@ protected Integer getRectangleRadius(final DRIRectangle rectangle)
 	/**
 	 * <p>getRectangleWidth.</p>
 	 *
-	 * @param rectangle a {@link net.sf.dynamicreports.report.definition.component.DRIRectangle} object.
+	 * @param rectangle a {@link software.xdev.dynamicreports.report.definition.component.DRIRectangle} object.
 	 * @return a int.
 	 */
 	protected int getRectangleWidth(final DRIRectangle rectangle)
@@ -1993,7 +1993,7 @@ protected int getRectangleWidth(final DRIRectangle rectangle)
 	/**
 	 * <p>getRectangleHeight.</p>
 	 *
-	 * @param rectangle a {@link net.sf.dynamicreports.report.definition.component.DRIRectangle} object.
+	 * @param rectangle a {@link software.xdev.dynamicreports.report.definition.component.DRIRectangle} object.
 	 * @return a int.
 	 */
 	protected int getRectangleHeight(final DRIRectangle rectangle)
@@ -2010,7 +2010,7 @@ protected int getRectangleHeight(final DRIRectangle rectangle)
 	/**
 	 * <p>getMapWidth.</p>
 	 *
-	 * @param map a {@link net.sf.dynamicreports.report.definition.component.DRIMap} object.
+	 * @param map a {@link software.xdev.dynamicreports.report.definition.component.DRIMap} object.
 	 * @return a int.
 	 */
 	protected int getMapWidth(final DRIMap map)
@@ -2025,7 +2025,7 @@ protected int getMapWidth(final DRIMap map)
 	/**
 	 * <p>getMapHeight.</p>
 	 *
-	 * @param map a {@link net.sf.dynamicreports.report.definition.component.DRIMap} object.
+	 * @param map a {@link software.xdev.dynamicreports.report.definition.component.DRIMap} object.
 	 * @return a int.
 	 */
 	protected int getMapHeight(final DRIMap map)
@@ -2042,7 +2042,7 @@ protected int getMapHeight(final DRIMap map)
 	/**
 	 * <p>getCustomComponentWidth.</p>
 	 *
-	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIDimensionComponent} object.
+	 * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent} object.
 	 * @return a int.
 	 */
 	protected int getCustomComponentWidth(final DRIDimensionComponent component)
@@ -2057,7 +2057,7 @@ protected int getCustomComponentWidth(final DRIDimensionComponent component)
 	/**
 	 * <p>getCustomComponentHeight.</p>
 	 *
-	 * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIDimensionComponent} object.
+	 * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent} object.
 	 * @return a int.
 	 */
 	protected int getCustomComponentHeight(final DRIDimensionComponent component)
@@ -2074,7 +2074,7 @@ protected int getCustomComponentHeight(final DRIDimensionComponent component)
 	/**
 	 * <p>getBreakWidth.</p>
 	 *
-	 * @param breakComponent a {@link net.sf.dynamicreports.report.definition.component.DRIBreak} object.
+	 * @param breakComponent a {@link software.xdev.dynamicreports.report.definition.component.DRIBreak} object.
 	 * @return a int.
 	 */
 	protected int getBreakWidth(final DRIBreak breakComponent)
@@ -2085,7 +2085,7 @@ protected int getBreakWidth(final DRIBreak breakComponent)
 	/**
 	 * <p>getBreakHeight.</p>
 	 *
-	 * @param breakComponent a {@link net.sf.dynamicreports.report.definition.component.DRIBreak} object.
+	 * @param breakComponent a {@link software.xdev.dynamicreports.report.definition.component.DRIBreak} object.
 	 * @return a int.
 	 */
 	protected int getBreakHeight(final DRIBreak breakComponent)
@@ -2098,7 +2098,7 @@ protected int getBreakHeight(final DRIBreak breakComponent)
 	/**
 	 * <p>getGenericElementWidth.</p>
 	 *
-	 * @param genericElement a {@link net.sf.dynamicreports.report.definition.component.DRIGenericElement} object.
+	 * @param genericElement a {@link software.xdev.dynamicreports.report.definition.component.DRIGenericElement} object.
 	 * @return a {@link java.lang.Integer} object.
 	 */
 	protected Integer getGenericElementWidth(final DRIGenericElement genericElement)
@@ -2113,7 +2113,7 @@ protected Integer getGenericElementWidth(final DRIGenericElement genericElement)
 	/**
 	 * <p>getGenericElementHeight.</p>
 	 *
-	 * @param genericElement a {@link net.sf.dynamicreports.report.definition.component.DRIGenericElement} object.
+	 * @param genericElement a {@link software.xdev.dynamicreports.report.definition.component.DRIGenericElement} object.
 	 * @return a {@link java.lang.Integer} object.
 	 */
 	protected Integer getGenericElementHeight(final DRIGenericElement genericElement)
@@ -2130,7 +2130,7 @@ protected Integer getGenericElementHeight(final DRIGenericElement genericElement
 	/**
 	 * <p>getListWidth.</p>
 	 *
-	 * @param list a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+	 * @param list a {@link software.xdev.dynamicreports.report.definition.component.DRIList} object.
 	 * @return a {@link java.lang.Integer} object.
 	 */
 	protected Integer getListWidth(final DRIList list)
@@ -2145,7 +2145,7 @@ protected Integer getListWidth(final DRIList list)
 	/**
 	 * <p>getListHeight.</p>
 	 *
-	 * @param list a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+	 * @param list a {@link software.xdev.dynamicreports.report.definition.component.DRIList} object.
 	 * @return a {@link java.lang.Integer} object.
 	 */
 	protected Integer getListHeight(final DRIList list)
@@ -2160,7 +2160,7 @@ protected Integer getListHeight(final DRIList list)
 	/**
 	 * <p>getListGap.</p>
 	 *
-	 * @param list a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+	 * @param list a {@link software.xdev.dynamicreports.report.definition.component.DRIList} object.
 	 * @return a int.
 	 */
 	protected int getListGap(final DRIList list)
@@ -2181,7 +2181,7 @@ protected int getListGap(final DRIList list)
 	/**
 	 * <p>getXyListWidth.</p>
 	 *
-	 * @param xyList a {@link net.sf.dynamicreports.report.definition.component.DRIXyList} object.
+	 * @param xyList a {@link software.xdev.dynamicreports.report.definition.component.DRIXyList} object.
 	 * @return a {@link java.lang.Integer} object.
 	 */
 	protected Integer getXyListWidth(final DRIXyList xyList)
@@ -2196,7 +2196,7 @@ protected Integer getXyListWidth(final DRIXyList xyList)
 	/**
 	 * <p>getXyListHeight.</p>
 	 *
-	 * @param xyList a {@link net.sf.dynamicreports.report.definition.component.DRIXyList} object.
+	 * @param xyList a {@link software.xdev.dynamicreports.report.definition.component.DRIXyList} object.
 	 * @return a {@link java.lang.Integer} object.
 	 */
 	protected Integer getXyListHeight(final DRIXyList xyList)
@@ -2213,7 +2213,7 @@ protected Integer getXyListHeight(final DRIXyList xyList)
 	/**
 	 * <p>getMultiPageListWidth.</p>
 	 *
-	 * @param multiPageList a {@link net.sf.dynamicreports.report.definition.component.DRIMultiPageList} object.
+	 * @param multiPageList a {@link software.xdev.dynamicreports.report.definition.component.DRIMultiPageList} object.
 	 * @return a int.
 	 */
 	protected int getMultiPageListWidth(final DRIMultiPageList multiPageList)
@@ -2232,7 +2232,7 @@ protected int getMultiPageListWidth(final DRIMultiPageList multiPageList)
 	/**
 	 * <p>getMultiPageListHeight.</p>
 	 *
-	 * @param multiPageList a {@link net.sf.dynamicreports.report.definition.component.DRIMultiPageList} object.
+	 * @param multiPageList a {@link software.xdev.dynamicreports.report.definition.component.DRIMultiPageList} object.
 	 * @return a int.
 	 */
 	protected int getMultiPageListHeight(final DRIMultiPageList multiPageList)
@@ -2253,7 +2253,7 @@ protected int getMultiPageListHeight(final DRIMultiPageList multiPageList)
 	/**
 	 * <p>getSubreportWidth.</p>
 	 *
-	 * @param subreport a {@link net.sf.dynamicreports.report.definition.component.DRISubreport} object.
+	 * @param subreport a {@link software.xdev.dynamicreports.report.definition.component.DRISubreport} object.
 	 * @return a int.
 	 */
 	protected int getSubreportWidth(final DRISubreport subreport)
@@ -2272,7 +2272,7 @@ protected int getSubreportWidth(final DRISubreport subreport)
 	/**
 	 * <p>getSubreportHeight.</p>
 	 *
-	 * @param subreport a {@link net.sf.dynamicreports.report.definition.component.DRISubreport} object.
+	 * @param subreport a {@link software.xdev.dynamicreports.report.definition.component.DRISubreport} object.
 	 * @return a int.
 	 */
 	protected int getSubreportHeight(final DRISubreport subreport)
@@ -2293,7 +2293,7 @@ protected int getSubreportHeight(final DRISubreport subreport)
 	/**
 	 * <p>getCrosstabWidth.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
 	 * @return a int.
 	 */
 	protected int getCrosstabWidth(final DRICrosstab crosstab)
@@ -2312,8 +2312,8 @@ protected int getCrosstabWidth(final DRICrosstab crosstab)
 	/**
 	 * <p>getCrosstabHeight.</p>
 	 *
-	 * @param crosstab       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @param whenNoDataCell a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+	 * @param crosstab       a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param whenNoDataCell a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
 	 * @return a int.
 	 */
 	protected int getCrosstabHeight(final DRICrosstab crosstab, final DRDesignCrosstabCellContent whenNoDataCell)
@@ -2342,8 +2342,8 @@ else if(this.template.getCrosstabHeight() != null)
 	/**
 	 * <p>getCrosstabColumnGroupTotalPosition.</p>
 	 *
-	 * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 * @param columnGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
 	 */
 	public CrosstabTotalPosition getCrosstabColumnGroupTotalPosition(final DRICrosstabColumnGroup<?> columnGroup)
 	{
@@ -2361,8 +2361,8 @@ public CrosstabTotalPosition getCrosstabColumnGroupTotalPosition(final DRICrosst
 	/**
 	 * <p>getCrosstabRowGroupTotalPosition.</p>
 	 *
-	 * @param rowGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 * @param rowGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
 	 */
 	public CrosstabTotalPosition getCrosstabRowGroupTotalPosition(final DRICrosstabRowGroup<?> rowGroup)
 	{
@@ -2380,7 +2380,7 @@ public CrosstabTotalPosition getCrosstabRowGroupTotalPosition(final DRICrosstabR
 	/**
 	 * <p>isCrosstabColumnGroupShowTotal.</p>
 	 *
-	 * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+	 * @param columnGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
 	 * @return a boolean.
 	 */
 	public boolean isCrosstabColumnGroupShowTotal(final DRICrosstabColumnGroup<?> columnGroup)
@@ -2395,7 +2395,7 @@ public boolean isCrosstabColumnGroupShowTotal(final DRICrosstabColumnGroup<?> co
 	/**
 	 * <p>isCrosstabRowGroupShowTotal.</p>
 	 *
-	 * @param rowGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+	 * @param rowGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
 	 * @return a boolean.
 	 */
 	public boolean isCrosstabRowGroupShowTotal(final DRICrosstabRowGroup<?> rowGroup)
@@ -2410,8 +2410,8 @@ public boolean isCrosstabRowGroupShowTotal(final DRICrosstabRowGroup<?> rowGroup
 	/**
 	 * <p>getCrosstabColumnGroupHeaderHeight.</p>
 	 *
-	 * @param columnGroup     a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
-	 * @param designCrosstab  a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @param columnGroup     a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+	 * @param designCrosstab  a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
 	 * @param availableHeight a int.
 	 * @return a int.
 	 */
@@ -2451,9 +2451,9 @@ public int getCrosstabColumnGroupHeaderHeight(
 	/**
 	 * <p>getCrosstabColumnGroupTotalHeaderWidth.</p>
 	 *
-	 * @param columnGroup    a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+	 * @param columnGroup    a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
 	 * @param cellWidth      a {@link java.lang.Integer} object.
-	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @param designCrosstab a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
 	 * @return a int.
 	 */
 	public int getCrosstabColumnGroupTotalHeaderWidth(
@@ -2506,8 +2506,8 @@ public int getCrosstabColumnGroupTotalHeaderWidth(
 	/**
 	 * <p>getCrosstabRowGroupHeaderWidth.</p>
 	 *
-	 * @param rowGroup       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
-	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @param rowGroup       a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+	 * @param designCrosstab a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
 	 * @return a int.
 	 */
 	public int getCrosstabRowGroupHeaderWidth(
@@ -2549,9 +2549,9 @@ public int getCrosstabRowGroupHeaderWidth(
 	/**
 	 * <p>getCrosstabRowGroupTotalHeaderHeight.</p>
 	 *
-	 * @param rowGroup       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+	 * @param rowGroup       a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
 	 * @param cellHeight     a {@link java.lang.Integer} object.
-	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @param designCrosstab a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
 	 * @return a int.
 	 */
 	public int getCrosstabRowGroupTotalHeaderHeight(
@@ -2600,8 +2600,8 @@ public int getCrosstabRowGroupTotalHeaderHeight(
 	/**
 	 * <p>getCrosstabCellWidth.</p>
 	 *
-	 * @param crosstab       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @param crosstab       a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param designCrosstab a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
 	 * @return a int.
 	 */
 	public int getCrosstabCellWidth(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab)
@@ -2640,8 +2640,8 @@ public int getCrosstabCellWidth(final DRICrosstab crosstab, final DRDesignCrosst
 	/**
 	 * <p>getCrosstabCellHeight.</p>
 	 *
-	 * @param crosstab       a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @param designCrosstab a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
+	 * @param crosstab       a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param designCrosstab a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab} object.
 	 * @return a int.
 	 */
 	public int getCrosstabCellHeight(final DRICrosstab crosstab, final DRDesignCrosstab designCrosstab)
@@ -2676,7 +2676,7 @@ public int getCrosstabCellHeight(final DRICrosstab crosstab, final DRDesignCross
 	/**
 	 * <p>getCrosstabWhenNoDataCellHeight.</p>
 	 *
-	 * @param whenNoDataCell a {@link net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
+	 * @param whenNoDataCell a {@link software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstabCellContent} object.
 	 * @return a int.
 	 */
 	public int getCrosstabWhenNoDataCellHeight(final DRDesignCrosstabCellContent whenNoDataCell)
@@ -2687,8 +2687,8 @@ public int getCrosstabWhenNoDataCellHeight(final DRDesignCrosstabCellContent whe
 	/**
 	 * <p>getCrosstabOddRowStyle.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
 	 */
 	protected DRISimpleStyle getCrosstabOddRowStyle(final DRICrosstab crosstab)
 	{
@@ -2710,8 +2710,8 @@ protected DRISimpleStyle getCrosstabOddRowStyle(final DRICrosstab crosstab)
 	/**
 	 * <p>getCrosstabEvenRowStyle.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
 	 */
 	protected DRISimpleStyle getCrosstabEvenRowStyle(final DRICrosstab crosstab)
 	{
@@ -2759,8 +2759,8 @@ private boolean isCrosstabHighlightEvenRows(final DRICrosstab crosstab)
 	/**
 	 * <p>getCrosstabGroupStyle.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getCrosstabGroupStyle(final DRICrosstab crosstab)
 	{
@@ -2782,8 +2782,8 @@ protected DRIReportStyle getCrosstabGroupStyle(final DRICrosstab crosstab)
 	/**
 	 * <p>getCrosstabGroupTotalStyle.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getCrosstabGroupTotalStyle(final DRICrosstab crosstab)
 	{
@@ -2805,8 +2805,8 @@ protected DRIReportStyle getCrosstabGroupTotalStyle(final DRICrosstab crosstab)
 	/**
 	 * <p>getCrosstabGrandTotalStyle.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getCrosstabGrandTotalStyle(final DRICrosstab crosstab)
 	{
@@ -2828,8 +2828,8 @@ protected DRIReportStyle getCrosstabGrandTotalStyle(final DRICrosstab crosstab)
 	/**
 	 * <p>getCrosstabCellStyle.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getCrosstabCellStyle(final DRICrosstab crosstab)
 	{
@@ -2851,9 +2851,9 @@ protected DRIReportStyle getCrosstabCellStyle(final DRICrosstab crosstab)
 	/**
 	 * <p>getCrosstabMeasureTitleStyle.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-	 * @param measure  a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+	 * @param measure  a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabMeasure} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public DRIReportStyle getCrosstabMeasureTitleStyle(final DRICrosstab crosstab, final DRICrosstabMeasure<?> measure)
 	{
@@ -2875,8 +2875,8 @@ public DRIReportStyle getCrosstabMeasureTitleStyle(final DRICrosstab crosstab, f
 	/**
 	 * <p>getCrosstabPercentageType.</p>
 	 *
-	 * @param variable a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+	 * @param variable a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabVariable} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
 	 */
 	protected CrosstabPercentageType getCrosstabPercentageType(final DRICrosstabVariable<?> variable)
 	{
@@ -2890,8 +2890,8 @@ protected CrosstabPercentageType getCrosstabPercentageType(final DRICrosstabVari
 	/**
 	 * <p>getBooleanComponentType.</p>
 	 *
-	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+	 * @param booleanField a {@link software.xdev.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.BooleanComponentType} object.
 	 */
 	public BooleanComponentType getBooleanComponentType(final DRIBooleanField booleanField)
 	{
@@ -2909,7 +2909,7 @@ public BooleanComponentType getBooleanComponentType(final DRIBooleanField boolea
 	/**
 	 * <p>getBooleanEmptyWhenNullValue.</p>
 	 *
-	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param booleanField a {@link software.xdev.dynamicreports.report.definition.component.DRIBooleanField} object.
 	 * @return a boolean.
 	 */
 	public boolean getBooleanEmptyWhenNullValue(final DRIBooleanField booleanField)
@@ -2928,7 +2928,7 @@ public boolean getBooleanEmptyWhenNullValue(final DRIBooleanField booleanField)
 	/**
 	 * <p>getBooleanImageWidth.</p>
 	 *
-	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param booleanField a {@link software.xdev.dynamicreports.report.definition.component.DRIBooleanField} object.
 	 * @return a int.
 	 */
 	public int getBooleanImageWidth(final DRIBooleanField booleanField)
@@ -2947,7 +2947,7 @@ public int getBooleanImageWidth(final DRIBooleanField booleanField)
 	/**
 	 * <p>getBooleanImageHeight.</p>
 	 *
-	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param booleanField a {@link software.xdev.dynamicreports.report.definition.component.DRIBooleanField} object.
 	 * @return a int.
 	 */
 	public int getBooleanImageHeight(final DRIBooleanField booleanField)
@@ -2966,9 +2966,9 @@ public int getBooleanImageHeight(final DRIBooleanField booleanField)
 	/**
 	 * <p>getBooleanHorizontalImageAlignment.</p>
 	 *
-	 * @param booleanField a {@link net.sf.dynamicreports.report.definition.component.DRIBooleanField} object.
-	 * @param style        a {@link net.sf.dynamicreports.design.base.style.DRDesignStyle} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+	 * @param booleanField a {@link software.xdev.dynamicreports.report.definition.component.DRIBooleanField} object.
+	 * @param style        a {@link software.xdev.dynamicreports.design.base.style.DRDesignStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
 	 */
 	protected HorizontalImageAlignment getBooleanHorizontalImageAlignment(
 		final DRIBooleanField booleanField,
@@ -2988,8 +2988,8 @@ protected HorizontalImageAlignment getBooleanHorizontalImageAlignment(
 	/**
 	 * <p>getBooleanColumnStyle.</p>
 	 *
-	 * @param column a {@link net.sf.dynamicreports.report.definition.column.DRIBooleanColumn} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param column a {@link software.xdev.dynamicreports.report.definition.column.DRIBooleanColumn} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public DRIReportStyle getBooleanColumnStyle(final DRIBooleanColumn column)
 	{
@@ -3028,8 +3028,8 @@ public Map<String, DRIStyle> getTemplateStyles()
 	/**
 	 * <p>getTitleSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getTitleSplitType(final DRIBand band)
 	{
@@ -3039,8 +3039,8 @@ protected SplitType getTitleSplitType(final DRIBand band)
 	/**
 	 * <p>getPageHeaderSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getPageHeaderSplitType(final DRIBand band)
 	{
@@ -3051,8 +3051,8 @@ protected SplitType getPageHeaderSplitType(final DRIBand band)
 	/**
 	 * <p>getPageFooterSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getPageFooterSplitType(final DRIBand band)
 	{
@@ -3063,8 +3063,8 @@ protected SplitType getPageFooterSplitType(final DRIBand band)
 	/**
 	 * <p>getColumnHeaderSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getColumnHeaderSplitType(final DRIBand band)
 	{
@@ -3077,8 +3077,8 @@ protected SplitType getColumnHeaderSplitType(final DRIBand band)
 	/**
 	 * <p>getColumnFooterSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getColumnFooterSplitType(final DRIBand band)
 	{
@@ -3091,8 +3091,8 @@ protected SplitType getColumnFooterSplitType(final DRIBand band)
 	/**
 	 * <p>getGroupHeaderSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getGroupHeaderSplitType(final DRIBand band)
 	{
@@ -3103,8 +3103,8 @@ protected SplitType getGroupHeaderSplitType(final DRIBand band)
 	/**
 	 * <p>getGroupFooterSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getGroupFooterSplitType(final DRIBand band)
 	{
@@ -3115,8 +3115,8 @@ protected SplitType getGroupFooterSplitType(final DRIBand band)
 	/**
 	 * <p>getDetailHeaderSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getDetailHeaderSplitType(final DRIBand band)
 	{
@@ -3129,8 +3129,8 @@ protected SplitType getDetailHeaderSplitType(final DRIBand band)
 	/**
 	 * <p>getDetailSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getDetailSplitType(final DRIBand band)
 	{
@@ -3140,8 +3140,8 @@ protected SplitType getDetailSplitType(final DRIBand band)
 	/**
 	 * <p>getDetailFooterSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getDetailFooterSplitType(final DRIBand band)
 	{
@@ -3154,8 +3154,8 @@ protected SplitType getDetailFooterSplitType(final DRIBand band)
 	/**
 	 * <p>getLastPageFooterSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getLastPageFooterSplitType(final DRIBand band)
 	{
@@ -3168,8 +3168,8 @@ protected SplitType getLastPageFooterSplitType(final DRIBand band)
 	/**
 	 * <p>getSummarySplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getSummarySplitType(final DRIBand band)
 	{
@@ -3179,8 +3179,8 @@ protected SplitType getSummarySplitType(final DRIBand band)
 	/**
 	 * <p>getNoDataSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getNoDataSplitType(final DRIBand band)
 	{
@@ -3190,8 +3190,8 @@ protected SplitType getNoDataSplitType(final DRIBand band)
 	/**
 	 * <p>getBackgroundSplitType.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	protected SplitType getBackgroundSplitType(final DRIBand band)
 	{
@@ -3225,8 +3225,8 @@ private SplitType getSplitType(final DRIBand band, final SplitType templateSplit
 	/**
 	 * <p>getTitleStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getTitleStyle(final DRIBand band)
 	{
@@ -3236,8 +3236,8 @@ protected DRIReportStyle getTitleStyle(final DRIBand band)
 	/**
 	 * <p>getPageHeaderStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getPageHeaderStyle(final DRIBand band)
 	{
@@ -3247,8 +3247,8 @@ protected DRIReportStyle getPageHeaderStyle(final DRIBand band)
 	/**
 	 * <p>getPageFooterStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getPageFooterStyle(final DRIBand band)
 	{
@@ -3258,8 +3258,8 @@ protected DRIReportStyle getPageFooterStyle(final DRIBand band)
 	/**
 	 * <p>getColumnHeaderStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getColumnHeaderStyle(final DRIBand band)
 	{
@@ -3269,8 +3269,8 @@ protected DRIReportStyle getColumnHeaderStyle(final DRIBand band)
 	/**
 	 * <p>getColumnFooterStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getColumnFooterStyle(final DRIBand band)
 	{
@@ -3280,8 +3280,8 @@ protected DRIReportStyle getColumnFooterStyle(final DRIBand band)
 	/**
 	 * <p>getGroupHeaderStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getGroupHeaderStyle(final DRIBand band)
 	{
@@ -3291,8 +3291,8 @@ protected DRIReportStyle getGroupHeaderStyle(final DRIBand band)
 	/**
 	 * <p>getGroupFooterStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getGroupFooterStyle(final DRIBand band)
 	{
@@ -3302,8 +3302,8 @@ protected DRIReportStyle getGroupFooterStyle(final DRIBand band)
 	/**
 	 * <p>getDetailHeaderStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getDetailHeaderStyle(final DRIBand band)
 	{
@@ -3313,8 +3313,8 @@ protected DRIReportStyle getDetailHeaderStyle(final DRIBand band)
 	/**
 	 * <p>getDetailStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getDetailStyle(final DRIBand band)
 	{
@@ -3324,8 +3324,8 @@ protected DRIReportStyle getDetailStyle(final DRIBand band)
 	/**
 	 * <p>getDetailFooterStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getDetailFooterStyle(final DRIBand band)
 	{
@@ -3335,8 +3335,8 @@ protected DRIReportStyle getDetailFooterStyle(final DRIBand band)
 	/**
 	 * <p>getLastPageFooterStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getLastPageFooterStyle(final DRIBand band)
 	{
@@ -3346,8 +3346,8 @@ protected DRIReportStyle getLastPageFooterStyle(final DRIBand band)
 	/**
 	 * <p>getSummaryStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getSummaryStyle(final DRIBand band)
 	{
@@ -3357,8 +3357,8 @@ protected DRIReportStyle getSummaryStyle(final DRIBand band)
 	/**
 	 * <p>getNoDataStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getNoDataStyle(final DRIBand band)
 	{
@@ -3368,8 +3368,8 @@ protected DRIReportStyle getNoDataStyle(final DRIBand band)
 	/**
 	 * <p>getBackgroundStyle.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	protected DRIReportStyle getBackgroundStyle(final DRIBand band)
 	{
@@ -3394,8 +3394,8 @@ private DRIReportStyle getBandStyle(final DRIBand band, final DRIReportStyle tem
 	/**
 	 * <p>getTitleBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getTitleBackgroundComponent(final DRIBand band)
 	{
@@ -3405,8 +3405,8 @@ protected DRIComponent getTitleBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getPageHeaderBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getPageHeaderBackgroundComponent(final DRIBand band)
 	{
@@ -3416,8 +3416,8 @@ protected DRIComponent getPageHeaderBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getPageFooterBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getPageFooterBackgroundComponent(final DRIBand band)
 	{
@@ -3427,8 +3427,8 @@ protected DRIComponent getPageFooterBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getColumnHeaderBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getColumnHeaderBackgroundComponent(final DRIBand band)
 	{
@@ -3438,8 +3438,8 @@ protected DRIComponent getColumnHeaderBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getColumnFooterBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getColumnFooterBackgroundComponent(final DRIBand band)
 	{
@@ -3449,8 +3449,8 @@ protected DRIComponent getColumnFooterBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getGroupHeaderBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getGroupHeaderBackgroundComponent(final DRIBand band)
 	{
@@ -3460,8 +3460,8 @@ protected DRIComponent getGroupHeaderBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getGroupFooterBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getGroupFooterBackgroundComponent(final DRIBand band)
 	{
@@ -3471,8 +3471,8 @@ protected DRIComponent getGroupFooterBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getDetailHeaderBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getDetailHeaderBackgroundComponent(final DRIBand band)
 	{
@@ -3482,8 +3482,8 @@ protected DRIComponent getDetailHeaderBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getDetailBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getDetailBackgroundComponent(final DRIBand band)
 	{
@@ -3493,8 +3493,8 @@ protected DRIComponent getDetailBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getDetailFooterBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getDetailFooterBackgroundComponent(final DRIBand band)
 	{
@@ -3504,8 +3504,8 @@ protected DRIComponent getDetailFooterBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getLastPageFooterBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getLastPageFooterBackgroundComponent(final DRIBand band)
 	{
@@ -3515,8 +3515,8 @@ protected DRIComponent getLastPageFooterBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getSummaryBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getSummaryBackgroundComponent(final DRIBand band)
 	{
@@ -3526,8 +3526,8 @@ protected DRIComponent getSummaryBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getNoDataBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getNoDataBackgroundComponent(final DRIBand band)
 	{
@@ -3537,8 +3537,8 @@ protected DRIComponent getNoDataBackgroundComponent(final DRIBand band)
 	/**
 	 * <p>getBackgroundBackgroundComponent.</p>
 	 *
-	 * @param band a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @param band a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	protected DRIComponent getBackgroundBackgroundComponent(final DRIBand band)
 	{
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java
index 70971a4..8925acf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/BooleanTextValueFormatter.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.ResourceBundle;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabExpression.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabExpression.java
index b2b83ad..2bd209c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabExpression.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRICustomValues;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
-import net.sf.dynamicreports.report.definition.expression.DRIComplexExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRICustomValues;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import software.xdev.dynamicreports.report.definition.expression.DRIComplexExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.List;
 
@@ -44,9 +44,9 @@ public class CrosstabExpression<T> extends AbstractComplexExpression<T> {
     /**
      * <p>Constructor for CrosstabExpression.</p>
      *
-     * @param crosstab   a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstab} object.
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param crosstab   a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public CrosstabExpression(DRICrosstab crosstab, DRIExpression<T> expression) throws DRException {
         this.expression = expression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java
index 47eb1aa..bc6dcd6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabMeasureExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.util.List;
 
@@ -36,7 +36,7 @@ public class CrosstabMeasureExpression extends AbstractComplexExpression<Double>
     /**
      * <p>Constructor for CrosstabMeasureExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public CrosstabMeasureExpression(DRIExpression<?> expression) {
         addExpression(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java
index c2d1a5d..ac39847 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabPrintInEvenRow.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>CrosstabPrintInEvenRow class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java
index 7b893e3..4164a7d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabPrintInOddRow.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>CrosstabPrintInOddRow class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCount.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabRowCount.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCount.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabRowCount.java
index 115bc6b..cb7391a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCount.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabRowCount.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>CrosstabRowCount class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java
index 74dc23c..e8fd6a7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CrosstabRowCounter.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>CrosstabRowCounter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CurrentDateExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CurrentDateExpression.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CurrentDateExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CurrentDateExpression.java
index c2bbe0a..c933445 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/CurrentDateExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/CurrentDateExpression.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.builder.datatype.DataTypes;
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.datatype.DataTypes;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
@@ -43,7 +43,7 @@ public class CurrentDateExpression extends AbstractComplexExpression<String> {
     /**
      * <p>Constructor for CurrentDateExpression.</p>
      *
-     * @param currentDateExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param currentDateExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param datePattern           a {@link java.lang.String} object.
      */
     public CurrentDateExpression(DRIExpression<String> currentDateExpression, String datePattern) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java
index 3adb189..9a7a813 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/GroupByDataTypeExpression.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>GroupByDataTypeExpression class.</p>
@@ -37,8 +37,8 @@ public class GroupByDataTypeExpression extends AbstractSimpleExpression<String>
     /**
      * <p>Constructor for GroupByDataTypeExpression.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param dataType        a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param dataType        a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     public GroupByDataTypeExpression(DRIExpression<?> valueExpression, DRIDataType<?, ?> dataType) {
         this.valueExpression = valueExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java
index fbceaf5..2c5cbc6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/MultiPageListDataSourceExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java
index 6392fcf..681e922 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/MultiPageListSubreportExpression.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.DRBand;
-import net.sf.dynamicreports.report.base.component.DRComponent;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.DRBand;
+import software.xdev.dynamicreports.report.base.component.DRComponent;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
 
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * <p>MultiPageListSubreportExpression class.</p>
@@ -57,7 +57,7 @@ public class MultiPageListSubreportExpression extends AbstractSimpleExpression<J
      * @param resourceBundle          a {@link java.util.ResourceBundle} object.
      * @param resourceBundleName      a {@link java.lang.String} object.
      * @param resourceBundleName      a {@link java.lang.String} object.
-     * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     * @param whenResourceMissingType a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
      * @param detailComponents        a {@link java.util.List} object.
      * @param templateStyles          a {@link java.util.Map} object.
      */
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/PageNumberExpression.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageNumberExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/PageNumberExpression.java
index 2f48670..57baf47 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageNumberExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/PageNumberExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.text.MessageFormat;
 import java.util.List;
@@ -37,7 +37,7 @@ public class PageNumberExpression extends AbstractComplexExpression<String> {
     /**
      * <p>Constructor for PageNumberExpression.</p>
      *
-     * @param pageNumberFormatExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param pageNumberFormatExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public PageNumberExpression(DRIExpression<String> pageNumberFormatExpression) {
         addExpression(pageNumberFormatExpression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java
index a2b3136..cf7ad21 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/PageXofYNumberExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 
@@ -41,7 +41,7 @@ public class PageXofYNumberExpression extends AbstractComplexExpression<String>
     /**
      * <p>Constructor for PageXofYNumberExpression.</p>
      *
-     * @param pageNumberFormatExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param pageNumberFormatExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param index                      a int.
      */
     public PageXofYNumberExpression(DRIExpression<String> pageNumberFormatExpression, int index) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/SerieValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/SerieValueExpression.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/SerieValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/SerieValueExpression.java
index 9a0e47a..e372ba6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/SerieValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/SerieValueExpression.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -48,10 +48,10 @@ public class SerieValueExpression extends AbstractSimpleExpression<Number> {
     /**
      * <p>Constructor for SerieValueExpression.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
-     * @param serieExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
-     * @param resetType       a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup      a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param serieExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param resetType       a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup      a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
      * @param key             a {@link java.lang.String} object.
      */
     public SerieValueExpression(DRIDesignExpression valueExpression, DRIDesignExpression serieExpression, ResetType resetType, DRDesignGroup resetGroup, String key) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java
index d9df066..7f1823f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocPrintWhenExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.util.List;
 
@@ -38,7 +38,7 @@ public class TocPrintWhenExpression extends AbstractComplexExpression<Boolean> {
     /**
      * <p>Constructor for TocPrintWhenExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public TocPrintWhenExpression(DRIExpression<?> expression) {
         addExpression(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocReferenceExpression.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocReferenceExpression.java
index 17d263d..95540e0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocReferenceExpression.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRICustomValues;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRICustomValues;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.util.List;
 
@@ -44,9 +44,9 @@ public class TocReferenceExpression extends AbstractComplexExpression<String> {
      *
      * @param level                 a int.
      * @param expressionName        a {@link java.lang.String} object.
-     * @param labelExpression       a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param anchorNameExpression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param customValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param labelExpression       a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param anchorNameExpression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param customValueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public TocReferenceExpression(int level, String expressionName, DRIExpression<?> labelExpression, DRIExpression<String> anchorNameExpression, DRIExpression<?> customValueExpression) {
         this.level = level;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java
index 6ab6d53..d1072ec 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/design/transformation/expressions/TocReferenceLinkExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.design.transformation.expressions;
+package software.xdev.dynamicreports.design.transformation.expressions;
 
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.util.List;
 
@@ -40,7 +40,7 @@ public class TocReferenceLinkExpression extends AbstractComplexExpression<String
      * <p>Constructor for TocReferenceLinkExpression.</p>
      *
      * @param expressionName       a {@link java.lang.String} object.
-     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param anchorNameExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public TocReferenceLinkExpression(String expressionName, DRIExpression<String> anchorNameExpression) {
         this.expressionName = expressionName;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/CustomScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/CustomScriptlet.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/CustomScriptlet.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/CustomScriptlet.java
index a44dd8f..01dd34b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/CustomScriptlet.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/CustomScriptlet.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
 import net.sf.jasperreports.engine.JRAbstractScriptlet;
 import net.sf.jasperreports.engine.JRScriptletException;
 
@@ -34,7 +34,7 @@ public class CustomScriptlet extends JRAbstractScriptlet {
     /**
      * <p>Constructor for CustomScriptlet.</p>
      *
-     * @param scriptlet a {@link net.sf.dynamicreports.report.definition.DRIScriptlet} object.
+     * @param scriptlet a {@link software.xdev.dynamicreports.report.definition.DRIScriptlet} object.
      */
     public CustomScriptlet(DRIScriptlet scriptlet) {
         this.scriptlet = scriptlet;
@@ -113,7 +113,7 @@ private JasperReportParameters getReportParameters() {
     /**
      * <p>Getter for the field <code>scriptlet</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIScriptlet} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIScriptlet} object.
      */
     protected DRIScriptlet getScriptlet() {
         return scriptlet;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/DefaultJasperScriptletManager.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/DefaultJasperScriptletManager.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/DefaultJasperScriptletManager.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/DefaultJasperScriptletManager.java
index 8f11642..1f48073 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/DefaultJasperScriptletManager.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/DefaultJasperScriptletManager.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
 /**
- * Simple, default implementation of {@link net.sf.dynamicreports.jasper.base.JasperScriptletManager}.
+ * Simple, default implementation of {@link software.xdev.dynamicreports.jasper.base.JasperScriptletManager}.
  *
  * @author edwin.njeru
  * @version 6.0.1-SNAPSHOT
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperCustomValues.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperCustomValues.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperCustomValues.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperCustomValues.java
index 05dcf3e..46ff888 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperCustomValues.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperCustomValues.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
 import static java.lang.Boolean.TRUE;
-import static net.sf.dynamicreports.jasper.base.JasperScriptletManager.USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY;
+import static software.xdev.dynamicreports.jasper.base.JasperScriptletManager.USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,12 +26,12 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
-import net.sf.dynamicreports.jasper.constant.ValueType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRICustomValues;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.jasper.constant.ValueType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRICustomValues;
 
 
 /**
@@ -91,7 +91,7 @@ private JasperScriptletManager createScriptletManager(final Properties propertie
 	 * addSimpleExpression.
 	 * </p>
 	 *
-	 * @param simpleExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression}
+	 * @param simpleExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression}
 	 *                         object.
 	 */
 	public void addSimpleExpression(final DRIDesignSimpleExpression simpleExpression)
@@ -105,7 +105,7 @@ public void addSimpleExpression(final DRIDesignSimpleExpression simpleExpression
 	 * addComplexExpression.
 	 * </p>
 	 *
-	 * @param complexExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression}
+	 * @param complexExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression}
 	 *                          object.
 	 */
 	public void addComplexExpression(final DRIDesignComplexExpression complexExpression)
@@ -120,7 +120,7 @@ public void addComplexExpression(final DRIDesignComplexExpression complexExpress
 	 * </p>
 	 *
 	 * @param name      a {@link java.lang.String} object.
-	 * @param valueType a {@link net.sf.dynamicreports.jasper.constant.ValueType} object.
+	 * @param valueType a {@link software.xdev.dynamicreports.jasper.constant.ValueType} object.
 	 */
 	public void addValueType(final String name, final ValueType valueType)
 	{
@@ -133,7 +133,7 @@ public void addValueType(final String name, final ValueType valueType)
 	 * </p>
 	 *
 	 * @param name a {@link java.lang.String} object.
-	 * @return a {@link net.sf.dynamicreports.jasper.constant.ValueType} object.
+	 * @return a {@link software.xdev.dynamicreports.jasper.constant.ValueType} object.
 	 */
 	protected ValueType getValueType(final String name)
 	{
@@ -146,7 +146,7 @@ protected ValueType getValueType(final String name)
 	 * </p>
 	 *
 	 * @param name a {@link java.lang.String} object.
-	 * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
+	 * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
 	 */
 	protected DRIDesignSimpleExpression getSimpleExpression(final String name)
 	{
@@ -159,7 +159,7 @@ protected DRIDesignSimpleExpression getSimpleExpression(final String name)
 	 * </p>
 	 *
 	 * @param name a {@link java.lang.String} object.
-	 * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
+	 * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
 	 */
 	protected DRIDesignComplexExpression getComplexExpression(final String name)
 	{
@@ -240,7 +240,7 @@ protected Object getSystemValue(final String name)
 	 * Getter for the field <code>jasperScriptlet</code>.
 	 * </p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} object.
+	 * @return a {@link software.xdev.dynamicreports.jasper.base.JasperScriptlet} object.
 	 */
 	protected JasperScriptlet getJasperScriptlet()
 	{
@@ -252,7 +252,7 @@ protected JasperScriptlet getJasperScriptlet()
 	 * Setter for the field <code>jasperScriptlet</code>.
 	 * </p>
 	 *
-	 * @param jasperScriptlet a {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} object.
+	 * @param jasperScriptlet a {@link software.xdev.dynamicreports.jasper.base.JasperScriptlet} object.
 	 */
 	protected void setJasperScriptlet(final JasperScriptlet jasperScriptlet)
 	{
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperReportDesign.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportDesign.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperReportDesign.java
index 6b88548..20af6af 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportDesign.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperReportDesign.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
-import net.sf.dynamicreports.design.definition.DRIDesignReport;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.definition.DRIDesignReport;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.design.JasperDesign;
 
 import java.io.Serializable;
@@ -48,9 +48,9 @@ public class JasperReportDesign implements Serializable {
     /**
      * <p>Constructor for JasperReportDesign.</p>
      *
-     * @param report          a {@link net.sf.dynamicreports.design.definition.DRIDesignReport} object.
+     * @param report          a {@link software.xdev.dynamicreports.design.definition.DRIDesignReport} object.
      * @param startPageNumber a {@link java.lang.Integer} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportDesign(DRIDesignReport report, Integer startPageNumber) throws DRException {
         this(report, null, startPageNumber);
@@ -59,10 +59,10 @@ public JasperReportDesign(DRIDesignReport report, Integer startPageNumber) throw
     /**
      * <p>Constructor for JasperReportDesign.</p>
      *
-     * @param report                 a {@link net.sf.dynamicreports.design.definition.DRIDesignReport} object.
-     * @param masterReportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param report                 a {@link software.xdev.dynamicreports.design.definition.DRIDesignReport} object.
+     * @param masterReportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      * @param startPageNumber        a {@link java.lang.Integer} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportDesign(DRIDesignReport report, ReportParameters masterReportParameters, Integer startPageNumber) throws DRException {
         this.masterReportParameters = masterReportParameters;
@@ -81,7 +81,7 @@ private void init(DRIDesignReport report) throws DRException {
     /**
      * <p>Getter for the field <code>customValues</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.base.JasperCustomValues} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.base.JasperCustomValues} object.
      */
     public JasperCustomValues getCustomValues() {
         return customValues;
@@ -117,7 +117,7 @@ public Integer getStartPageNumber() {
     /**
      * <p>Getter for the field <code>masterReportParameters</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public ReportParameters getMasterReportParameters() {
         return masterReportParameters;
@@ -135,7 +135,7 @@ public boolean isTableOfContents() {
     /**
      * <p>Getter for the field <code>tableOfContentsCustomizer</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
      */
     public DRITableOfContentsCustomizer getTableOfContentsCustomizer() {
         return tableOfContentsCustomizer;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportParameters.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperReportParameters.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportParameters.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperReportParameters.java
index 3d336a9..944abf4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperReportParameters.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperReportParameters.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
-
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.transformation.expressions.CrosstabRowCounter;
-import net.sf.dynamicreports.jasper.constant.ValueType;
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.exception.DRReportException;
+package software.xdev.dynamicreports.jasper.base;
+
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.transformation.expressions.CrosstabRowCounter;
+import software.xdev.dynamicreports.jasper.constant.ValueType;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.exception.DRReportException;
 import net.sf.jasperreports.engine.JRParameter;
 import net.sf.jasperreports.engine.JRScriptlet;
 import net.sf.jasperreports.engine.JRScriptletException;
@@ -56,7 +56,7 @@ public class JasperReportParameters implements ReportParameters {
     /**
      * <p>Constructor for JasperReportParameters.</p>
      *
-     * @param jasperScriptlet a {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} object.
+     * @param jasperScriptlet a {@link software.xdev.dynamicreports.jasper.base.JasperScriptlet} object.
      */
     protected JasperReportParameters(JasperScriptlet jasperScriptlet) {
         this.jasperScriptlet = jasperScriptlet;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperScriptlet.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptlet.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperScriptlet.java
index 92b0701..0b83aef 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptlet.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperScriptlet.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.jasper.constant.ValueType;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.jasper.constant.ValueType;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
 import net.sf.jasperreports.engine.JRDefaultScriptlet;
 import net.sf.jasperreports.engine.JRScriptlet;
 import net.sf.jasperreports.engine.JRScriptletException;
@@ -78,7 +78,7 @@ public Object getValue(final String name, final Object[] values)
 	/**
 	 * <p>Getter for the field <code>reportParameters</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.jasper.base.JasperReportParameters} object.
+	 * @return a {@link software.xdev.dynamicreports.jasper.base.JasperReportParameters} object.
 	 */
 	public JasperReportParameters getReportParameters()
 	{
@@ -101,7 +101,7 @@ private JasperCustomValues getCustomValues()
 	 * <p>getValueType.</p>
 	 *
 	 * @param name a {@link java.lang.String} object.
-	 * @return a {@link net.sf.dynamicreports.jasper.constant.ValueType} object.
+	 * @return a {@link software.xdev.dynamicreports.jasper.constant.ValueType} object.
 	 */
 	protected ValueType getValueType(final String name)
 	{
@@ -112,7 +112,7 @@ protected ValueType getValueType(final String name)
 	 * <p>getSimpleExpression.</p>
 	 *
 	 * @param name a {@link java.lang.String} object.
-	 * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
+	 * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
 	 */
 	protected DRIDesignSimpleExpression getSimpleExpression(final String name)
 	{
@@ -123,7 +123,7 @@ protected DRIDesignSimpleExpression getSimpleExpression(final String name)
 	 * <p>getComplexExpression.</p>
 	 *
 	 * @param name a {@link java.lang.String} object.
-	 * @return a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
+	 * @return a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
 	 */
 	protected DRIDesignComplexExpression getComplexExpression(final String name)
 	{
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptletManager.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperScriptletManager.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptletManager.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperScriptletManager.java
index c7704b7..04cdd3f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperScriptletManager.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperScriptletManager.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
 /**
- * Interface for managers of {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} used in {@link net.sf.dynamicreports.jasper.base.JasperCustomValues}.
+ * Interface for managers of {@link software.xdev.dynamicreports.jasper.base.JasperScriptlet} used in {@link software.xdev.dynamicreports.jasper.base.JasperCustomValues}.
  *
  * @author edwin.njeru
  * @version 6.0.1-SNAPSHOT
@@ -28,19 +28,19 @@ public interface JasperScriptletManager {
     /**
      * Property key used for selecting thread safe implementation.
      */
-    public static final String USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY = "net.sf.dynamicreports.useThreadSafeScriptletManager";
+    public static final String USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY = "software.xdev.dynamicreports.useThreadSafeScriptletManager";
 
     /**
-     * Getter for the {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} instance.
+     * Getter for the {@link software.xdev.dynamicreports.jasper.base.JasperScriptlet} instance.
      *
-     * @return the set {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} instance
+     * @return the set {@link software.xdev.dynamicreports.jasper.base.JasperScriptlet} instance
      */
     JasperScriptlet getJasperScriptlet();
 
     /**
-     * Setter for the {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} instance.
+     * Setter for the {@link software.xdev.dynamicreports.jasper.base.JasperScriptlet} instance.
      *
-     * @param jasperScriptlet the {@link net.sf.dynamicreports.jasper.base.JasperScriptlet} instance to set
+     * @param jasperScriptlet the {@link software.xdev.dynamicreports.jasper.base.JasperScriptlet} instance to set
      */
     void setJasperScriptlet(JasperScriptlet jasperScriptlet);
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java
index 823b022..5bc81be 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperSystemFontExtensionsRegistryFactory.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 import net.sf.jasperreports.engine.JRPropertiesMap;
 import net.sf.jasperreports.engine.JRPropertiesUtil;
 import net.sf.jasperreports.engine.JRPropertiesUtil.PropertySuffix;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperTemplateStyleLoader.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperTemplateStyleLoader.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperTemplateStyleLoader.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperTemplateStyleLoader.java
index d5e7f8f..1e23652 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/JasperTemplateStyleLoader.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/JasperTemplateStyleLoader.java
@@ -15,31 +15,31 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
-
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.report.base.style.DRBaseStyle;
-import net.sf.dynamicreports.report.base.style.DRBorder;
-import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
-import net.sf.dynamicreports.report.base.style.DRFont;
-import net.sf.dynamicreports.report.base.style.DRPadding;
-import net.sf.dynamicreports.report.base.style.DRParagraph;
-import net.sf.dynamicreports.report.base.style.DRPen;
-import net.sf.dynamicreports.report.base.style.DRStyle;
-import net.sf.dynamicreports.report.base.style.DRTabStop;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.LineSpacing;
-import net.sf.dynamicreports.report.constant.LineStyle;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.Rotation;
-import net.sf.dynamicreports.report.constant.TabStopAlignment;
-import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
-import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRException;
+package software.xdev.dynamicreports.jasper.base;
+
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.report.base.style.DRBaseStyle;
+import software.xdev.dynamicreports.report.base.style.DRBorder;
+import software.xdev.dynamicreports.report.base.style.DRConditionalStyle;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.base.style.DRPadding;
+import software.xdev.dynamicreports.report.base.style.DRParagraph;
+import software.xdev.dynamicreports.report.base.style.DRPen;
+import software.xdev.dynamicreports.report.base.style.DRStyle;
+import software.xdev.dynamicreports.report.base.style.DRTabStop;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.LineSpacing;
+import software.xdev.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.Rotation;
+import software.xdev.dynamicreports.report.constant.TabStopAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRConditionalStyle;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRLineBox;
@@ -76,7 +76,7 @@ public class JasperTemplateStyleLoader {
      * <p>loadStyles.</p>
      *
      * @param file a {@link java.io.File} object.
-     * @return an array of {@link net.sf.dynamicreports.report.base.style.DRStyle} objects.
+     * @return an array of {@link software.xdev.dynamicreports.report.base.style.DRStyle} objects.
      */
     public static DRStyle[] loadStyles(File file) {
         Validate.notNull(file, "file must not be null");
@@ -87,8 +87,8 @@ public static DRStyle[] loadStyles(File file) {
      * <p>loadStyles.</p>
      *
      * @param fileName a {@link java.lang.String} object.
-     * @return an array of {@link net.sf.dynamicreports.report.base.style.DRStyle} objects.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return an array of {@link software.xdev.dynamicreports.report.base.style.DRStyle} objects.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public static DRStyle[] loadStyles(String fileName) throws DRException {
         Validate.notNull(fileName, "fileName must not be null");
@@ -103,7 +103,7 @@ public static DRStyle[] loadStyles(String fileName) throws DRException {
      * <p>loadStyles.</p>
      *
      * @param inputStream a {@link java.io.InputStream} object.
-     * @return an array of {@link net.sf.dynamicreports.report.base.style.DRStyle} objects.
+     * @return an array of {@link software.xdev.dynamicreports.report.base.style.DRStyle} objects.
      */
     public static DRStyle[] loadStyles(InputStream inputStream) {
         Validate.notNull(inputStream, "inputStream must not be null");
@@ -114,7 +114,7 @@ public static DRStyle[] loadStyles(InputStream inputStream) {
      * <p>loadStyles.</p>
      *
      * @param url a {@link java.net.URL} object.
-     * @return an array of {@link net.sf.dynamicreports.report.base.style.DRStyle} objects.
+     * @return an array of {@link software.xdev.dynamicreports.report.base.style.DRStyle} objects.
      */
     public static DRStyle[] loadStyles(URL url) {
         Validate.notNull(url, "url must not be null");
@@ -196,7 +196,7 @@ private static void paragraph(JRParagraph jrParagraph, DRParagraph paragraph) {
      * <p>pen.</p>
      *
      * @param jrPen a {@link net.sf.jasperreports.engine.JRPen} object.
-     * @param pen   a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param pen   a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     protected static void pen(JRPen jrPen, DRPen pen) {
         pen.setLineColor(jrPen.getOwnLineColor());
@@ -390,7 +390,7 @@ private static LineSpacing lineSpacing(LineSpacingEnum lineSpacing) {
      * <p>rotation.</p>
      *
      * @param rotation a {@link net.sf.jasperreports.engine.type.RotationEnum} object.
-     * @return a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Rotation} object.
      */
     protected static Rotation rotation(RotationEnum rotation) {
         if (rotation == null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/StartPageNumberScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/StartPageNumberScriptlet.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/StartPageNumberScriptlet.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/StartPageNumberScriptlet.java
index 6ebff7d..c85d0bb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/StartPageNumberScriptlet.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/StartPageNumberScriptlet.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
 import net.sf.jasperreports.engine.JRDefaultScriptlet;
 import net.sf.jasperreports.engine.JRScriptletException;
 import net.sf.jasperreports.engine.JRVariable;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java
index f326d47..fc9d4cb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/ThreadSafeJasperScriptletManager.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
 /**
- * Thread safe implementation of {@link net.sf.dynamicreports.jasper.base.JasperScriptletManager} used for filling cached reports concurrently. Note: use of this class can lead to memory leaks if the threads starting the report fill
+ * Thread safe implementation of {@link software.xdev.dynamicreports.jasper.base.JasperScriptletManager} used for filling cached reports concurrently. Note: use of this class can lead to memory leaks if the threads starting the report fill
  * are not terminated properly.
  *
  * @author edwin.njeru
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java
index 5f80f3e..c549cb3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/AbstractJasperExcelExporter.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIExcelExporter;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ImageAnchorType;
-import net.sf.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIExcelExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ImageAnchorType;
+import software.xdev.dynamicreports.report.constant.RunDirection;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -550,7 +550,7 @@ public RunDirection getSheetDirection() {
     /**
      * <p>Setter for the field <code>sheetDirection</code>.</p>
      *
-     * @param sheetDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @param sheetDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public void setSheetDirection(RunDirection sheetDirection) {
         this.sheetDirection = sheetDirection;
@@ -625,7 +625,7 @@ public ImageAnchorType getImageAnchorType() {
     /**
      * <p>Setter for the field <code>imageAnchorType</code>.</p>
      *
-     * @param imageAnchorType a {@link net.sf.dynamicreports.report.constant.ImageAnchorType} object.
+     * @param imageAnchorType a {@link software.xdev.dynamicreports.report.constant.ImageAnchorType} object.
      */
     public void setImageAnchorType(ImageAnchorType imageAnchorType) {
         this.imageAnchorType = imageAnchorType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/AbstractJasperExporter.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/AbstractJasperExporter.java
index 5bd698d..da107d1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/AbstractJasperExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/AbstractJasperExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.Validate;
 
 import java.io.File;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperCsvExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperCsvExporter.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperCsvExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperCsvExporter.java
index 3b8b159..0169d35 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperCsvExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperCsvExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperICsvExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperICsvExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperCsvExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperDocxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperDocxExporter.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperDocxExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperDocxExporter.java
index f15adff..d66c761 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperDocxExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperDocxExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIDocxExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIDocxExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperDocxExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperHtmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperHtmlExporter.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperHtmlExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperHtmlExporter.java
index 9e01882..fff083e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperHtmlExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperHtmlExporter.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.constant.SizeUnit;
-import net.sf.dynamicreports.jasper.definition.export.JasperIHtmlExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.constant.SizeUnit;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIHtmlExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperHtmlExporter class.</p>
@@ -208,7 +208,7 @@ public SizeUnit getSizeUnit() {
     /**
      * <p>Setter for the field <code>sizeUnit</code>.</p>
      *
-     * @param sizeUnit a {@link net.sf.dynamicreports.jasper.constant.SizeUnit} object.
+     * @param sizeUnit a {@link software.xdev.dynamicreports.jasper.constant.SizeUnit} object.
      */
     public void setSizeUnit(SizeUnit sizeUnit) {
         this.sizeUnit = sizeUnit;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperImageExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperImageExporter.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperImageExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperImageExporter.java
index e52542f..615d716 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperImageExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperImageExporter.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.constant.ImageType;
-import net.sf.dynamicreports.jasper.definition.export.JasperIImageExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.constant.ImageType;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIImageExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -59,7 +59,7 @@ public ImageType getImageType() {
     /**
      * <p>Setter for the field <code>imageType</code>.</p>
      *
-     * @param imageType a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @param imageType a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
      */
     public void setImageType(ImageType imageType) {
         Validate.notNull(imageType, "imageType must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdsExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperOdsExporter.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdsExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperOdsExporter.java
index 3808a3d..55d4fd1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdsExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperOdsExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIOdsExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIOdsExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperOdsExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdtExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperOdtExporter.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdtExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperOdtExporter.java
index 3ee1298..7b68176 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperOdtExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperOdtExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIOdtExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIOdtExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperOdtExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPdfExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperPdfExporter.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPdfExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperPdfExporter.java
index 69252dc..4b90089 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPdfExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperPdfExporter.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.constant.PdfPermission;
-import net.sf.dynamicreports.jasper.constant.PdfVersion;
-import net.sf.dynamicreports.jasper.definition.export.JasperIPdfExporter;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.PdfPrintScaling;
-import net.sf.dynamicreports.report.constant.PdfaConformance;
+import software.xdev.dynamicreports.jasper.constant.PdfPermission;
+import software.xdev.dynamicreports.jasper.constant.PdfVersion;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIPdfExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.PdfPrintScaling;
+import software.xdev.dynamicreports.report.constant.PdfaConformance;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -179,7 +179,7 @@ public void setPermissions(List<PdfPermission> permissions) {
     /**
      * <p>addPermission.</p>
      *
-     * @param permission a {@link net.sf.dynamicreports.jasper.constant.PdfPermission} object.
+     * @param permission a {@link software.xdev.dynamicreports.jasper.constant.PdfPermission} object.
      */
     public void addPermission(PdfPermission permission) {
         this.permissions.add(permission);
@@ -194,7 +194,7 @@ public PdfVersion getPdfVersion() {
     /**
      * <p>Setter for the field <code>pdfVersion</code>.</p>
      *
-     * @param pdfVersion a {@link net.sf.dynamicreports.jasper.constant.PdfVersion} object.
+     * @param pdfVersion a {@link software.xdev.dynamicreports.jasper.constant.PdfVersion} object.
      */
     public void setPdfVersion(PdfVersion pdfVersion) {
         this.pdfVersion = pdfVersion;
@@ -404,7 +404,7 @@ public PdfPrintScaling getPrintScaling() {
     /**
      * <p>Setter for the field <code>printScaling</code>.</p>
      *
-     * @param printScaling a {@link net.sf.dynamicreports.report.constant.PdfPrintScaling} object.
+     * @param printScaling a {@link software.xdev.dynamicreports.report.constant.PdfPrintScaling} object.
      */
     public void setPrintScaling(PdfPrintScaling printScaling) {
         this.printScaling = printScaling;
@@ -419,7 +419,7 @@ public PdfaConformance getPdfaConformance() {
     /**
      * <p>Setter for the field <code>pdfaConformance</code>.</p>
      *
-     * @param pdfaConformance a {@link net.sf.dynamicreports.report.constant.PdfaConformance} object.
+     * @param pdfaConformance a {@link software.xdev.dynamicreports.report.constant.PdfaConformance} object.
      */
     public void setPdfaConformance(PdfaConformance pdfaConformance) {
         this.pdfaConformance = pdfaConformance;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPptxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperPptxExporter.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPptxExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperPptxExporter.java
index 56df328..5650f43 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperPptxExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperPptxExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIPptxExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIPptxExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperPptxExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperRtfExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperRtfExporter.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperRtfExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperRtfExporter.java
index dca907e..a188084 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperRtfExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperRtfExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIRtfExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIRtfExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperRtfExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperTextExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperTextExporter.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperTextExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperTextExporter.java
index 0e900b5..918f9a9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperTextExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperTextExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperITextExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperITextExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperTextExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXlsxExporter.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsxExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXlsxExporter.java
index e940826..3c427d6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXlsxExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXlsxExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperXlsxExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXmlExporter.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXmlExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXmlExporter.java
index 833dc99..ee7df0f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/export/JasperXmlExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXmlExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.export;
+package software.xdev.dynamicreports.jasper.base.export;
 
-import net.sf.dynamicreports.jasper.definition.export.JasperIXmlExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIXmlExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperXmlExporter class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java
index 2f8d11e..bcbcebe 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/AbstractPrintListHandler.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.reporthandler;
+package software.xdev.dynamicreports.jasper.base.reporthandler;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.definition.JasperReportHandler;
 import net.sf.jasperreports.engine.JasperPrint;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java
similarity index 98%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java
index 271c96e..806713e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperPrintListFileHandler.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.reporthandler;
+package software.xdev.dynamicreports.jasper.base.reporthandler;
 
-import net.sf.dynamicreports.report.exception.DRReportException;
+import software.xdev.dynamicreports.report.exception.DRReportException;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRVirtualizer;
 import net.sf.jasperreports.engine.JasperPrint;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java
index f2e58e9..07f2c83 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperPrintListHandler.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.reporthandler;
+package software.xdev.dynamicreports.jasper.base.reporthandler;
 
 import net.sf.jasperreports.engine.JasperPrint;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java
index dc015ad..cf4631a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/reporthandler/JasperReportBuilderHandler.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.reporthandler;
+package software.xdev.dynamicreports.jasper.base.reporthandler;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.definition.JasperReportHandler;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JasperPrint;
 
 import java.util.ArrayList;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java
index aa62c6b..b712c43 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/tableofcontents/JasperTocHeading.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.tableofcontents;
+package software.xdev.dynamicreports.jasper.base.tableofcontents;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java
index 388c418..8b201e8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/tableofcontents/JasperTocReport.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.tableofcontents;
+package software.xdev.dynamicreports.jasper.base.tableofcontents;
 
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
-import net.sf.dynamicreports.jasper.base.JasperReportDesign;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.jasper.transformation.ConstantTransform;
-import net.sf.dynamicreports.report.base.DRPage;
-import net.sf.dynamicreports.report.builder.MarginBuilder;
-import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
+import software.xdev.dynamicreports.jasper.base.JasperReportDesign;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.jasper.transformation.ConstantTransform;
+import software.xdev.dynamicreports.report.base.DRPage;
+import software.xdev.dynamicreports.report.builder.MarginBuilder;
+import software.xdev.dynamicreports.report.constant.TableOfContentsPosition;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRParameter;
 import net.sf.jasperreports.engine.JRPrintElement;
@@ -45,8 +45,8 @@
 import java.util.Map;
 import java.util.ResourceBundle;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * <p>JasperTocReport class.</p>
@@ -59,10 +59,10 @@ public class JasperTocReport {
     /**
      * <p>createTocReport.</p>
      *
-     * @param jasperReportDesign a {@link net.sf.dynamicreports.jasper.base.JasperReportDesign} object.
+     * @param jasperReportDesign a {@link software.xdev.dynamicreports.jasper.base.JasperReportDesign} object.
      * @param jasperPrint        a {@link net.sf.jasperreports.engine.JasperPrint} object.
      * @param parameters         a {@link java.util.Map} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      * @throws net.sf.jasperreports.engine.JRException if any.
      */
     public static void createTocReport(JasperReportDesign jasperReportDesign, JasperPrint jasperPrint, Map<String, Object> parameters) throws DRException, JRException {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java
index c8f29d0..c30aab9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/templatedesign/JasperEmptyTemplateDesign.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.templatedesign;
+package software.xdev.dynamicreports.jasper.base.templatedesign;
 
-import net.sf.dynamicreports.report.base.AbstractTemplateDesign;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.base.AbstractTemplateDesign;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.design.JasperDesign;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java
index 73a176e..002ca1a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/templatedesign/JasperTemplateDesign.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base.templatedesign;
-
-import net.sf.dynamicreports.jasper.transformation.ConstantTransform;
-import net.sf.dynamicreports.report.base.DRField;
-import net.sf.dynamicreports.report.base.DRMargin;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.DRIMargin;
-import net.sf.dynamicreports.report.definition.DRITemplateDesign;
-import net.sf.dynamicreports.report.exception.DRException;
+package software.xdev.dynamicreports.jasper.base.templatedesign;
+
+import software.xdev.dynamicreports.jasper.transformation.ConstantTransform;
+import software.xdev.dynamicreports.report.base.DRField;
+import software.xdev.dynamicreports.report.base.DRMargin;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.DRIMargin;
+import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRBand;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRField;
@@ -64,7 +64,7 @@ public class JasperTemplateDesign implements DRITemplateDesign<JasperDesign> {
      * <p>Constructor for JasperTemplateDesign.</p>
      *
      * @param jasperDesign a {@link net.sf.jasperreports.engine.design.JasperDesign} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperTemplateDesign(JasperDesign jasperDesign) throws DRException {
         init(jasperDesign);
@@ -74,7 +74,7 @@ public JasperTemplateDesign(JasperDesign jasperDesign) throws DRException {
      * <p>Constructor for JasperTemplateDesign.</p>
      *
      * @param file a {@link java.io.File} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperTemplateDesign(File file) throws DRException {
         Validate.notNull(file, "file must not be null");
@@ -89,7 +89,7 @@ public JasperTemplateDesign(File file) throws DRException {
      * <p>Constructor for JasperTemplateDesign.</p>
      *
      * @param fileName a {@link java.lang.String} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperTemplateDesign(String fileName) throws DRException {
         Validate.notNull(fileName, "fileName must not be null");
@@ -104,7 +104,7 @@ public JasperTemplateDesign(String fileName) throws DRException {
      * <p>Constructor for JasperTemplateDesign.</p>
      *
      * @param inputStream a {@link java.io.InputStream} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperTemplateDesign(InputStream inputStream) throws DRException {
         Validate.notNull(inputStream, "inputStream must not be null");
@@ -119,7 +119,7 @@ public JasperTemplateDesign(InputStream inputStream) throws DRException {
      * <p>Constructor for JasperTemplateDesign.</p>
      *
      * @param url a {@link java.net.URL} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperTemplateDesign(URL url) throws DRException {
         Validate.notNull(url, "url must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
similarity index 61%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
index 068a83b..f413eef 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder;
+package software.xdev.dynamicreports.jasper.builder;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -31,25 +31,25 @@
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.jasper.base.export.AbstractJasperExporter;
-import net.sf.dynamicreports.jasper.base.reporthandler.JasperReportBuilderHandler;
-import net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.Exporters;
-import net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
-import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
-import net.sf.dynamicreports.jasper.transformation.ExporterTransform;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.base.export.AbstractJasperExporter;
+import software.xdev.dynamicreports.jasper.base.reporthandler.JasperReportBuilderHandler;
+import software.xdev.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.Exporters;
+import software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
+import software.xdev.dynamicreports.jasper.definition.JasperReportHandler;
+import software.xdev.dynamicreports.jasper.transformation.ExporterTransform;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
@@ -81,7 +81,7 @@ public JasperConcatenatedReportBuilder() {
     /**
      * <p>Constructor for JasperConcatenatedReportBuilder.</p>
      *
-     * @param jasperReportHandler a {@link net.sf.dynamicreports.jasper.definition.JasperReportHandler} object.
+     * @param jasperReportHandler a {@link software.xdev.dynamicreports.jasper.definition.JasperReportHandler} object.
      */
     public JasperConcatenatedReportBuilder(final JasperReportHandler jasperReportHandler) {
         this.jasperReportHandler = jasperReportHandler;
@@ -90,8 +90,8 @@ public JasperConcatenatedReportBuilder(final JasperReportHandler jasperReportHan
     /**
      * <p>concatenate.</p>
      *
-     * @param jasperReportBuilders a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @param jasperReportBuilders a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      */
     public JasperConcatenatedReportBuilder concatenate(final JasperReportBuilder... jasperReportBuilders) {
         Validate.notNull(jasperReportBuilders, "jasperReportBuilders must not be null");
@@ -104,8 +104,8 @@ public JasperConcatenatedReportBuilder concatenate(final JasperReportBuilder...
      * <p>toPng.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toPng(final OutputStream outputStream) throws DRException {
         return this.toPng(outputStream, 1);
@@ -116,8 +116,8 @@ public JasperConcatenatedReportBuilder toPng(final OutputStream outputStream) th
      *
      * @param outputStream a {@link java.io.OutputStream} object.
      * @param zoom         a float.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toPng(final OutputStream outputStream, final float zoom) throws DRException {
         Validate.notNull(outputStream, "outputStream must not be null");
@@ -182,7 +182,7 @@ public JasperConcatenatedReportBuilder toPng(final OutputStream outputStream, fi
     /**
      * <p>continuousPageNumbering.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      */
     public JasperConcatenatedReportBuilder continuousPageNumbering() {
         return this.setContinuousPageNumbering(true);
@@ -192,7 +192,7 @@ public JasperConcatenatedReportBuilder continuousPageNumbering() {
      * <p>setContinuousPageNumbering.</p>
      *
      * @param continuousPageNumbering a boolean.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      */
     public JasperConcatenatedReportBuilder setContinuousPageNumbering(final boolean continuousPageNumbering) {
         this.jasperReportHandler.setContinuousPageNumbering(continuousPageNumbering);
@@ -205,8 +205,8 @@ public JasperConcatenatedReportBuilder setContinuousPageNumbering(final boolean
      * <p>toCsv.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toCsv(final OutputStream outputStream) throws DRException {
         return this.toCsv(Exporters.csvExporter(outputStream));
@@ -215,9 +215,9 @@ public JasperConcatenatedReportBuilder toCsv(final OutputStream outputStream) th
     /**
      * <p>toCsv.</p>
      *
-     * @param csvExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param csvExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toCsv(final JasperCsvExporterBuilder csvExporterBuilder) throws DRException {
         return this.export(csvExporterBuilder);
@@ -229,8 +229,8 @@ public JasperConcatenatedReportBuilder toCsv(final JasperCsvExporterBuilder csvE
      * <p>toDocx.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toDocx(final OutputStream outputStream) throws DRException {
         return this.toDocx(Exporters.docxExporter(outputStream));
@@ -239,9 +239,9 @@ public JasperConcatenatedReportBuilder toDocx(final OutputStream outputStream) t
     /**
      * <p>toDocx.</p>
      *
-     * @param docxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param docxExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toDocx(final JasperDocxExporterBuilder docxExporterBuilder) throws DRException {
         return this.export(docxExporterBuilder);
@@ -253,8 +253,8 @@ public JasperConcatenatedReportBuilder toDocx(final JasperDocxExporterBuilder do
      * <p>toHtml.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toHtml(final OutputStream outputStream) throws DRException {
         return this.toHtml(Exporters.htmlExporter(outputStream));
@@ -263,9 +263,9 @@ public JasperConcatenatedReportBuilder toHtml(final OutputStream outputStream) t
     /**
      * <p>toHtml.</p>
      *
-     * @param htmlExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param htmlExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toHtml(final JasperHtmlExporterBuilder htmlExporterBuilder) throws DRException {
         return this.export(htmlExporterBuilder);
@@ -277,8 +277,8 @@ public JasperConcatenatedReportBuilder toHtml(final JasperHtmlExporterBuilder ht
      * <p>toOds.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toOds(final OutputStream outputStream) throws DRException {
         return this.toOds(Exporters.odsExporter(outputStream));
@@ -287,9 +287,9 @@ public JasperConcatenatedReportBuilder toOds(final OutputStream outputStream) th
     /**
      * <p>toOds.</p>
      *
-     * @param odsExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param odsExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toOds(final JasperOdsExporterBuilder odsExporterBuilder) throws DRException {
         return this.export(odsExporterBuilder);
@@ -301,8 +301,8 @@ public JasperConcatenatedReportBuilder toOds(final JasperOdsExporterBuilder odsE
      * <p>toOdt.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toOdt(final OutputStream outputStream) throws DRException {
         return this.toOdt(Exporters.odtExporter(outputStream));
@@ -311,9 +311,9 @@ public JasperConcatenatedReportBuilder toOdt(final OutputStream outputStream) th
     /**
      * <p>toOdt.</p>
      *
-     * @param odtExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param odtExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toOdt(final JasperOdtExporterBuilder odtExporterBuilder) throws DRException {
         return this.export(odtExporterBuilder);
@@ -325,8 +325,8 @@ public JasperConcatenatedReportBuilder toOdt(final JasperOdtExporterBuilder odtE
      * <p>toPdf.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toPdf(final OutputStream outputStream) throws DRException {
         return this.toPdf(Exporters.pdfExporter(outputStream));
@@ -335,9 +335,9 @@ public JasperConcatenatedReportBuilder toPdf(final OutputStream outputStream) th
     /**
      * <p>toPdf.</p>
      *
-     * @param pdfExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param pdfExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toPdf(final JasperPdfExporterBuilder pdfExporterBuilder) throws DRException {
         return this.export(pdfExporterBuilder);
@@ -349,8 +349,8 @@ public JasperConcatenatedReportBuilder toPdf(final JasperPdfExporterBuilder pdfE
      * <p>toRtf.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toRtf(final OutputStream outputStream) throws DRException {
         return this.toRtf(Exporters.rtfExporter(outputStream));
@@ -359,9 +359,9 @@ public JasperConcatenatedReportBuilder toRtf(final OutputStream outputStream) th
     /**
      * <p>toRtf.</p>
      *
-     * @param rtfExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param rtfExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toRtf(final JasperRtfExporterBuilder rtfExporterBuilder) throws DRException {
         return this.export(rtfExporterBuilder);
@@ -373,8 +373,8 @@ public JasperConcatenatedReportBuilder toRtf(final JasperRtfExporterBuilder rtfE
      * <p>toText.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toText(final OutputStream outputStream) throws DRException {
         return this.toText(Exporters.textExporter(outputStream));
@@ -383,9 +383,9 @@ public JasperConcatenatedReportBuilder toText(final OutputStream outputStream) t
     /**
      * <p>toText.</p>
      *
-     * @param textExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param textExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toText(final JasperTextExporterBuilder textExporterBuilder) throws DRException {
         return this.export(textExporterBuilder);
@@ -397,8 +397,8 @@ public JasperConcatenatedReportBuilder toText(final JasperTextExporterBuilder te
      * <p>toXlsx.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toXlsx(final OutputStream outputStream) throws DRException {
         return this.toXlsx(Exporters.xlsxExporter(outputStream));
@@ -407,9 +407,9 @@ public JasperConcatenatedReportBuilder toXlsx(final OutputStream outputStream) t
     /**
      * <p>toXlsx.</p>
      *
-     * @param xlsxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param xlsxExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toXlsx(final JasperXlsxExporterBuilder xlsxExporterBuilder) throws DRException {
         return this.export(xlsxExporterBuilder);
@@ -421,8 +421,8 @@ public JasperConcatenatedReportBuilder toXlsx(final JasperXlsxExporterBuilder xl
      * <p>toXml.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toXml(final OutputStream outputStream) throws DRException {
         return this.toXml(Exporters.xmlExporter(outputStream));
@@ -431,9 +431,9 @@ public JasperConcatenatedReportBuilder toXml(final OutputStream outputStream) th
     /**
      * <p>toXml.</p>
      *
-     * @param xmlExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param xmlExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toXml(final JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
         return this.export(xmlExporterBuilder);
@@ -445,8 +445,8 @@ public JasperConcatenatedReportBuilder toXml(final JasperXmlExporterBuilder xmlE
      * <p>toPptx.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toPptx(final OutputStream outputStream) throws DRException {
         return this.toPptx(Exporters.pptxExporter(outputStream));
@@ -455,9 +455,9 @@ public JasperConcatenatedReportBuilder toPptx(final OutputStream outputStream) t
     /**
      * <p>toPptx.</p>
      *
-     * @param pptxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param pptxExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder toPptx(final JasperPptxExporterBuilder pptxExporterBuilder) throws DRException {
         return this.export(pptxExporterBuilder);
@@ -466,9 +466,9 @@ public JasperConcatenatedReportBuilder toPptx(final JasperPptxExporterBuilder pp
     /**
      * <p>export.</p>
      *
-     * @param exporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param exporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperConcatenatedReportBuilder export(final AbstractJasperExporterBuilder<?, ? extends AbstractJasperExporter> exporterBuilder) throws DRException {
         Validate.notNull(exporterBuilder, "exporterBuilder must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperReportBuilder.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperReportBuilder.java
index 424130a..155aa26 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/JasperReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperReportBuilder.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder;
+package software.xdev.dynamicreports.jasper.builder;
 
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -36,39 +36,39 @@
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.design.base.DRDesignReport;
-import net.sf.dynamicreports.design.definition.DRIDesignReport;
-import net.sf.dynamicreports.jasper.base.JasperReportDesign;
-import net.sf.dynamicreports.jasper.base.export.AbstractJasperExporter;
-import net.sf.dynamicreports.jasper.base.export.JasperImageExporter;
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocReport;
-import net.sf.dynamicreports.jasper.base.templatedesign.JasperEmptyTemplateDesign;
-import net.sf.dynamicreports.jasper.base.templatedesign.JasperTemplateDesign;
-import net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.Exporters;
-import net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
-import net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
-import net.sf.dynamicreports.jasper.constant.ImageType;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.jasper.transformation.ExporterTransform;
-import net.sf.dynamicreports.jasper.transformation.JasperTransform;
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.QueryBuilder;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.QueryLanguage;
-import net.sf.dynamicreports.report.definition.DRITemplateDesign;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignReport;
+import software.xdev.dynamicreports.design.definition.DRIDesignReport;
+import software.xdev.dynamicreports.jasper.base.JasperReportDesign;
+import software.xdev.dynamicreports.jasper.base.export.AbstractJasperExporter;
+import software.xdev.dynamicreports.jasper.base.export.JasperImageExporter;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocReport;
+import software.xdev.dynamicreports.jasper.base.templatedesign.JasperEmptyTemplateDesign;
+import software.xdev.dynamicreports.jasper.base.templatedesign.JasperTemplateDesign;
+import software.xdev.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.Exporters;
+import software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
+import software.xdev.dynamicreports.jasper.constant.ImageType;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.jasper.transformation.ExporterTransform;
+import software.xdev.dynamicreports.jasper.transformation.JasperTransform;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.QueryBuilder;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.QueryLanguage;
+import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRParameter;
@@ -124,8 +124,8 @@ public JasperReportBuilder() {
      * <p>Setter for the field <code>startPageNumber</code>.</p>
      *
      * @param startPageNumber a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder setStartPageNumber(final Integer startPageNumber) throws DRException {
         if (this.startPageNumber == startPageNumber) {
@@ -188,8 +188,8 @@ public JasperReportBuilder setDataSource(final QueryBuilder query, final Connect
      * <p>setTemplateDesign.</p>
      *
      * @param inputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder setTemplateDesign(final InputStream inputStream) throws DRException {
         return this.setTemplateDesign(new JasperTemplateDesign(inputStream));
@@ -199,8 +199,8 @@ public JasperReportBuilder setTemplateDesign(final InputStream inputStream) thro
      * <p>setTemplateDesign.</p>
      *
      * @param file a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder setTemplateDesign(final File file) throws DRException {
         return this.setTemplateDesign(new JasperTemplateDesign(file));
@@ -212,8 +212,8 @@ public JasperReportBuilder setTemplateDesign(final File file) throws DRException
      * <p>setTemplateDesign.</p>
      *
      * @param fileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder setTemplateDesign(final String fileName) throws DRException {
         return this.setTemplateDesign(new JasperTemplateDesign(fileName));
@@ -223,8 +223,8 @@ public JasperReportBuilder setTemplateDesign(final String fileName) throws DRExc
      * <p>setTemplateDesign.</p>
      *
      * @param jasperDesign a {@link net.sf.jasperreports.engine.design.JasperDesign} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder setTemplateDesign(final JasperDesign jasperDesign) throws DRException {
         return this.setTemplateDesign(new JasperTemplateDesign(jasperDesign));
@@ -234,8 +234,8 @@ public JasperReportBuilder setTemplateDesign(final JasperDesign jasperDesign) th
      * <p>setTemplateDesign.</p>
      *
      * @param jasperDesignUrl a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder setTemplateDesign(final URL jasperDesignUrl) throws DRException {
         return this.setTemplateDesign(new JasperTemplateDesign(jasperDesignUrl));
@@ -267,8 +267,8 @@ public JasperReportBuilder setParameters(final Map<String, Object> parameters) {
     /**
      * <p>rebuild.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder rebuild() throws DRException {
         this.builded = false;
@@ -301,7 +301,7 @@ private JasperReportDesign toJasperReportDesign() throws DRException {
      * <p>toJasperDesign.</p>
      *
      * @return a {@link net.sf.jasperreports.engine.design.JasperDesign} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperDesign toJasperDesign() throws DRException {
         if (this.jasperDesign == null) {
@@ -314,7 +314,7 @@ public JasperDesign toJasperDesign() throws DRException {
      * <p>toJasperReport.</p>
      *
      * @return a {@link net.sf.jasperreports.engine.JasperReport} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReport toJasperReport() throws DRException {
         if (this.jasperReport == null) {
@@ -331,7 +331,7 @@ public JasperReport toJasperReport() throws DRException {
      * <p>getJasperParameters.</p>
      *
      * @return a {@link java.util.Map} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public Map<String, Object> getJasperParameters() throws DRException {
         if (this.parameters == null) {
@@ -349,7 +349,7 @@ public Map<String, Object> getJasperParameters() throws DRException {
      * <p>toJasperPrint.</p>
      *
      * @return a {@link net.sf.jasperreports.engine.JasperPrint} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperPrint toJasperPrint() throws DRException {
         if (this.jasperPrint == null) {
@@ -381,8 +381,8 @@ public JasperPrint toJasperPrint() throws DRException {
     /**
      * <p>show.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder show() throws DRException {
         JasperViewer.viewReport(this.toJasperPrint());
@@ -393,8 +393,8 @@ public JasperReportBuilder show() throws DRException {
      * <p>show.</p>
      *
      * @param exitOnClose a boolean.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder show(final boolean exitOnClose) throws DRException {
         JasperViewer.viewReport(this.toJasperPrint(), exitOnClose, null);
@@ -404,8 +404,8 @@ public JasperReportBuilder show(final boolean exitOnClose) throws DRException {
     /**
      * <p>showJrXml.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder showJrXml() throws DRException {
         try {
@@ -420,8 +420,8 @@ public JasperReportBuilder showJrXml() throws DRException {
      * <p>toJrXml.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toJrXml(final OutputStream outputStream) throws DRException {
         Validate.notNull(outputStream, "outputStream must not be null");
@@ -436,8 +436,8 @@ public JasperReportBuilder toJrXml(final OutputStream outputStream) throws DRExc
     /**
      * <p>print.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder print() throws DRException {
         return this.print(true);
@@ -447,8 +447,8 @@ public JasperReportBuilder print() throws DRException {
      * <p>print.</p>
      *
      * @param withPrintDialog a boolean.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder print(final boolean withPrintDialog) throws DRException {
         try {
@@ -463,7 +463,7 @@ public JasperReportBuilder print(final boolean withPrintDialog) throws DRExcepti
      * <p>Setter for the field <code>virtualizer</code>.</p>
      *
      * @param virtualizer a {@link net.sf.jasperreports.engine.JRVirtualizer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
      */
     public JasperReportBuilder setVirtualizer(final JRVirtualizer virtualizer) {
         this.virtualizer = virtualizer;
@@ -474,9 +474,9 @@ public JasperReportBuilder setVirtualizer(final JRVirtualizer virtualizer) {
      * <p>toImage.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @param imageType    a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param imageType    a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toImage(final OutputStream outputStream, final ImageType imageType) throws DRException {
         return this.toImage(Exporters.imageExporter(outputStream, imageType));
@@ -485,9 +485,9 @@ public JasperReportBuilder toImage(final OutputStream outputStream, final ImageT
     /**
      * <p>toImage.</p>
      *
-     * @param imageExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param imageExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toImage(final JasperImageExporterBuilder imageExporterBuilder) throws DRException {
         Validate.notNull(imageExporterBuilder, "imageExporterBuilder must not be null");
@@ -590,8 +590,8 @@ public JasperReportBuilder toImage(final JasperImageExporterBuilder imageExporte
      * <p>toCsv.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toCsv(final OutputStream outputStream) throws DRException {
         return this.toCsv(Exporters.csvExporter(outputStream));
@@ -600,9 +600,9 @@ public JasperReportBuilder toCsv(final OutputStream outputStream) throws DRExcep
     /**
      * <p>toCsv.</p>
      *
-     * @param csvExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param csvExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toCsv(final JasperCsvExporterBuilder csvExporterBuilder) throws DRException {
         return this.export(csvExporterBuilder);
@@ -614,8 +614,8 @@ public JasperReportBuilder toCsv(final JasperCsvExporterBuilder csvExporterBuild
      * <p>toDocx.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toDocx(final OutputStream outputStream) throws DRException {
         return this.toDocx(Exporters.docxExporter(outputStream));
@@ -624,9 +624,9 @@ public JasperReportBuilder toDocx(final OutputStream outputStream) throws DRExce
     /**
      * <p>toDocx.</p>
      *
-     * @param docxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param docxExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toDocx(final JasperDocxExporterBuilder docxExporterBuilder) throws DRException {
         return this.export(docxExporterBuilder);
@@ -638,8 +638,8 @@ public JasperReportBuilder toDocx(final JasperDocxExporterBuilder docxExporterBu
      * <p>toHtml.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toHtml(final OutputStream outputStream) throws DRException {
         return this.toHtml(Exporters.htmlExporter(outputStream));
@@ -648,9 +648,9 @@ public JasperReportBuilder toHtml(final OutputStream outputStream) throws DRExce
     /**
      * <p>toHtml.</p>
      *
-     * @param htmlExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param htmlExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toHtml(final JasperHtmlExporterBuilder htmlExporterBuilder) throws DRException {
         return this.export(htmlExporterBuilder);
@@ -662,8 +662,8 @@ public JasperReportBuilder toHtml(final JasperHtmlExporterBuilder htmlExporterBu
      * <p>toOds.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toOds(final OutputStream outputStream) throws DRException {
         return this.toOds(Exporters.odsExporter(outputStream));
@@ -672,9 +672,9 @@ public JasperReportBuilder toOds(final OutputStream outputStream) throws DRExcep
     /**
      * <p>toOds.</p>
      *
-     * @param odsExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param odsExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toOds(final JasperOdsExporterBuilder odsExporterBuilder) throws DRException {
         return this.export(odsExporterBuilder);
@@ -686,8 +686,8 @@ public JasperReportBuilder toOds(final JasperOdsExporterBuilder odsExporterBuild
      * <p>toOdt.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toOdt(final OutputStream outputStream) throws DRException {
         return this.toOdt(Exporters.odtExporter(outputStream));
@@ -696,9 +696,9 @@ public JasperReportBuilder toOdt(final OutputStream outputStream) throws DRExcep
     /**
      * <p>toOdt.</p>
      *
-     * @param odtExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param odtExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toOdt(final JasperOdtExporterBuilder odtExporterBuilder) throws DRException {
         return this.export(odtExporterBuilder);
@@ -710,8 +710,8 @@ public JasperReportBuilder toOdt(final JasperOdtExporterBuilder odtExporterBuild
      * <p>toPdf.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toPdf(final OutputStream outputStream) throws DRException {
         return this.toPdf(Exporters.pdfExporter(outputStream));
@@ -720,9 +720,9 @@ public JasperReportBuilder toPdf(final OutputStream outputStream) throws DRExcep
     /**
      * <p>toPdf.</p>
      *
-     * @param pdfExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param pdfExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toPdf(final JasperPdfExporterBuilder pdfExporterBuilder) throws DRException {
         return this.export(pdfExporterBuilder);
@@ -734,8 +734,8 @@ public JasperReportBuilder toPdf(final JasperPdfExporterBuilder pdfExporterBuild
      * <p>toRtf.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toRtf(final OutputStream outputStream) throws DRException {
         return this.toRtf(Exporters.rtfExporter(outputStream));
@@ -744,9 +744,9 @@ public JasperReportBuilder toRtf(final OutputStream outputStream) throws DRExcep
     /**
      * <p>toRtf.</p>
      *
-     * @param rtfExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param rtfExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toRtf(final JasperRtfExporterBuilder rtfExporterBuilder) throws DRException {
         return this.export(rtfExporterBuilder);
@@ -758,8 +758,8 @@ public JasperReportBuilder toRtf(final JasperRtfExporterBuilder rtfExporterBuild
      * <p>toText.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toText(final OutputStream outputStream) throws DRException {
         return this.toText(Exporters.textExporter(outputStream));
@@ -768,9 +768,9 @@ public JasperReportBuilder toText(final OutputStream outputStream) throws DRExce
     /**
      * <p>toText.</p>
      *
-     * @param textExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param textExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toText(final JasperTextExporterBuilder textExporterBuilder) throws DRException {
         return this.export(textExporterBuilder);
@@ -782,8 +782,8 @@ public JasperReportBuilder toText(final JasperTextExporterBuilder textExporterBu
      * <p>toXlsx.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toXlsx(final OutputStream outputStream) throws DRException {
         return this.toXlsx(Exporters.xlsxExporter(outputStream));
@@ -792,9 +792,9 @@ public JasperReportBuilder toXlsx(final OutputStream outputStream) throws DRExce
     /**
      * <p>toXlsx.</p>
      *
-     * @param xlsxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param xlsxExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toXlsx(final JasperXlsxExporterBuilder xlsxExporterBuilder) throws DRException {
         return this.export(xlsxExporterBuilder);
@@ -806,8 +806,8 @@ public JasperReportBuilder toXlsx(final JasperXlsxExporterBuilder xlsxExporterBu
      * <p>toXml.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toXml(final OutputStream outputStream) throws DRException {
         return this.toXml(Exporters.xmlExporter(outputStream));
@@ -816,9 +816,9 @@ public JasperReportBuilder toXml(final OutputStream outputStream) throws DRExcep
     /**
      * <p>toXml.</p>
      *
-     * @param xmlExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param xmlExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toXml(final JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
         return this.export(xmlExporterBuilder);
@@ -830,8 +830,8 @@ public JasperReportBuilder toXml(final JasperXmlExporterBuilder xmlExporterBuild
      * <p>toPptx.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toPptx(final OutputStream outputStream) throws DRException {
         return this.toPptx(Exporters.pptxExporter(outputStream));
@@ -840,9 +840,9 @@ public JasperReportBuilder toPptx(final OutputStream outputStream) throws DRExce
     /**
      * <p>toPptx.</p>
      *
-     * @param pptxExporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param pptxExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder toPptx(final JasperPptxExporterBuilder pptxExporterBuilder) throws DRException {
         return this.export(pptxExporterBuilder);
@@ -853,9 +853,9 @@ public JasperReportBuilder toPptx(final JasperPptxExporterBuilder pptxExporterBu
     /**
      * <p>export.</p>
      *
-     * @param exporterBuilder a {@link net.sf.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param exporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperReportBuilder export(final AbstractJasperExporterBuilder<?, ? extends AbstractJasperExporter> exporterBuilder) throws DRException {
         Validate.notNull(exporterBuilder, "exporterBuilder must not be null");
@@ -884,7 +884,7 @@ public Connection getConnection() {
      * <p>Setter for the field <code>connection</code>.</p>
      *
      * @param connection a {@link java.sql.Connection} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
      */
     public JasperReportBuilder setConnection(final Connection connection) {
         Validate.notNull(connection, "connection must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java
index 0fe781d..e5d861f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/AbstractJasperExcelExporterBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.AbstractJasperExcelExporter;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ImageAnchorType;
-import net.sf.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.jasper.base.export.AbstractJasperExcelExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ImageAnchorType;
+import software.xdev.dynamicreports.report.constant.RunDirection;
 import org.apache.commons.lang3.Validate;
 
 import java.util.Map;
@@ -391,7 +391,7 @@ public T setPageScale(Integer pageScale) {
     /**
      * <p>setSheetDirection.</p>
      *
-     * @param sheetDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @param sheetDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      * @return a T object.
      */
     public T setSheetDirection(RunDirection sheetDirection) {
@@ -446,7 +446,7 @@ public T setShowGridLines(Boolean showGridLines) {
     /**
      * <p>setImageAnchorType.</p>
      *
-     * @param imageAnchorType a {@link net.sf.dynamicreports.report.constant.ImageAnchorType} object.
+     * @param imageAnchorType a {@link software.xdev.dynamicreports.report.constant.ImageAnchorType} object.
      * @return a T object.
      */
     public T setImageAnchorType(ImageAnchorType imageAnchorType) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java
index afff26e..5b9e1cd 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/AbstractJasperExporterBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.AbstractJasperExporter;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.AbstractJasperExporter;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 import java.io.File;
 import java.io.OutputStream;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/ExporterBuilders.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/ExporterBuilders.java
index 20790fb..2662aa9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/ExporterBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/ExporterBuilders.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
 import java.io.File;
 import java.io.OutputStream;
 import java.io.Writer;
 
-import net.sf.dynamicreports.jasper.constant.ImageType;
+import software.xdev.dynamicreports.jasper.constant.ImageType;
 
 
 /**
@@ -38,7 +38,7 @@ public class ExporterBuilders
      * <p>csvExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public JasperCsvExporterBuilder csvExporter(final Writer outputWriter)
     {
@@ -49,7 +49,7 @@ public JasperCsvExporterBuilder csvExporter(final Writer outputWriter)
      * <p>csvExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public JasperCsvExporterBuilder csvExporter(final OutputStream outputStream)
     {
@@ -60,7 +60,7 @@ public JasperCsvExporterBuilder csvExporter(final OutputStream outputStream)
      * <p>csvExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public JasperCsvExporterBuilder csvExporter(final File outputFile)
     {
@@ -71,7 +71,7 @@ public JasperCsvExporterBuilder csvExporter(final File outputFile)
      * <p>csvExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public JasperCsvExporterBuilder csvExporter(final String outputFileName)
     {
@@ -84,7 +84,7 @@ public JasperCsvExporterBuilder csvExporter(final String outputFileName)
      * <p>docxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public JasperDocxExporterBuilder docxExporter(final Writer outputWriter)
     {
@@ -95,7 +95,7 @@ public JasperDocxExporterBuilder docxExporter(final Writer outputWriter)
      * <p>docxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public JasperDocxExporterBuilder docxExporter(final OutputStream outputStream)
     {
@@ -106,7 +106,7 @@ public JasperDocxExporterBuilder docxExporter(final OutputStream outputStream)
      * <p>docxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public JasperDocxExporterBuilder docxExporter(final File outputFile)
     {
@@ -117,7 +117,7 @@ public JasperDocxExporterBuilder docxExporter(final File outputFile)
      * <p>docxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public JasperDocxExporterBuilder docxExporter(final String outputFileName)
     {
@@ -130,7 +130,7 @@ public JasperDocxExporterBuilder docxExporter(final String outputFileName)
      * <p>htmlExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder htmlExporter(final Writer outputWriter)
     {
@@ -141,7 +141,7 @@ public JasperHtmlExporterBuilder htmlExporter(final Writer outputWriter)
      * <p>htmlExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder htmlExporter(final OutputStream outputStream)
     {
@@ -152,7 +152,7 @@ public JasperHtmlExporterBuilder htmlExporter(final OutputStream outputStream)
      * <p>htmlExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder htmlExporter(final File outputFile)
     {
@@ -163,7 +163,7 @@ public JasperHtmlExporterBuilder htmlExporter(final File outputFile)
      * <p>htmlExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder htmlExporter(final String outputFileName)
     {
@@ -176,7 +176,7 @@ public JasperHtmlExporterBuilder htmlExporter(final String outputFileName)
      * <p>odsExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public JasperOdsExporterBuilder odsExporter(final Writer outputWriter)
     {
@@ -187,7 +187,7 @@ public JasperOdsExporterBuilder odsExporter(final Writer outputWriter)
      * <p>odsExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public JasperOdsExporterBuilder odsExporter(final OutputStream outputStream)
     {
@@ -198,7 +198,7 @@ public JasperOdsExporterBuilder odsExporter(final OutputStream outputStream)
      * <p>odsExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public JasperOdsExporterBuilder odsExporter(final File outputFile)
     {
@@ -209,7 +209,7 @@ public JasperOdsExporterBuilder odsExporter(final File outputFile)
      * <p>odsExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public JasperOdsExporterBuilder odsExporter(final String outputFileName)
     {
@@ -222,7 +222,7 @@ public JasperOdsExporterBuilder odsExporter(final String outputFileName)
      * <p>odtExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public JasperOdtExporterBuilder odtExporter(final Writer outputWriter)
     {
@@ -233,7 +233,7 @@ public JasperOdtExporterBuilder odtExporter(final Writer outputWriter)
      * <p>odtExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public JasperOdtExporterBuilder odtExporter(final OutputStream outputStream)
     {
@@ -244,7 +244,7 @@ public JasperOdtExporterBuilder odtExporter(final OutputStream outputStream)
      * <p>odtExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public JasperOdtExporterBuilder odtExporter(final File outputFile)
     {
@@ -255,7 +255,7 @@ public JasperOdtExporterBuilder odtExporter(final File outputFile)
      * <p>odtExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public JasperOdtExporterBuilder odtExporter(final String outputFileName)
     {
@@ -268,7 +268,7 @@ public JasperOdtExporterBuilder odtExporter(final String outputFileName)
      * <p>pdfExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder pdfExporter(final Writer outputWriter)
     {
@@ -279,7 +279,7 @@ public JasperPdfExporterBuilder pdfExporter(final Writer outputWriter)
      * <p>pdfExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder pdfExporter(final OutputStream outputStream)
     {
@@ -290,7 +290,7 @@ public JasperPdfExporterBuilder pdfExporter(final OutputStream outputStream)
      * <p>pdfExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder pdfExporter(final File outputFile)
     {
@@ -301,7 +301,7 @@ public JasperPdfExporterBuilder pdfExporter(final File outputFile)
      * <p>pdfExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder pdfExporter(final String outputFileName)
     {
@@ -314,7 +314,7 @@ public JasperPdfExporterBuilder pdfExporter(final String outputFileName)
      * <p>rtfExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public JasperRtfExporterBuilder rtfExporter(final Writer outputWriter)
     {
@@ -325,7 +325,7 @@ public JasperRtfExporterBuilder rtfExporter(final Writer outputWriter)
      * <p>rtfExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public JasperRtfExporterBuilder rtfExporter(final OutputStream outputStream)
     {
@@ -336,7 +336,7 @@ public JasperRtfExporterBuilder rtfExporter(final OutputStream outputStream)
      * <p>rtfExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public JasperRtfExporterBuilder rtfExporter(final File outputFile)
     {
@@ -347,7 +347,7 @@ public JasperRtfExporterBuilder rtfExporter(final File outputFile)
      * <p>rtfExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public JasperRtfExporterBuilder rtfExporter(final String outputFileName)
     {
@@ -360,7 +360,7 @@ public JasperRtfExporterBuilder rtfExporter(final String outputFileName)
      * <p>textExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder textExporter(final Writer outputWriter)
     {
@@ -371,7 +371,7 @@ public JasperTextExporterBuilder textExporter(final Writer outputWriter)
      * <p>textExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder textExporter(final OutputStream outputStream)
     {
@@ -382,7 +382,7 @@ public JasperTextExporterBuilder textExporter(final OutputStream outputStream)
      * <p>textExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder textExporter(final File outputFile)
     {
@@ -393,7 +393,7 @@ public JasperTextExporterBuilder textExporter(final File outputFile)
      * <p>textExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder textExporter(final String outputFileName)
     {
@@ -406,7 +406,7 @@ public JasperTextExporterBuilder textExporter(final String outputFileName)
      * <p>xlsxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public JasperXlsxExporterBuilder xlsxExporter(final Writer outputWriter)
     {
@@ -417,7 +417,7 @@ public JasperXlsxExporterBuilder xlsxExporter(final Writer outputWriter)
      * <p>xlsxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public JasperXlsxExporterBuilder xlsxExporter(final OutputStream outputStream)
     {
@@ -428,7 +428,7 @@ public JasperXlsxExporterBuilder xlsxExporter(final OutputStream outputStream)
      * <p>xlsxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public JasperXlsxExporterBuilder xlsxExporter(final File outputFile)
     {
@@ -439,7 +439,7 @@ public JasperXlsxExporterBuilder xlsxExporter(final File outputFile)
      * <p>xlsxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public JasperXlsxExporterBuilder xlsxExporter(final String outputFileName)
     {
@@ -452,7 +452,7 @@ public JasperXlsxExporterBuilder xlsxExporter(final String outputFileName)
      * <p>xmlExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public JasperXmlExporterBuilder xmlExporter(final Writer outputWriter)
     {
@@ -463,7 +463,7 @@ public JasperXmlExporterBuilder xmlExporter(final Writer outputWriter)
      * <p>xmlExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public JasperXmlExporterBuilder xmlExporter(final OutputStream outputStream)
     {
@@ -474,7 +474,7 @@ public JasperXmlExporterBuilder xmlExporter(final OutputStream outputStream)
      * <p>xmlExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public JasperXmlExporterBuilder xmlExporter(final File outputFile)
     {
@@ -485,7 +485,7 @@ public JasperXmlExporterBuilder xmlExporter(final File outputFile)
      * <p>xmlExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public JasperXmlExporterBuilder xmlExporter(final String outputFileName)
     {
@@ -498,7 +498,7 @@ public JasperXmlExporterBuilder xmlExporter(final String outputFileName)
      * <p>pptxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public JasperPptxExporterBuilder pptxExporter(final Writer outputWriter)
     {
@@ -509,7 +509,7 @@ public JasperPptxExporterBuilder pptxExporter(final Writer outputWriter)
      * <p>pptxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public JasperPptxExporterBuilder pptxExporter(final OutputStream outputStream)
     {
@@ -520,7 +520,7 @@ public JasperPptxExporterBuilder pptxExporter(final OutputStream outputStream)
      * <p>pptxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public JasperPptxExporterBuilder pptxExporter(final File outputFile)
     {
@@ -531,7 +531,7 @@ public JasperPptxExporterBuilder pptxExporter(final File outputFile)
      * <p>pptxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public JasperPptxExporterBuilder pptxExporter(final String outputFileName)
     {
@@ -544,8 +544,8 @@ public JasperPptxExporterBuilder pptxExporter(final String outputFileName)
      * <p>imageExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @param imageType    a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @param imageType    a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public JasperImageExporterBuilder imageExporter(final OutputStream outputStream, final ImageType imageType)
     {
@@ -556,8 +556,8 @@ public JasperImageExporterBuilder imageExporter(final OutputStream outputStream,
      * <p>imageExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @param imageType  a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @param imageType  a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public JasperImageExporterBuilder imageExporter(final File outputFile, final ImageType imageType)
     {
@@ -568,8 +568,8 @@ public JasperImageExporterBuilder imageExporter(final File outputFile, final Ima
      * <p>imageExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @param imageType      a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @param imageType      a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public JasperImageExporterBuilder imageExporter(final String outputFileName, final ImageType imageType)
     {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/Exporters.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/Exporters.java
index e50076f..b2ee9d2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/Exporters.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/Exporters.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
 import java.io.File;
 import java.io.OutputStream;
 import java.io.Writer;
 
-import net.sf.dynamicreports.jasper.constant.ImageType;
+import software.xdev.dynamicreports.jasper.constant.ImageType;
 
 
 /**
@@ -38,7 +38,7 @@ public class Exporters
      * <p>csvExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public static JasperCsvExporterBuilder csvExporter(final Writer outputWriter)
     {
@@ -49,7 +49,7 @@ public static JasperCsvExporterBuilder csvExporter(final Writer outputWriter)
      * <p>csvExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public static JasperCsvExporterBuilder csvExporter(final OutputStream outputStream)
     {
@@ -60,7 +60,7 @@ public static JasperCsvExporterBuilder csvExporter(final OutputStream outputStre
      * <p>csvExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public static JasperCsvExporterBuilder csvExporter(final File outputFile)
     {
@@ -71,7 +71,7 @@ public static JasperCsvExporterBuilder csvExporter(final File outputFile)
      * <p>csvExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public static JasperCsvExporterBuilder csvExporter(final String outputFileName)
     {
@@ -84,7 +84,7 @@ public static JasperCsvExporterBuilder csvExporter(final String outputFileName)
      * <p>docxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public static JasperDocxExporterBuilder docxExporter(final Writer outputWriter)
     {
@@ -95,7 +95,7 @@ public static JasperDocxExporterBuilder docxExporter(final Writer outputWriter)
      * <p>docxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public static JasperDocxExporterBuilder docxExporter(final OutputStream outputStream)
     {
@@ -106,7 +106,7 @@ public static JasperDocxExporterBuilder docxExporter(final OutputStream outputSt
      * <p>docxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public static JasperDocxExporterBuilder docxExporter(final File outputFile)
     {
@@ -117,7 +117,7 @@ public static JasperDocxExporterBuilder docxExporter(final File outputFile)
      * <p>docxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public static JasperDocxExporterBuilder docxExporter(final String outputFileName)
     {
@@ -130,7 +130,7 @@ public static JasperDocxExporterBuilder docxExporter(final String outputFileName
      * <p>htmlExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public static JasperHtmlExporterBuilder htmlExporter(final Writer outputWriter)
     {
@@ -141,7 +141,7 @@ public static JasperHtmlExporterBuilder htmlExporter(final Writer outputWriter)
      * <p>htmlExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public static JasperHtmlExporterBuilder htmlExporter(final OutputStream outputStream)
     {
@@ -152,7 +152,7 @@ public static JasperHtmlExporterBuilder htmlExporter(final OutputStream outputSt
      * <p>htmlExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public static JasperHtmlExporterBuilder htmlExporter(final File outputFile)
     {
@@ -163,7 +163,7 @@ public static JasperHtmlExporterBuilder htmlExporter(final File outputFile)
      * <p>htmlExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public static JasperHtmlExporterBuilder htmlExporter(final String outputFileName)
     {
@@ -176,7 +176,7 @@ public static JasperHtmlExporterBuilder htmlExporter(final String outputFileName
      * <p>odsExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public static JasperOdsExporterBuilder odsExporter(final Writer outputWriter)
     {
@@ -187,7 +187,7 @@ public static JasperOdsExporterBuilder odsExporter(final Writer outputWriter)
      * <p>odsExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public static JasperOdsExporterBuilder odsExporter(final OutputStream outputStream)
     {
@@ -198,7 +198,7 @@ public static JasperOdsExporterBuilder odsExporter(final OutputStream outputStre
      * <p>odsExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public static JasperOdsExporterBuilder odsExporter(final File outputFile)
     {
@@ -209,7 +209,7 @@ public static JasperOdsExporterBuilder odsExporter(final File outputFile)
      * <p>odsExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public static JasperOdsExporterBuilder odsExporter(final String outputFileName)
     {
@@ -222,7 +222,7 @@ public static JasperOdsExporterBuilder odsExporter(final String outputFileName)
      * <p>odtExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public static JasperOdtExporterBuilder odtExporter(final Writer outputWriter)
     {
@@ -233,7 +233,7 @@ public static JasperOdtExporterBuilder odtExporter(final Writer outputWriter)
      * <p>odtExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public static JasperOdtExporterBuilder odtExporter(final OutputStream outputStream)
     {
@@ -244,7 +244,7 @@ public static JasperOdtExporterBuilder odtExporter(final OutputStream outputStre
      * <p>odtExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public static JasperOdtExporterBuilder odtExporter(final File outputFile)
     {
@@ -255,7 +255,7 @@ public static JasperOdtExporterBuilder odtExporter(final File outputFile)
      * <p>odtExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public static JasperOdtExporterBuilder odtExporter(final String outputFileName)
     {
@@ -268,7 +268,7 @@ public static JasperOdtExporterBuilder odtExporter(final String outputFileName)
      * <p>pdfExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public static JasperPdfExporterBuilder pdfExporter(final Writer outputWriter)
     {
@@ -279,7 +279,7 @@ public static JasperPdfExporterBuilder pdfExporter(final Writer outputWriter)
      * <p>pdfExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public static JasperPdfExporterBuilder pdfExporter(final OutputStream outputStream)
     {
@@ -290,7 +290,7 @@ public static JasperPdfExporterBuilder pdfExporter(final OutputStream outputStre
      * <p>pdfExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public static JasperPdfExporterBuilder pdfExporter(final File outputFile)
     {
@@ -301,7 +301,7 @@ public static JasperPdfExporterBuilder pdfExporter(final File outputFile)
      * <p>pdfExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public static JasperPdfExporterBuilder pdfExporter(final String outputFileName)
     {
@@ -314,7 +314,7 @@ public static JasperPdfExporterBuilder pdfExporter(final String outputFileName)
      * <p>rtfExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public static JasperRtfExporterBuilder rtfExporter(final Writer outputWriter)
     {
@@ -325,7 +325,7 @@ public static JasperRtfExporterBuilder rtfExporter(final Writer outputWriter)
      * <p>rtfExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public static JasperRtfExporterBuilder rtfExporter(final OutputStream outputStream)
     {
@@ -336,7 +336,7 @@ public static JasperRtfExporterBuilder rtfExporter(final OutputStream outputStre
      * <p>rtfExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public static JasperRtfExporterBuilder rtfExporter(final File outputFile)
     {
@@ -347,7 +347,7 @@ public static JasperRtfExporterBuilder rtfExporter(final File outputFile)
      * <p>rtfExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public static JasperRtfExporterBuilder rtfExporter(final String outputFileName)
     {
@@ -360,7 +360,7 @@ public static JasperRtfExporterBuilder rtfExporter(final String outputFileName)
      * <p>textExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public static JasperTextExporterBuilder textExporter(final Writer outputWriter)
     {
@@ -371,7 +371,7 @@ public static JasperTextExporterBuilder textExporter(final Writer outputWriter)
      * <p>textExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public static JasperTextExporterBuilder textExporter(final OutputStream outputStream)
     {
@@ -382,7 +382,7 @@ public static JasperTextExporterBuilder textExporter(final OutputStream outputSt
      * <p>textExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public static JasperTextExporterBuilder textExporter(final File outputFile)
     {
@@ -393,7 +393,7 @@ public static JasperTextExporterBuilder textExporter(final File outputFile)
      * <p>textExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public static JasperTextExporterBuilder textExporter(final String outputFileName)
     {
@@ -406,7 +406,7 @@ public static JasperTextExporterBuilder textExporter(final String outputFileName
      * <p>xlsxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public static JasperXlsxExporterBuilder xlsxExporter(final Writer outputWriter)
     {
@@ -417,7 +417,7 @@ public static JasperXlsxExporterBuilder xlsxExporter(final Writer outputWriter)
      * <p>xlsxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public static JasperXlsxExporterBuilder xlsxExporter(final OutputStream outputStream)
     {
@@ -428,7 +428,7 @@ public static JasperXlsxExporterBuilder xlsxExporter(final OutputStream outputSt
      * <p>xlsxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public static JasperXlsxExporterBuilder xlsxExporter(final File outputFile)
     {
@@ -439,7 +439,7 @@ public static JasperXlsxExporterBuilder xlsxExporter(final File outputFile)
      * <p>xlsxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public static JasperXlsxExporterBuilder xlsxExporter(final String outputFileName)
     {
@@ -452,7 +452,7 @@ public static JasperXlsxExporterBuilder xlsxExporter(final String outputFileName
      * <p>xmlExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public static JasperXmlExporterBuilder xmlExporter(final Writer outputWriter)
     {
@@ -463,7 +463,7 @@ public static JasperXmlExporterBuilder xmlExporter(final Writer outputWriter)
      * <p>xmlExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public static JasperXmlExporterBuilder xmlExporter(final OutputStream outputStream)
     {
@@ -474,7 +474,7 @@ public static JasperXmlExporterBuilder xmlExporter(final OutputStream outputStre
      * <p>xmlExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public static JasperXmlExporterBuilder xmlExporter(final File outputFile)
     {
@@ -485,7 +485,7 @@ public static JasperXmlExporterBuilder xmlExporter(final File outputFile)
      * <p>xmlExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public static JasperXmlExporterBuilder xmlExporter(final String outputFileName)
     {
@@ -498,7 +498,7 @@ public static JasperXmlExporterBuilder xmlExporter(final String outputFileName)
      * <p>pptxExporter.</p>
      *
      * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public static JasperPptxExporterBuilder pptxExporter(final Writer outputWriter)
     {
@@ -509,7 +509,7 @@ public static JasperPptxExporterBuilder pptxExporter(final Writer outputWriter)
      * <p>pptxExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public static JasperPptxExporterBuilder pptxExporter(final OutputStream outputStream)
     {
@@ -520,7 +520,7 @@ public static JasperPptxExporterBuilder pptxExporter(final OutputStream outputSt
      * <p>pptxExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public static JasperPptxExporterBuilder pptxExporter(final File outputFile)
     {
@@ -531,7 +531,7 @@ public static JasperPptxExporterBuilder pptxExporter(final File outputFile)
      * <p>pptxExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public static JasperPptxExporterBuilder pptxExporter(final String outputFileName)
     {
@@ -544,8 +544,8 @@ public static JasperPptxExporterBuilder pptxExporter(final String outputFileName
      * <p>imageExporter.</p>
      *
      * @param outputStream a {@link java.io.OutputStream} object.
-     * @param imageType    a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @param imageType    a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public static JasperImageExporterBuilder imageExporter(final OutputStream outputStream, final ImageType imageType)
     {
@@ -556,8 +556,8 @@ public static JasperImageExporterBuilder imageExporter(final OutputStream output
      * <p>imageExporter.</p>
      *
      * @param outputFile a {@link java.io.File} object.
-     * @param imageType  a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @param imageType  a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public static JasperImageExporterBuilder imageExporter(final File outputFile, final ImageType imageType)
     {
@@ -568,8 +568,8 @@ public static JasperImageExporterBuilder imageExporter(final File outputFile, fi
      * <p>imageExporter.</p>
      *
      * @param outputFileName a {@link java.lang.String} object.
-     * @param imageType      a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @param imageType      a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public static JasperImageExporterBuilder imageExporter(final String outputFileName, final ImageType imageType)
     {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java
index 63034c0..afc33bc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperCsvExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperCsvExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperCsvExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperCsvExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperCsvExporterBuilder() {
      * <p>setFieldDelimiter.</p>
      *
      * @param fieldDelimiter a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public JasperCsvExporterBuilder setFieldDelimiter(String fieldDelimiter) {
         this.getObject().setFieldDelimiter(fieldDelimiter);
@@ -51,7 +51,7 @@ public JasperCsvExporterBuilder setFieldDelimiter(String fieldDelimiter) {
      * <p>setRecordDelimiter.</p>
      *
      * @param recordDelimiter a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder} object.
      */
     public JasperCsvExporterBuilder setRecordDelimiter(String recordDelimiter) {
         this.getObject().setRecordDelimiter(recordDelimiter);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java
index 412b405..63107be 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperDocxExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperDocxExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperDocxExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperDocxExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperDocxExporterBuilder() {
      * <p>setFramesAsNestedTables.</p>
      *
      * @param framesAsNestedTables a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public JasperDocxExporterBuilder setFramesAsNestedTables(Boolean framesAsNestedTables) {
         this.getObject().setFramesAsNestedTables(framesAsNestedTables);
@@ -51,7 +51,7 @@ public JasperDocxExporterBuilder setFramesAsNestedTables(Boolean framesAsNestedT
      * <p>setFlexibleRowHeight.</p>
      *
      * @param flexibleRowHeight a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public JasperDocxExporterBuilder setFlexibleRowHeight(Boolean flexibleRowHeight) {
         this.getObject().setFlexibleRowHeight(flexibleRowHeight);
@@ -62,7 +62,7 @@ public JasperDocxExporterBuilder setFlexibleRowHeight(Boolean flexibleRowHeight)
      * <p>setIgnoreHyperLink.</p>
      *
      * @param ignoreHyperLink a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder} object.
      */
     public JasperDocxExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
         this.getObject().setIgnoreHyperLink(ignoreHyperLink);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java
index 5db5cb3..34ef502 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperHtmlExporterBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperHtmlExporter;
-import net.sf.dynamicreports.jasper.constant.SizeUnit;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperHtmlExporter;
+import software.xdev.dynamicreports.jasper.constant.SizeUnit;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperHtmlExporterBuilder class.</p>
@@ -41,7 +41,7 @@ protected JasperHtmlExporterBuilder() {
      * <p>setOutputImagesToDir.</p>
      *
      * @param outputImagesToDir a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setOutputImagesToDir(Boolean outputImagesToDir) {
         this.getObject().setOutputImagesToDir(outputImagesToDir);
@@ -52,7 +52,7 @@ public JasperHtmlExporterBuilder setOutputImagesToDir(Boolean outputImagesToDir)
      * <p>setImagesDirName.</p>
      *
      * @param imagesDirName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setImagesDirName(String imagesDirName) {
         this.getObject().setImagesDirName(imagesDirName);
@@ -63,7 +63,7 @@ public JasperHtmlExporterBuilder setImagesDirName(String imagesDirName) {
      * <p>setImagesURI.</p>
      *
      * @param imagesURI a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setImagesURI(String imagesURI) {
         this.getObject().setImagesURI(imagesURI);
@@ -74,7 +74,7 @@ public JasperHtmlExporterBuilder setImagesURI(String imagesURI) {
      * <p>setHtmlHeader.</p>
      *
      * @param htmlHeader a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setHtmlHeader(String htmlHeader) {
         this.getObject().setHtmlHeader(htmlHeader);
@@ -85,7 +85,7 @@ public JasperHtmlExporterBuilder setHtmlHeader(String htmlHeader) {
      * <p>setBetweenPagesHtml.</p>
      *
      * @param betweenPagesHtml a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setBetweenPagesHtml(String betweenPagesHtml) {
         this.getObject().setBetweenPagesHtml(betweenPagesHtml);
@@ -96,7 +96,7 @@ public JasperHtmlExporterBuilder setBetweenPagesHtml(String betweenPagesHtml) {
      * <p>setHtmlFooter.</p>
      *
      * @param htmlFooter a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setHtmlFooter(String htmlFooter) {
         this.getObject().setHtmlFooter(htmlFooter);
@@ -107,7 +107,7 @@ public JasperHtmlExporterBuilder setHtmlFooter(String htmlFooter) {
      * <p>setRemoveEmptySpaceBetweenRows.</p>
      *
      * @param removeEmptySpaceBetweenRows a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setRemoveEmptySpaceBetweenRows(Boolean removeEmptySpaceBetweenRows) {
         this.getObject().setRemoveEmptySpaceBetweenRows(removeEmptySpaceBetweenRows);
@@ -118,7 +118,7 @@ public JasperHtmlExporterBuilder setRemoveEmptySpaceBetweenRows(Boolean removeEm
      * <p>setWhitePageBackground.</p>
      *
      * @param whitePageBackground a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setWhitePageBackground(Boolean whitePageBackground) {
         this.getObject().setWhitePageBackground(whitePageBackground);
@@ -129,7 +129,7 @@ public JasperHtmlExporterBuilder setWhitePageBackground(Boolean whitePageBackgro
      * <p>setUsingImagesToAlign.</p>
      *
      * @param usingImagesToAlign a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      * @deprecated To be removed.
      */
     @Deprecated
@@ -142,7 +142,7 @@ public JasperHtmlExporterBuilder setUsingImagesToAlign(Boolean usingImagesToAlig
      * <p>setWrapBreakWord.</p>
      *
      * @param wrapBreakWord a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setWrapBreakWord(Boolean wrapBreakWord) {
         this.getObject().setWrapBreakWord(wrapBreakWord);
@@ -152,8 +152,8 @@ public JasperHtmlExporterBuilder setWrapBreakWord(Boolean wrapBreakWord) {
     /**
      * <p>setSizeUnit.</p>
      *
-     * @param sizeUnit a {@link net.sf.dynamicreports.jasper.constant.SizeUnit} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @param sizeUnit a {@link software.xdev.dynamicreports.jasper.constant.SizeUnit} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setSizeUnit(SizeUnit sizeUnit) {
         this.getObject().setSizeUnit(sizeUnit);
@@ -164,7 +164,7 @@ public JasperHtmlExporterBuilder setSizeUnit(SizeUnit sizeUnit) {
      * <p>setFramesAsNestedTables.</p>
      *
      * @param framesAsNestedTables a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      * @deprecated To be removed.
      */
     @Deprecated
@@ -177,7 +177,7 @@ public JasperHtmlExporterBuilder setFramesAsNestedTables(Boolean framesAsNestedT
      * <p>setIgnorePageMargins.</p>
      *
      * @param ignorePageMargins a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setIgnorePageMargins(Boolean ignorePageMargins) {
         this.getObject().setIgnorePageMargins(ignorePageMargins);
@@ -188,7 +188,7 @@ public JasperHtmlExporterBuilder setIgnorePageMargins(Boolean ignorePageMargins)
      * <p>setBorderCollapse.</p>
      *
      * @param borderCollapse a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setBorderCollapse(String borderCollapse) {
         this.getObject().setBorderCollapse(borderCollapse);
@@ -199,7 +199,7 @@ public JasperHtmlExporterBuilder setBorderCollapse(String borderCollapse) {
      * <p>setAccessibleHtml.</p>
      *
      * @param accessibleHtml a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setAccessibleHtml(Boolean accessibleHtml) {
         this.getObject().setAccessibleHtml(accessibleHtml);
@@ -210,7 +210,7 @@ public JasperHtmlExporterBuilder setAccessibleHtml(Boolean accessibleHtml) {
      * <p>setZoomRatio.</p>
      *
      * @param zoomRatio a {@link java.lang.Float} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setZoomRatio(Float zoomRatio) {
         this.getObject().setZoomRatio(zoomRatio);
@@ -221,7 +221,7 @@ public JasperHtmlExporterBuilder setZoomRatio(Float zoomRatio) {
      * <p>setIgnoreHyperLink.</p>
      *
      * @param ignoreHyperLink a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
         this.getObject().setIgnoreHyperLink(ignoreHyperLink);
@@ -232,7 +232,7 @@ public JasperHtmlExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
      * <p>setFlushOutput.</p>
      *
      * @param flushOutput a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder} object.
      */
     public JasperHtmlExporterBuilder setFlushOutput(Boolean flushOutput) {
         this.getObject().setFlushOutput(flushOutput);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
index 96db9fa..c334728 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperImageExporter;
-import net.sf.dynamicreports.jasper.constant.ImageType;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperImageExporter;
+import software.xdev.dynamicreports.jasper.constant.ImageType;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperImageExporterBuilder class.</p>
@@ -41,7 +41,7 @@ protected JasperImageExporterBuilder() {
      * <p>setPageGap.</p>
      *
      * @param pageGap a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public JasperImageExporterBuilder setPageGap(Integer pageGap) {
         this.getObject().setPageGap(pageGap);
@@ -51,8 +51,8 @@ public JasperImageExporterBuilder setPageGap(Integer pageGap) {
     /**
      * <p>setImageType.</p>
      *
-     * @param imageType a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @param imageType a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public JasperImageExporterBuilder setImageType(ImageType imageType) {
         this.getObject().setImageType(imageType);
@@ -63,7 +63,7 @@ public JasperImageExporterBuilder setImageType(ImageType imageType) {
      * <p>setZoom.</p>
      *
      * @param zoom a {@link java.lang.Float} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      * @deprecated To be removed. Use setZoomRatio instead.
      */
     @Deprecated
@@ -75,7 +75,7 @@ public JasperImageExporterBuilder setZoom(Float zoom) {
      * <p>setZoomRatio.</p>
      *
      * @param zoom a {@link java.lang.Float} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
      */
     public JasperImageExporterBuilder setZoomRatio(Float zoom) {
         this.getObject().setZoomRatio(zoom);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java
index ef75735..1d085af 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperOdsExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperOdsExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperOdsExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperOdsExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperOdsExporterBuilder() {
      * <p>setFlexibleRowHeight.</p>
      *
      * @param flexibleRowHeight a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder} object.
      */
     public JasperOdsExporterBuilder setFlexibleRowHeight(Boolean flexibleRowHeight) {
         getObject().setFlexibleRowHeight(flexibleRowHeight);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java
index e5c889e..2a41eb0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperOdtExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperOdtExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperOdtExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperOdtExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperOdtExporterBuilder() {
      * <p>setFlexibleRowHeight.</p>
      *
      * @param flexibleRowHeight a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public JasperOdtExporterBuilder setFlexibleRowHeight(Boolean flexibleRowHeight) {
         this.getObject().setFlexibleRowHeight(flexibleRowHeight);
@@ -51,7 +51,7 @@ public JasperOdtExporterBuilder setFlexibleRowHeight(Boolean flexibleRowHeight)
      * <p>setIgnoreHyperLink.</p>
      *
      * @param ignoreHyperLink a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder} object.
      */
     public JasperOdtExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
         this.getObject().setIgnoreHyperLink(ignoreHyperLink);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java
index f235f75..1e7827e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperPdfExporterBuilder.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperPdfExporter;
-import net.sf.dynamicreports.jasper.constant.PdfPermission;
-import net.sf.dynamicreports.jasper.constant.PdfVersion;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.PdfPrintScaling;
-import net.sf.dynamicreports.report.constant.PdfaConformance;
+import software.xdev.dynamicreports.jasper.base.export.JasperPdfExporter;
+import software.xdev.dynamicreports.jasper.constant.PdfPermission;
+import software.xdev.dynamicreports.jasper.constant.PdfVersion;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.PdfPrintScaling;
+import software.xdev.dynamicreports.report.constant.PdfaConformance;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -45,7 +45,7 @@ protected JasperPdfExporterBuilder() {
      * <p>setCreatingBatchModeBookmarks.</p>
      *
      * @param creatingBatchModeBookmarks a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setCreatingBatchModeBookmarks(Boolean creatingBatchModeBookmarks) {
         this.getObject().setCreatingBatchModeBookmarks(creatingBatchModeBookmarks);
@@ -56,7 +56,7 @@ public JasperPdfExporterBuilder setCreatingBatchModeBookmarks(Boolean creatingBa
      * <p>setCompressed.</p>
      *
      * @param compressed a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setCompressed(Boolean compressed) {
         this.getObject().setCompressed(compressed);
@@ -67,7 +67,7 @@ public JasperPdfExporterBuilder setCompressed(Boolean compressed) {
      * <p>setEncrypted.</p>
      *
      * @param encrypted a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setEncrypted(Boolean encrypted) {
         this.getObject().setEncrypted(encrypted);
@@ -78,7 +78,7 @@ public JasperPdfExporterBuilder setEncrypted(Boolean encrypted) {
      * <p>setBitKey128.</p>
      *
      * @param bitKey128 a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setBitKey128(Boolean bitKey128) {
         this.getObject().setBitKey128(bitKey128);
@@ -89,7 +89,7 @@ public JasperPdfExporterBuilder setBitKey128(Boolean bitKey128) {
      * <p>setUserPassword.</p>
      *
      * @param userPassword a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setUserPassword(String userPassword) {
         this.getObject().setUserPassword(userPassword);
@@ -100,7 +100,7 @@ public JasperPdfExporterBuilder setUserPassword(String userPassword) {
      * <p>setOwnerPassword.</p>
      *
      * @param ownerPassword a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setOwnerPassword(String ownerPassword) {
         this.getObject().setOwnerPassword(ownerPassword);
@@ -110,8 +110,8 @@ public JasperPdfExporterBuilder setOwnerPassword(String ownerPassword) {
     /**
      * <p>permissions.</p>
      *
-     * @param permissions a {@link net.sf.dynamicreports.jasper.constant.PdfPermission} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @param permissions a {@link software.xdev.dynamicreports.jasper.constant.PdfPermission} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder permissions(PdfPermission... permissions) {
         return addPermission(permissions);
@@ -120,8 +120,8 @@ public JasperPdfExporterBuilder permissions(PdfPermission... permissions) {
     /**
      * <p>addPermission.</p>
      *
-     * @param permissions a {@link net.sf.dynamicreports.jasper.constant.PdfPermission} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @param permissions a {@link software.xdev.dynamicreports.jasper.constant.PdfPermission} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder addPermission(PdfPermission... permissions) {
         Validate.notNull(permissions, "permissions must not be null");
@@ -135,8 +135,8 @@ public JasperPdfExporterBuilder addPermission(PdfPermission... permissions) {
     /**
      * <p>setPdfVersion.</p>
      *
-     * @param pdfVersion a {@link net.sf.dynamicreports.jasper.constant.PdfVersion} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @param pdfVersion a {@link software.xdev.dynamicreports.jasper.constant.PdfVersion} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setPdfVersion(PdfVersion pdfVersion) {
         this.getObject().setPdfVersion(pdfVersion);
@@ -147,7 +147,7 @@ public JasperPdfExporterBuilder setPdfVersion(PdfVersion pdfVersion) {
      * <p>setMetadataTitle.</p>
      *
      * @param metadataTitle a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setMetadataTitle(String metadataTitle) {
         this.getObject().setMetadataTitle(metadataTitle);
@@ -158,7 +158,7 @@ public JasperPdfExporterBuilder setMetadataTitle(String metadataTitle) {
      * <p>setMetadataAuthor.</p>
      *
      * @param metadataAuthor a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setMetadataAuthor(String metadataAuthor) {
         this.getObject().setMetadataAuthor(metadataAuthor);
@@ -169,7 +169,7 @@ public JasperPdfExporterBuilder setMetadataAuthor(String metadataAuthor) {
      * <p>setMetadataSubject.</p>
      *
      * @param metadataSubject a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setMetadataSubject(String metadataSubject) {
         this.getObject().setMetadataSubject(metadataSubject);
@@ -180,7 +180,7 @@ public JasperPdfExporterBuilder setMetadataSubject(String metadataSubject) {
      * <p>setMetadataKeyWords.</p>
      *
      * @param metadataKeyWords a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setMetadataKeyWords(String metadataKeyWords) {
         this.getObject().setMetadataKeyWords(metadataKeyWords);
@@ -191,7 +191,7 @@ public JasperPdfExporterBuilder setMetadataKeyWords(String metadataKeyWords) {
      * <p>setMetadataCreator.</p>
      *
      * @param metadataCreator a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setMetadataCreator(String metadataCreator) {
         this.getObject().setMetadataCreator(metadataCreator);
@@ -202,7 +202,7 @@ public JasperPdfExporterBuilder setMetadataCreator(String metadataCreator) {
      * <p>setForceSvgShapes.</p>
      *
      * @param forceSvgShapes a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setForceSvgShapes(Boolean forceSvgShapes) {
         this.getObject().setForceSvgShapes(forceSvgShapes);
@@ -213,7 +213,7 @@ public JasperPdfExporterBuilder setForceSvgShapes(Boolean forceSvgShapes) {
      * <p>setPdfJavaScript.</p>
      *
      * @param pdfJavaScript a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setPdfJavaScript(String pdfJavaScript) {
         this.getObject().setPdfJavaScript(pdfJavaScript);
@@ -224,7 +224,7 @@ public JasperPdfExporterBuilder setPdfJavaScript(String pdfJavaScript) {
      * <p>setTagged.</p>
      *
      * @param tagged a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setTagged(Boolean tagged) {
         this.getObject().setTagged(tagged);
@@ -235,7 +235,7 @@ public JasperPdfExporterBuilder setTagged(Boolean tagged) {
      * <p>setTagLanguage.</p>
      *
      * @param tagLanguage a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setTagLanguage(String tagLanguage) {
         this.getObject().setTagLanguage(tagLanguage);
@@ -246,7 +246,7 @@ public JasperPdfExporterBuilder setTagLanguage(String tagLanguage) {
      * <p>setCollapseMissingBookmarkLevels.</p>
      *
      * @param collapseMissingBookmarkLevels a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setCollapseMissingBookmarkLevels(Boolean collapseMissingBookmarkLevels) {
         this.getObject().setCollapseMissingBookmarkLevels(collapseMissingBookmarkLevels);
@@ -257,7 +257,7 @@ public JasperPdfExporterBuilder setCollapseMissingBookmarkLevels(Boolean collaps
      * <p>setSizePageToContent.</p>
      *
      * @param sizePageToContent a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setSizePageToContent(Boolean sizePageToContent) {
         this.getObject().setSizePageToContent(sizePageToContent);
@@ -268,7 +268,7 @@ public JasperPdfExporterBuilder setSizePageToContent(Boolean sizePageToContent)
      * <p>setIgnoreHyperLink.</p>
      *
      * @param ignoreHyperLink a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
         this.getObject().setIgnoreHyperLink(ignoreHyperLink);
@@ -279,7 +279,7 @@ public JasperPdfExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
      * <p>setForceLineBreakPolicy.</p>
      *
      * @param forceLineBreakPolicy a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setForceLineBreakPolicy(Boolean forceLineBreakPolicy) {
         this.getObject().setForceLineBreakPolicy(forceLineBreakPolicy);
@@ -289,8 +289,8 @@ public JasperPdfExporterBuilder setForceLineBreakPolicy(Boolean forceLineBreakPo
     /**
      * <p>setPrintScaling.</p>
      *
-     * @param printScaling a {@link net.sf.dynamicreports.report.constant.PdfPrintScaling} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @param printScaling a {@link software.xdev.dynamicreports.report.constant.PdfPrintScaling} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setPrintScaling(PdfPrintScaling printScaling) {
         this.getObject().setPrintScaling(printScaling);
@@ -300,8 +300,8 @@ public JasperPdfExporterBuilder setPrintScaling(PdfPrintScaling printScaling) {
     /**
      * <p>setPdfaConformance.</p>
      *
-     * @param pdfaConformance a {@link net.sf.dynamicreports.report.constant.PdfaConformance} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @param pdfaConformance a {@link software.xdev.dynamicreports.report.constant.PdfaConformance} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setPdfaConformance(PdfaConformance pdfaConformance) {
         this.getObject().setPdfaConformance(pdfaConformance);
@@ -312,7 +312,7 @@ public JasperPdfExporterBuilder setPdfaConformance(PdfaConformance pdfaConforman
      * <p>setIccProfilePath.</p>
      *
      * @param iccProfilePath a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setIccProfilePath(String iccProfilePath) {
         this.getObject().setIccProfilePath(iccProfilePath);
@@ -323,7 +323,7 @@ public JasperPdfExporterBuilder setIccProfilePath(String iccProfilePath) {
      * <p>setAllowedPermissionsHint.</p>
      *
      * @param allowedPermissionsHint a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setAllowedPermissionsHint(String allowedPermissionsHint) {
         this.getObject().setAllowedPermissionsHint(allowedPermissionsHint);
@@ -334,7 +334,7 @@ public JasperPdfExporterBuilder setAllowedPermissionsHint(String allowedPermissi
      * <p>setDeniedPermissionsHint.</p>
      *
      * @param deniedPermissionsHint a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setDeniedPermissionsHint(String deniedPermissionsHint) {
         this.getObject().setDeniedPermissionsHint(deniedPermissionsHint);
@@ -345,7 +345,7 @@ public JasperPdfExporterBuilder setDeniedPermissionsHint(String deniedPermission
      * <p>setDisplayMetadataTitle.</p>
      *
      * @param displayMetadataTitle a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder} object.
      */
     public JasperPdfExporterBuilder setDisplayMetadataTitle(Boolean displayMetadataTitle) {
         this.getObject().setDisplayMetadataTitle(displayMetadataTitle);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java
index a0d90d3..5da4216 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperPptxExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperPptxExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperPptxExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperPptxExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperPptxExporterBuilder() {
      * <p>setIgnoreHyperLink.</p>
      *
      * @param ignoreHyperLink a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperPptxExporterBuilder} object.
      */
     public JasperPptxExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
         this.getObject().setIgnoreHyperLink(ignoreHyperLink);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java
index 87dbb51..2f36179 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperRtfExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperRtfExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperRtfExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperRtfExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperRtfExporterBuilder() {
      * <p>setIgnoreHyperLink.</p>
      *
      * @param ignoreHyperLink a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder} object.
      */
     public JasperRtfExporterBuilder setIgnoreHyperLink(Boolean ignoreHyperLink) {
         this.getObject().setIgnoreHyperLink(ignoreHyperLink);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java
index 57367d3..993d529 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperTextExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperTextExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperTextExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperTextExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperTextExporterBuilder() {
      * <p>setCharacterWidth.</p>
      *
      * @param characterWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      * @deprecated To be removed. Use setCharacterWidth(Float characterWidth) instead.
      */
     @Deprecated
@@ -52,7 +52,7 @@ public JasperTextExporterBuilder setCharacterWidth(Integer characterWidth) {
      * <p>setCharacterWidth.</p>
      *
      * @param characterWidth a {@link java.lang.Float} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder setCharacterWidth(Float characterWidth) {
         this.getObject().setCharacterWidth(characterWidth);
@@ -63,7 +63,7 @@ public JasperTextExporterBuilder setCharacterWidth(Float characterWidth) {
      * <p>setCharacterHeight.</p>
      *
      * @param characterHeight a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      * @deprecated To be removed. Use setCharacterHeight(Float characterHeight) instead.
      */
     @Deprecated
@@ -75,7 +75,7 @@ public JasperTextExporterBuilder setCharacterHeight(Integer characterHeight) {
      * <p>setCharacterHeight.</p>
      *
      * @param characterHeight a {@link java.lang.Float} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder setCharacterHeight(Float characterHeight) {
         this.getObject().setCharacterHeight(characterHeight);
@@ -86,7 +86,7 @@ public JasperTextExporterBuilder setCharacterHeight(Float characterHeight) {
      * <p>setPageWidth.</p>
      *
      * @param pageWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      * @deprecated To be removed. Use setPageWidthInChars instead.
      */
     @Deprecated
@@ -98,7 +98,7 @@ public JasperTextExporterBuilder setPageWidth(Integer pageWidth) {
      * <p>setPageWidthInChars.</p>
      *
      * @param pageWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder setPageWidthInChars(Integer pageWidth) {
         this.getObject().setPageWidthInChars(pageWidth);
@@ -109,7 +109,7 @@ public JasperTextExporterBuilder setPageWidthInChars(Integer pageWidth) {
      * <p>setPageHeight.</p>
      *
      * @param pageHeight a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      * @deprecated To be removed. Use setPageHeightInChars instead.
      */
     @Deprecated
@@ -121,7 +121,7 @@ public JasperTextExporterBuilder setPageHeight(Integer pageHeight) {
      * <p>setPageHeightInChars.</p>
      *
      * @param pageHeight a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder setPageHeightInChars(Integer pageHeight) {
         this.getObject().setPageHeightInChars(pageHeight);
@@ -132,7 +132,7 @@ public JasperTextExporterBuilder setPageHeightInChars(Integer pageHeight) {
      * <p>setBetweenPagesText.</p>
      *
      * @param betweenPagesText a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      * @deprecated To be removed. Use setPageSeparator instead.
      */
     @Deprecated
@@ -144,7 +144,7 @@ public JasperTextExporterBuilder setBetweenPagesText(String betweenPagesText) {
      * <p>setPageSeparator.</p>
      *
      * @param pageSeparator a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder setPageSeparator(String pageSeparator) {
         this.getObject().setPageSeparator(pageSeparator);
@@ -155,7 +155,7 @@ public JasperTextExporterBuilder setPageSeparator(String pageSeparator) {
      * <p>setLineSeparator.</p>
      *
      * @param lineSeparator a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder} object.
      */
     public JasperTextExporterBuilder setLineSeparator(String lineSeparator) {
         this.getObject().setLineSeparator(lineSeparator);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java
index 47e250f..056db8b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXlsxExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperXlsxExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperXlsxExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperXlsxExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperXlsxExporterBuilder() {
      * <p>setMacroTemplate.</p>
      *
      * @param macroTemplate a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder} object.
      */
     public JasperXlsxExporterBuilder setMacroTemplate(String macroTemplate) {
         getObject().setMacroTemplate(macroTemplate);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
index 8b9a7fa..f9170fa 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.builder.export;
+package software.xdev.dynamicreports.jasper.builder.export;
 
-import net.sf.dynamicreports.jasper.base.export.JasperXmlExporter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.jasper.base.export.JasperXmlExporter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperXmlExporterBuilder class.</p>
@@ -40,7 +40,7 @@ protected JasperXmlExporterBuilder() {
      * <p>setEmbeddingImages.</p>
      *
      * @param embeddingImages a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
      */
     public JasperXmlExporterBuilder setEmbeddingImages(Boolean embeddingImages) {
         this.getObject().setEmbeddingImages(embeddingImages);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ImageType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/ImageType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ImageType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/ImageType.java
index 19ca37f..1db18de 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ImageType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/ImageType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.constant;
+package software.xdev.dynamicreports.jasper.constant;
 
 /**
  * <p>ImageType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/JasperProperty.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/JasperProperty.java
similarity index 99%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/JasperProperty.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/JasperProperty.java
index 8c8c8f5..23248de 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/JasperProperty.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/JasperProperty.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.constant;
+package software.xdev.dynamicreports.jasper.constant;
 
 import net.sf.jasperreports.engine.JRAbstractExporter;
 import net.sf.jasperreports.engine.JRTextElement;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfPermission.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/PdfPermission.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfPermission.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/PdfPermission.java
index e23b0eb..eec8de8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfPermission.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/PdfPermission.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.constant;
+package software.xdev.dynamicreports.jasper.constant;
 
 /**
  * <p>PdfPermission class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfVersion.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/PdfVersion.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfVersion.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/PdfVersion.java
index 9d1bde1..f2b8465 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/PdfVersion.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/PdfVersion.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.constant;
+package software.xdev.dynamicreports.jasper.constant;
 
 /**
  * <p>PdfVersion class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/SizeUnit.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/SizeUnit.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/SizeUnit.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/SizeUnit.java
index 4730e6c..8ed0360 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/SizeUnit.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/SizeUnit.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.constant;
+package software.xdev.dynamicreports.jasper.constant;
 
 /**
  * <p>SizeUnit class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ValueType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/ValueType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ValueType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/ValueType.java
index 9f4cd39..fadea55 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/constant/ValueType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/constant/ValueType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.constant;
+package software.xdev.dynamicreports.jasper.constant;
 
 /**
  * <p>ValueType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/JasperReportHandler.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/JasperReportHandler.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/JasperReportHandler.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/JasperReportHandler.java
index 6ac1336..1767ef5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/JasperReportHandler.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/JasperReportHandler.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition;
+package software.xdev.dynamicreports.jasper.definition;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JasperPrint;
 
 import java.util.List;
@@ -34,7 +34,7 @@ public interface JasperReportHandler {
     /**
      * <p>concatenate.</p>
      *
-     * @param jasperReportBuilders a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @param jasperReportBuilders a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
      */
     public void concatenate(JasperReportBuilder... jasperReportBuilders);
 
@@ -49,7 +49,7 @@ public interface JasperReportHandler {
      * <p>getPrintList.</p>
      *
      * @return a {@link java.util.List} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public List<JasperPrint> getPrintList() throws DRException;
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperICsvExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperICsvExporter.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperICsvExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperICsvExporter.java
index fe9ee91..eb3e132 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperICsvExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperICsvExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperICsvExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIDocxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIDocxExporter.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIDocxExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIDocxExporter.java
index 5ac263f..03995c6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIDocxExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIDocxExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperIDocxExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExcelExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIExcelExporter.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExcelExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIExcelExporter.java
index d6ced73..d8017ab 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExcelExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIExcelExporter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
-import net.sf.dynamicreports.report.constant.ImageAnchorType;
-import net.sf.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.ImageAnchorType;
+import software.xdev.dynamicreports.report.constant.RunDirection;
 
 import java.util.List;
 import java.util.Map;
@@ -244,7 +244,7 @@ public interface JasperIExcelExporter extends JasperIExporter {
     /**
      * <p>getSheetDirection.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public RunDirection getSheetDirection();
 
@@ -279,7 +279,7 @@ public interface JasperIExcelExporter extends JasperIExporter {
     /**
      * <p>getImageAnchorType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ImageAnchorType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ImageAnchorType} object.
      */
     public ImageAnchorType getImageAnchorType();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIExporter.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIExporter.java
index b416f07..ac6709f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 import java.io.File;
 import java.io.OutputStream;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java
index 89bf069..71f28e9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIHtmlExporter.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
-import net.sf.dynamicreports.jasper.constant.SizeUnit;
+import software.xdev.dynamicreports.jasper.constant.SizeUnit;
 
 /**
  * <p>JasperIHtmlExporter interface.</p>
@@ -100,7 +100,7 @@ public interface JasperIHtmlExporter extends JasperIExporter {
     /**
      * <p>getSizeUnit.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.constant.SizeUnit} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.constant.SizeUnit} object.
      */
     public SizeUnit getSizeUnit();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIImageExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIImageExporter.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIImageExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIImageExporter.java
index 301ea0b..53db30b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIImageExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIImageExporter.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
-import net.sf.dynamicreports.jasper.constant.ImageType;
+import software.xdev.dynamicreports.jasper.constant.ImageType;
 
 /**
  * <p>JasperIImageExporter interface.</p>
@@ -37,7 +37,7 @@ public interface JasperIImageExporter extends JasperIExporter {
     /**
      * <p>getImageType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.constant.ImageType} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
      */
     public ImageType getImageType();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdsExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIOdsExporter.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdsExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIOdsExporter.java
index e3bbb9d..4ffe862 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdsExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIOdsExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperIOdsExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdtExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIOdtExporter.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdtExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIOdtExporter.java
index 96642a6..a0657c6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIOdtExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIOdtExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperIOdtExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPdfExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIPdfExporter.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPdfExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIPdfExporter.java
index e024532..88e4dad 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPdfExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIPdfExporter.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
-import net.sf.dynamicreports.jasper.constant.PdfPermission;
-import net.sf.dynamicreports.jasper.constant.PdfVersion;
-import net.sf.dynamicreports.report.constant.PdfPrintScaling;
-import net.sf.dynamicreports.report.constant.PdfaConformance;
+import software.xdev.dynamicreports.jasper.constant.PdfPermission;
+import software.xdev.dynamicreports.jasper.constant.PdfVersion;
+import software.xdev.dynamicreports.report.constant.PdfPrintScaling;
+import software.xdev.dynamicreports.report.constant.PdfaConformance;
 
 import java.util.List;
 
@@ -84,7 +84,7 @@ public interface JasperIPdfExporter extends JasperIExporter {
     /**
      * <p>getPdfVersion.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.constant.PdfVersion} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.constant.PdfVersion} object.
      */
     public PdfVersion getPdfVersion();
 
@@ -182,14 +182,14 @@ public interface JasperIPdfExporter extends JasperIExporter {
     /**
      * <p>getPrintScaling.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.PdfPrintScaling} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.PdfPrintScaling} object.
      */
     public PdfPrintScaling getPrintScaling();
 
     /**
      * <p>getPdfaConformance.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.PdfaConformance} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.PdfaConformance} object.
      */
     public PdfaConformance getPdfaConformance();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPptxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIPptxExporter.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPptxExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIPptxExporter.java
index 1e32837..a41d3db 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIPptxExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIPptxExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperIPptxExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIRtfExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIRtfExporter.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIRtfExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIRtfExporter.java
index 6e9836a..6c7b278 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIRtfExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIRtfExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperIRtfExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperITextExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperITextExporter.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperITextExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperITextExporter.java
index f8e03d0..bd63ae1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperITextExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperITextExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperITextExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java
index f747c1f..05c68f0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXlsxExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperIXlsxExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
index 95e613d..4d554c9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.definition.export;
+package software.xdev.dynamicreports.jasper.definition.export;
 
 /**
  * <p>JasperIXmlExporter interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/exception/JasperDesignException.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/exception/JasperDesignException.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/exception/JasperDesignException.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/exception/JasperDesignException.java
index 6ab05b3..6da16df 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/exception/JasperDesignException.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/exception/JasperDesignException.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.exception;
+package software.xdev.dynamicreports.jasper.exception;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>JasperDesignException class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/AbstractExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/AbstractExpressionTransform.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/AbstractExpressionTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/AbstractExpressionTransform.java
index 8b079dc..e8888ca 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/AbstractExpressionTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/AbstractExpressionTransform.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
-
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.DRIDesignField;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.DRIDesignSort;
-import net.sf.dynamicreports.design.definition.DRIDesignVariable;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
-import net.sf.dynamicreports.jasper.constant.ValueType;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.report.constant.SystemExpression;
+package software.xdev.dynamicreports.jasper.transformation;
+
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.DRIDesignField;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.DRIDesignSort;
+import software.xdev.dynamicreports.design.definition.DRIDesignVariable;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
+import software.xdev.dynamicreports.jasper.constant.ValueType;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.report.constant.SystemExpression;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRGenericElementParameter;
 import net.sf.jasperreports.engine.JRGroup;
@@ -118,7 +118,7 @@ private void addJasperExpression(DRIDesignJasperExpression jasperExpression) {
     /**
      * <p>addSimpleExpression.</p>
      *
-     * @param simpleExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
+     * @param simpleExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression} object.
      */
     protected void addSimpleExpression(DRIDesignSimpleExpression simpleExpression) {
         if (simpleExpression == null) {
@@ -153,7 +153,7 @@ private void addVariable(DRIDesignVariable variable) {
     /**
      * <p>addComplexExpression.</p>
      *
-     * @param complexExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
+     * @param complexExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression} object.
      */
     protected void addComplexExpression(DRIDesignComplexExpression complexExpression) {
         if (complexExpression == null) {
@@ -209,7 +209,7 @@ private JRDesignVariable variable(DRIDesignVariable variable) {
     /**
      * <p>getGroup.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @param group a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      * @return a {@link net.sf.jasperreports.engine.JRGroup} object.
      */
     protected JRGroup getGroup(DRIDesignGroup group) {
@@ -286,7 +286,7 @@ protected String toParameterValue(String expression) {
     /**
      * <p>getExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      * @return a {@link net.sf.jasperreports.engine.design.JRDesignExpression} object.
      */
     public JRDesignExpression getExpression(DRIDesignExpression expression) {
@@ -324,7 +324,7 @@ private JRDesignSortField sort(DRIDesignSort sort) {
     /**
      * <p>getPropertyExpression.</p>
      *
-     * @param propertyExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression} object.
+     * @param propertyExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignPropertyExpression} object.
      * @return a {@link net.sf.jasperreports.engine.JRPropertyExpression} object.
      */
     protected JRPropertyExpression getPropertyExpression(DRIDesignPropertyExpression propertyExpression) {
@@ -337,7 +337,7 @@ protected JRPropertyExpression getPropertyExpression(DRIDesignPropertyExpression
     /**
      * <p>getGenericElementParameterExpression.</p>
      *
-     * @param parameterExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression} object.
+     * @param parameterExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignParameterExpression} object.
      * @return a {@link net.sf.jasperreports.engine.JRGenericElementParameter} object.
      */
     protected JRGenericElementParameter getGenericElementParameterExpression(DRIDesignParameterExpression parameterExpression) {
@@ -350,7 +350,7 @@ protected JRGenericElementParameter getGenericElementParameterExpression(DRIDesi
     /**
      * <p>getCustomValues.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.base.JasperCustomValues} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.base.JasperCustomValues} object.
      */
     protected abstract JasperCustomValues getCustomValues();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/BandTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/BandTransform.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/BandTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/BandTransform.java
index 13c2bc3..84db535 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/BandTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/BandTransform.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
-import net.sf.dynamicreports.design.definition.DRIDesignBand;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.DRIDesignReport;
-import net.sf.dynamicreports.design.definition.DRIDesignTemplateDesign;
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.design.definition.DRIDesignBand;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.DRIDesignReport;
+import software.xdev.dynamicreports.design.definition.DRIDesignTemplateDesign;
+import software.xdev.dynamicreports.report.constant.ListType;
 import net.sf.jasperreports.engine.JRElement;
 import net.sf.jasperreports.engine.design.JRDesignBand;
 import net.sf.jasperreports.engine.design.JRDesignElement;
@@ -40,7 +40,7 @@ public class BandTransform {
     /**
      * <p>Constructor for BandTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
      */
     public BandTransform(JasperTransformAccessor accessor) {
         this.accessor = accessor;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ComponentTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ComponentTransform.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ComponentTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ComponentTransform.java
index d775bf6..1af5e28 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ComponentTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ComponentTransform.java
@@ -15,46 +15,46 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.definition.DRIDesignHyperLink;
-import net.sf.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
-import net.sf.dynamicreports.design.definition.component.DRIDesignBreak;
-import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
-import net.sf.dynamicreports.design.definition.component.DRIDesignEllipse;
-import net.sf.dynamicreports.design.definition.component.DRIDesignFiller;
-import net.sf.dynamicreports.design.definition.component.DRIDesignGenericElement;
-import net.sf.dynamicreports.design.definition.component.DRIDesignImage;
-import net.sf.dynamicreports.design.definition.component.DRIDesignLine;
-import net.sf.dynamicreports.design.definition.component.DRIDesignList;
-import net.sf.dynamicreports.design.definition.component.DRIDesignMap;
-import net.sf.dynamicreports.design.definition.component.DRIDesignRectangle;
-import net.sf.dynamicreports.design.definition.component.DRIDesignSubreport;
-import net.sf.dynamicreports.design.definition.component.DRIDesignTextField;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
-import net.sf.dynamicreports.design.exception.DRDesignReportException;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.jasper.transformation.expression.JasperSubreportParametersExpression;
-import net.sf.dynamicreports.jasper.transformation.expression.SubreportExpression;
-import net.sf.dynamicreports.jasper.transformation.expression.SubreportParametersExpression;
-import net.sf.dynamicreports.jasper.transformation.expression.SubreportWidthExpression;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.component.CustomComponentTransform;
-import net.sf.dynamicreports.report.component.CustomComponents;
-import net.sf.dynamicreports.report.component.DRIDesignCustomComponent;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.definition.DRIDesignHyperLink;
+import software.xdev.dynamicreports.design.definition.DRIDesignTableOfContentsHeading;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignBreak;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignComponent;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignEllipse;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignFiller;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignGenericElement;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignImage;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignLine;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignList;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignMap;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignRectangle;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignSubreport;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignTextField;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignParameterExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignPropertyExpression;
+import software.xdev.dynamicreports.design.exception.DRDesignReportException;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.jasper.transformation.expression.JasperSubreportParametersExpression;
+import software.xdev.dynamicreports.jasper.transformation.expression.SubreportExpression;
+import software.xdev.dynamicreports.jasper.transformation.expression.SubreportParametersExpression;
+import software.xdev.dynamicreports.jasper.transformation.expression.SubreportWidthExpression;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.component.CustomComponentTransform;
+import software.xdev.dynamicreports.report.component.CustomComponents;
+import software.xdev.dynamicreports.report.component.DRIDesignCustomComponent;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.StretchType;
 import net.sf.jasperreports.components.ComponentsExtensionsRegistryFactory;
 import net.sf.jasperreports.components.map.StandardMapComponent;
 import net.sf.jasperreports.engine.JRGenericElementType;
@@ -88,7 +88,7 @@ public class ComponentTransform {
     /**
      * <p>Constructor for ComponentTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
      */
     public ComponentTransform(final JasperTransformAccessor accessor) {
         this.accessor = accessor;
@@ -97,8 +97,8 @@ public ComponentTransform(final JasperTransformAccessor accessor) {
     /**
      * <p>component.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.design.definition.component.DRIDesignComponent} object.
-     * @param listType  a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @param component a {@link software.xdev.dynamicreports.design.definition.component.DRIDesignComponent} object.
+     * @param listType  a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      * @return an array of {@link net.sf.jasperreports.engine.design.JRDesignElement} objects.
      */
     protected JRDesignElement[] component(final DRIDesignComponent component, final ListType listType) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ConstantTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ConstantTransform.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ConstantTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ConstantTransform.java
index 388d77a..c66bd26 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ConstantTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ConstantTransform.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
 import java.util.List;
 
@@ -32,45 +32,45 @@
 
 import com.lowagie.text.pdf.PdfWriter;
 
-import net.sf.dynamicreports.design.constant.EvaluationTime;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.jasper.constant.PdfPermission;
-import net.sf.dynamicreports.jasper.constant.PdfVersion;
-import net.sf.dynamicreports.jasper.constant.SizeUnit;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.report.constant.BreakType;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.HyperLinkTarget;
-import net.sf.dynamicreports.report.constant.HyperLinkType;
-import net.sf.dynamicreports.report.constant.ImageAnchorType;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.LineDirection;
-import net.sf.dynamicreports.report.constant.LineSpacing;
-import net.sf.dynamicreports.report.constant.LineStyle;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PdfPrintScaling;
-import net.sf.dynamicreports.report.constant.PdfaConformance;
-import net.sf.dynamicreports.report.constant.RectangleAnchor;
-import net.sf.dynamicreports.report.constant.Rotation;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.StretchType;
-import net.sf.dynamicreports.report.constant.TabStopAlignment;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.constant.TimePeriod;
-import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
-import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.design.constant.EvaluationTime;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.jasper.constant.PdfPermission;
+import software.xdev.dynamicreports.jasper.constant.PdfVersion;
+import software.xdev.dynamicreports.jasper.constant.SizeUnit;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.report.constant.BreakType;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.constant.CrosstabTotalPosition;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.HyperLinkTarget;
+import software.xdev.dynamicreports.report.constant.HyperLinkType;
+import software.xdev.dynamicreports.report.constant.ImageAnchorType;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.LineDirection;
+import software.xdev.dynamicreports.report.constant.LineSpacing;
+import software.xdev.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PdfPrintScaling;
+import software.xdev.dynamicreports.report.constant.PdfaConformance;
+import software.xdev.dynamicreports.report.constant.RectangleAnchor;
+import software.xdev.dynamicreports.report.constant.Rotation;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.report.constant.TabStopAlignment;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.constant.TimePeriod;
+import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
 import net.sf.jasperreports.crosstabs.type.CrosstabPercentageEnum;
 import net.sf.jasperreports.crosstabs.type.CrosstabTotalPositionEnum;
 import net.sf.jasperreports.engine.analytics.dataset.BucketOrder;
@@ -120,7 +120,7 @@ public class ConstantTransform
 	/**
 	 * <p>lineStyle.</p>
 	 *
-	 * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+	 * @param lineStyle a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.LineStyleEnum} object.
 	 */
 	protected static LineStyleEnum lineStyle(final LineStyle lineStyle)
@@ -148,7 +148,7 @@ protected static LineStyleEnum lineStyle(final LineStyle lineStyle)
 	/**
 	 * <p>imageScale.</p>
 	 *
-	 * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+	 * @param imageScale a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.ScaleImageEnum} object.
 	 */
 	@SuppressWarnings("deprecation")
@@ -182,7 +182,7 @@ protected static ScaleImageEnum imageScale(final ImageScale imageScale)
 	/**
 	 * <p>imageAnchorType.</p>
 	 *
-	 * @param imageAnchorType a {@link net.sf.dynamicreports.report.constant.ImageAnchorType} object.
+	 * @param imageAnchorType a {@link software.xdev.dynamicreports.report.constant.ImageAnchorType} object.
 	 * @return a {@link net.sf.jasperreports.engine.export.type.ImageAnchorTypeEnum} object.
 	 */
 	protected static ImageAnchorTypeEnum imageAnchorType(final ImageAnchorType imageAnchorType)
@@ -208,7 +208,7 @@ protected static ImageAnchorTypeEnum imageAnchorType(final ImageAnchorType image
 	/**
 	 * <p>horizontalTextAlignment.</p>
 	 *
-	 * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+	 * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.HorizontalTextAlignEnum} object.
 	 */
 	protected static HorizontalTextAlignEnum horizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment)
@@ -237,7 +237,7 @@ protected static HorizontalTextAlignEnum horizontalTextAlignment(final Horizonta
 	/**
 	 * <p>verticalTextAlignment.</p>
 	 *
-	 * @param verticalTextAlignment a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+	 * @param verticalTextAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalTextAlignment} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.VerticalTextAlignEnum} object.
 	 */
 	protected static VerticalTextAlignEnum verticalTextAlignment(final VerticalTextAlignment verticalTextAlignment)
@@ -266,7 +266,7 @@ protected static VerticalTextAlignEnum verticalTextAlignment(final VerticalTextA
 	/**
 	 * <p>horizontalImageAlignment.</p>
 	 *
-	 * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+	 * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.HorizontalImageAlignEnum} object.
 	 */
 	protected static HorizontalImageAlignEnum horizontalImageAlignment(final HorizontalImageAlignment horizontalImageAlignment)
@@ -293,7 +293,7 @@ protected static HorizontalImageAlignEnum horizontalImageAlignment(final Horizon
 	/**
 	 * <p>verticalImageAlignment.</p>
 	 *
-	 * @param verticalImageAlignment a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+	 * @param verticalImageAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalImageAlignment} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.VerticalImageAlignEnum} object.
 	 */
 	protected static VerticalImageAlignEnum verticalImageAlignment(final VerticalImageAlignment verticalImageAlignment)
@@ -320,7 +320,7 @@ protected static VerticalImageAlignEnum verticalImageAlignment(final VerticalIma
 	/**
 	 * <p>rotation.</p>
 	 *
-	 * @param rotation a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+	 * @param rotation a {@link software.xdev.dynamicreports.report.constant.Rotation} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.RotationEnum} object.
 	 */
 	protected static RotationEnum rotation(final Rotation rotation)
@@ -348,7 +348,7 @@ protected static RotationEnum rotation(final Rotation rotation)
 	/**
 	 * <p>whenNoDataType.</p>
 	 *
-	 * @param whenNoDataType a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @param whenNoDataType a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.WhenNoDataTypeEnum} object.
 	 */
 	protected static WhenNoDataTypeEnum whenNoDataType(final WhenNoDataType whenNoDataType)
@@ -372,7 +372,7 @@ protected static WhenNoDataTypeEnum whenNoDataType(final WhenNoDataType whenNoDa
 	 * <p>whenNoDataType.</p>
 	 *
 	 * @param whenNoDataType a {@link net.sf.jasperreports.engine.type.WhenNoDataTypeEnum} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
 	 */
 	public static WhenNoDataType whenNoDataType(final WhenNoDataTypeEnum whenNoDataType)
 	{
@@ -398,7 +398,7 @@ public static WhenNoDataType whenNoDataType(final WhenNoDataTypeEnum whenNoDataT
 	/**
 	 * <p>whenResourceMissingType.</p>
 	 *
-	 * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @param whenResourceMissingType a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.WhenResourceMissingTypeEnum} object.
 	 */
 	protected static WhenResourceMissingTypeEnum whenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
@@ -423,7 +423,7 @@ protected static WhenResourceMissingTypeEnum whenResourceMissingType(final WhenR
 	 * <p>whenResourceMissingType.</p>
 	 *
 	 * @param whenResourceMissingType a {@link net.sf.jasperreports.engine.type.WhenResourceMissingTypeEnum} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
 	 */
 	public static WhenResourceMissingType whenResourceMissingType(final WhenResourceMissingTypeEnum whenResourceMissingType)
 	{
@@ -446,7 +446,7 @@ public static WhenResourceMissingType whenResourceMissingType(final WhenResource
 	/**
 	 * <p>pageOrientation.</p>
 	 *
-	 * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 * @param orientation a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.OrientationEnum} object.
 	 */
 	protected static OrientationEnum pageOrientation(final PageOrientation orientation)
@@ -466,7 +466,7 @@ protected static OrientationEnum pageOrientation(final PageOrientation orientati
 	 * <p>pageOrientation.</p>
 	 *
 	 * @param orientation a {@link net.sf.jasperreports.engine.type.OrientationEnum} object.
-	 * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
 	 */
 	public static PageOrientation pageOrientation(final OrientationEnum orientation)
 	{
@@ -484,7 +484,7 @@ public static PageOrientation pageOrientation(final OrientationEnum orientation)
 	/**
 	 * <p>variableResetType.</p>
 	 *
-	 * @param resetType a {@link net.sf.dynamicreports.design.constant.ResetType} object.
+	 * @param resetType a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.ResetTypeEnum} object.
 	 */
 	public static ResetTypeEnum variableResetType(final ResetType resetType)
@@ -527,7 +527,7 @@ public static DatasetResetTypeEnum variableDatabaseResetType(final ResetType res
 	/**
 	 * <p>evaluationTime.</p>
 	 *
-	 * @param evaluationTime a {@link net.sf.dynamicreports.design.constant.EvaluationTime} object.
+	 * @param evaluationTime a {@link software.xdev.dynamicreports.design.constant.EvaluationTime} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.EvaluationTimeEnum} object.
 	 */
 	public static EvaluationTimeEnum evaluationTime(final EvaluationTime evaluationTime)
@@ -561,7 +561,7 @@ public static EvaluationTimeEnum evaluationTime(final EvaluationTime evaluationT
 	/**
 	 * <p>splitType.</p>
 	 *
-	 * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.SplitTypeEnum} object.
 	 */
 	protected static SplitTypeEnum splitType(final SplitType splitType)
@@ -586,7 +586,7 @@ protected static SplitTypeEnum splitType(final SplitType splitType)
 	/**
 	 * <p>timePeriodType.</p>
 	 *
-	 * @param timePeriodType a {@link net.sf.dynamicreports.report.constant.TimePeriod} object.
+	 * @param timePeriodType a {@link software.xdev.dynamicreports.report.constant.TimePeriod} object.
 	 * @return a {@link java.lang.Class} object.
 	 */
 	protected static Class<?> timePeriodType(final TimePeriod timePeriodType)
@@ -619,7 +619,7 @@ protected static Class<?> timePeriodType(final TimePeriod timePeriodType)
 	/**
 	 * <p>calculation.</p>
 	 *
-	 * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+	 * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.CalculationEnum} object.
 	 */
 	protected static CalculationEnum calculation(final Calculation calculation)
@@ -654,7 +654,7 @@ protected static CalculationEnum calculation(final Calculation calculation)
 	/**
 	 * <p>sizeUnit.</p>
 	 *
-	 * @param sizeUnit a {@link net.sf.dynamicreports.jasper.constant.SizeUnit} object.
+	 * @param sizeUnit a {@link software.xdev.dynamicreports.jasper.constant.SizeUnit} object.
 	 * @return a {@link net.sf.jasperreports.export.type.HtmlSizeUnitEnum} object.
 	 */
 	protected static HtmlSizeUnitEnum sizeUnit(final SizeUnit sizeUnit)
@@ -673,7 +673,7 @@ protected static HtmlSizeUnitEnum sizeUnit(final SizeUnit sizeUnit)
 	/**
 	 * <p>pdfVersion.</p>
 	 *
-	 * @param pdfVersion a {@link net.sf.dynamicreports.jasper.constant.PdfVersion} object.
+	 * @param pdfVersion a {@link software.xdev.dynamicreports.jasper.constant.PdfVersion} object.
 	 * @return a {@link net.sf.jasperreports.export.type.PdfVersionEnum} object.
 	 */
 	protected static PdfVersionEnum pdfVersion(final PdfVersion pdfVersion)
@@ -736,7 +736,7 @@ protected static Integer pdfPermission(final List<PdfPermission> permissions)
 	/**
 	 * <p>pdfPrintScaling.</p>
 	 *
-	 * @param pdfPrintScaling a {@link net.sf.dynamicreports.report.constant.PdfPrintScaling} object.
+	 * @param pdfPrintScaling a {@link software.xdev.dynamicreports.report.constant.PdfPrintScaling} object.
 	 * @return a {@link net.sf.jasperreports.export.type.PdfPrintScalingEnum} object.
 	 */
 	protected static PdfPrintScalingEnum pdfPrintScaling(final PdfPrintScaling pdfPrintScaling)
@@ -755,7 +755,7 @@ protected static PdfPrintScalingEnum pdfPrintScaling(final PdfPrintScaling pdfPr
 	/**
 	 * <p>pdfaConformance.</p>
 	 *
-	 * @param pdfaConformance a {@link net.sf.dynamicreports.report.constant.PdfaConformance} object.
+	 * @param pdfaConformance a {@link software.xdev.dynamicreports.report.constant.PdfaConformance} object.
 	 * @return a {@link net.sf.jasperreports.export.type.PdfaConformanceEnum} object.
 	 */
 	protected static PdfaConformanceEnum pdfaConformance(final PdfaConformance pdfaConformance)
@@ -776,7 +776,7 @@ protected static PdfaConformanceEnum pdfaConformance(final PdfaConformance pdfaC
 	/**
 	 * <p>lineDirection.</p>
 	 *
-	 * @param lineDirection a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+	 * @param lineDirection a {@link software.xdev.dynamicreports.report.constant.LineDirection} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.LineDirectionEnum} object.
 	 */
 	public static LineDirectionEnum lineDirection(final LineDirection lineDirection)
@@ -800,7 +800,7 @@ public static LineDirectionEnum lineDirection(final LineDirection lineDirection)
 	/**
 	 * <p>markup.</p>
 	 *
-	 * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+	 * @param markup a {@link software.xdev.dynamicreports.report.constant.Markup} object.
 	 * @return a {@link java.lang.String} object.
 	 */
 	public static String markup(final Markup markup)
@@ -828,7 +828,7 @@ public static String markup(final Markup markup)
 	/**
 	 * <p>lineSpacing.</p>
 	 *
-	 * @param lineSpacing a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+	 * @param lineSpacing a {@link software.xdev.dynamicreports.report.constant.LineSpacing} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.LineSpacingEnum} object.
 	 */
 	public static LineSpacingEnum lineSpacing(final LineSpacing lineSpacing)
@@ -860,7 +860,7 @@ public static LineSpacingEnum lineSpacing(final LineSpacing lineSpacing)
 	/**
 	 * <p>breakType.</p>
 	 *
-	 * @param breakType a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+	 * @param breakType a {@link software.xdev.dynamicreports.report.constant.BreakType} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.BreakTypeEnum} object.
 	 */
 	public static BreakTypeEnum breakType(final BreakType breakType)
@@ -884,7 +884,7 @@ public static BreakTypeEnum breakType(final BreakType breakType)
 	/**
 	 * <p>runDirection.</p>
 	 *
-	 * @param runDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 * @param runDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.RunDirectionEnum} object.
 	 */
 	public static RunDirectionEnum runDirection(final RunDirection runDirection)
@@ -908,7 +908,7 @@ public static RunDirectionEnum runDirection(final RunDirection runDirection)
 	/**
 	 * <p>crosstabTotalPosition.</p>
 	 *
-	 * @param totalPosition a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 * @param totalPosition a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
 	 * @return a {@link net.sf.jasperreports.crosstabs.type.CrosstabTotalPositionEnum} object.
 	 */
 	public static CrosstabTotalPositionEnum crosstabTotalPosition(final CrosstabTotalPosition totalPosition)
@@ -932,7 +932,7 @@ public static CrosstabTotalPositionEnum crosstabTotalPosition(final CrosstabTota
 	/**
 	 * <p>crosstabPercentageType.</p>
 	 *
-	 * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+	 * @param percentageType a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
 	 * @return a {@link net.sf.jasperreports.crosstabs.type.CrosstabPercentageEnum} object.
 	 */
 	public static CrosstabPercentageEnum crosstabPercentageType(final CrosstabPercentageType percentageType)
@@ -956,7 +956,7 @@ public static CrosstabPercentageEnum crosstabPercentageType(final CrosstabPercen
 	/**
 	 * <p>orderType.</p>
 	 *
-	 * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+	 * @param orderType a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.SortOrderEnum} object.
 	 */
 	public static SortOrderEnum orderType(final OrderType orderType)
@@ -980,7 +980,7 @@ public static SortOrderEnum orderType(final OrderType orderType)
 	/**
 	 * <p>bucketOrderType.</p>
 	 *
-	 * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+	 * @param orderType a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
 	 * @return a {@link net.sf.jasperreports.engine.analytics.dataset.BucketOrder} object.
 	 */
 	public static BucketOrder bucketOrderType(final OrderType orderType)
@@ -1004,7 +1004,7 @@ public static BucketOrder bucketOrderType(final OrderType orderType)
 	/**
 	 * <p>componentPositionType.</p>
 	 *
-	 * @param componentPositionType a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+	 * @param componentPositionType a {@link software.xdev.dynamicreports.report.constant.ComponentPositionType} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.PositionTypeEnum} object.
 	 */
 	public static PositionTypeEnum componentPositionType(final ComponentPositionType componentPositionType)
@@ -1026,7 +1026,7 @@ public static PositionTypeEnum componentPositionType(final ComponentPositionType
 	/**
 	 * <p>stretchType.</p>
 	 *
-	 * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+	 * @param stretchType a {@link software.xdev.dynamicreports.report.constant.StretchType} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.StretchTypeEnum} object.
 	 */
 	@SuppressWarnings("deprecation")
@@ -1125,7 +1125,7 @@ public static HyperlinkTargetEnum hyperLinkTarget(final String hyperLinkTarget)
 	/**
 	 * <p>groupFooterPosition.</p>
 	 *
-	 * @param footerPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 * @param footerPosition a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.FooterPositionEnum} object.
 	 */
 	public static FooterPositionEnum groupFooterPosition(final GroupFooterPosition footerPosition)
@@ -1148,7 +1148,7 @@ public static FooterPositionEnum groupFooterPosition(final GroupFooterPosition f
 	/**
 	 * <p>tabStopAlignment.</p>
 	 *
-	 * @param alignment a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+	 * @param alignment a {@link software.xdev.dynamicreports.report.constant.TabStopAlignment} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.TabStopAlignEnum} object.
 	 */
 	public static TabStopAlignEnum tabStopAlignment(final TabStopAlignment alignment)
@@ -1169,7 +1169,7 @@ public static TabStopAlignEnum tabStopAlignment(final TabStopAlignment alignment
 	/**
 	 * <p>printOrder.</p>
 	 *
-	 * @param printOrder a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 * @param printOrder a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.PrintOrderEnum} object.
 	 */
 	protected static PrintOrderEnum printOrder(final Orientation printOrder)
@@ -1188,7 +1188,7 @@ protected static PrintOrderEnum printOrder(final Orientation printOrder)
 	/**
 	 * <p>rectangleAnchor.</p>
 	 *
-	 * @param rectangleAnchor a {@link net.sf.dynamicreports.report.constant.RectangleAnchor} object.
+	 * @param rectangleAnchor a {@link software.xdev.dynamicreports.report.constant.RectangleAnchor} object.
 	 * @return a {@link org.jfree.ui.RectangleAnchor} object.
 	 */
 	public static org.jfree.ui.RectangleAnchor rectangleAnchor(final RectangleAnchor rectangleAnchor)
@@ -1221,7 +1221,7 @@ public static org.jfree.ui.RectangleAnchor rectangleAnchor(final RectangleAnchor
 	/**
 	 * <p>textAdjust.</p>
 	 *
-	 * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+	 * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
 	 * @return a {@link net.sf.jasperreports.engine.type.TextAdjustEnum} object.
 	 */
 	public static TextAdjustEnum textAdjust(final TextAdjust textAdjust)
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/CrosstabTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/CrosstabTransform.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/CrosstabTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/CrosstabTransform.java
index bbea704..3b31c16 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/CrosstabTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/CrosstabTransform.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
 import java.util.Map;
 
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCell;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabColumnGroup;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabGroup;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
-import net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstabRowGroup;
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.jasper.transformation.expression.CrosstabParametersExpression;
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstab;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCell;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabCellContent;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabColumnGroup;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabDataset;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabGroup;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabMeasure;
+import software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstabRowGroup;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.jasper.transformation.expression.CrosstabParametersExpression;
+import software.xdev.dynamicreports.report.constant.ListType;
 import net.sf.jasperreports.crosstabs.design.JRDesignCellContents;
 import net.sf.jasperreports.crosstabs.design.JRDesignCrosstab;
 import net.sf.jasperreports.crosstabs.design.JRDesignCrosstabBucket;
@@ -60,7 +60,7 @@ public class CrosstabTransform
 	/**
 	 * <p>Constructor for CrosstabTransform.</p>
 	 *
-	 * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+	 * @param accessor a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
 	 */
 	public CrosstabTransform(final JasperTransformAccessor accessor)
 	{
@@ -70,7 +70,7 @@ public CrosstabTransform(final JasperTransformAccessor accessor)
 	/**
 	 * <p>transform.</p>
 	 *
-	 * @param crosstab a {@link net.sf.dynamicreports.design.definition.crosstab.DRIDesignCrosstab} object.
+	 * @param crosstab a {@link software.xdev.dynamicreports.design.definition.crosstab.DRIDesignCrosstab} object.
 	 * @return a {@link net.sf.jasperreports.engine.design.JRDesignElement} object.
 	 */
 	protected JRDesignElement transform(final DRIDesignCrosstab crosstab)
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/DatasetExpressionTransform.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetExpressionTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/DatasetExpressionTransform.java
index 5c52c48..998f80d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetExpressionTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/DatasetExpressionTransform.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.DRIDesignField;
-import net.sf.dynamicreports.design.definition.DRIDesignSort;
-import net.sf.dynamicreports.design.definition.DRIDesignVariable;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.DRIDesignField;
+import software.xdev.dynamicreports.design.definition.DRIDesignSort;
+import software.xdev.dynamicreports.design.definition.DRIDesignVariable;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.design.JRDesignDataset;
 import net.sf.jasperreports.engine.design.JRDesignField;
@@ -48,9 +48,9 @@ public class DatasetExpressionTransform extends AbstractExpressionTransform {
     /**
      * <p>Constructor for DatasetExpressionTransform.</p>
      *
-     * @param dataset      a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @param dataset      a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
      * @param jrDataset    a {@link net.sf.jasperreports.engine.design.JRDesignDataset} object.
-     * @param customValues a {@link net.sf.dynamicreports.jasper.base.JasperCustomValues} object.
+     * @param customValues a {@link software.xdev.dynamicreports.jasper.base.JasperCustomValues} object.
      */
     public DatasetExpressionTransform(DRIDesignDataset dataset, JRDesignDataset jrDataset, JasperCustomValues customValues) {
         this.dataset = dataset;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/DatasetTransform.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/DatasetTransform.java
index 77fd19b..94f03ce 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/DatasetTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/DatasetTransform.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
-import net.sf.dynamicreports.jasper.base.JasperScriptlet;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.jasper.transformation.expression.DatasetParametersExpression;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
+import software.xdev.dynamicreports.jasper.base.JasperScriptlet;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.jasper.transformation.expression.DatasetParametersExpression;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.design.JRDesignDataset;
 import net.sf.jasperreports.engine.design.JRDesignDatasetRun;
@@ -44,7 +44,7 @@ public class DatasetTransform {
     /**
      * <p>Constructor for DatasetTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
      */
     public DatasetTransform(JasperTransformAccessor accessor) {
         this.accessor = accessor;
@@ -113,7 +113,7 @@ private void addScriptlet(JRDesignDataset jrDataset, Map<String, Object> paramet
     /**
      * <p>datasetRun.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @param dataset a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
      * @return a {@link net.sf.jasperreports.engine.design.JRDesignDatasetRun} object.
      */
     public JRDesignDatasetRun datasetRun(DRIDesignDataset dataset) {
@@ -134,7 +134,7 @@ public JRDesignDatasetRun datasetRun(DRIDesignDataset dataset) {
     /**
      * <p>Getter for the field <code>datasetParameters</code>.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @param dataset a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
      * @return a {@link java.util.Map} object.
      */
     protected Map<String, Object> getDatasetParameters(DRIDesignDataset dataset) {
@@ -144,8 +144,8 @@ protected Map<String, Object> getDatasetParameters(DRIDesignDataset dataset) {
     /**
      * <p>getDatasetExpressionTransform.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.DatasetExpressionTransform} object.
+     * @param dataset a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.DatasetExpressionTransform} object.
      */
     public DatasetExpressionTransform getDatasetExpressionTransform(DRIDesignDataset dataset) {
         return datasetExpressions.get(dataset);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ExporterTransform.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ExporterTransform.java
index 75cdfdf..135fa7f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ExporterTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ExporterTransform.java
@@ -15,28 +15,28 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
 import java.io.File;
 
-import net.sf.dynamicreports.design.transformation.StyleResolver;
-import net.sf.dynamicreports.jasper.definition.export.JasperICsvExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIDocxExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIExcelExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIHtmlExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIOdsExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIOdtExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIPdfExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIPptxExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIRtfExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperITextExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
-import net.sf.dynamicreports.jasper.definition.export.JasperIXmlExporter;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.report.base.style.DRFont;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.transformation.StyleResolver;
+import software.xdev.dynamicreports.jasper.definition.export.JasperICsvExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIDocxExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIExcelExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIHtmlExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIOdsExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIOdtExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIPdfExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIPptxExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIRtfExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperITextExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIXmlExporter;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.export.FileHtmlResourceHandler;
 import net.sf.jasperreports.engine.export.HtmlExporter;
 import net.sf.jasperreports.engine.export.HtmlResourceHandler;
@@ -94,7 +94,7 @@ public class ExporterTransform
     /**
      * <p>Constructor for ExporterTransform.</p>
      *
-     * @param jasperExporter a {@link net.sf.dynamicreports.jasper.definition.export.JasperIExporter} object.
+     * @param jasperExporter a {@link software.xdev.dynamicreports.jasper.definition.export.JasperIExporter} object.
      */
     public ExporterTransform(final JasperIExporter jasperExporter)
     {
@@ -105,7 +105,7 @@ public ExporterTransform(final JasperIExporter jasperExporter)
      * <p>transform.</p>
      *
      * @return a {@link net.sf.jasperreports.export.Exporter} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public Exporter<?, ?, ?, ?> transform() throws DRException
     {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/GroupTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/GroupTransform.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/GroupTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/GroupTransform.java
index 74f6850..63bc745 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/GroupTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/GroupTransform.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.design.JRDesignGroup;
 
@@ -34,7 +34,7 @@ public class GroupTransform {
     /**
      * <p>Constructor for GroupTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
      */
     public GroupTransform(JasperTransformAccessor accessor) {
         this.accessor = accessor;
@@ -85,7 +85,7 @@ public void transformExpressions() {
     /**
      * <p>getGroup.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.design.definition.DRIDesignGroup} object.
+     * @param group a {@link software.xdev.dynamicreports.design.definition.DRIDesignGroup} object.
      * @return a {@link net.sf.jasperreports.engine.design.JRDesignGroup} object.
      */
     public JRDesignGroup getGroup(DRIDesignGroup group) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/JasperTransform.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/JasperTransform.java
index 7ecee37..cbe916d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/JasperTransform.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
 import java.util.Map;
 
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.DRIDesignReport;
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
-import net.sf.dynamicreports.jasper.base.JasperReportDesign;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.DRIDesignReport;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
+import software.xdev.dynamicreports.jasper.base.JasperReportDesign;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.design.JasperDesign;
 
 /**
@@ -49,9 +49,9 @@ public class JasperTransform implements JasperTransformAccessor {
     /**
      * <p>Constructor for JasperTransform.</p>
      *
-     * @param report             a {@link net.sf.dynamicreports.design.definition.DRIDesignReport} object.
-     * @param jasperReportDesign a {@link net.sf.dynamicreports.jasper.base.JasperReportDesign} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @param report             a {@link software.xdev.dynamicreports.design.definition.DRIDesignReport} object.
+     * @param jasperReportDesign a {@link software.xdev.dynamicreports.jasper.base.JasperReportDesign} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public JasperTransform(final DRIDesignReport report, final JasperReportDesign jasperReportDesign) throws DRException {
         this.report = report;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransformAccessor.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/JasperTransformAccessor.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransformAccessor.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/JasperTransformAccessor.java
index 21584d7..7b35c68 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/JasperTransformAccessor.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/JasperTransformAccessor.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
 import java.util.Map;
 
-import net.sf.dynamicreports.design.definition.DRIDesignDataset;
-import net.sf.dynamicreports.design.definition.DRIDesignReport;
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.design.definition.DRIDesignDataset;
+import software.xdev.dynamicreports.design.definition.DRIDesignReport;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import net.sf.jasperreports.engine.design.JasperDesign;
 
 /**
@@ -36,7 +36,7 @@ public interface JasperTransformAccessor {
     /**
      * <p>getReport.</p>
      *
-     * @return a {@link net.sf.dynamicreports.design.definition.DRIDesignReport} object.
+     * @return a {@link software.xdev.dynamicreports.design.definition.DRIDesignReport} object.
      */
     public DRIDesignReport getReport();
 
@@ -50,7 +50,7 @@ public interface JasperTransformAccessor {
     /**
      * <p>getCustomValues.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.base.JasperCustomValues} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.base.JasperCustomValues} object.
      */
     public JasperCustomValues getCustomValues();
 
@@ -78,14 +78,14 @@ public interface JasperTransformAccessor {
     /**
      * <p>getMasterReportParameters.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public ReportParameters getMasterReportParameters();
 
     /**
      * <p>getReportTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.ReportTransform} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.ReportTransform} object.
      */
     public ReportTransform getReportTransform();
 
@@ -97,57 +97,57 @@ public interface JasperTransformAccessor {
     /**
      * <p>transformToDataset.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @param dataset a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
      */
     public void transformToDataset(DRIDesignDataset dataset);
 
     /**
      * <p>getExpressionTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.AbstractExpressionTransform} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.AbstractExpressionTransform} object.
      */
     public AbstractExpressionTransform getExpressionTransform();
 
     /**
      * <p>getExpressionTransform.</p>
      *
-     * @param dataset a {@link net.sf.dynamicreports.design.definition.DRIDesignDataset} object.
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.AbstractExpressionTransform} object.
+     * @param dataset a {@link software.xdev.dynamicreports.design.definition.DRIDesignDataset} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.AbstractExpressionTransform} object.
      */
     public AbstractExpressionTransform getExpressionTransform(DRIDesignDataset dataset);
 
     /**
      * <p>getGroupTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.GroupTransform} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.GroupTransform} object.
      */
     public GroupTransform getGroupTransform();
 
     /**
      * <p>getComponentTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.ComponentTransform} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.ComponentTransform} object.
      */
     public ComponentTransform getComponentTransform();
 
     /**
      * <p>getStyleTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.StyleTransform} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.StyleTransform} object.
      */
     public StyleTransform getStyleTransform();
 
     /**
      * <p>getCrosstabTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.CrosstabTransform} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.CrosstabTransform} object.
      */
     public CrosstabTransform getCrosstabTransform();
 
     /**
      * <p>getDatasetTransform.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.transformation.DatasetTransform} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.transformation.DatasetTransform} object.
      */
     public DatasetTransform getDatasetTransform();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java
index bda73b2..972f2db 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/MainDatasetExpressionTransform.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
-
-import net.sf.dynamicreports.design.definition.DRIDesignField;
-import net.sf.dynamicreports.design.definition.DRIDesignGroup;
-import net.sf.dynamicreports.design.definition.DRIDesignSort;
-import net.sf.dynamicreports.design.definition.DRIDesignVariable;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
+package software.xdev.dynamicreports.jasper.transformation;
+
+import software.xdev.dynamicreports.design.definition.DRIDesignField;
+import software.xdev.dynamicreports.design.definition.DRIDesignGroup;
+import software.xdev.dynamicreports.design.definition.DRIDesignSort;
+import software.xdev.dynamicreports.design.definition.DRIDesignVariable;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignJasperExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSimpleExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignSystemExpression;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRGroup;
 import net.sf.jasperreports.engine.design.JRDesignField;
@@ -46,7 +46,7 @@ public class MainDatasetExpressionTransform extends AbstractExpressionTransform
     /**
      * <p>Constructor for MainDatasetExpressionTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
      */
     public MainDatasetExpressionTransform(JasperTransformAccessor accessor) {
         this.accessor = accessor;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ReportTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ReportTransform.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ReportTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ReportTransform.java
index 1b6e8a4..4dcb05a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/ReportTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ReportTransform.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
+package software.xdev.dynamicreports.jasper.transformation;
 
-import net.sf.dynamicreports.design.definition.DRIDesignHyperLink;
-import net.sf.dynamicreports.design.definition.DRIDesignMargin;
-import net.sf.dynamicreports.design.definition.DRIDesignPage;
-import net.sf.dynamicreports.design.definition.DRIDesignParameter;
-import net.sf.dynamicreports.design.definition.DRIDesignQuery;
-import net.sf.dynamicreports.design.definition.DRIDesignReport;
-import net.sf.dynamicreports.jasper.base.CustomScriptlet;
-import net.sf.dynamicreports.jasper.base.JasperCustomValues;
-import net.sf.dynamicreports.jasper.base.JasperReportParameters;
-import net.sf.dynamicreports.jasper.base.JasperScriptlet;
-import net.sf.dynamicreports.jasper.base.StartPageNumberScriptlet;
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
-import net.sf.dynamicreports.jasper.constant.ValueType;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.design.definition.DRIDesignHyperLink;
+import software.xdev.dynamicreports.design.definition.DRIDesignMargin;
+import software.xdev.dynamicreports.design.definition.DRIDesignPage;
+import software.xdev.dynamicreports.design.definition.DRIDesignParameter;
+import software.xdev.dynamicreports.design.definition.DRIDesignQuery;
+import software.xdev.dynamicreports.design.definition.DRIDesignReport;
+import software.xdev.dynamicreports.jasper.base.CustomScriptlet;
+import software.xdev.dynamicreports.jasper.base.JasperCustomValues;
+import software.xdev.dynamicreports.jasper.base.JasperReportParameters;
+import software.xdev.dynamicreports.jasper.base.JasperScriptlet;
+import software.xdev.dynamicreports.jasper.base.StartPageNumberScriptlet;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.jasper.constant.ValueType;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import net.sf.jasperreports.engine.JRAbstractScriptlet;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRParameter;
@@ -62,7 +62,7 @@ public class ReportTransform {
     /**
      * <p>Constructor for ReportTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
      */
     public ReportTransform(JasperTransformAccessor accessor) {
         this.accessor = accessor;
@@ -201,7 +201,7 @@ private void addScriptlet(String name, Class<? extends JRAbstractScriptlet> scri
     /**
      * <p>hyperLink.</p>
      *
-     * @param hyperLink a {@link net.sf.dynamicreports.design.definition.DRIDesignHyperLink} object.
+     * @param hyperLink a {@link software.xdev.dynamicreports.design.definition.DRIDesignHyperLink} object.
      * @return a {@link net.sf.jasperreports.engine.design.JRDesignHyperlink} object.
      */
     public JRDesignHyperlink hyperLink(DRIDesignHyperLink hyperLink) {
@@ -281,7 +281,7 @@ protected JRDesignScriptlet scriptlet(String name, Class<? extends JRAbstractScr
     /**
      * <p>query.</p>
      *
-     * @param query a {@link net.sf.dynamicreports.design.definition.DRIDesignQuery} object.
+     * @param query a {@link software.xdev.dynamicreports.design.definition.DRIDesignQuery} object.
      * @return a {@link net.sf.jasperreports.engine.design.JRDesignQuery} object.
      */
     protected JRDesignQuery query(DRIDesignQuery query) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/StyleTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/StyleTransform.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/StyleTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/StyleTransform.java
index a25ab0b..adb6f0a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/StyleTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/StyleTransform.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation;
-
-import net.sf.dynamicreports.design.definition.style.DRIDesignBaseStyle;
-import net.sf.dynamicreports.design.definition.style.DRIDesignBorder;
-import net.sf.dynamicreports.design.definition.style.DRIDesignConditionalStyle;
-import net.sf.dynamicreports.design.definition.style.DRIDesignFont;
-import net.sf.dynamicreports.design.definition.style.DRIDesignPadding;
-import net.sf.dynamicreports.design.definition.style.DRIDesignParagraph;
-import net.sf.dynamicreports.design.definition.style.DRIDesignPen;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.design.definition.style.DRIDesignTabStop;
-import net.sf.dynamicreports.jasper.exception.JasperDesignException;
+package software.xdev.dynamicreports.jasper.transformation;
+
+import software.xdev.dynamicreports.design.definition.style.DRIDesignBaseStyle;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignBorder;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignConditionalStyle;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignFont;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignPadding;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignParagraph;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignPen;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignTabStop;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRLineBox;
 import net.sf.jasperreports.engine.JRParagraph;
@@ -51,7 +51,7 @@ public class StyleTransform {
     /**
      * <p>Constructor for StyleTransform.</p>
      *
-     * @param accessor a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param accessor a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
      */
     public StyleTransform(final JasperTransformAccessor accessor) {
         this.accessor = accessor;
@@ -146,7 +146,7 @@ private void paragraph(final JRParagraph jrParagraph, final DRIDesignParagraph p
      * <p>pen.</p>
      *
      * @param jrPen a {@link net.sf.jasperreports.engine.JRPen} object.
-     * @param pen   a {@link net.sf.dynamicreports.design.definition.style.DRIDesignPen} object.
+     * @param pen   a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignPen} object.
      */
     protected void pen(final JRPen jrPen, final DRIDesignPen pen) {
         if (pen == null) {
@@ -199,7 +199,7 @@ private void font(final JRBaseStyle baseStyle, final DRIDesignFont font) {
     /**
      * <p>font.</p>
      *
-     * @param font a {@link net.sf.dynamicreports.design.definition.style.DRIDesignFont} object.
+     * @param font a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignFont} object.
      * @return a {@link net.sf.jasperreports.engine.base.JRBaseFont} object.
      */
     protected JRBaseFont font(final DRIDesignFont font) {
@@ -223,7 +223,7 @@ protected JRBaseFont font(final DRIDesignFont font) {
     /**
      * <p>getStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.design.definition.style.DRIDesignStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.design.definition.style.DRIDesignStyle} object.
      * @return a {@link net.sf.jasperreports.engine.design.JRDesignStyle} object.
      */
     protected JRDesignStyle getStyle(final DRIDesignStyle style) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java
index 9510fe8..1dcdbc9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/CrosstabParametersExpression.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation.expression;
+package software.xdev.dynamicreports.jasper.transformation.expression;
 
-import net.sf.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
-import net.sf.dynamicreports.jasper.base.JasperReportParameters;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
+import software.xdev.dynamicreports.jasper.base.JasperReportParameters;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java
index 5f0a00c..9337157 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/DatasetParametersExpression.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation.expression;
+package software.xdev.dynamicreports.jasper.transformation.expression;
 
-import net.sf.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
-import net.sf.dynamicreports.jasper.base.JasperReportParameters;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
+import software.xdev.dynamicreports.jasper.base.JasperReportParameters;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java
index 00f1d2b..ee938e3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/JasperSubreportParametersExpression.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation.expression;
+package software.xdev.dynamicreports.jasper.transformation.expression;
 
-import net.sf.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.jasper.base.JasperReportParameters;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.jasper.base.JasperReportParameters;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.HashMap;
 import java.util.List;
@@ -40,7 +40,7 @@ public class JasperSubreportParametersExpression extends AbstractDesignComplexEx
     /**
      * <p>Constructor for JasperSubreportParametersExpression.</p>
      *
-     * @param parametersExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param parametersExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public JasperSubreportParametersExpression(DRIDesignExpression parametersExpression) {
         super(ReportUtils.generateUniqueName("jasperSubreportParametersExpression"));
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportExpression.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportExpression.java
index 5293c6a..9a55f70 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportExpression.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation.expression;
+package software.xdev.dynamicreports.jasper.transformation.expression;
 
-import net.sf.dynamicreports.design.base.DRDesignReport;
-import net.sf.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.DRIDesignReport;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.jasper.base.JasperReportDesign;
-import net.sf.dynamicreports.jasper.transformation.JasperTransform;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRICustomValues;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignReport;
+import software.xdev.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.DRIDesignReport;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.jasper.base.JasperReportDesign;
+import software.xdev.dynamicreports.jasper.transformation.JasperTransform;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRICustomValues;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperCompileManager;
 import net.sf.jasperreports.engine.JasperReport;
@@ -58,9 +58,9 @@ public class SubreportExpression extends AbstractDesignComplexExpression {
     /**
      * <p>Constructor for SubreportExpression.</p>
      *
-     * @param pageWidthExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
-     * @param reportExpression    a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
-     * @param pageWidthExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param pageWidthExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param reportExpression    a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param pageWidthExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      * @param pageWidth           a {@link java.lang.Integer} object.
      */
     public SubreportExpression(DRIDesignExpression pageWidthExpression, DRIDesignExpression reportExpression, Integer pageWidth) {
@@ -104,7 +104,7 @@ public Object evaluate(List<?> values, ReportParameters reportParameters) {
     /**
      * <p>getReportDesign.</p>
      *
-     * @return a {@link net.sf.dynamicreports.jasper.base.JasperReportDesign} object.
+     * @return a {@link software.xdev.dynamicreports.jasper.base.JasperReportDesign} object.
      */
     public JasperReportDesign getReportDesign() {
         return reportDesigns.get(reportBuilder);
@@ -113,7 +113,7 @@ public JasperReportDesign getReportDesign() {
     /**
      * <p>Getter for the field <code>reportBuilder</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.ReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.ReportBuilder} object.
      */
     public ReportBuilder<?> getReportBuilder() {
         return reportBuilder;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java
index db539bd..3d0adf0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportParametersExpression.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation.expression;
+package software.xdev.dynamicreports.jasper.transformation.expression;
 
-import net.sf.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
-import net.sf.dynamicreports.design.definition.expression.DRIDesignExpression;
-import net.sf.dynamicreports.jasper.base.JasperReportParameters;
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.design.base.expression.AbstractDesignComplexExpression;
+import software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression;
+import software.xdev.dynamicreports.jasper.base.JasperReportParameters;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.HashMap;
 import java.util.List;
@@ -42,8 +42,8 @@ public class SubreportParametersExpression extends AbstractDesignComplexExpressi
     /**
      * <p>Constructor for SubreportParametersExpression.</p>
      *
-     * @param subreportExpression  a {@link net.sf.dynamicreports.jasper.transformation.expression.SubreportExpression} object.
-     * @param parametersExpression a {@link net.sf.dynamicreports.design.definition.expression.DRIDesignExpression} object.
+     * @param subreportExpression  a {@link software.xdev.dynamicreports.jasper.transformation.expression.SubreportExpression} object.
+     * @param parametersExpression a {@link software.xdev.dynamicreports.design.definition.expression.DRIDesignExpression} object.
      */
     public SubreportParametersExpression(SubreportExpression subreportExpression, DRIDesignExpression parametersExpression) {
         super(ReportUtils.generateUniqueName("subreportParametersExpression"));
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java
index 14e574b..b94443a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/expression/SubreportWidthExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.transformation.expression;
+package software.xdev.dynamicreports.jasper.transformation.expression;
 
-import net.sf.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRICustomValues;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.design.base.expression.AbstractDesignSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRICustomValues;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>SubreportWidthExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/ReportUtils.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/ReportUtils.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/ReportUtils.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/ReportUtils.java
index 47cb126..f056a29 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/ReportUtils.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/ReportUtils.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report;
+package software.xdev.dynamicreports.report;
 
-import net.sf.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Calculation;
 
 import java.lang.reflect.ParameterizedType;
 import java.util.concurrent.locks.Lock;
@@ -57,7 +57,7 @@ public static String generateUniqueName(String name) {
      * getVariableValueClass.
      * </p>
      *
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param valueClass  a {@link java.lang.Class} object.
      * @return a {@link java.lang.Class} object.
      */
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/AbstractScriptlet.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractScriptlet.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/AbstractScriptlet.java
index 18362c1..f16930c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractScriptlet.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/AbstractScriptlet.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/AbstractTemplateDesign.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractTemplateDesign.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/AbstractTemplateDesign.java
index 112f7af..c50bc3d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/AbstractTemplateDesign.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/AbstractTemplateDesign.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
-
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.DRIMargin;
-import net.sf.dynamicreports.report.definition.DRITemplateDesign;
-import net.sf.dynamicreports.report.exception.DRException;
+package software.xdev.dynamicreports.report.base;
+
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.DRIMargin;
+import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.List;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRBand.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRBand.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRBand.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRBand.java
index df0b71b..c1fe700 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRBand.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRBand.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.base.component.DRComponent;
-import net.sf.dynamicreports.report.base.component.DRList;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.definition.DRIBand;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.component.DRComponent;
+import software.xdev.dynamicreports.report.base.component.DRList;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.definition.DRIBand;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRBand class.</p>
@@ -54,7 +54,7 @@ public SplitType getSplitType() {
     /**
      * <p>Setter for the field <code>splitType</code>.</p>
      *
-     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public void setSplitType(SplitType splitType) {
         this.splitType = splitType;
@@ -69,7 +69,7 @@ public DRList getList() {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public void addComponent(DRComponent component) {
         list.addComponent(component);
@@ -84,7 +84,7 @@ public DRIExpression<Boolean> getPrintWhenExpression() {
     /**
      * <p>Setter for the field <code>printWhenExpression</code>.</p>
      *
-     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param printWhenExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
         this.printWhenExpression = printWhenExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRDataset.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRDataset.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRDataset.java
index 0a5f2f6..af39302 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRDataset.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRDataset.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIDataset;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIDataset;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 import java.sql.Connection;
@@ -76,7 +76,7 @@ public void setFields(List<DRField<?>> fields) {
     /**
      * <p>addField.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.base.DRField} object.
+     * @param field a {@link software.xdev.dynamicreports.report.base.DRField} object.
      */
     public void addField(DRField<?> field) {
         Validate.notNull(field, "field must not be null");
@@ -103,7 +103,7 @@ public void setVariables(List<DRVariable<?>> variables) {
     /**
      * <p>addVariable.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.base.DRVariable} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.base.DRVariable} object.
      */
     public void addVariable(DRVariable<?> variable) {
         Validate.notNull(variable, "variable must not be null");
@@ -130,7 +130,7 @@ public void setSorts(List<DRSort> sorts) {
     /**
      * <p>addSort.</p>
      *
-     * @param sort a {@link net.sf.dynamicreports.report.base.DRSort} object.
+     * @param sort a {@link software.xdev.dynamicreports.report.base.DRSort} object.
      */
     public void addSort(DRSort sort) {
         Validate.notNull(sort, "sort must not be null");
@@ -146,7 +146,7 @@ public DRQuery getQuery() {
     /**
      * <p>Setter for the field <code>query</code>.</p>
      *
-     * @param query a {@link net.sf.dynamicreports.report.base.DRQuery} object.
+     * @param query a {@link software.xdev.dynamicreports.report.base.DRQuery} object.
      */
     public void setQuery(DRQuery query) {
         this.query = query;
@@ -161,7 +161,7 @@ public DRIExpression<Connection> getConnectionExpression() {
     /**
      * <p>Setter for the field <code>connectionExpression</code>.</p>
      *
-     * @param connectionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param connectionExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setConnectionExpression(DRIExpression<Connection> connectionExpression) {
         this.connectionExpression = connectionExpression;
@@ -176,7 +176,7 @@ public DRIExpression<?> getDataSourceExpression() {
     /**
      * <p>Setter for the field <code>dataSourceExpression</code>.</p>
      *
-     * @param dataSourceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param dataSourceExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setDataSourceExpression(DRIExpression<?> dataSourceExpression) {
         this.dataSourceExpression = dataSourceExpression;
@@ -191,7 +191,7 @@ public DRIExpression<Boolean> getFilterExpression() {
     /**
      * <p>Setter for the field <code>filterExpression</code>.</p>
      *
-     * @param filterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param filterExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setFilterExpression(DRIExpression<Boolean> filterExpression) {
         this.filterExpression = filterExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRField.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRField.java
index b9423b1..ac5e071 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRField.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -58,7 +58,7 @@ public DRIDataType<? super T, T> getDataType() {
     /**
      * <p>Setter for the field <code>dataType</code>.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     public void setDataType(DRIDataType<? super T, T> dataType) {
         this.dataType = dataType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRGroup.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRGroup.java
index 6fe61c0..67de268 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRGroup.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
-
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+package software.xdev.dynamicreports.report.base;
+
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -62,7 +62,7 @@ public class DRGroup implements DRIGroup {
     /**
      * <p>Constructor for DRGroup.</p>
      *
-     * @param valueField a {@link net.sf.dynamicreports.report.base.component.DRTextField} object.
+     * @param valueField a {@link software.xdev.dynamicreports.report.base.component.DRTextField} object.
      */
     public DRGroup(DRTextField<?> valueField) {
         this(ReportUtils.generateUniqueName("group"), valueField);
@@ -72,7 +72,7 @@ public DRGroup(DRTextField<?> valueField) {
      * <p>Constructor for DRGroup.</p>
      *
      * @param name       a {@link java.lang.String} object.
-     * @param valueField a {@link net.sf.dynamicreports.report.base.component.DRTextField} object.
+     * @param valueField a {@link software.xdev.dynamicreports.report.base.component.DRTextField} object.
      */
     public DRGroup(String name, DRTextField<?> valueField) {
         Validate.notEmpty(name, "name must not be empty");
@@ -108,7 +108,7 @@ public DRIExpression<?> getTitleExpression() {
     /**
      * <p>Setter for the field <code>titleExpression</code>.</p>
      *
-     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param titleExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setTitleExpression(DRIExpression<?> titleExpression) {
         this.titleExpression = titleExpression;
@@ -123,7 +123,7 @@ public DRIReportStyle getTitleStyle() {
     /**
      * <p>Setter for the field <code>titleStyle</code>.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setTitleStyle(DRIReportStyle titleStyle) {
         this.titleStyle = titleStyle;
@@ -153,7 +153,7 @@ public GroupHeaderLayout getHeaderLayout() {
     /**
      * <p>Setter for the field <code>headerLayout</code>.</p>
      *
-     * @param headerLayout a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+     * @param headerLayout a {@link software.xdev.dynamicreports.report.constant.GroupHeaderLayout} object.
      */
     public void setHeaderLayout(GroupHeaderLayout headerLayout) {
         this.headerLayout = headerLayout;
@@ -228,7 +228,7 @@ public DRIExpression<Boolean> getPrintSubtotalsWhenExpression() {
     /**
      * <p>Setter for the field <code>printSubtotalsWhenExpression</code>.</p>
      *
-     * @param printSubtotalsWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param printSubtotalsWhenExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setPrintSubtotalsWhenExpression(DRIExpression<Boolean> printSubtotalsWhenExpression) {
         this.printSubtotalsWhenExpression = printSubtotalsWhenExpression;
@@ -336,7 +336,7 @@ public GroupFooterPosition getFooterPosition() {
     /**
      * <p>Setter for the field <code>footerPosition</code>.</p>
      *
-     * @param footerPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     * @param footerPosition a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
      */
     public void setFooterPosition(GroupFooterPosition footerPosition) {
         this.footerPosition = footerPosition;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRHyperLink.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRHyperLink.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRHyperLink.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRHyperLink.java
index 6e9e838..e3df2cd 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRHyperLink.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRHyperLink.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIHyperLink;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIHyperLink;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRHyperLink class.</p>
@@ -46,7 +46,7 @@ public DRIExpression<String> getAnchorExpression() {
     /**
      * <p>Setter for the field <code>anchorExpression</code>.</p>
      *
-     * @param anchorExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param anchorExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setAnchorExpression(DRIExpression<String> anchorExpression) {
         this.anchorExpression = anchorExpression;
@@ -61,7 +61,7 @@ public DRIExpression<Integer> getPageExpression() {
     /**
      * <p>Setter for the field <code>pageExpression</code>.</p>
      *
-     * @param pageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param pageExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setPageExpression(DRIExpression<Integer> pageExpression) {
         this.pageExpression = pageExpression;
@@ -76,7 +76,7 @@ public DRIExpression<String> getReferenceExpression() {
     /**
      * <p>Setter for the field <code>referenceExpression</code>.</p>
      *
-     * @param referenceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param referenceExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setReferenceExpression(DRIExpression<String> referenceExpression) {
         this.referenceExpression = referenceExpression;
@@ -91,7 +91,7 @@ public DRIExpression<String> getTooltipExpression() {
     /**
      * <p>Setter for the field <code>tooltipExpression</code>.</p>
      *
-     * @param tooltipExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param tooltipExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setTooltipExpression(DRIExpression<String> tooltipExpression) {
         this.tooltipExpression = tooltipExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRMargin.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRMargin.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRMargin.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRMargin.java
index 7ced304..fb5b9d6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRMargin.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRMargin.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIMargin;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIMargin;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRPage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRPage.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRPage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRPage.java
index a32a0be..10c21d3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRPage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRPage.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.definition.DRIPage;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.definition.DRIPage;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -43,8 +43,8 @@ public class DRPage implements DRIPage {
     /**
      * <p>setPageFormat.</p>
      *
-     * @param pageType    a {@link net.sf.dynamicreports.report.constant.PageType} object.
-     * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     * @param pageType    a {@link software.xdev.dynamicreports.report.constant.PageType} object.
+     * @param orientation a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
      */
     public void setPageFormat(PageType pageType, PageOrientation orientation) {
         Validate.notNull(pageType, "pageType must not be null");
@@ -56,7 +56,7 @@ public void setPageFormat(PageType pageType, PageOrientation orientation) {
      *
      * @param width       a {@link java.lang.Integer} object.
      * @param height      a {@link java.lang.Integer} object.
-     * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     * @param orientation a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
      */
     public void setPageFormat(Integer width, Integer height, PageOrientation orientation) {
         Validate.isTrue(width >= 0, "width must be >= 0");
@@ -87,7 +87,7 @@ public Integer getWidth() {
      *
      * @param width the page width >= 0
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public void setWidth(Integer width) {
         if (width != null) {
@@ -111,7 +111,7 @@ public Integer getHeight() {
      *
      * @param height the page height >= 0
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public void setHeight(Integer height) {
         if (height != null) {
@@ -129,7 +129,7 @@ public PageOrientation getOrientation() {
     /**
      * <p>Setter for the field <code>orientation</code>.</p>
      *
-     * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     * @param orientation a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
      */
     public void setOrientation(PageOrientation orientation) {
         this.orientation = orientation;
@@ -144,7 +144,7 @@ public DRMargin getMargin() {
     /**
      * <p>Setter for the field <code>margin</code>.</p>
      *
-     * @param margin a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+     * @param margin a {@link software.xdev.dynamicreports.report.base.DRMargin} object.
      */
     public void setMargin(DRMargin margin) {
         this.margin = margin;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRParameter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRParameter.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRParameter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRParameter.java
index e26ec0f..df1065a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRParameter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRParameter.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIParameter;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIParameter;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRQuery.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRQuery.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRQuery.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRQuery.java
index b7cbecd..1a9418f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRQuery.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRQuery.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIQuery;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIQuery;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRReport.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRReport.java
index 803beb3..364a69d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRReport.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,23 +27,23 @@
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.column.DRColumn;
-import net.sf.dynamicreports.report.base.grid.DRColumnGrid;
-import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
-import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRIReport;
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.definition.DRITemplateDesign;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.style.DRIFont;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.base.column.DRColumn;
+import software.xdev.dynamicreports.report.base.grid.DRColumnGrid;
+import software.xdev.dynamicreports.report.base.style.DRConditionalStyle;
+import software.xdev.dynamicreports.report.base.style.DRSimpleStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRIReport;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIFont;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
 
 
 /**
@@ -169,7 +169,7 @@ public DRReportTemplate getTemplate()
 	/**
 	 * <p>Setter for the field <code>template</code>.</p>
 	 *
-	 * @param template a {@link net.sf.dynamicreports.report.base.DRReportTemplate} object.
+	 * @param template a {@link software.xdev.dynamicreports.report.base.DRReportTemplate} object.
 	 */
 	public void setTemplate(final DRReportTemplate template)
 	{
@@ -199,7 +199,7 @@ public void setTemplateStyles(final List<DRIStyle> templateStyles)
 	/**
 	 * <p>addTemplateStyle.</p>
 	 *
-	 * @param templateStyle a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 * @param templateStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIStyle} object.
 	 */
 	public void addTemplateStyle(final DRIStyle templateStyle)
 	{
@@ -220,7 +220,7 @@ public DRITemplateDesign<?> getTemplateDesign()
 	/**
 	 * <p>Setter for the field <code>templateDesign</code>.</p>
 	 *
-	 * @param templateDesign a {@link net.sf.dynamicreports.report.definition.DRITemplateDesign} object.
+	 * @param templateDesign a {@link software.xdev.dynamicreports.report.definition.DRITemplateDesign} object.
 	 */
 	public void setTemplateDesign(final DRITemplateDesign<?> templateDesign)
 	{
@@ -366,7 +366,7 @@ public void setColumns(final List<DRColumn<?>> columns)
 	/**
 	 * <p>addColumn.</p>
 	 *
-	 * @param column a {@link net.sf.dynamicreports.report.base.column.DRColumn} object.
+	 * @param column a {@link software.xdev.dynamicreports.report.base.column.DRColumn} object.
 	 */
 	public void addColumn(final DRColumn<?> column)
 	{
@@ -398,7 +398,7 @@ public void setGroups(final List<DRGroup> groups)
 	/**
 	 * <p>addGroup.</p>
 	 *
-	 * @param group a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+	 * @param group a {@link software.xdev.dynamicreports.report.base.DRGroup} object.
 	 */
 	public void addGroup(final DRGroup group)
 	{
@@ -430,7 +430,7 @@ public void setFields(final List<DRField<?>> fields)
 	/**
 	 * <p>addField.</p>
 	 *
-	 * @param field a {@link net.sf.dynamicreports.report.base.DRField} object.
+	 * @param field a {@link software.xdev.dynamicreports.report.base.DRField} object.
 	 */
 	public void addField(final DRField<?> field)
 	{
@@ -462,7 +462,7 @@ public void setVariables(final List<DRVariable<?>> variables)
 	/**
 	 * <p>addVariable.</p>
 	 *
-	 * @param variable a {@link net.sf.dynamicreports.report.base.DRVariable} object.
+	 * @param variable a {@link software.xdev.dynamicreports.report.base.DRVariable} object.
 	 */
 	public void addVariable(final DRVariable<?> variable)
 	{
@@ -494,7 +494,7 @@ public void setSorts(final List<DRSort> sorts)
 	/**
 	 * <p>addSort.</p>
 	 *
-	 * @param sort a {@link net.sf.dynamicreports.report.base.DRSort} object.
+	 * @param sort a {@link software.xdev.dynamicreports.report.base.DRSort} object.
 	 */
 	public void addSort(final DRSort sort)
 	{
@@ -526,7 +526,7 @@ public void setSubtotals(final List<DRSubtotal<?>> subtotals)
 	/**
 	 * <p>addSubtotal.</p>
 	 *
-	 * @param subtotal a {@link net.sf.dynamicreports.report.base.DRSubtotal} object.
+	 * @param subtotal a {@link software.xdev.dynamicreports.report.base.DRSubtotal} object.
 	 */
 	public void addSubtotal(final DRSubtotal<?> subtotal)
 	{
@@ -558,7 +558,7 @@ public void setParameters(final List<DRParameter<?>> parameters)
 	/**
 	 * <p>addParameter.</p>
 	 *
-	 * @param parameter a {@link net.sf.dynamicreports.report.base.DRParameter} object.
+	 * @param parameter a {@link software.xdev.dynamicreports.report.base.DRParameter} object.
 	 */
 	public void addParameter(final DRParameter<?> parameter)
 	{
@@ -625,7 +625,7 @@ public void setScriptlets(final List<DRIScriptlet> scriptlets)
 	/**
 	 * <p>addScriptlet.</p>
 	 *
-	 * @param scriptlet a {@link net.sf.dynamicreports.report.definition.DRIScriptlet} object.
+	 * @param scriptlet a {@link software.xdev.dynamicreports.report.definition.DRIScriptlet} object.
 	 */
 	public void addScriptlet(final DRIScriptlet scriptlet)
 	{
@@ -677,7 +677,7 @@ public DRQuery getQuery()
 	/**
 	 * <p>Setter for the field <code>query</code>.</p>
 	 *
-	 * @param query a {@link net.sf.dynamicreports.report.base.DRQuery} object.
+	 * @param query a {@link software.xdev.dynamicreports.report.base.DRQuery} object.
 	 */
 	public void setQuery(final DRQuery query)
 	{
@@ -696,7 +696,7 @@ public DRPage getPage()
 	/**
 	 * <p>Setter for the field <code>page</code>.</p>
 	 *
-	 * @param page a {@link net.sf.dynamicreports.report.base.DRPage} object.
+	 * @param page a {@link software.xdev.dynamicreports.report.base.DRPage} object.
 	 */
 	public void setPage(final DRPage page)
 	{
@@ -735,7 +735,7 @@ public WhenNoDataType getWhenNoDataType()
 	/**
 	 * <p>Setter for the field <code>whenNoDataType</code>.</p>
 	 *
-	 * @param whenNoDataType a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @param whenNoDataType a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
 	 */
 	public void setWhenNoDataType(final WhenNoDataType whenNoDataType)
 	{
@@ -754,7 +754,7 @@ public WhenResourceMissingType getWhenResourceMissingType()
 	/**
 	 * <p>Setter for the field <code>whenResourceMissingType</code>.</p>
 	 *
-	 * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @param whenResourceMissingType a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
 	 */
 	public void setWhenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
 	{
@@ -849,7 +849,7 @@ public Orientation getPrintOrder()
 	/**
 	 * <p>Setter for the field <code>printOrder</code>.</p>
 	 *
-	 * @param printOrder a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 * @param printOrder a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
 	 */
 	public void setPrintOrder(final Orientation printOrder)
 	{
@@ -868,7 +868,7 @@ public RunDirection getColumnDirection()
 	/**
 	 * <p>Setter for the field <code>columnDirection</code>.</p>
 	 *
-	 * @param columnDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 * @param columnDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
 	 */
 	public void setColumnDirection(final RunDirection columnDirection)
 	{
@@ -925,7 +925,7 @@ public DRIFont getDefaultFont()
 	/**
 	 * <p>Setter for the field <code>defaultFont</code>.</p>
 	 *
-	 * @param defaultFont a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+	 * @param defaultFont a {@link software.xdev.dynamicreports.report.definition.style.DRIFont} object.
 	 */
 	public void setDefaultFont(final DRIFont defaultFont)
 	{
@@ -944,7 +944,7 @@ public DRIReportStyle getTextStyle()
 	/**
 	 * <p>Setter for the field <code>textStyle</code>.</p>
 	 *
-	 * @param textStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param textStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setTextStyle(final DRIReportStyle textStyle)
 	{
@@ -963,7 +963,7 @@ public DRIReportStyle getColumnTitleStyle()
 	/**
 	 * <p>Setter for the field <code>columnTitleStyle</code>.</p>
 	 *
-	 * @param columnTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param columnTitleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setColumnTitleStyle(final DRIReportStyle columnTitleStyle)
 	{
@@ -982,7 +982,7 @@ public DRIReportStyle getColumnStyle()
 	/**
 	 * <p>Setter for the field <code>columnStyle</code>.</p>
 	 *
-	 * @param columnStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param columnStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setColumnStyle(final DRIReportStyle columnStyle)
 	{
@@ -1001,7 +1001,7 @@ public DRIReportStyle getGroupTitleStyle()
 	/**
 	 * <p>Setter for the field <code>groupTitleStyle</code>.</p>
 	 *
-	 * @param groupTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param groupTitleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setGroupTitleStyle(final DRIReportStyle groupTitleStyle)
 	{
@@ -1020,7 +1020,7 @@ public DRIReportStyle getGroupStyle()
 	/**
 	 * <p>Setter for the field <code>groupStyle</code>.</p>
 	 *
-	 * @param groupStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param groupStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setGroupStyle(final DRIReportStyle groupStyle)
 	{
@@ -1039,7 +1039,7 @@ public DRIReportStyle getSubtotalStyle()
 	/**
 	 * <p>Setter for the field <code>subtotalStyle</code>.</p>
 	 *
-	 * @param subtotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param subtotalStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setSubtotalStyle(final DRIReportStyle subtotalStyle)
 	{
@@ -1058,7 +1058,7 @@ public DRIReportStyle getImageStyle()
 	/**
 	 * <p>Setter for the field <code>imageStyle</code>.</p>
 	 *
-	 * @param imageStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param imageStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setImageStyle(final DRIReportStyle imageStyle)
 	{
@@ -1096,7 +1096,7 @@ public DRSimpleStyle getDetailOddRowStyle()
 	/**
 	 * <p>Setter for the field <code>detailOddRowStyle</code>.</p>
 	 *
-	 * @param detailOddRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @param detailOddRowStyle a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public void setDetailOddRowStyle(final DRSimpleStyle detailOddRowStyle)
 	{
@@ -1134,7 +1134,7 @@ public DRSimpleStyle getDetailEvenRowStyle()
 	/**
 	 * <p>Setter for the field <code>detailEvenRowStyle</code>.</p>
 	 *
-	 * @param detailEvenRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @param detailEvenRowStyle a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public void setDetailEvenRowStyle(final DRSimpleStyle detailEvenRowStyle)
 	{
@@ -1167,7 +1167,7 @@ public void setDetailRowHighlighters(final List<DRConditionalStyle> detailRowHig
 	/**
 	 * <p>addDetailRowHighlighter.</p>
 	 *
-	 * @param detailRowHighlighter a {@link net.sf.dynamicreports.report.base.style.DRConditionalStyle} object.
+	 * @param detailRowHighlighter a {@link software.xdev.dynamicreports.report.base.style.DRConditionalStyle} object.
 	 */
 	public void addDetailRowHighlighter(final DRConditionalStyle detailRowHighlighter)
 	{
@@ -1187,7 +1187,7 @@ public DRColumnGrid getColumnGrid()
 	/**
 	 * <p>Setter for the field <code>columnGrid</code>.</p>
 	 *
-	 * @param columnGrid a {@link net.sf.dynamicreports.report.base.grid.DRColumnGrid} object.
+	 * @param columnGrid a {@link software.xdev.dynamicreports.report.base.grid.DRColumnGrid} object.
 	 */
 	public void setColumnGrid(final DRColumnGrid columnGrid)
 	{
@@ -1225,7 +1225,7 @@ public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
 	/**
 	 * <p>Setter for the field <code>tableOfContentsCustomizer</code>.</p>
 	 *
-	 * @param tableOfContentsCustomizer a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer}
+	 * @param tableOfContentsCustomizer a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer}
 	 *                                  object.
 	 */
 	public void setTableOfContentsCustomizer(final DRITableOfContentsCustomizer tableOfContentsCustomizer)
@@ -1245,7 +1245,7 @@ public DRIExpression<Boolean> getFilterExpression()
 	/**
 	 * <p>Setter for the field <code>filterExpression</code>.</p>
 	 *
-	 * @param filterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+	 * @param filterExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
 	 */
 	public void setFilterExpression(final DRIExpression<Boolean> filterExpression)
 	{
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReportTemplate.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRReportTemplate.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReportTemplate.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRReportTemplate.java
index ce5c9ec..993b5db 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRReportTemplate.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRReportTemplate.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,25 +23,25 @@
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.component.DRComponent;
-import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRIReportTemplate;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.definition.style.DRIFont;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.base.component.DRComponent;
+import software.xdev.dynamicreports.report.base.style.DRSimpleStyle;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRIReportTemplate;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.definition.style.DRIFont;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
 
 
 /**
@@ -216,7 +216,7 @@ public void setTemplateStyles(final List<DRIStyle> templateStyles)
 	/**
 	 * <p>addTemplateStyle.</p>
 	 *
-	 * @param templateStyle a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 * @param templateStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIStyle} object.
 	 */
 	public void addTemplateStyle(final DRIStyle templateStyle)
 	{
@@ -313,7 +313,7 @@ public WhenNoDataType getWhenNoDataType()
 	/**
 	 * <p>Setter for the field <code>whenNoDataType</code>.</p>
 	 *
-	 * @param whenNoDataType a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @param whenNoDataType a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
 	 */
 	public void setWhenNoDataType(final WhenNoDataType whenNoDataType)
 	{
@@ -332,7 +332,7 @@ public WhenResourceMissingType getWhenResourceMissingType()
 	/**
 	 * <p>Setter for the field <code>whenResourceMissingType</code>.</p>
 	 *
-	 * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @param whenResourceMissingType a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
 	 */
 	public void setWhenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
 	{
@@ -427,7 +427,7 @@ public Orientation getPrintOrder()
 	/**
 	 * <p>Setter for the field <code>printOrder</code>.</p>
 	 *
-	 * @param printOrder a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 * @param printOrder a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
 	 */
 	public void setPrintOrder(final Orientation printOrder)
 	{
@@ -446,7 +446,7 @@ public RunDirection getColumnDirection()
 	/**
 	 * <p>Setter for the field <code>columnDirection</code>.</p>
 	 *
-	 * @param columnDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 * @param columnDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
 	 */
 	public void setColumnDirection(final RunDirection columnDirection)
 	{
@@ -522,7 +522,7 @@ public DRSimpleStyle getDetailOddRowStyle()
 	/**
 	 * <p>Setter for the field <code>detailOddRowStyle</code>.</p>
 	 *
-	 * @param detailOddRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @param detailOddRowStyle a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public void setDetailOddRowStyle(final DRSimpleStyle detailOddRowStyle)
 	{
@@ -560,7 +560,7 @@ public DRSimpleStyle getDetailEvenRowStyle()
 	/**
 	 * <p>Setter for the field <code>detailEvenRowStyle</code>.</p>
 	 *
-	 * @param detailEvenRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @param detailEvenRowStyle a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public void setDetailEvenRowStyle(final DRSimpleStyle detailEvenRowStyle)
 	{
@@ -579,7 +579,7 @@ public DRIFont getDefaultFont()
 	/**
 	 * <p>Setter for the field <code>defaultFont</code>.</p>
 	 *
-	 * @param defaultFont a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+	 * @param defaultFont a {@link software.xdev.dynamicreports.report.definition.style.DRIFont} object.
 	 */
 	public void setDefaultFont(final DRIFont defaultFont)
 	{
@@ -598,7 +598,7 @@ public DRIReportStyle getTextStyle()
 	/**
 	 * <p>Setter for the field <code>textStyle</code>.</p>
 	 *
-	 * @param textStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param textStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setTextStyle(final DRIReportStyle textStyle)
 	{
@@ -617,7 +617,7 @@ public DRIReportStyle getColumnTitleStyle()
 	/**
 	 * <p>Setter for the field <code>columnTitleStyle</code>.</p>
 	 *
-	 * @param columnTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param columnTitleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setColumnTitleStyle(final DRIReportStyle columnTitleStyle)
 	{
@@ -636,7 +636,7 @@ public DRIReportStyle getColumnStyle()
 	/**
 	 * <p>Setter for the field <code>columnStyle</code>.</p>
 	 *
-	 * @param columnStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param columnStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setColumnStyle(final DRIReportStyle columnStyle)
 	{
@@ -655,7 +655,7 @@ public DRIReportStyle getGroupTitleStyle()
 	/**
 	 * <p>Setter for the field <code>groupTitleStyle</code>.</p>
 	 *
-	 * @param groupTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param groupTitleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setGroupTitleStyle(final DRIReportStyle groupTitleStyle)
 	{
@@ -674,7 +674,7 @@ public DRIReportStyle getGroupStyle()
 	/**
 	 * <p>Setter for the field <code>groupStyle</code>.</p>
 	 *
-	 * @param groupStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param groupStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setGroupStyle(final DRIReportStyle groupStyle)
 	{
@@ -693,7 +693,7 @@ public DRIReportStyle getSubtotalStyle()
 	/**
 	 * <p>Setter for the field <code>subtotalStyle</code>.</p>
 	 *
-	 * @param subtotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param subtotalStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setSubtotalStyle(final DRIReportStyle subtotalStyle)
 	{
@@ -712,7 +712,7 @@ public DRIReportStyle getImageStyle()
 	/**
 	 * <p>Setter for the field <code>imageStyle</code>.</p>
 	 *
-	 * @param imageStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param imageStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setImageStyle(final DRIReportStyle imageStyle)
 	{
@@ -722,8 +722,8 @@ public void setImageStyle(final DRIReportStyle imageStyle)
 	/**
 	 * <p>setPageFormat.</p>
 	 *
-	 * @param pageType    a {@link net.sf.dynamicreports.report.constant.PageType} object.
-	 * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 * @param pageType    a {@link software.xdev.dynamicreports.report.constant.PageType} object.
+	 * @param orientation a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
 	 */
 	public void setPageFormat(final PageType pageType, final PageOrientation orientation)
 	{
@@ -804,7 +804,7 @@ public DRMargin getPageMargin()
 	/**
 	 * <p>Setter for the field <code>pageMargin</code>.</p>
 	 *
-	 * @param pageMargin a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+	 * @param pageMargin a {@link software.xdev.dynamicreports.report.base.DRMargin} object.
 	 */
 	public void setPageMargin(final DRMargin pageMargin)
 	{
@@ -930,7 +930,7 @@ public GroupHeaderLayout getGroupHeaderLayout()
 	/**
 	 * <p>Setter for the field <code>groupHeaderLayout</code>.</p>
 	 *
-	 * @param groupHeaderLayout a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+	 * @param groupHeaderLayout a {@link software.xdev.dynamicreports.report.constant.GroupHeaderLayout} object.
 	 */
 	public void setGroupHeaderLayout(final GroupHeaderLayout groupHeaderLayout)
 	{
@@ -1086,7 +1086,7 @@ public GroupFooterPosition getGroupFooterPosition()
 	/**
 	 * <p>Setter for the field <code>groupFooterPosition</code>.</p>
 	 *
-	 * @param groupFooterPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 * @param groupFooterPosition a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
 	 */
 	public void setGroupFooterPosition(final GroupFooterPosition groupFooterPosition)
 	{
@@ -1143,7 +1143,7 @@ public Position getSubtotalLabelPosition()
 	/**
 	 * <p>Setter for the field <code>subtotalLabelPosition</code>.</p>
 	 *
-	 * @param subtotalLabelPosition a {@link net.sf.dynamicreports.report.constant.Position} object.
+	 * @param subtotalLabelPosition a {@link software.xdev.dynamicreports.report.constant.Position} object.
 	 */
 	public void setSubtotalLabelPosition(final Position subtotalLabelPosition)
 	{
@@ -1181,7 +1181,7 @@ public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
 	/**
 	 * <p>Setter for the field <code>tableOfContentsCustomizer</code>.</p>
 	 *
-	 * @param tableOfContentsCustomizer a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer}
+	 * @param tableOfContentsCustomizer a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer}
 	 *                                  object.
 	 */
 	public void setTableOfContentsCustomizer(final DRITableOfContentsCustomizer tableOfContentsCustomizer)
@@ -1442,7 +1442,7 @@ public DRSimpleStyle getCrosstabOddRowStyle()
 	/**
 	 * <p>Setter for the field <code>crosstabOddRowStyle</code>.</p>
 	 *
-	 * @param crosstabOddRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @param crosstabOddRowStyle a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public void setCrosstabOddRowStyle(final DRSimpleStyle crosstabOddRowStyle)
 	{
@@ -1480,7 +1480,7 @@ public DRSimpleStyle getCrosstabEvenRowStyle()
 	/**
 	 * <p>Setter for the field <code>crosstabEvenRowStyle</code>.</p>
 	 *
-	 * @param crosstabEvenRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @param crosstabEvenRowStyle a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public void setCrosstabEvenRowStyle(final DRSimpleStyle crosstabEvenRowStyle)
 	{
@@ -1499,7 +1499,7 @@ public DRIReportStyle getCrosstabGroupStyle()
 	/**
 	 * <p>Setter for the field <code>crosstabGroupStyle</code>.</p>
 	 *
-	 * @param crosstabGroupStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstabGroupStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setCrosstabGroupStyle(final DRIReportStyle crosstabGroupStyle)
 	{
@@ -1518,7 +1518,7 @@ public DRIReportStyle getCrosstabGroupTotalStyle()
 	/**
 	 * <p>Setter for the field <code>crosstabGroupTotalStyle</code>.</p>
 	 *
-	 * @param crosstabGroupTotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstabGroupTotalStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setCrosstabGroupTotalStyle(final DRIReportStyle crosstabGroupTotalStyle)
 	{
@@ -1537,7 +1537,7 @@ public DRIReportStyle getCrosstabGrandTotalStyle()
 	/**
 	 * <p>Setter for the field <code>crosstabGrandTotalStyle</code>.</p>
 	 *
-	 * @param crosstabGrandTotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstabGrandTotalStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setCrosstabGrandTotalStyle(final DRIReportStyle crosstabGrandTotalStyle)
 	{
@@ -1556,7 +1556,7 @@ public DRIReportStyle getCrosstabCellStyle()
 	/**
 	 * <p>Setter for the field <code>crosstabCellStyle</code>.</p>
 	 *
-	 * @param crosstabCellStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstabCellStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setCrosstabCellStyle(final DRIReportStyle crosstabCellStyle)
 	{
@@ -1575,7 +1575,7 @@ public DRIReportStyle getCrosstabMeasureTitleStyle()
 	/**
 	 * <p>Setter for the field <code>crosstabMeasureTitleStyle</code>.</p>
 	 *
-	 * @param crosstabMeasureTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param crosstabMeasureTitleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setCrosstabMeasureTitleStyle(final DRIReportStyle crosstabMeasureTitleStyle)
 	{
@@ -1594,7 +1594,7 @@ public BooleanComponentType getBooleanComponentType()
 	/**
 	 * <p>Setter for the field <code>booleanComponentType</code>.</p>
 	 *
-	 * @param booleanComponentType a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+	 * @param booleanComponentType a {@link software.xdev.dynamicreports.report.constant.BooleanComponentType} object.
 	 */
 	public void setBooleanComponentType(final BooleanComponentType booleanComponentType)
 	{
@@ -1670,7 +1670,7 @@ public DRIReportStyle getBooleanColumnStyle()
 	/**
 	 * <p>Setter for the field <code>booleanColumnStyle</code>.</p>
 	 *
-	 * @param booleanColumnStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param booleanColumnStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setBooleanColumnStyle(final DRIReportStyle booleanColumnStyle)
 	{
@@ -1689,7 +1689,7 @@ public SplitType getDefaultSplitType()
 	/**
 	 * <p>Setter for the field <code>defaultSplitType</code>.</p>
 	 *
-	 * @param defaultSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param defaultSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setDefaultSplitType(final SplitType defaultSplitType)
 	{
@@ -1708,7 +1708,7 @@ public SplitType getTitleSplitType()
 	/**
 	 * <p>Setter for the field <code>titleSplitType</code>.</p>
 	 *
-	 * @param titleSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param titleSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setTitleSplitType(final SplitType titleSplitType)
 	{
@@ -1727,7 +1727,7 @@ public SplitType getPageHeaderSplitType()
 	/**
 	 * <p>Setter for the field <code>pageHeaderSplitType</code>.</p>
 	 *
-	 * @param pageHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param pageHeaderSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setPageHeaderSplitType(final SplitType pageHeaderSplitType)
 	{
@@ -1746,7 +1746,7 @@ public SplitType getPageFooterSplitType()
 	/**
 	 * <p>Setter for the field <code>pageFooterSplitType</code>.</p>
 	 *
-	 * @param pageFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param pageFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setPageFooterSplitType(final SplitType pageFooterSplitType)
 	{
@@ -1765,7 +1765,7 @@ public SplitType getColumnHeaderSplitType()
 	/**
 	 * <p>Setter for the field <code>columnHeaderSplitType</code>.</p>
 	 *
-	 * @param columnHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param columnHeaderSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setColumnHeaderSplitType(final SplitType columnHeaderSplitType)
 	{
@@ -1784,7 +1784,7 @@ public SplitType getColumnFooterSplitType()
 	/**
 	 * <p>Setter for the field <code>columnFooterSplitType</code>.</p>
 	 *
-	 * @param columnFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param columnFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setColumnFooterSplitType(final SplitType columnFooterSplitType)
 	{
@@ -1803,7 +1803,7 @@ public SplitType getGroupHeaderSplitType()
 	/**
 	 * <p>Setter for the field <code>groupHeaderSplitType</code>.</p>
 	 *
-	 * @param groupHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param groupHeaderSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setGroupHeaderSplitType(final SplitType groupHeaderSplitType)
 	{
@@ -1822,7 +1822,7 @@ public SplitType getGroupFooterSplitType()
 	/**
 	 * <p>Setter for the field <code>groupFooterSplitType</code>.</p>
 	 *
-	 * @param groupFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param groupFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setGroupFooterSplitType(final SplitType groupFooterSplitType)
 	{
@@ -1841,7 +1841,7 @@ public SplitType getDetailHeaderSplitType()
 	/**
 	 * <p>Setter for the field <code>detailHeaderSplitType</code>.</p>
 	 *
-	 * @param detailHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param detailHeaderSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setDetailHeaderSplitType(final SplitType detailHeaderSplitType)
 	{
@@ -1860,7 +1860,7 @@ public SplitType getDetailSplitType()
 	/**
 	 * <p>Setter for the field <code>detailSplitType</code>.</p>
 	 *
-	 * @param detailSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param detailSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setDetailSplitType(final SplitType detailSplitType)
 	{
@@ -1879,7 +1879,7 @@ public SplitType getDetailFooterSplitType()
 	/**
 	 * <p>Setter for the field <code>detailFooterSplitType</code>.</p>
 	 *
-	 * @param detailFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param detailFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setDetailFooterSplitType(final SplitType detailFooterSplitType)
 	{
@@ -1898,7 +1898,7 @@ public SplitType getLastPageFooterSplitType()
 	/**
 	 * <p>Setter for the field <code>lastPageFooterSplitType</code>.</p>
 	 *
-	 * @param lastPageFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param lastPageFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setLastPageFooterSplitType(final SplitType lastPageFooterSplitType)
 	{
@@ -1917,7 +1917,7 @@ public SplitType getSummarySplitType()
 	/**
 	 * <p>Setter for the field <code>summarySplitType</code>.</p>
 	 *
-	 * @param summarySplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param summarySplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setSummarySplitType(final SplitType summarySplitType)
 	{
@@ -1936,7 +1936,7 @@ public SplitType getNoDataSplitType()
 	/**
 	 * <p>Setter for the field <code>noDataSplitType</code>.</p>
 	 *
-	 * @param noDataSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param noDataSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setNoDataSplitType(final SplitType noDataSplitType)
 	{
@@ -1955,7 +1955,7 @@ public SplitType getBackgroundSplitType()
 	/**
 	 * <p>Setter for the field <code>backgroundSplitType</code>.</p>
 	 *
-	 * @param backgroundSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @param backgroundSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public void setBackgroundSplitType(final SplitType backgroundSplitType)
 	{
@@ -1974,7 +1974,7 @@ public DRIReportStyle getTitleStyle()
 	/**
 	 * <p>Setter for the field <code>titleStyle</code>.</p>
 	 *
-	 * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param titleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setTitleStyle(final DRIReportStyle titleStyle)
 	{
@@ -1993,7 +1993,7 @@ public DRIReportStyle getPageHeaderStyle()
 	/**
 	 * <p>Setter for the field <code>pageHeaderStyle</code>.</p>
 	 *
-	 * @param pageHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param pageHeaderStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setPageHeaderStyle(final DRIReportStyle pageHeaderStyle)
 	{
@@ -2012,7 +2012,7 @@ public DRIReportStyle getPageFooterStyle()
 	/**
 	 * <p>Setter for the field <code>pageFooterStyle</code>.</p>
 	 *
-	 * @param pageFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param pageFooterStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setPageFooterStyle(final DRIReportStyle pageFooterStyle)
 	{
@@ -2031,7 +2031,7 @@ public DRIReportStyle getColumnHeaderStyle()
 	/**
 	 * <p>Setter for the field <code>columnHeaderStyle</code>.</p>
 	 *
-	 * @param columnHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param columnHeaderStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setColumnHeaderStyle(final DRIReportStyle columnHeaderStyle)
 	{
@@ -2050,7 +2050,7 @@ public DRIReportStyle getColumnFooterStyle()
 	/**
 	 * <p>Setter for the field <code>columnFooterStyle</code>.</p>
 	 *
-	 * @param columnFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param columnFooterStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setColumnFooterStyle(final DRIReportStyle columnFooterStyle)
 	{
@@ -2069,7 +2069,7 @@ public DRIReportStyle getGroupHeaderStyle()
 	/**
 	 * <p>Setter for the field <code>groupHeaderStyle</code>.</p>
 	 *
-	 * @param groupHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param groupHeaderStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setGroupHeaderStyle(final DRIReportStyle groupHeaderStyle)
 	{
@@ -2088,7 +2088,7 @@ public DRIReportStyle getGroupFooterStyle()
 	/**
 	 * <p>Setter for the field <code>groupFooterStyle</code>.</p>
 	 *
-	 * @param groupFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param groupFooterStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setGroupFooterStyle(final DRIReportStyle groupFooterStyle)
 	{
@@ -2107,7 +2107,7 @@ public DRIReportStyle getDetailHeaderStyle()
 	/**
 	 * <p>Setter for the field <code>detailHeaderStyle</code>.</p>
 	 *
-	 * @param detailHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param detailHeaderStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setDetailHeaderStyle(final DRIReportStyle detailHeaderStyle)
 	{
@@ -2126,7 +2126,7 @@ public DRIReportStyle getDetailStyle()
 	/**
 	 * <p>Setter for the field <code>detailStyle</code>.</p>
 	 *
-	 * @param detailStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param detailStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setDetailStyle(final DRIReportStyle detailStyle)
 	{
@@ -2145,7 +2145,7 @@ public DRIReportStyle getDetailFooterStyle()
 	/**
 	 * <p>Setter for the field <code>detailFooterStyle</code>.</p>
 	 *
-	 * @param detailFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param detailFooterStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setDetailFooterStyle(final DRIReportStyle detailFooterStyle)
 	{
@@ -2164,7 +2164,7 @@ public DRIReportStyle getLastPageFooterStyle()
 	/**
 	 * <p>Setter for the field <code>lastPageFooterStyle</code>.</p>
 	 *
-	 * @param lastPageFooterStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param lastPageFooterStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setLastPageFooterStyle(final DRIReportStyle lastPageFooterStyle)
 	{
@@ -2183,7 +2183,7 @@ public DRIReportStyle getSummaryStyle()
 	/**
 	 * <p>Setter for the field <code>summaryStyle</code>.</p>
 	 *
-	 * @param summaryStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param summaryStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setSummaryStyle(final DRIReportStyle summaryStyle)
 	{
@@ -2202,7 +2202,7 @@ public DRIReportStyle getNoDataStyle()
 	/**
 	 * <p>Setter for the field <code>noDataStyle</code>.</p>
 	 *
-	 * @param noDataStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param noDataStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setNoDataStyle(final DRIReportStyle noDataStyle)
 	{
@@ -2221,7 +2221,7 @@ public DRIReportStyle getBackgroundStyle()
 	/**
 	 * <p>Setter for the field <code>backgroundStyle</code>.</p>
 	 *
-	 * @param backgroundStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+	 * @param backgroundStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
 	 */
 	public void setBackgroundStyle(final DRIReportStyle backgroundStyle)
 	{
@@ -2240,7 +2240,7 @@ public DRComponent getTitleBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>titleBackgroundComponent</code>.</p>
 	 *
-	 * @param titleBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param titleBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setTitleBackgroundComponent(final DRComponent titleBackgroundComponent)
 	{
@@ -2259,7 +2259,7 @@ public DRComponent getPageHeaderBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>pageHeaderBackgroundComponent</code>.</p>
 	 *
-	 * @param pageHeaderBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param pageHeaderBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setPageHeaderBackgroundComponent(final DRComponent pageHeaderBackgroundComponent)
 	{
@@ -2278,7 +2278,7 @@ public DRComponent getPageFooterBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>pageFooterBackgroundComponent</code>.</p>
 	 *
-	 * @param pageFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param pageFooterBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setPageFooterBackgroundComponent(final DRComponent pageFooterBackgroundComponent)
 	{
@@ -2297,7 +2297,7 @@ public DRComponent getColumnHeaderBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>columnHeaderBackgroundComponent</code>.</p>
 	 *
-	 * @param columnHeaderBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param columnHeaderBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setColumnHeaderBackgroundComponent(final DRComponent columnHeaderBackgroundComponent)
 	{
@@ -2316,7 +2316,7 @@ public DRComponent getColumnFooterBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>columnFooterBackgroundComponent</code>.</p>
 	 *
-	 * @param columnFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param columnFooterBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setColumnFooterBackgroundComponent(final DRComponent columnFooterBackgroundComponent)
 	{
@@ -2335,7 +2335,7 @@ public DRComponent getGroupHeaderBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>groupHeaderBackgroundComponent</code>.</p>
 	 *
-	 * @param groupHeaderBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param groupHeaderBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setGroupHeaderBackgroundComponent(final DRComponent groupHeaderBackgroundComponent)
 	{
@@ -2354,7 +2354,7 @@ public DRComponent getGroupFooterBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>groupFooterBackgroundComponent</code>.</p>
 	 *
-	 * @param groupFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param groupFooterBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setGroupFooterBackgroundComponent(final DRComponent groupFooterBackgroundComponent)
 	{
@@ -2373,7 +2373,7 @@ public DRComponent getDetailHeaderBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>detailHeaderBackgroundComponent</code>.</p>
 	 *
-	 * @param detailHeaderBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param detailHeaderBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setDetailHeaderBackgroundComponent(final DRComponent detailHeaderBackgroundComponent)
 	{
@@ -2392,7 +2392,7 @@ public DRComponent getDetailBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>detailBackgroundComponent</code>.</p>
 	 *
-	 * @param detailBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param detailBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setDetailBackgroundComponent(final DRComponent detailBackgroundComponent)
 	{
@@ -2411,7 +2411,7 @@ public DRComponent getDetailFooterBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>detailFooterBackgroundComponent</code>.</p>
 	 *
-	 * @param detailFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param detailFooterBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setDetailFooterBackgroundComponent(final DRComponent detailFooterBackgroundComponent)
 	{
@@ -2430,7 +2430,7 @@ public DRComponent getLastPageFooterBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>lastPageFooterBackgroundComponent</code>.</p>
 	 *
-	 * @param lastPageFooterBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent}
+	 * @param lastPageFooterBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent}
 	 *                                          object.
 	 */
 	public void setLastPageFooterBackgroundComponent(final DRComponent lastPageFooterBackgroundComponent)
@@ -2450,7 +2450,7 @@ public DRComponent getSummaryBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>summaryBackgroundComponent</code>.</p>
 	 *
-	 * @param summaryBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param summaryBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setSummaryBackgroundComponent(final DRComponent summaryBackgroundComponent)
 	{
@@ -2469,7 +2469,7 @@ public DRComponent getNoDataBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>noDataBackgroundComponent</code>.</p>
 	 *
-	 * @param noDataBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param noDataBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setNoDataBackgroundComponent(final DRComponent noDataBackgroundComponent)
 	{
@@ -2488,7 +2488,7 @@ public DRComponent getBackgroundBackgroundComponent()
 	/**
 	 * <p>Setter for the field <code>backgroundBackgroundComponent</code>.</p>
 	 *
-	 * @param backgroundBackgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+	 * @param backgroundBackgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
 	 */
 	public void setBackgroundBackgroundComponent(final DRComponent backgroundBackgroundComponent)
 	{
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSort.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRSort.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSort.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRSort.java
index b934f27..56a109d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSort.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRSort.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.definition.DRISort;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.definition.DRISort;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRSort class.</p>
@@ -43,7 +43,7 @@ public DRIExpression<?> getExpression() {
     /**
      * <p>Setter for the field <code>expression</code>.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setExpression(DRIExpression<?> expression) {
         this.expression = expression;
@@ -58,7 +58,7 @@ public OrderType getOrderType() {
     /**
      * <p>Setter for the field <code>orderType</code>.</p>
      *
-     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @param orderType a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      */
     public void setOrderType(OrderType orderType) {
         this.orderType = orderType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSubtotal.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRSubtotal.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSubtotal.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRSubtotal.java
index 031ba73..6f6b670 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRSubtotal.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRSubtotal.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
-
-import net.sf.dynamicreports.report.base.column.DRColumn;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.SubtotalPosition;
-import net.sf.dynamicreports.report.definition.DRISubtotal;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+package software.xdev.dynamicreports.report.base;
+
+import software.xdev.dynamicreports.report.base.column.DRColumn;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.SubtotalPosition;
+import software.xdev.dynamicreports.report.definition.DRISubtotal;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -51,7 +51,7 @@ public class DRSubtotal<T> implements DRISubtotal<T> {
     /**
      * <p>Constructor for DRSubtotal.</p>
      *
-     * @param showInColumn a {@link net.sf.dynamicreports.report.base.column.DRColumn} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.base.column.DRColumn} object.
      */
     public DRSubtotal(DRColumn<?> showInColumn) {
         setShowInColumn(showInColumn);
@@ -71,7 +71,7 @@ public DRColumn<?> getShowInColumn() {
     /**
      * <p>Setter for the field <code>showInColumn</code>.</p>
      *
-     * @param showInColumn a {@link net.sf.dynamicreports.report.base.column.DRColumn} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.base.column.DRColumn} object.
      */
     public void setShowInColumn(DRColumn<?> showInColumn) {
         Validate.notNull(showInColumn, "showInColumn must not be null");
@@ -93,7 +93,7 @@ public DRIExpression<?> getLabelExpression() {
     /**
      * <p>Setter for the field <code>labelExpression</code>.</p>
      *
-     * @param labelExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param labelExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setLabelExpression(DRIExpression<?> labelExpression) {
         this.labelExpression = labelExpression;
@@ -108,7 +108,7 @@ public DRIReportStyle getLabelStyle() {
     /**
      * <p>Setter for the field <code>labelStyle</code>.</p>
      *
-     * @param labelStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param labelStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setLabelStyle(DRIReportStyle labelStyle) {
         this.labelStyle = labelStyle;
@@ -123,7 +123,7 @@ public Position getLabelPosition() {
     /**
      * <p>Setter for the field <code>labelPosition</code>.</p>
      *
-     * @param labelPosition a {@link net.sf.dynamicreports.report.constant.Position} object.
+     * @param labelPosition a {@link software.xdev.dynamicreports.report.constant.Position} object.
      */
     public void setLabelPosition(Position labelPosition) {
         this.labelPosition = labelPosition;
@@ -153,7 +153,7 @@ public ComponentDimensionType getLabelWidthType() {
     /**
      * <p>Setter for the field <code>labelWidthType</code>.</p>
      *
-     * @param labelWidthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @param labelWidthType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public void setLabelWidthType(ComponentDimensionType labelWidthType) {
         this.labelWidthType = labelWidthType;
@@ -168,7 +168,7 @@ public SubtotalPosition getPosition() {
     /**
      * <p>Setter for the field <code>position</code>.</p>
      *
-     * @param position a {@link net.sf.dynamicreports.report.constant.SubtotalPosition} object.
+     * @param position a {@link software.xdev.dynamicreports.report.constant.SubtotalPosition} object.
      */
     public void setPosition(SubtotalPosition position) {
         Validate.notNull(position, "position must not be null");
@@ -184,7 +184,7 @@ public DRGroup getGroup() {
     /**
      * <p>Setter for the field <code>group</code>.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+     * @param group a {@link software.xdev.dynamicreports.report.base.DRGroup} object.
      */
     public void setGroup(DRGroup group) {
         this.group = group;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRTableOfContentsHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRTableOfContentsHeading.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRTableOfContentsHeading.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRTableOfContentsHeading.java
index 9a36198..201320f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRTableOfContentsHeading.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRTableOfContentsHeading.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsHeading;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsHeading;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRTableOfContentsHeading class.</p>
@@ -43,7 +43,7 @@ public DRTableOfContentsHeading getParentHeading() {
     /**
      * <p>Setter for the field <code>parentHeading</code>.</p>
      *
-     * @param parentHeading a {@link net.sf.dynamicreports.report.base.DRTableOfContentsHeading} object.
+     * @param parentHeading a {@link software.xdev.dynamicreports.report.base.DRTableOfContentsHeading} object.
      */
     public void setParentHeading(DRTableOfContentsHeading parentHeading) {
         this.parentHeading = parentHeading;
@@ -58,7 +58,7 @@ public DRIExpression<String> getLabelExpression() {
     /**
      * <p>Setter for the field <code>labelExpression</code>.</p>
      *
-     * @param labelExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param labelExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setLabelExpression(DRIExpression<String> labelExpression) {
         this.labelExpression = labelExpression;
@@ -73,7 +73,7 @@ public DRIExpression<?> getCustomValueExpression() {
     /**
      * <p>Setter for the field <code>customValueExpression</code>.</p>
      *
-     * @param customValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param customValueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setCustomValueExpression(DRIExpression<?> customValueExpression) {
         this.customValueExpression = customValueExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRVariable.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRVariable.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRVariable.java
index d1bdd5c..217cff7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/DRVariable.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/DRVariable.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base;
+package software.xdev.dynamicreports.report.base;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.definition.DRIVariable;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.definition.DRIVariable;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -44,8 +44,8 @@ public class DRVariable<T> implements DRIVariable<T> {
     /**
      * <p>Constructor for DRVariable.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation     a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation     a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public DRVariable(DRIExpression<?> valueExpression, Calculation calculation) {
         this(ReportUtils.generateUniqueName("variable"), valueExpression, calculation);
@@ -55,8 +55,8 @@ public DRVariable(DRIExpression<?> valueExpression, Calculation calculation) {
      * <p>Constructor for DRVariable.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation     a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation     a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public DRVariable(String name, DRIExpression<?> valueExpression, Calculation calculation) {
         Validate.notEmpty(name, "name must not be empty");
@@ -82,7 +82,7 @@ public DRIExpression<?> getInitialValueExpression() {
     /**
      * <p>Setter for the field <code>initialValueExpression</code>.</p>
      *
-     * @param initialValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param initialValueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setInitialValueExpression(DRIExpression<?> initialValueExpression) {
         this.initialValueExpression = initialValueExpression;
@@ -103,7 +103,7 @@ public Evaluation getResetType() {
     /**
      * <p>Setter for the field <code>resetType</code>.</p>
      *
-     * @param resetType a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @param resetType a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
      */
     public void setResetType(Evaluation resetType) {
         this.resetType = resetType;
@@ -118,7 +118,7 @@ public DRGroup getResetGroup() {
     /**
      * <p>Setter for the field <code>resetGroup</code>.</p>
      *
-     * @param resetGroup a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+     * @param resetGroup a {@link software.xdev.dynamicreports.report.base.DRGroup} object.
      */
     public void setResetGroup(DRGroup resetGroup) {
         this.resetGroup = resetGroup;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRBooleanColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRBooleanColumn.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRBooleanColumn.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRBooleanColumn.java
index 8abbcbf..9cb8fc3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRBooleanColumn.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRBooleanColumn.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.column;
+package software.xdev.dynamicreports.report.base.column;
 
-import net.sf.dynamicreports.report.base.component.DRBooleanField;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.column.DRIBooleanColumn;
-import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
+import software.xdev.dynamicreports.report.base.component.DRBooleanField;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.column.DRIBooleanColumn;
+import software.xdev.dynamicreports.report.definition.component.DRIBooleanField;
 
 /**
  * <p>DRBooleanColumn class.</p>
@@ -34,7 +34,7 @@ public class DRBooleanColumn extends DRColumn<DRIBooleanField> implements DRIBoo
     /**
      * <p>Constructor for DRBooleanColumn.</p>
      *
-     * @param booleanField a {@link net.sf.dynamicreports.report.base.component.DRBooleanField} object.
+     * @param booleanField a {@link software.xdev.dynamicreports.report.base.component.DRBooleanField} object.
      */
     public DRBooleanColumn(DRBooleanField booleanField) {
         super(booleanField);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRColumn.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRColumn.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRColumn.java
index 2abd328..e9b35bf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRColumn.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRColumn.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.column;
+package software.xdev.dynamicreports.report.base.column;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.column.DRIColumn;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.column.DRIColumn;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRColumn class.</p>
@@ -88,7 +88,7 @@ public DRIExpression<?> getTitleExpression() {
     /**
      * <p>Setter for the field <code>titleExpression</code>.</p>
      *
-     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param titleExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setTitleExpression(final DRIExpression<?> titleExpression) {
         this.titleExpression = titleExpression;
@@ -103,7 +103,7 @@ public DRIReportStyle getTitleStyle() {
     /**
      * <p>Setter for the field <code>titleStyle</code>.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setTitleStyle(final DRIReportStyle titleStyle) {
         this.titleStyle = titleStyle;
@@ -136,7 +136,7 @@ public ComponentDimensionType getTitleHeightType() {
     /**
      * <p>Setter for the field <code>titleHeightType</code>.</p>
      *
-     * @param titleHeightType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @param titleHeightType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public void setTitleHeightType(final ComponentDimensionType titleHeightType) {
         this.titleHeightType = titleHeightType;
@@ -186,7 +186,7 @@ public TextAdjust getTitleTextAdjust() {
     /**
      * <p>Setter for the field <code>titleTextAdjust</code>.</p>
      *
-     * @param titleStretchWithOverflow a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param titleStretchWithOverflow a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     public void setTitleTextAdjust(final TextAdjust titleTextAdjust) {
         this.titleTextAdjust = titleTextAdjust;
@@ -210,7 +210,7 @@ public void setTitlePropertyExpressions(final List<DRIPropertyExpression> titleP
     /**
      * <p>addTitlePropertyExpression.</p>
      *
-     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @param propertyExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
      */
     public void addTitlePropertyExpression(final DRIPropertyExpression propertyExpression) {
         Validate.notNull(propertyExpression, "propertyExpression must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRValueColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRValueColumn.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRValueColumn.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRValueColumn.java
index d5104b4..b613621 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/column/DRValueColumn.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/column/DRValueColumn.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.column;
+package software.xdev.dynamicreports.report.base.column;
 
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.column.DRIValueColumn;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
 
 /**
  * <p>DRValueColumn class.</p>
@@ -36,7 +36,7 @@ public class DRValueColumn<T> extends DRColumn<DRITextField<T>> implements DRIVa
     /**
      * <p>Constructor for DRValueColumn.</p>
      *
-     * @param valueField a {@link net.sf.dynamicreports.report.base.component.DRTextField} object.
+     * @param valueField a {@link software.xdev.dynamicreports.report.base.component.DRTextField} object.
      */
     public DRValueColumn(DRTextField<T> valueField) {
         super(valueField);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBooleanField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRBooleanField.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBooleanField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRBooleanField.java
index 1224b1b..da43dcc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBooleanField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRBooleanField.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
-
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+package software.xdev.dynamicreports.report.base.component;
+
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.component.DRIBooleanField;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -51,7 +51,7 @@ public DRIExpression<Boolean> getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setValueExpression(DRIExpression<Boolean> valueExpression) {
         Validate.notNull(valueExpression, "valueExpression must not be null");
@@ -67,7 +67,7 @@ public BooleanComponentType getComponentType() {
     /**
      * <p>Setter for the field <code>componentType</code>.</p>
      *
-     * @param componentType a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+     * @param componentType a {@link software.xdev.dynamicreports.report.constant.BooleanComponentType} object.
      */
     public void setComponentType(BooleanComponentType componentType) {
         this.componentType = componentType;
@@ -133,7 +133,7 @@ public HorizontalImageAlignment getHorizontalImageAlignment() {
     /**
      * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
         this.horizontalImageAlignment = horizontalImageAlignment;
@@ -148,7 +148,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
         this.horizontalTextAlignment = horizontalTextAlignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBreak.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRBreak.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBreak.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRBreak.java
index e0e6c5b..07fdfb9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRBreak.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRBreak.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.BreakType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIBreak;
+import software.xdev.dynamicreports.report.constant.BreakType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIBreak;
 
 /**
  * <p>DRBreak class.</p>
@@ -41,7 +41,7 @@ public BreakType getType() {
     /**
      * <p>setType.</p>
      *
-     * @param breakType a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     * @param breakType a {@link software.xdev.dynamicreports.report.constant.BreakType} object.
      */
     public void setType(BreakType breakType) {
         this.breakType = breakType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRComponent.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRComponent.java
index d95eb21..7352648 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRComponent.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
-
-import net.sf.dynamicreports.report.base.DRTableOfContentsHeading;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+package software.xdev.dynamicreports.report.base.component;
+
+import software.xdev.dynamicreports.report.base.DRTableOfContentsHeading;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
@@ -66,7 +66,7 @@ public DRIReportStyle getStyle() {
     /**
      * <p>Setter for the field <code>style</code>.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setStyle(DRIReportStyle style) {
         this.style = style;
@@ -81,7 +81,7 @@ public DRIExpression<Boolean> getPrintWhenExpression() {
     /**
      * <p>Setter for the field <code>printWhenExpression</code>.</p>
      *
-     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param printWhenExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
         this.printWhenExpression = printWhenExpression;
@@ -120,7 +120,7 @@ public void setPropertyExpressions(List<DRIPropertyExpression> propertyExpressio
     /**
      * <p>addPropertyExpression.</p>
      *
-     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @param propertyExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
      */
     public void addPropertyExpression(DRIPropertyExpression propertyExpression) {
         Validate.notNull(propertyExpression, "propertyExpression must not be null");
@@ -136,7 +136,7 @@ public DRTableOfContentsHeading getTableOfContentsHeading() {
     /**
      * <p>Setter for the field <code>tableOfContentsHeading</code>.</p>
      *
-     * @param tableOfContentsHeading a {@link net.sf.dynamicreports.report.base.DRTableOfContentsHeading} object.
+     * @param tableOfContentsHeading a {@link software.xdev.dynamicreports.report.base.DRTableOfContentsHeading} object.
      */
     public void setTableOfContentsHeading(DRTableOfContentsHeading tableOfContentsHeading) {
         this.tableOfContentsHeading = tableOfContentsHeading;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRCurrentDate.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRCurrentDate.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRCurrentDate.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRCurrentDate.java
index 512f069..ca92c2e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRCurrentDate.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRCurrentDate.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRICurrentDate;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRICurrentDate;
 
 /**
  * <p>DRCurrentDate class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRDimensionComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRDimensionComponent.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRDimensionComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRDimensionComponent.java
index 4334c60..9d80667 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRDimensionComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRDimensionComponent.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
-
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.StretchType;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+package software.xdev.dynamicreports.report.base.component;
+
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -89,7 +89,7 @@ public ComponentDimensionType getWidthType() {
     /**
      * <p>Setter for the field <code>widthType</code>.</p>
      *
-     * @param widthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @param widthType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public void setWidthType(ComponentDimensionType widthType) {
         this.widthType = widthType;
@@ -104,7 +104,7 @@ public ComponentDimensionType getHeightType() {
     /**
      * <p>Setter for the field <code>heightType</code>.</p>
      *
-     * @param heightType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @param heightType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public void setHeightType(ComponentDimensionType heightType) {
         this.heightType = heightType;
@@ -119,7 +119,7 @@ public ComponentPositionType getPositionType() {
     /**
      * <p>Setter for the field <code>positionType</code>.</p>
      *
-     * @param positionType a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     * @param positionType a {@link software.xdev.dynamicreports.report.constant.ComponentPositionType} object.
      */
     public void setPositionType(ComponentPositionType positionType) {
         this.positionType = positionType;
@@ -134,7 +134,7 @@ public StretchType getStretchType() {
     /**
      * <p>Setter for the field <code>stretchType</code>.</p>
      *
-     * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     * @param stretchType a {@link software.xdev.dynamicreports.report.constant.StretchType} object.
      */
     public void setStretchType(StretchType stretchType) {
         this.stretchType = stretchType;
@@ -179,7 +179,7 @@ public DRIGroup getPrintWhenGroupChanges() {
     /**
      * <p>Setter for the field <code>printWhenGroupChanges</code>.</p>
      *
-     * @param printWhenGroupChanges a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @param printWhenGroupChanges a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     public void setPrintWhenGroupChanges(DRIGroup printWhenGroupChanges) {
         this.printWhenGroupChanges = printWhenGroupChanges;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DREllipse.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DREllipse.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DREllipse.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DREllipse.java
index 4c95743..bc40ee0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DREllipse.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DREllipse.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.base.style.DRPen;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIEllipse;
+import software.xdev.dynamicreports.report.base.style.DRPen;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIEllipse;
 
 /**
  * <p>DREllipse class.</p>
@@ -41,7 +41,7 @@ public DRPen getPen() {
     /**
      * <p>Setter for the field <code>pen</code>.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public void setPen(DRPen pen) {
         this.pen = pen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFiller.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRFiller.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFiller.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRFiller.java
index dc0a272..3582410 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFiller.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRFiller.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIFiller;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIFiller;
 
 /**
  * <p>DRFiller class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFormatField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRFormatField.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFormatField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRFormatField.java
index dedb292..e4db3de 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRFormatField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRFormatField.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.component.DRIFormatField;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.component.DRIFormatField;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -44,7 +44,7 @@ public DRIExpression<String> getFormatExpression() {
     /**
      * <p>Setter for the field <code>formatExpression</code>.</p>
      *
-     * @param formatExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param formatExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setFormatExpression(DRIExpression<String> formatExpression) {
         Validate.notNull(formatExpression, "formatExpression must not be null");
@@ -60,7 +60,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
         this.horizontalTextAlignment = horizontalTextAlignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRGenericElement.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRGenericElement.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRGenericElement.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRGenericElement.java
index 0ddee36..075fdd8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRGenericElement.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRGenericElement.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIGenericElement;
-import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIGenericElement;
+import software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression;
 import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
@@ -107,7 +107,7 @@ public void setParameterExpressions(List<DRIParameterExpression> parameterExpres
     /**
      * <p>addParameterExpression.</p>
      *
-     * @param parameterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIParameterExpression} object.
+     * @param parameterExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression} object.
      */
     public void addParameterExpression(DRIParameterExpression parameterExpression) {
         Validate.notNull(parameterExpression, "parameterExpression must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRHyperLinkComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRHyperLinkComponent.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRHyperLinkComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRHyperLinkComponent.java
index 001e6ee..a39ca39 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRHyperLinkComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRHyperLinkComponent.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.base.DRHyperLink;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIHyperLinkComponent;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.DRHyperLink;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIHyperLinkComponent;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>Abstract DRHyperLinkComponent class.</p>
@@ -44,7 +44,7 @@ public DRIExpression<String> getAnchorNameExpression() {
     /**
      * <p>Setter for the field <code>anchorNameExpression</code>.</p>
      *
-     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param anchorNameExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setAnchorNameExpression(DRIExpression<String> anchorNameExpression) {
         this.anchorNameExpression = anchorNameExpression;
@@ -74,7 +74,7 @@ public DRHyperLink getHyperLink() {
     /**
      * <p>Setter for the field <code>hyperLink</code>.</p>
      *
-     * @param hyperLink a {@link net.sf.dynamicreports.report.base.DRHyperLink} object.
+     * @param hyperLink a {@link software.xdev.dynamicreports.report.base.DRHyperLink} object.
      */
     public void setHyperLink(DRHyperLink hyperLink) {
         this.hyperLink = hyperLink;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRImage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRImage.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRImage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRImage.java
index 321690e..837a0b4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRImage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRImage.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.definition.component.DRIImage;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.definition.component.DRIImage;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -48,7 +48,7 @@ public DRIExpression<?> getImageExpression() {
     /**
      * <p>Setter for the field <code>imageExpression</code>.</p>
      *
-     * @param imageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param imageExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setImageExpression(DRIExpression<?> imageExpression) {
         Validate.notNull(imageExpression, "imageExpression must not be null");
@@ -64,7 +64,7 @@ public ImageScale getImageScale() {
     /**
      * <p>Setter for the field <code>imageScale</code>.</p>
      *
-     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @param imageScale a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      */
     public void setImageScale(ImageScale imageScale) {
         this.imageScale = imageScale;
@@ -109,7 +109,7 @@ public HorizontalImageAlignment getHorizontalImageAlignment() {
     /**
      * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
         this.horizontalImageAlignment = horizontalImageAlignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRLine.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRLine.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRLine.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRLine.java
index a83d920..f2d6e4b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRLine.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRLine.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.base.style.DRPen;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.LineDirection;
-import net.sf.dynamicreports.report.definition.component.DRILine;
+import software.xdev.dynamicreports.report.base.style.DRPen;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.LineDirection;
+import software.xdev.dynamicreports.report.definition.component.DRILine;
 
 /**
  * <p>DRLine class.</p>
@@ -43,7 +43,7 @@ public LineDirection getDirection() {
     /**
      * <p>Setter for the field <code>direction</code>.</p>
      *
-     * @param direction a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     * @param direction a {@link software.xdev.dynamicreports.report.constant.LineDirection} object.
      */
     public void setDirection(LineDirection direction) {
         this.direction = direction;
@@ -58,7 +58,7 @@ public DRPen getPen() {
     /**
      * <p>Setter for the field <code>pen</code>.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public void setPen(DRPen pen) {
         this.pen = pen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRList.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRList.java
index cf29e35..451a0c8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRList.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.component.DRIList;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.component.DRIList;
 import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
@@ -51,7 +51,7 @@ public DRList() {
     /**
      * <p>Constructor for DRList.</p>
      *
-     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @param type a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public DRList(ListType type) {
         setType(type);
@@ -73,7 +73,7 @@ public List<DRListCell> getListCells() {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public void addComponent(DRComponent component) {
         listCells.add(new DRListCell(component));
@@ -82,7 +82,7 @@ public void addComponent(DRComponent component) {
     /**
      * <p>addCell.</p>
      *
-     * @param cell a {@link net.sf.dynamicreports.report.base.component.DRListCell} object.
+     * @param cell a {@link software.xdev.dynamicreports.report.base.component.DRListCell} object.
      */
     public void addCell(DRListCell cell) {
         Validate.notNull(cell, "cell must not be null");
@@ -92,9 +92,9 @@ public void addCell(DRListCell cell) {
     /**
      * <p>addComponent.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
-     * @param component           a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public void addComponent(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRComponent component) {
         listCells.add(new DRListCell(horizontalAlignment, verticalAlignment, component));
@@ -109,7 +109,7 @@ public ListType getType() {
     /**
      * <p>Setter for the field <code>type</code>.</p>
      *
-     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @param type a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public void setType(ListType type) {
         Validate.notNull(type, "type must not be null");
@@ -143,7 +143,7 @@ public DRComponent getBackgroundComponent() {
     /**
      * <p>Setter for the field <code>backgroundComponent</code>.</p>
      *
-     * @param backgroundComponent a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param backgroundComponent a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public void setBackgroundComponent(DRComponent backgroundComponent) {
         this.backgroundComponent = backgroundComponent;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRListCell.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRListCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRListCell.java
index 3ea9530..62b3cc9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRListCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRListCell.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.component.DRIListCell;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.component.DRIListCell;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -39,7 +39,7 @@ public class DRListCell implements DRIListCell {
     /**
      * <p>Constructor for DRListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public DRListCell(DRComponent component) {
         Validate.notNull(component, "component must not be null");
@@ -49,9 +49,9 @@ public DRListCell(DRComponent component) {
     /**
      * <p>Constructor for DRListCell.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
-     * @param component           a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public DRListCell(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRComponent component) {
         this(component);
@@ -68,7 +68,7 @@ public HorizontalCellComponentAlignment getHorizontalAlignment() {
     /**
      * <p>Setter for the field <code>horizontalAlignment</code>.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
      */
     public void setHorizontalAlignment(HorizontalCellComponentAlignment horizontalAlignment) {
         this.horizontalAlignment = horizontalAlignment;
@@ -83,7 +83,7 @@ public VerticalCellComponentAlignment getVerticalAlignment() {
     /**
      * <p>Setter for the field <code>verticalAlignment</code>.</p>
      *
-     * @param verticalAlignment a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param verticalAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
      */
     public void setVerticalAlignment(VerticalCellComponentAlignment verticalAlignment) {
         this.verticalAlignment = verticalAlignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMap.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRMap.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMap.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRMap.java
index 64dffe1..8af41c8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMap.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRMap.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIMap;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIMap;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRMap class.</p>
@@ -43,7 +43,7 @@ public DRIExpression<Float> getLatitudeExpression() {
     /**
      * <p>Setter for the field <code>latitudeExpression</code>.</p>
      *
-     * @param latitudeExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param latitudeExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setLatitudeExpression(DRIExpression<Float> latitudeExpression) {
         this.latitudeExpression = latitudeExpression;
@@ -58,7 +58,7 @@ public DRIExpression<Float> getLongitudeExpression() {
     /**
      * <p>Setter for the field <code>longitudeExpression</code>.</p>
      *
-     * @param longitudeExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param longitudeExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setLongitudeExpression(DRIExpression<Float> longitudeExpression) {
         this.longitudeExpression = longitudeExpression;
@@ -73,7 +73,7 @@ public DRIExpression<Integer> getZoomExpression() {
     /**
      * <p>Setter for the field <code>zoomExpression</code>.</p>
      *
-     * @param zoomExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param zoomExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setZoomExpression(DRIExpression<Integer> zoomExpression) {
         this.zoomExpression = zoomExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMultiPageList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRMultiPageList.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMultiPageList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRMultiPageList.java
index 3fdcb66..f6badcb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRMultiPageList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRMultiPageList.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.component.DRIMultiPageList;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.component.DRIMultiPageList;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,7 +62,7 @@ public void setComponents(List<DRIComponent> components) {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public void addComponent(DRIComponent component) {
         components.add(component);
@@ -77,7 +77,7 @@ public SplitType getSplitType() {
     /**
      * <p>Setter for the field <code>splitType</code>.</p>
      *
-     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public void setSplitType(SplitType splitType) {
         this.splitType = splitType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageNumber.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRPageNumber.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageNumber.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRPageNumber.java
index d7d7ab6..57fc7bc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageNumber.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRPageNumber.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIPageNumber;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIPageNumber;
 
 /**
  * <p>DRPageNumber class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageXofY.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRPageXofY.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageXofY.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRPageXofY.java
index 1468e25..36a587b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRPageXofY.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRPageXofY.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIPageXofY;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIPageXofY;
 
 /**
  * <p>DRPageXofY class.</p>
@@ -59,7 +59,7 @@ public ComponentDimensionType getPageXWidthType() {
     /**
      * <p>Setter for the field <code>pageXWidthType</code>.</p>
      *
-     * @param pageXWidthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @param pageXWidthType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public void setPageXWidthType(ComponentDimensionType pageXWidthType) {
         this.pageXWidthType = pageXWidthType;
@@ -89,7 +89,7 @@ public ComponentDimensionType getPageYWidthType() {
     /**
      * <p>Setter for the field <code>pageYWidthType</code>.</p>
      *
-     * @param pageYWidthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @param pageYWidthType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public void setPageYWidthType(ComponentDimensionType pageYWidthType) {
         this.pageYWidthType = pageYWidthType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRRectangle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRRectangle.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRRectangle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRRectangle.java
index e3d94e7..328ab2a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRRectangle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRRectangle.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.base.style.DRPen;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIRectangle;
+import software.xdev.dynamicreports.report.base.style.DRPen;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIRectangle;
 
 /**
  * <p>DRRectangle class.</p>
@@ -57,7 +57,7 @@ public DRPen getPen() {
     /**
      * <p>Setter for the field <code>pen</code>.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public void setPen(DRPen pen) {
         this.pen = pen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRSubreport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRSubreport.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRSubreport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRSubreport.java
index 54292dd..60262e3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRSubreport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRSubreport.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRISubreport;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRISubreport;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 import java.sql.Connection;
@@ -49,7 +49,7 @@ public DRIExpression<?> getReportExpression() {
     /**
      * <p>Setter for the field <code>reportExpression</code>.</p>
      *
-     * @param reportExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param reportExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setReportExpression(DRIExpression<?> reportExpression) {
         Validate.notNull(reportExpression, "reportExpression must not be null");
@@ -65,7 +65,7 @@ public DRIExpression<Map<String, Object>> getParametersExpression() {
     /**
      * <p>Setter for the field <code>parametersExpression</code>.</p>
      *
-     * @param parametersExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param parametersExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setParametersExpression(DRIExpression<Map<String, Object>> parametersExpression) {
         this.parametersExpression = parametersExpression;
@@ -80,7 +80,7 @@ public DRIExpression<Connection> getConnectionExpression() {
     /**
      * <p>Setter for the field <code>connectionExpression</code>.</p>
      *
-     * @param connectionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param connectionExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setConnectionExpression(DRIExpression<Connection> connectionExpression) {
         this.connectionExpression = connectionExpression;
@@ -95,7 +95,7 @@ public DRIExpression<?> getDataSourceExpression() {
     /**
      * <p>Setter for the field <code>dataSourceExpression</code>.</p>
      *
-     * @param dataSourceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param dataSourceExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setDataSourceExpression(DRIExpression<?> dataSourceExpression) {
         this.dataSourceExpression = dataSourceExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTextField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRTextField.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTextField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRTextField.java
index d93640f..dd3139c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTextField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRTextField.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.DRGroup;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.base.DRGroup;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 
 /**
  * <p>DRTextField class.</p>
@@ -63,7 +63,7 @@ public DRIExpression<T> getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setValueExpression(final DRIExpression<T> valueExpression) {
         Validate.notNull(valueExpression, "valueExpression must not be null");
@@ -94,7 +94,7 @@ public DRIExpression<String> getPatternExpression() {
     /**
      * <p>Setter for the field <code>patternExpression</code>.</p>
      *
-     * @param patternExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param patternExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setPatternExpression(final DRIExpression<String> patternExpression) {
         this.patternExpression = patternExpression;
@@ -109,7 +109,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
         this.horizontalTextAlignment = horizontalTextAlignment;
@@ -124,7 +124,7 @@ public void setHorizontalTextAlignment(final HorizontalTextAlignment horizontalT
     /**
      * <p>Setter for the field <code>valueFormatter</code>.</p>
      *
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      */
     public void setValueFormatter(final DRIValueFormatter<?, ? super T> valueFormatter) {
         this.valueFormatter = valueFormatter;
@@ -139,7 +139,7 @@ public DRIDataType<? super T, T> getDataType() {
     /**
      * <p>Setter for the field <code>dataType</code>.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     public void setDataType(final DRIDataType<? super T, T> dataType) {
         this.dataType = dataType;
@@ -200,7 +200,7 @@ public Evaluation getEvaluationTime() {
     /**
      * <p>Setter for the field <code>evaluationTime</code>.</p>
      *
-     * @param evaluationTime a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @param evaluationTime a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
      */
     public void setEvaluationTime(final Evaluation evaluationTime) {
         this.evaluationTime = evaluationTime;
@@ -215,7 +215,7 @@ public DRGroup getEvaluationGroup() {
     /**
      * <p>Setter for the field <code>evaluationGroup</code>.</p>
      *
-     * @param evaluationGroup a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+     * @param evaluationGroup a {@link software.xdev.dynamicreports.report.base.DRGroup} object.
      */
     public void setEvaluationGroup(final DRGroup evaluationGroup) {
         this.evaluationGroup = evaluationGroup;
@@ -230,7 +230,7 @@ public Markup getMarkup() {
     /**
      * <p>Setter for the field <code>markup</code>.</p>
      *
-     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @param markup a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      */
     public void setMarkup(final Markup markup) {
         this.markup = markup;
@@ -277,7 +277,7 @@ public TextAdjust getTextAdjust() {
     /**
      * <p>Setter for the field <code>textAdjust</code>.</p>
      *
-     * @param setTextAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param setTextAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     public void setTextAdjust(final TextAdjust textAdjust) {
         this.textAdjust = textAdjust;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTotalPages.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRTotalPages.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTotalPages.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRTotalPages.java
index 0fe221b..6b49a81 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRTotalPages.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRTotalPages.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRITotalPages;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRITotalPages;
 
 /**
  * <p>DRTotalPages class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRXyList.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRXyList.java
index 5aaec15..eb3f3fd 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRXyList.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIXyList;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIXyList;
 import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
@@ -51,7 +51,7 @@ public List<DRXyListCell> getXyListCells() {
     /**
      * <p>addCell.</p>
      *
-     * @param cell a {@link net.sf.dynamicreports.report.base.component.DRXyListCell} object.
+     * @param cell a {@link software.xdev.dynamicreports.report.base.component.DRXyListCell} object.
      */
     public void addCell(DRXyListCell cell) {
         Validate.notNull(cell, "cell must not be null");
@@ -63,7 +63,7 @@ public void addCell(DRXyListCell cell) {
      *
      * @param x         a {@link java.lang.Integer} object.
      * @param y         a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public void addComponent(Integer x, Integer y, DRComponent component) {
         xyListCells.add(new DRXyListCell(x, y, component));
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRXyListCell.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyListCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRXyListCell.java
index b57060a..a919a89 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/component/DRXyListCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/component/DRXyListCell.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.component;
+package software.xdev.dynamicreports.report.base.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIXyListCell;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIXyListCell;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -39,7 +39,7 @@ public class DRXyListCell implements DRIXyListCell {
      *
      * @param x         a {@link java.lang.Integer} object.
      * @param y         a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public DRXyListCell(Integer x, Integer y, DRComponent component) {
         Validate.notNull(x, "x must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstab.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstab.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstab.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstab.java
index e39599b..cd963a0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstab.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstab.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
-
-import net.sf.dynamicreports.report.base.component.DRDimensionComponent;
-import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstab;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+package software.xdev.dynamicreports.report.base.crosstab;
+
+import software.xdev.dynamicreports.report.base.component.DRDimensionComponent;
+import software.xdev.dynamicreports.report.base.style.DRSimpleStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstab;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
@@ -154,7 +154,7 @@ public RunDirection getRunDirection() {
     /**
      * <p>Setter for the field <code>runDirection</code>.</p>
      *
-     * @param runDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @param runDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public void setRunDirection(RunDirection runDirection) {
         this.runDirection = runDirection;
@@ -232,7 +232,7 @@ public DRSimpleStyle getOddRowStyle() {
     /**
      * <p>Setter for the field <code>oddRowStyle</code>.</p>
      *
-     * @param oddRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+     * @param oddRowStyle a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
      */
     public void setOddRowStyle(DRSimpleStyle oddRowStyle) {
         this.oddRowStyle = oddRowStyle;
@@ -262,7 +262,7 @@ public DRSimpleStyle getEvenRowStyle() {
     /**
      * <p>Setter for the field <code>evenRowStyle</code>.</p>
      *
-     * @param evenRowStyle a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+     * @param evenRowStyle a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
      */
     public void setEvenRowStyle(DRSimpleStyle evenRowStyle) {
         this.evenRowStyle = evenRowStyle;
@@ -277,7 +277,7 @@ public DRIReportStyle getGroupStyle() {
     /**
      * <p>Setter for the field <code>groupStyle</code>.</p>
      *
-     * @param groupStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param groupStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setGroupStyle(DRIReportStyle groupStyle) {
         this.groupStyle = groupStyle;
@@ -292,7 +292,7 @@ public DRIReportStyle getGroupTotalStyle() {
     /**
      * <p>Setter for the field <code>groupTotalStyle</code>.</p>
      *
-     * @param groupTotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param groupTotalStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setGroupTotalStyle(DRIReportStyle groupTotalStyle) {
         this.groupTotalStyle = groupTotalStyle;
@@ -307,7 +307,7 @@ public DRIReportStyle getGrandTotalStyle() {
     /**
      * <p>Setter for the field <code>grandTotalStyle</code>.</p>
      *
-     * @param grandTotalStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param grandTotalStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setGrandTotalStyle(DRIReportStyle grandTotalStyle) {
         this.grandTotalStyle = grandTotalStyle;
@@ -322,7 +322,7 @@ public DRIReportStyle getCellStyle() {
     /**
      * <p>Setter for the field <code>cellStyle</code>.</p>
      *
-     * @param cellStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param cellStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setCellStyle(DRIReportStyle cellStyle) {
         this.cellStyle = cellStyle;
@@ -337,7 +337,7 @@ public DRIReportStyle getMeasureTitleStyle() {
     /**
      * <p>Setter for the field <code>measureTitleStyle</code>.</p>
      *
-     * @param measureTitleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param measureTitleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setMeasureTitleStyle(DRIReportStyle measureTitleStyle) {
         this.measureTitleStyle = measureTitleStyle;
@@ -346,7 +346,7 @@ public void setMeasureTitleStyle(DRIReportStyle measureTitleStyle) {
     /**
      * <p>addColumnGroup.</p>
      *
-     * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+     * @param columnGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
      */
     public void addColumnGroup(DRICrosstabColumnGroup<?> columnGroup) {
         Validate.notNull(columnGroup, "columnGroup must not be null");
@@ -362,7 +362,7 @@ public List<DRICrosstabRowGroup<?>> getRowGroups() {
     /**
      * <p>addRowGroup.</p>
      *
-     * @param rowGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+     * @param rowGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
      */
     public void addRowGroup(DRICrosstabRowGroup<?> rowGroup) {
         Validate.notNull(rowGroup, "rowGroup must not be null");
@@ -378,7 +378,7 @@ public List<DRICrosstabVariable<?>> getVariables() {
     /**
      * <p>addVariable.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabVariable} object.
      */
     public void addVariable(DRICrosstabVariable<?> variable) {
         Validate.notNull(variable, "variable must not be null");
@@ -394,7 +394,7 @@ public List<DRICrosstabMeasure<?>> getMeasures() {
     /**
      * <p>addMeasure.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabMeasure} object.
      */
     public void addMeasure(DRICrosstabMeasure<?> measure) {
         Validate.notNull(measure, "measure must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java
index cff8ee2..2fe7330 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabCellContent.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
+package software.xdev.dynamicreports.report.base.crosstab;
 
-import net.sf.dynamicreports.report.base.component.DRComponent;
-import net.sf.dynamicreports.report.base.component.DRList;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellContent;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.base.component.DRComponent;
+import software.xdev.dynamicreports.report.base.component.DRList;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabCellContent;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRCrosstabCellContent class.</p>
@@ -52,7 +52,7 @@ public DRList getList() {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     public void addComponent(DRComponent component) {
         list.addComponent(component);
@@ -67,7 +67,7 @@ public DRIReportStyle getStyle() {
     /**
      * <p>Setter for the field <code>style</code>.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setStyle(DRIReportStyle style) {
         this.style = style;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java
similarity index 67%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java
index ad99af7..92eee68 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabCellStyle.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
+package software.xdev.dynamicreports.report.base.crosstab;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRCrosstabCellStyle class.</p>
@@ -39,7 +39,7 @@ public class DRCrosstabCellStyle implements DRICrosstabCellStyle {
     /**
      * <p>Constructor for DRCrosstabCellStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRCrosstabCellStyle(DRIReportStyle style) {
         this(style, null, null);
@@ -48,9 +48,9 @@ public DRCrosstabCellStyle(DRIReportStyle style) {
     /**
      * <p>Constructor for DRCrosstabCellStyle.</p>
      *
-     * @param style       a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
-     * @param rowGroup    a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
-     * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+     * @param style       a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param rowGroup    a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+     * @param columnGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
      */
     public DRCrosstabCellStyle(DRIReportStyle style, DRICrosstabRowGroup<?> rowGroup, DRICrosstabColumnGroup<?> columnGroup) {
         this.style = style;
@@ -67,7 +67,7 @@ public DRICrosstabRowGroup<?> getRowGroup() {
     /**
      * <p>Setter for the field <code>rowGroup</code>.</p>
      *
-     * @param rowGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+     * @param rowGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
      */
     public void setRowGroup(DRICrosstabRowGroup<?> rowGroup) {
         this.rowGroup = rowGroup;
@@ -82,7 +82,7 @@ public DRICrosstabColumnGroup<?> getColumnGroup() {
     /**
      * <p>Setter for the field <code>columnGroup</code>.</p>
      *
-     * @param columnGroup a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+     * @param columnGroup a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
      */
     public void setColumnGroup(DRICrosstabColumnGroup<?> columnGroup) {
         this.columnGroup = columnGroup;
@@ -97,7 +97,7 @@ public DRIReportStyle getStyle() {
     /**
      * <p>Setter for the field <code>style</code>.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setStyle(DRIReportStyle style) {
         this.style = style;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java
index 4260028..020b724 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabColumnGroup.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
+package software.xdev.dynamicreports.report.base.crosstab;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup;
 
 /**
  * <p>DRCrosstabColumnGroup class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabDataset.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabDataset.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabDataset.java
index ffc814c..2532e95 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabDataset.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabDataset.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
+package software.xdev.dynamicreports.report.base.crosstab;
 
-import net.sf.dynamicreports.report.base.DRDataset;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabDataset;
+import software.xdev.dynamicreports.report.base.DRDataset;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabDataset;
 
 /**
  * <p>DRCrosstabDataset class.</p>
@@ -42,7 +42,7 @@ public DRDataset getSubDataset() {
     /**
      * <p>Setter for the field <code>subDataset</code>.</p>
      *
-     * @param subDataset a {@link net.sf.dynamicreports.report.base.DRDataset} object.
+     * @param subDataset a {@link software.xdev.dynamicreports.report.base.DRDataset} object.
      */
     public void setSubDataset(DRDataset subDataset) {
         this.subDataset = subDataset;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabGroup.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabGroup.java
index 3d81f1b..2bff21d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabGroup.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
+package software.xdev.dynamicreports.report.base.crosstab;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -23,19 +23,19 @@
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.base.DRHyperLink;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabGroup;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.base.DRHyperLink;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.CrosstabTotalPosition;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabGroup;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>Abstract DRCrosstabGroup class.</p>
@@ -107,7 +107,7 @@ public HorizontalTextAlignment getHeaderHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>headerHorizontalTextAlignment</code>.</p>
      *
-     * @param headerHorizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param headerHorizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHeaderHorizontalTextAlignment(final HorizontalTextAlignment headerHorizontalTextAlignment) {
         this.headerHorizontalTextAlignment = headerHorizontalTextAlignment;
@@ -122,7 +122,7 @@ public void setHeaderHorizontalTextAlignment(final HorizontalTextAlignment heade
     /**
      * <p>Setter for the field <code>headerValueFormatter</code>.</p>
      *
-     * @param headerValueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param headerValueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      */
     public void setHeaderValueFormatter(final DRIValueFormatter<?, ? super T> headerValueFormatter) {
         this.headerValueFormatter = headerValueFormatter;
@@ -154,7 +154,7 @@ public TextAdjust getHeaderTextAdjust() {
     /**
      * <p>Setter for the field <code>setHeaderTextAdjust</code>.</p>
      *
-     * @param headerTextAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param headerTextAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     public void setHeaderTextAdjust(final TextAdjust headerTextAdjust) {
         this.headerTextAdjust = headerTextAdjust;
@@ -169,7 +169,7 @@ public DRHyperLink getHeaderHyperLink() {
     /**
      * <p>Setter for the field <code>headerHyperLink</code>.</p>
      *
-     * @param headerHyperLink a {@link net.sf.dynamicreports.report.base.DRHyperLink} object.
+     * @param headerHyperLink a {@link software.xdev.dynamicreports.report.base.DRHyperLink} object.
      */
     public void setHeaderHyperLink(final DRHyperLink headerHyperLink) {
         this.headerHyperLink = headerHyperLink;
@@ -184,7 +184,7 @@ public DRIReportStyle getHeaderStyle() {
     /**
      * <p>Setter for the field <code>headerStyle</code>.</p>
      *
-     * @param headerStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param headerStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setHeaderStyle(final DRIReportStyle headerStyle) {
         this.headerStyle = headerStyle;
@@ -208,7 +208,7 @@ public void setHeaderPropertyExpressions(final List<DRIPropertyExpression> heade
     /**
      * <p>addHeaderPropertyExpression.</p>
      *
-     * @param headerPropertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @param headerPropertyExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
      */
     public void addHeaderPropertyExpression(final DRIPropertyExpression headerPropertyExpression) {
         Validate.notNull(headerPropertyExpression, "headerPropertyExpression must not be null");
@@ -239,7 +239,7 @@ public CrosstabTotalPosition getTotalPosition() {
     /**
      * <p>Setter for the field <code>totalPosition</code>.</p>
      *
-     * @param totalPosition a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     * @param totalPosition a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
      */
     public void setTotalPosition(final CrosstabTotalPosition totalPosition) {
         this.totalPosition = totalPosition;
@@ -254,7 +254,7 @@ public DRIExpression<?> getTotalHeaderExpression() {
     /**
      * <p>Setter for the field <code>totalHeaderExpression</code>.</p>
      *
-     * @param totalHeaderExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param totalHeaderExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setTotalHeaderExpression(final DRIExpression<?> totalHeaderExpression) {
         this.totalHeaderExpression = totalHeaderExpression;
@@ -286,7 +286,7 @@ public TextAdjust getTotalHeaderTextAdjust() {
     /**
      * <p>Setter for the field <code>totalHeaderTextAdjust</code>.</p>
      *
-     * @param headerTextAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param headerTextAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     public void setTotalHeaderTextAdjust(final TextAdjust headerTextAdjust) {
         this.totalHeaderTextAdjust = headerTextAdjust;
@@ -301,7 +301,7 @@ public DRIReportStyle getTotalHeaderStyle() {
     /**
      * <p>Setter for the field <code>totalHeaderStyle</code>.</p>
      *
-     * @param totalHeaderStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param totalHeaderStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setTotalHeaderStyle(final DRIReportStyle totalHeaderStyle) {
         this.totalHeaderStyle = totalHeaderStyle;
@@ -325,7 +325,7 @@ public void setTotalHeaderPropertyExpressions(final List<DRIPropertyExpression>
     /**
      * <p>addTotalHeaderPropertyExpression.</p>
      *
-     * @param totalHeaderPropertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @param totalHeaderPropertyExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
      */
     public void addTotalHeaderPropertyExpression(final DRIPropertyExpression totalHeaderPropertyExpression) {
         Validate.notNull(totalHeaderPropertyExpression, "totalHeaderPropertyExpression must not be null");
@@ -341,7 +341,7 @@ public DRIExpression<T> getExpression() {
     /**
      * <p>Setter for the field <code>expression</code>.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setExpression(final DRIExpression<T> expression) {
         Validate.notNull(expression, "expression must not be null");
@@ -357,7 +357,7 @@ public DRIDataType<? super T, T> getDataType() {
     /**
      * <p>Setter for the field <code>dataType</code>.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     public void setDataType(final DRIDataType<? super T, T> dataType) {
         this.dataType = dataType;
@@ -372,7 +372,7 @@ public DRIExpression<? extends Comparable<?>> getOrderByExpression() {
     /**
      * <p>Setter for the field <code>orderByExpression</code>.</p>
      *
-     * @param orderByExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param orderByExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setOrderByExpression(final DRIExpression<? extends Comparable<?>> orderByExpression) {
         this.orderByExpression = orderByExpression;
@@ -387,7 +387,7 @@ public OrderType getOrderType() {
     /**
      * <p>Setter for the field <code>orderType</code>.</p>
      *
-     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @param orderType a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      */
     public void setOrderType(final OrderType orderType) {
         this.orderType = orderType;
@@ -402,7 +402,7 @@ public DRIExpression<? extends Comparator<?>> getComparatorExpression() {
     /**
      * <p>Setter for the field <code>comparatorExpression</code>.</p>
      *
-     * @param comparatorExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param comparatorExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setComparatorExpression(final DRIExpression<? extends Comparator<?>> comparatorExpression) {
         this.comparatorExpression = comparatorExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java
index da1f5ac..be4a854 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabMeasure.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
+package software.xdev.dynamicreports.report.base.crosstab;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.base.DRHyperLink;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.base.DRHyperLink;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabCellStyle;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabMeasure;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRCrosstabMeasure class.</p>
@@ -61,7 +61,7 @@ public class DRCrosstabMeasure<T> implements DRICrosstabMeasure<T> {
     /**
      * <p>Constructor for DRCrosstabMeasure.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRCrosstabMeasure(final DRIExpression<?> expression) {
         Validate.notNull(expression, "expression must not be null");
@@ -92,7 +92,7 @@ public DRIDataType<? super T, T> getDataType() {
     /**
      * <p>Setter for the field <code>dataType</code>.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     public void setDataType(final DRIDataType<? super T, T> dataType) {
         this.dataType = dataType;
@@ -122,7 +122,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
         this.horizontalTextAlignment = horizontalTextAlignment;
@@ -137,7 +137,7 @@ public void setHorizontalTextAlignment(final HorizontalTextAlignment horizontalT
     /**
      * <p>Setter for the field <code>valueFormatter</code>.</p>
      *
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      */
     public void setValueFormatter(final DRIValueFormatter<?, ? super T> valueFormatter) {
         this.valueFormatter = valueFormatter;
@@ -169,7 +169,7 @@ public TextAdjust getTextAdjust() {
     /**
      * <p>Setter for the field <code>textAdjust</code>.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     public void setTextAdjust(final TextAdjust textAdjust) {
         this.textAdjust = textAdjust;
@@ -184,7 +184,7 @@ public DRHyperLink getHyperLink() {
     /**
      * <p>Setter for the field <code>hyperLink</code>.</p>
      *
-     * @param hyperLink a {@link net.sf.dynamicreports.report.base.DRHyperLink} object.
+     * @param hyperLink a {@link software.xdev.dynamicreports.report.base.DRHyperLink} object.
      */
     public void setHyperLink(final DRHyperLink hyperLink) {
         this.hyperLink = hyperLink;
@@ -208,7 +208,7 @@ public void setPropertyExpressions(final List<DRIPropertyExpression> propertyExp
     /**
      * <p>addPropertyExpression.</p>
      *
-     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @param propertyExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
      */
     public void addPropertyExpression(final DRIPropertyExpression propertyExpression) {
         Validate.notNull(propertyExpression, "propertyExpression must not be null");
@@ -239,7 +239,7 @@ public DRIExpression<?> getTitleExpression() {
     /**
      * <p>Setter for the field <code>titleExpression</code>.</p>
      *
-     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param titleExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setTitleExpression(final DRIExpression<?> titleExpression) {
         this.titleExpression = titleExpression;
@@ -254,7 +254,7 @@ public DRIReportStyle getTitleStyle() {
     /**
      * <p>Setter for the field <code>titleStyle</code>.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setTitleStyle(final DRIReportStyle titleStyle) {
         this.titleStyle = titleStyle;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java
index bed6616..f8a0a2d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabRowGroup.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
+package software.xdev.dynamicreports.report.base.crosstab;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup;
 
 /**
  * <p>DRCrosstabRowGroup class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabVariable.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabVariable.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabVariable.java
index 4625d15..9a25bde 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/crosstab/DRCrosstabVariable.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/crosstab/DRCrosstabVariable.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.crosstab;
+package software.xdev.dynamicreports.report.base.crosstab;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabVariable;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -42,8 +42,8 @@ public class DRCrosstabVariable<T> implements DRICrosstabVariable<T> {
     /**
      * <p>Constructor for DRCrosstabVariable.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation     a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation     a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public DRCrosstabVariable(DRIExpression<?> valueExpression, Calculation calculation) {
         Validate.notNull(valueExpression, "valueExpression must not be null");
@@ -80,7 +80,7 @@ public CrosstabPercentageType getPercentageType() {
     /**
      * <p>Setter for the field <code>percentageType</code>.</p>
      *
-     * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     * @param percentageType a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
      */
     public void setPercentageType(CrosstabPercentageType percentageType) {
         this.percentageType = percentageType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/AbstractDataType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/datatype/AbstractDataType.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/AbstractDataType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/datatype/AbstractDataType.java
index d0ac9c7..41f3980 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/AbstractDataType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/datatype/AbstractDataType.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.datatype;
+package software.xdev.dynamicreports.report.base.datatype;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.Locale;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/DRDataType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/datatype/DRDataType.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/DRDataType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/datatype/DRDataType.java
index 2228a96..e40b103 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/datatype/DRDataType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/datatype/DRDataType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.datatype;
+package software.xdev.dynamicreports.report.base.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 
 /**
  * <p>DRDataType class.</p>
@@ -53,7 +53,7 @@ public DRDataType(String pattern) {
      * <p>Constructor for DRDataType.</p>
      *
      * @param pattern                 a {@link java.lang.String} object.
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public DRDataType(String pattern, HorizontalTextAlignment horizontalTextAlignment) {
         this.pattern = pattern;
@@ -84,7 +84,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
         this.horizontalTextAlignment = horizontalTextAlignment;
@@ -99,7 +99,7 @@ public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAli
     /**
      * <p>Setter for the field <code>valueFormatter</code>.</p>
      *
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      */
     public void setValueFormatter(DRIValueFormatter<?, ? extends U> valueFormatter) {
         this.valueFormatter = valueFormatter;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractSimpleExpression.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSimpleExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractSimpleExpression.java
index 3e67960..bac8636 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSimpleExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractSimpleExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.expression;
+package software.xdev.dynamicreports.report.base.expression;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractSystemExpression.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSystemExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractSystemExpression.java
index 40d041f..e41cba1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractSystemExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractSystemExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.expression;
+package software.xdev.dynamicreports.report.base.expression;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRISystemExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractValueFormatter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractValueFormatter.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractValueFormatter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractValueFormatter.java
index e38ca6c..9617d57 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/expression/AbstractValueFormatter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/expression/AbstractValueFormatter.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.expression;
+package software.xdev.dynamicreports.report.base.expression;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGrid.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGrid.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGrid.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGrid.java
index 8b3ba6e..2822ab3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGrid.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGrid.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.grid;
+package software.xdev.dynamicreports.report.base.grid;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGrid;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGrid;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent;
 
 /**
  * <p>DRColumnGrid class.</p>
@@ -43,7 +43,7 @@ public DRColumnGrid() {
     /**
      * <p>Constructor for DRColumnGrid.</p>
      *
-     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @param type a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public DRColumnGrid(ListType type) {
         this.list = new DRColumnGridList(type);
@@ -58,7 +58,7 @@ public DRColumnGridList getList() {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
      */
     public void addComponent(DRIColumnGridComponent component) {
         list.addComponent(component);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGridList.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGridList.java
index e5fcbf6..b61454c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGridList.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.grid;
+package software.xdev.dynamicreports.report.base.grid;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridList;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridList;
 import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
@@ -51,7 +51,7 @@ public DRColumnGridList() {
     /**
      * <p>Constructor for DRColumnGridList.</p>
      *
-     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @param type a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public DRColumnGridList(ListType type) {
         setType(type);
@@ -67,7 +67,7 @@ public List<DRColumnGridListCell> getListCells() {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
      */
     public void addComponent(DRIColumnGridComponent component) {
         listCells.add(new DRColumnGridListCell(component));
@@ -76,7 +76,7 @@ public void addComponent(DRIColumnGridComponent component) {
     /**
      * <p>addCell.</p>
      *
-     * @param cell a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridListCell} object.
+     * @param cell a {@link software.xdev.dynamicreports.report.base.grid.DRColumnGridListCell} object.
      */
     public void addCell(DRColumnGridListCell cell) {
         Validate.notNull(cell, "cell must not be null");
@@ -86,9 +86,9 @@ public void addCell(DRColumnGridListCell cell) {
     /**
      * <p>addComponent.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
-     * @param component           a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
      */
     public void addComponent(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRIColumnGridComponent component) {
         listCells.add(new DRColumnGridListCell(horizontalAlignment, verticalAlignment, component));
@@ -103,7 +103,7 @@ public ListType getType() {
     /**
      * <p>Setter for the field <code>type</code>.</p>
      *
-     * @param type a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @param type a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public void setType(ListType type) {
         Validate.notNull(type, "type must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGridListCell.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridListCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGridListCell.java
index 91b02b8..783687e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnGridListCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnGridListCell.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.grid;
+package software.xdev.dynamicreports.report.base.grid;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridListCell;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridListCell;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -40,7 +40,7 @@ public class DRColumnGridListCell implements DRIColumnGridListCell {
     /**
      * <p>Constructor for DRColumnGridListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
      */
     public DRColumnGridListCell(DRIColumnGridComponent component) {
         Validate.notNull(component, "component must not be null");
@@ -50,9 +50,9 @@ public DRColumnGridListCell(DRIColumnGridComponent component) {
     /**
      * <p>Constructor for DRColumnGridListCell.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
-     * @param component           a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param component           a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
      */
     public DRColumnGridListCell(HorizontalCellComponentAlignment horizontalAlignment, VerticalCellComponentAlignment verticalAlignment, DRIColumnGridComponent component) {
         this(component);
@@ -69,7 +69,7 @@ public HorizontalCellComponentAlignment getHorizontalAlignment() {
     /**
      * <p>Setter for the field <code>horizontalAlignment</code>.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
      */
     public void setHorizontalAlignment(HorizontalCellComponentAlignment horizontalAlignment) {
         this.horizontalAlignment = horizontalAlignment;
@@ -84,7 +84,7 @@ public VerticalCellComponentAlignment getVerticalAlignment() {
     /**
      * <p>Setter for the field <code>verticalAlignment</code>.</p>
      *
-     * @param verticalAlignment a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @param verticalAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
      */
     public void setVerticalAlignment(VerticalCellComponentAlignment verticalAlignment) {
         this.verticalAlignment = verticalAlignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnTitleGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnTitleGroup.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnTitleGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnTitleGroup.java
index 329d446..928efcc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/grid/DRColumnTitleGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/grid/DRColumnTitleGroup.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.grid;
+package software.xdev.dynamicreports.report.base.grid;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnTitleGroup;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnTitleGroup;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRColumnTitleGroup class.</p>
@@ -72,7 +72,7 @@ public DRColumnGridList getList() {
     /**
      * <p>addComponent.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     * @param component a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
      */
     public void addComponent(final DRIColumnGridComponent component) {
         list.addComponent(component);
@@ -87,7 +87,7 @@ public DRIExpression<?> getTitleExpression() {
     /**
      * <p>Setter for the field <code>titleExpression</code>.</p>
      *
-     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param titleExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setTitleExpression(final DRIExpression<?> titleExpression) {
         this.titleExpression = titleExpression;
@@ -102,7 +102,7 @@ public DRIReportStyle getTitleStyle() {
     /**
      * <p>Setter for the field <code>titleStyle</code>.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setTitleStyle(final DRIReportStyle titleStyle) {
         this.titleStyle = titleStyle;
@@ -123,7 +123,7 @@ public Integer getTitleWidth() {
      *
      * @param titleWidth the column title width >= 0
      * @throws java.lang.IllegalArgumentException if <code>titleWidth</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public void setTitleWidth(final Integer titleWidth) {
         if (titleWidth != null) {
@@ -141,7 +141,7 @@ public ComponentDimensionType getTitleWidthType() {
     /**
      * <p>Setter for the field <code>titleWidthType</code>.</p>
      *
-     * @param titleWidthType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @param titleWidthType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public void setTitleWidthType(final ComponentDimensionType titleWidthType) {
         this.titleWidthType = titleWidthType;
@@ -185,7 +185,7 @@ public Integer getTitleHeight() {
      *
      * @param titleHeight the column title height >= 0
      * @throws java.lang.IllegalArgumentException if <code>titleHeight</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public void setTitleHeight(final Integer titleHeight) {
         if (titleHeight != null) {
@@ -203,7 +203,7 @@ public ComponentDimensionType getTitleHeightType() {
     /**
      * <p>Setter for the field <code>titleHeightType</code>.</p>
      *
-     * @param titleHeightType a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @param titleHeightType a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public void setTitleHeightType(final ComponentDimensionType titleHeightType) {
         this.titleHeightType = titleHeightType;
@@ -258,7 +258,7 @@ public TextAdjust getTitleTextAdjust() {
     /**
      * <p>Setter for the field <code>titleTextAdjust</code>.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     public void setTitleTextAdjust(final TextAdjust textAdjust) {
         this.titleTextAdjust = textAdjust;
@@ -282,7 +282,7 @@ public void setTitlePropertyExpressions(final List<DRIPropertyExpression> titleP
     /**
      * <p>addTitlePropertyExpression.</p>
      *
-     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @param propertyExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
      */
     public void addTitlePropertyExpression(final DRIPropertyExpression propertyExpression) {
         Validate.notNull(propertyExpression, "propertyExpression must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBaseStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRBaseStyle.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBaseStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRBaseStyle.java
index e60afeb..f36f52f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBaseStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRBaseStyle.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
-
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.Rotation;
-import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
-import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
-import net.sf.dynamicreports.report.definition.style.DRIBaseStyle;
+package software.xdev.dynamicreports.report.base.style;
+
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.Rotation;
+import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
+import software.xdev.dynamicreports.report.definition.style.DRIBaseStyle;
 
 import java.awt.Color;
 
@@ -127,7 +127,7 @@ public ImageScale getImageScale() {
     /**
      * <p>Setter for the field <code>imageScale</code>.</p>
      *
-     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @param imageScale a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      */
     public void setImageScale(ImageScale imageScale) {
         this.imageScale = imageScale;
@@ -142,7 +142,7 @@ public HorizontalImageAlignment getHorizontalImageAlignment() {
     /**
      * <p>Setter for the field <code>horizontalImageAlignment</code>.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public void setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
         this.horizontalImageAlignment = horizontalImageAlignment;
@@ -157,7 +157,7 @@ public VerticalImageAlignment getVerticalImageAlignment() {
     /**
      * <p>Setter for the field <code>verticalImageAlignment</code>.</p>
      *
-     * @param verticalImageAlignment a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     * @param verticalImageAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalImageAlignment} object.
      */
     public void setVerticalImageAlignment(VerticalImageAlignment verticalImageAlignment) {
         this.verticalImageAlignment = verticalImageAlignment;
@@ -172,7 +172,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
     /**
      * <p>Setter for the field <code>horizontalTextAlignment</code>.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public void setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
         this.horizontalTextAlignment = horizontalTextAlignment;
@@ -187,7 +187,7 @@ public VerticalTextAlignment getVerticalTextAlignment() {
     /**
      * <p>Setter for the field <code>verticalTextAlignment</code>.</p>
      *
-     * @param verticalTextAlignment a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     * @param verticalTextAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalTextAlignment} object.
      */
     public void setVerticalTextAlignment(VerticalTextAlignment verticalTextAlignment) {
         this.verticalTextAlignment = verticalTextAlignment;
@@ -202,7 +202,7 @@ public DRBorder getBorder() {
     /**
      * <p>Setter for the field <code>border</code>.</p>
      *
-     * @param border a {@link net.sf.dynamicreports.report.base.style.DRBorder} object.
+     * @param border a {@link software.xdev.dynamicreports.report.base.style.DRBorder} object.
      */
     public void setBorder(DRBorder border) {
         this.border = border;
@@ -217,7 +217,7 @@ public DRPadding getPadding() {
     /**
      * <p>Setter for the field <code>padding</code>.</p>
      *
-     * @param padding a {@link net.sf.dynamicreports.report.base.style.DRPadding} object.
+     * @param padding a {@link software.xdev.dynamicreports.report.base.style.DRPadding} object.
      */
     public void setPadding(DRPadding padding) {
         this.padding = padding;
@@ -232,7 +232,7 @@ public DRFont getFont() {
     /**
      * <p>Setter for the field <code>font</code>.</p>
      *
-     * @param font a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+     * @param font a {@link software.xdev.dynamicreports.report.base.style.DRFont} object.
      */
     public void setFont(DRFont font) {
         this.font = font;
@@ -247,7 +247,7 @@ public Rotation getRotation() {
     /**
      * <p>Setter for the field <code>rotation</code>.</p>
      *
-     * @param rotation a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     * @param rotation a {@link software.xdev.dynamicreports.report.constant.Rotation} object.
      */
     public void setRotation(Rotation rotation) {
         this.rotation = rotation;
@@ -277,7 +277,7 @@ public Markup getMarkup() {
     /**
      * <p>Setter for the field <code>markup</code>.</p>
      *
-     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @param markup a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      */
     public void setMarkup(Markup markup) {
         this.markup = markup;
@@ -292,7 +292,7 @@ public DRParagraph getParagraph() {
     /**
      * <p>Setter for the field <code>paragraph</code>.</p>
      *
-     * @param paragraph a {@link net.sf.dynamicreports.report.base.style.DRParagraph} object.
+     * @param paragraph a {@link software.xdev.dynamicreports.report.base.style.DRParagraph} object.
      */
     public void setParagraph(DRParagraph paragraph) {
         this.paragraph = paragraph;
@@ -307,7 +307,7 @@ public DRPen getLinePen() {
     /**
      * <p>Setter for the field <code>linePen</code>.</p>
      *
-     * @param linePen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param linePen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public void setLinePen(DRPen linePen) {
         this.linePen = linePen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBorder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRBorder.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBorder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRBorder.java
index 8a7ca4d..552ade0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRBorder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRBorder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.style.DRIBorder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.style.DRIBorder;
 
 /**
  * <p>DRBorder class.</p>
@@ -47,7 +47,7 @@ public DRBorder() {
     /**
      * <p>Constructor for DRBorder.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public DRBorder(DRPen pen) {
         topPen = pen;
@@ -65,7 +65,7 @@ public DRPen getTopPen() {
     /**
      * <p>Setter for the field <code>topPen</code>.</p>
      *
-     * @param topPen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param topPen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public void setTopPen(DRPen topPen) {
         this.topPen = topPen;
@@ -80,7 +80,7 @@ public DRPen getLeftPen() {
     /**
      * <p>Setter for the field <code>leftPen</code>.</p>
      *
-     * @param leftPen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param leftPen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public void setLeftPen(DRPen leftPen) {
         this.leftPen = leftPen;
@@ -95,7 +95,7 @@ public DRPen getBottomPen() {
     /**
      * <p>Setter for the field <code>bottomPen</code>.</p>
      *
-     * @param bottomPen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param bottomPen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public void setBottomPen(DRPen bottomPen) {
         this.bottomPen = bottomPen;
@@ -110,7 +110,7 @@ public DRPen getRightPen() {
     /**
      * <p>Setter for the field <code>rightPen</code>.</p>
      *
-     * @param rightPen a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @param rightPen a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public void setRightPen(DRPen rightPen) {
         this.rightPen = rightPen;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRConditionalStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRConditionalStyle.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRConditionalStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRConditionalStyle.java
index 72d5169..ba504ed 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRConditionalStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRConditionalStyle.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIConditionalStyle;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -36,7 +36,7 @@ public class DRConditionalStyle extends DRBaseStyle implements DRIConditionalSty
     /**
      * <p>Constructor for DRConditionalStyle.</p>
      *
-     * @param conditionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param conditionExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRConditionalStyle(DRIExpression<Boolean> conditionExpression) {
         Validate.notNull(conditionExpression, "conditionExpression must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRFont.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRFont.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRFont.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRFont.java
index 505af7e..e14b1a5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRFont.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRFont.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.style.DRIFont;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.style.DRIFont;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPadding.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRPadding.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPadding.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRPadding.java
index 065797b..1701c34 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPadding.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRPadding.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.style.DRIPadding;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.style.DRIPadding;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRParagraph.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRParagraph.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRParagraph.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRParagraph.java
index 9939e1f..a282a43 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRParagraph.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRParagraph.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.LineSpacing;
-import net.sf.dynamicreports.report.definition.style.DRIParagraph;
-import net.sf.dynamicreports.report.definition.style.DRITabStop;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.LineSpacing;
+import software.xdev.dynamicreports.report.definition.style.DRIParagraph;
+import software.xdev.dynamicreports.report.definition.style.DRITabStop;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +60,7 @@ public LineSpacing getLineSpacing() {
     /**
      * <p>Setter for the field <code>lineSpacing</code>.</p>
      *
-     * @param lineSpacing a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     * @param lineSpacing a {@link software.xdev.dynamicreports.report.constant.LineSpacing} object.
      */
     public void setLineSpacing(LineSpacing lineSpacing) {
         this.lineSpacing = lineSpacing;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPen.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRPen.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPen.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRPen.java
index 0216d84..7773c57 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRPen.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRPen.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.LineStyle;
-import net.sf.dynamicreports.report.definition.style.DRIPen;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIPen;
 import org.apache.commons.lang3.Validate;
 
 import java.awt.Color;
@@ -47,7 +47,7 @@ public DRPen() {
      * <p>Constructor for DRPen.</p>
      *
      * @param lineWidth a {@link java.lang.Float} object.
-     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @param lineStyle a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
      */
     public DRPen(Float lineWidth, LineStyle lineStyle) {
         this.setLineWidth(lineWidth);
@@ -81,7 +81,7 @@ public LineStyle getLineStyle() {
     /**
      * <p>Setter for the field <code>lineStyle</code>.</p>
      *
-     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @param lineStyle a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
      */
     public void setLineStyle(LineStyle lineStyle) {
         this.lineStyle = lineStyle;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRSimpleStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRSimpleStyle.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRSimpleStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRSimpleStyle.java
index ce65ee5..37c0bda 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRSimpleStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRSimpleStyle.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.style.DRISimpleStyle;
 
 /**
  * <p>DRSimpleStyle class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRStyle.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRStyle.java
index 0f5f322..3e19baa 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRStyle.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
 import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
@@ -69,7 +69,7 @@ public DRIReportStyle getParentStyle() {
     /**
      * <p>Setter for the field <code>parentStyle</code>.</p>
      *
-     * @param parentStyle a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @param parentStyle a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public void setParentStyle(DRIReportStyle parentStyle) {
         this.parentStyle = parentStyle;
@@ -95,7 +95,7 @@ public void setConditionalStyles(List<DRConditionalStyle> conditionalStyles) {
     /**
      * <p>addConditionalStyle.</p>
      *
-     * @param conditionalStyle a {@link net.sf.dynamicreports.report.base.style.DRConditionalStyle} object.
+     * @param conditionalStyle a {@link software.xdev.dynamicreports.report.base.style.DRConditionalStyle} object.
      */
     public void addConditionalStyle(DRConditionalStyle conditionalStyle) {
         Validate.notNull(conditionalStyle, "conditionalStyle must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTabStop.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRTabStop.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTabStop.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRTabStop.java
index e779036..8ff6e61 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTabStop.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRTabStop.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.TabStopAlignment;
-import net.sf.dynamicreports.report.definition.style.DRITabStop;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.TabStopAlignment;
+import software.xdev.dynamicreports.report.definition.style.DRITabStop;
 
 /**
  * <p>DRTabStop class.</p>
@@ -57,7 +57,7 @@ public TabStopAlignment getAlignment() {
     /**
      * <p>Setter for the field <code>alignment</code>.</p>
      *
-     * @param alignment a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     * @param alignment a {@link software.xdev.dynamicreports.report.constant.TabStopAlignment} object.
      */
     public void setAlignment(TabStopAlignment alignment) {
         this.alignment = alignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTemplateStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRTemplateStyle.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTemplateStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRTemplateStyle.java
index 2fd6b1d..98315af 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/base/style/DRTemplateStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/base/style/DRTemplateStyle.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.base.style;
+package software.xdev.dynamicreports.report.base.style;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.style.DRITemplateStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.style.DRITemplateStyle;
 
 /**
  * <p>DRTemplateStyle class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/AbstractBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/AbstractBuilder.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/AbstractBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/AbstractBuilder.java
index c84e5e1..eb7a215 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/AbstractBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/AbstractBuilder.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DatasetBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/DatasetBuilder.java
similarity index 66%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DatasetBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/DatasetBuilder.java
index e2445ed..4c1ceee 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DatasetBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/DatasetBuilder.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
-import net.sf.dynamicreports.report.base.DRDataset;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.QueryLanguage;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.DRDataset;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.QueryLanguage;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 import org.apache.commons.lang3.Validate;
 
@@ -50,8 +50,8 @@ protected DatasetBuilder() {
     /**
      * <p>fields.</p>
      *
-     * @param fields a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param fields a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder fields(FieldBuilder<?>... fields) {
         return addField(fields);
@@ -62,7 +62,7 @@ public DatasetBuilder fields(FieldBuilder<?>... fields) {
      *
      * @param name       a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder addField(String name, Class<?> valueClass) {
         return addField(DynamicReports.field(name, valueClass));
@@ -72,9 +72,9 @@ public DatasetBuilder addField(String name, Class<?> valueClass) {
      * <p>addField.</p>
      *
      * @param name     a {@link java.lang.String} object.
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      * @param <U>      a U object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public <U> DatasetBuilder addField(String name, DRIDataType<? super U, U> dataType) {
         return addField(DynamicReports.field(name, dataType));
@@ -83,8 +83,8 @@ public <U> DatasetBuilder addField(String name, DRIDataType<? super U, U> dataTy
     /**
      * <p>addField.</p>
      *
-     * @param fields a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param fields a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder addField(FieldBuilder<?>... fields) {
         Validate.notNull(fields, "fields must not be null");
@@ -100,8 +100,8 @@ public DatasetBuilder addField(FieldBuilder<?>... fields) {
     /**
      * <p>variables.</p>
      *
-     * @param variables a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param variables a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder variables(VariableBuilder<?>... variables) {
         return addVariable(variables);
@@ -110,8 +110,8 @@ public DatasetBuilder variables(VariableBuilder<?>... variables) {
     /**
      * <p>addVariable.</p>
      *
-     * @param variables a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param variables a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder addVariable(VariableBuilder<?>... variables) {
         Validate.notNull(variables, "variables must not be null");
@@ -127,8 +127,8 @@ public DatasetBuilder addVariable(VariableBuilder<?>... variables) {
     /**
      * <p>sortBy.</p>
      *
-     * @param sortColumns a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param sortColumns a {@link software.xdev.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder sortBy(TextColumnBuilder<?>... sortColumns) {
         Validate.notNull(sortColumns, "sortColumns must not be null");
@@ -142,8 +142,8 @@ public DatasetBuilder sortBy(TextColumnBuilder<?>... sortColumns) {
     /**
      * <p>sortBy.</p>
      *
-     * @param sorts a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param sorts a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder sortBy(SortBuilder... sorts) {
         return addSort(sorts);
@@ -152,8 +152,8 @@ public DatasetBuilder sortBy(SortBuilder... sorts) {
     /**
      * <p>addSort.</p>
      *
-     * @param sorts a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param sorts a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder addSort(SortBuilder... sorts) {
         Validate.notNull(sorts, "sorts must not be null");
@@ -171,7 +171,7 @@ public DatasetBuilder addSort(SortBuilder... sorts) {
      *
      * @param text     a {@link java.lang.String} object.
      * @param language a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setQuery(String text, String language) {
         Validate.notNull(text, "text must not be null");
@@ -183,7 +183,7 @@ public DatasetBuilder setQuery(String text, String language) {
      * <p>setQuery.</p>
      *
      * @param sql a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setQuery(String sql) {
         Validate.notNull(sql, "sql must not be null");
@@ -193,8 +193,8 @@ public DatasetBuilder setQuery(String sql) {
     /**
      * <p>setQuery.</p>
      *
-     * @param query a {@link net.sf.dynamicreports.report.builder.QueryBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param query a {@link software.xdev.dynamicreports.report.builder.QueryBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setQuery(QueryBuilder query) {
         Validate.notNull(query, "query must not be null");
@@ -208,7 +208,7 @@ public DatasetBuilder setQuery(QueryBuilder query) {
      * <p>setConnection.</p>
      *
      * @param connection a {@link java.sql.Connection} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setConnection(Connection connection) {
         getObject().setConnectionExpression(Expressions.value(connection));
@@ -218,8 +218,8 @@ public DatasetBuilder setConnection(Connection connection) {
     /**
      * <p>setConnection.</p>
      *
-     * @param connectionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param connectionExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setConnection(DRIExpression<Connection> connectionExpression) {
         getObject().setConnectionExpression(connectionExpression);
@@ -232,7 +232,7 @@ public DatasetBuilder setConnection(DRIExpression<Connection> connectionExpressi
      * <p>setDataSource.</p>
      *
      * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setDataSource(JRDataSource dataSource) {
         getObject().setDataSourceExpression(Expressions.dataSource(dataSource));
@@ -242,8 +242,8 @@ public DatasetBuilder setDataSource(JRDataSource dataSource) {
     /**
      * <p>setDataSource.</p>
      *
-     * @param dataSourceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param dataSourceExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setDataSource(DRIExpression<JRDataSource> dataSourceExpression) {
         getObject().setDataSourceExpression(dataSourceExpression);
@@ -255,8 +255,8 @@ public DatasetBuilder setDataSource(DRIExpression<JRDataSource> dataSourceExpres
     /**
      * <p>setFilterExpression.</p>
      *
-     * @param filterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @param filterExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setFilterExpression(DRIExpression<Boolean> filterExpression) {
         getObject().setFilterExpression(filterExpression);
@@ -268,7 +268,7 @@ public DatasetBuilder setFilterExpression(DRIExpression<Boolean> filterExpressio
      *
      * @param sql        a {@link java.lang.String} object.
      * @param connection a {@link java.sql.Connection} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setDataSource(String sql, Connection connection) {
         Validate.notNull(sql, "sql must not be null");
@@ -278,9 +278,9 @@ public DatasetBuilder setDataSource(String sql, Connection connection) {
     /**
      * <p>setDataSource.</p>
      *
-     * @param query      a {@link net.sf.dynamicreports.report.builder.QueryBuilder} object.
+     * @param query      a {@link software.xdev.dynamicreports.report.builder.QueryBuilder} object.
      * @param connection a {@link java.sql.Connection} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public DatasetBuilder setDataSource(QueryBuilder query, Connection connection) {
         Validate.notNull(query, "query must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DynamicReports.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/DynamicReports.java
similarity index 64%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DynamicReports.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/DynamicReports.java
index 58034a1..105ebd0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/DynamicReports.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/DynamicReports.java
@@ -15,34 +15,34 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.builder.export.ExporterBuilders;
-import net.sf.dynamicreports.jasper.definition.JasperReportHandler;
-import net.sf.dynamicreports.report.builder.column.ColumnBuilders;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilders;
-import net.sf.dynamicreports.report.builder.condition.ConditionBuilders;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilders;
-import net.sf.dynamicreports.report.builder.datatype.DataTypeBuilders;
-import net.sf.dynamicreports.report.builder.datatype.DataTypes;
-import net.sf.dynamicreports.report.builder.expression.ExpressionBuilders;
-import net.sf.dynamicreports.report.builder.grid.GridBuilders;
-import net.sf.dynamicreports.report.builder.group.GroupBuilders;
-import net.sf.dynamicreports.report.builder.style.StyleBuilders;
-import net.sf.dynamicreports.report.builder.subtotal.SubtotalBuilders;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.builder.export.ExporterBuilders;
+import software.xdev.dynamicreports.jasper.definition.JasperReportHandler;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilders;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilders;
+import software.xdev.dynamicreports.report.builder.condition.ConditionBuilders;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilders;
+import software.xdev.dynamicreports.report.builder.datatype.DataTypeBuilders;
+import software.xdev.dynamicreports.report.builder.datatype.DataTypes;
+import software.xdev.dynamicreports.report.builder.expression.ExpressionBuilders;
+import software.xdev.dynamicreports.report.builder.grid.GridBuilders;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilders;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilders;
+import software.xdev.dynamicreports.report.builder.subtotal.SubtotalBuilders;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * <p>DynamicReports class.</p>
@@ -117,7 +117,7 @@ public static JasperConcatenatedReportBuilder concatenatedReport() {
     /**
      * Creates a new concatenated report builder. This report builder allows concatenating several separated reports into one single document.
      *
-     * @param jasperReportHandler a {@link net.sf.dynamicreports.jasper.definition.JasperReportHandler} object.
+     * @param jasperReportHandler a {@link software.xdev.dynamicreports.jasper.definition.JasperReportHandler} object.
      * @return a report builder
      */
     public static JasperConcatenatedReportBuilder concatenatedReport(final JasperReportHandler jasperReportHandler) {
@@ -132,7 +132,7 @@ public static JasperConcatenatedReportBuilder concatenatedReport(final JasperRep
      * @param name       a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static <T> FieldBuilder<T> field(final String name, final Class valueClass) {
@@ -149,9 +149,9 @@ public static <T> FieldBuilder<T> field(final String name, final Class valueClas
      * <p>field.</p>
      *
      * @param name     a {@link java.lang.String} object.
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      * @param <T>      a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static <T> FieldBuilder<T> field(final String name, final DRIDataType dataType) {
@@ -166,10 +166,10 @@ public static <T> FieldBuilder<T> field(final String name, final DRIDataType dat
     /**
      * <p>variable.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public static <T> VariableBuilder<T> variable(final ValueColumnBuilder<?, ?> column, final Calculation calculation) {
         Validate.notNull(column, "column must not be null");
@@ -180,10 +180,10 @@ public static <T> VariableBuilder<T> variable(final ValueColumnBuilder<?, ?> col
      * <p>variable.</p>
      *
      * @param name        a {@link java.lang.String} object.
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public static <T> VariableBuilder<T> variable(final String name, final ValueColumnBuilder<?, ?> column, final Calculation calculation) {
         Validate.notNull(column, "column must not be null");
@@ -193,10 +193,10 @@ public static <T> VariableBuilder<T> variable(final String name, final ValueColu
     /**
      * <p>variable.</p>
      *
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public static <T> VariableBuilder<T> variable(final FieldBuilder<T> field, final Calculation calculation) {
         Validate.notNull(field, "field must not be null");
@@ -207,10 +207,10 @@ public static <T> VariableBuilder<T> variable(final FieldBuilder<T> field, final
      * <p>variable.</p>
      *
      * @param name        a {@link java.lang.String} object.
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public static <T> VariableBuilder<T> variable(final String name, final FieldBuilder<T> field, final Calculation calculation) {
         return new VariableBuilder<>(name, field, calculation);
@@ -221,9 +221,9 @@ public static <T> VariableBuilder<T> variable(final String name, final FieldBuil
      *
      * @param fieldName   a {@link java.lang.String} object.
      * @param valueClass  a {@link java.lang.Class} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public static <T> VariableBuilder<T> variable(final String fieldName, final Class<?> valueClass, final Calculation calculation) {
         return new VariableBuilder<>(field(fieldName, valueClass), calculation);
@@ -235,9 +235,9 @@ public static <T> VariableBuilder<T> variable(final String fieldName, final Clas
      * @param name        a {@link java.lang.String} object.
      * @param fieldName   a {@link java.lang.String} object.
      * @param valueClass  a {@link java.lang.Class} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public static <T> VariableBuilder<T> variable(final String name, final String fieldName, final Class<?> valueClass, final Calculation calculation) {
         return new VariableBuilder<>(name, field(fieldName, valueClass), calculation);
@@ -246,10 +246,10 @@ public static <T> VariableBuilder<T> variable(final String name, final String fi
     /**
      * <p>variable.</p>
      *
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public static <T> VariableBuilder<T> variable(final DRIExpression<?> expression, final Calculation calculation) {
         return new VariableBuilder<>(expression, calculation);
@@ -259,10 +259,10 @@ public static <T> VariableBuilder<T> variable(final DRIExpression<?> expression,
      * <p>variable.</p>
      *
      * @param name        a {@link java.lang.String} object.
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public static <T> VariableBuilder<T> variable(final String name, final DRIExpression<?> expression, final Calculation calculation) {
         return new VariableBuilder<>(name, expression, calculation);
@@ -273,8 +273,8 @@ public static <T> VariableBuilder<T> variable(final String name, final DRIExpres
     /**
      * <p>asc.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder asc(final TextColumnBuilder<?> column) {
         return new SortBuilder(column).setOrderType(OrderType.ASCENDING);
@@ -283,8 +283,8 @@ public static SortBuilder asc(final TextColumnBuilder<?> column) {
     /**
      * <p>asc.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder asc(final FieldBuilder<?> field) {
         return new SortBuilder(field).setOrderType(OrderType.ASCENDING);
@@ -295,7 +295,7 @@ public static SortBuilder asc(final FieldBuilder<?> field) {
      *
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder asc(final String fieldName, final Class<?> valueClass) {
         return new SortBuilder(field(fieldName, valueClass)).setOrderType(OrderType.ASCENDING);
@@ -304,8 +304,8 @@ public static SortBuilder asc(final String fieldName, final Class<?> valueClass)
     /**
      * <p>asc.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder asc(final VariableBuilder<?> variable) {
         return new SortBuilder(variable).setOrderType(OrderType.ASCENDING);
@@ -314,8 +314,8 @@ public static SortBuilder asc(final VariableBuilder<?> variable) {
     /**
      * <p>asc.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder asc(final DRIExpression<?> expression) {
         return new SortBuilder(expression).setOrderType(OrderType.ASCENDING);
@@ -324,8 +324,8 @@ public static SortBuilder asc(final DRIExpression<?> expression) {
     /**
      * <p>desc.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder desc(final TextColumnBuilder<?> column) {
         return new SortBuilder(column).setOrderType(OrderType.DESCENDING);
@@ -334,8 +334,8 @@ public static SortBuilder desc(final TextColumnBuilder<?> column) {
     /**
      * <p>desc.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder desc(final FieldBuilder<?> field) {
         return new SortBuilder(field).setOrderType(OrderType.DESCENDING);
@@ -346,7 +346,7 @@ public static SortBuilder desc(final FieldBuilder<?> field) {
      *
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder desc(final String fieldName, final Class<?> valueClass) {
         return new SortBuilder(field(fieldName, valueClass)).setOrderType(OrderType.DESCENDING);
@@ -355,8 +355,8 @@ public static SortBuilder desc(final String fieldName, final Class<?> valueClass
     /**
      * <p>desc.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder desc(final VariableBuilder<?> variable) {
         return new SortBuilder(variable).setOrderType(OrderType.DESCENDING);
@@ -365,8 +365,8 @@ public static SortBuilder desc(final VariableBuilder<?> variable) {
     /**
      * <p>desc.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public static SortBuilder desc(final DRIExpression<?> expression) {
         return new SortBuilder(expression).setOrderType(OrderType.DESCENDING);
@@ -377,7 +377,7 @@ public static SortBuilder desc(final DRIExpression<?> expression) {
     /**
      * <p>hyperLink.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public static HyperLinkBuilder hyperLink() {
         return new HyperLinkBuilder();
@@ -387,7 +387,7 @@ public static HyperLinkBuilder hyperLink() {
      * <p>hyperLink.</p>
      *
      * @param link a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public static HyperLinkBuilder hyperLink(final String link) {
         return new HyperLinkBuilder(link);
@@ -396,8 +396,8 @@ public static HyperLinkBuilder hyperLink(final String link) {
     /**
      * <p>hyperLink.</p>
      *
-     * @param linkExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param linkExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public static HyperLinkBuilder hyperLink(final DRIExpression<String> linkExpression) {
         return new HyperLinkBuilder(linkExpression);
@@ -408,7 +408,7 @@ public static HyperLinkBuilder hyperLink(final DRIExpression<String> linkExpress
     /**
      * <p>margin.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.MarginBuilder} object.
      */
     public static MarginBuilder margin() {
         return new MarginBuilder();
@@ -418,7 +418,7 @@ public static MarginBuilder margin() {
      * <p>margin.</p>
      *
      * @param margin a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.MarginBuilder} object.
      */
     public static MarginBuilder margin(final int margin) {
         return new MarginBuilder(margin);
@@ -432,7 +432,7 @@ public static MarginBuilder margin(final int margin) {
      * @param name  a {@link java.lang.String} object.
      * @param value a T object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.ParameterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.ParameterBuilder} object.
      */
     public static <T> ParameterBuilder<T> parameter(final String name, final T value) {
         return new ParameterBuilder<>(name, value);
@@ -444,7 +444,7 @@ public static <T> ParameterBuilder<T> parameter(final String name, final T value
      * @param name       a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.ParameterBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.ParameterBuilder} object.
      */
     public static <T> ParameterBuilder<T> parameter(final String name, final Class<T> valueClass) {
         return new ParameterBuilder<>(name, valueClass);
@@ -457,7 +457,7 @@ public static <T> ParameterBuilder<T> parameter(final String name, final Class<T
      *
      * @param text     a {@link java.lang.String} object.
      * @param language a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.QueryBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.QueryBuilder} object.
      */
     public static QueryBuilder query(final String text, final String language) {
         return new QueryBuilder(text, language);
@@ -500,7 +500,7 @@ public static int mm(final Number value) {
     /**
      * <p>template.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
      */
     public static ReportTemplateBuilder template() {
         return new ReportTemplateBuilder();
@@ -511,7 +511,7 @@ public static ReportTemplateBuilder template() {
     /**
      * <p>tableOfContentsCustomizer.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
      */
     public static TableOfContentsCustomizerBuilder tableOfContentsCustomizer() {
         return new TableOfContentsCustomizerBuilder();
@@ -520,7 +520,7 @@ public static TableOfContentsCustomizerBuilder tableOfContentsCustomizer() {
     /**
      * <p>tableOfContentsHeading.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
      */
     public static TableOfContentsHeadingBuilder tableOfContentsHeading() {
         return new TableOfContentsHeadingBuilder();
@@ -530,7 +530,7 @@ public static TableOfContentsHeadingBuilder tableOfContentsHeading() {
      * <p>tableOfContentsHeading.</p>
      *
      * @param label a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
      */
     public static TableOfContentsHeadingBuilder tableOfContentsHeading(final String label) {
         return new TableOfContentsHeadingBuilder().setLabel(label);
@@ -541,7 +541,7 @@ public static TableOfContentsHeadingBuilder tableOfContentsHeading(final String
     /**
      * <p>dataset.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
      */
     public static DatasetBuilder dataset() {
         return new DatasetBuilder();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/FieldBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/FieldBuilder.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/FieldBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/FieldBuilder.java
index e8c558c..fd55f19 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/FieldBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/FieldBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
-import net.sf.dynamicreports.report.base.DRField;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.base.DRField;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
 
 /**
  * <p>FieldBuilder class.</p>
@@ -44,8 +44,8 @@ protected FieldBuilder(String name, Class<? super T> valueClass) {
     /**
      * <p>setDataType.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     public FieldBuilder<T> setDataType(DRIDataType<? super T, T> dataType) {
         getObject().setDataType(dataType);
@@ -56,7 +56,7 @@ public FieldBuilder<T> setDataType(DRIDataType<? super T, T> dataType) {
      * <p>setDescription.</p>
      *
      * @param description a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     public FieldBuilder<T> setDescription(String description) {
         getObject().setDescription(description);
@@ -66,7 +66,7 @@ public FieldBuilder<T> setDescription(String description) {
     /**
      * <p>getField.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRField} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRField} object.
      */
     public DRField<T> getField() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/HyperLinkBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/HyperLinkBuilder.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/HyperLinkBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/HyperLinkBuilder.java
index 8731b31..a66ca24 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/HyperLinkBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/HyperLinkBuilder.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
-
-import net.sf.dynamicreports.report.base.DRHyperLink;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HyperLinkTarget;
-import net.sf.dynamicreports.report.constant.HyperLinkType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+package software.xdev.dynamicreports.report.builder;
+
+import software.xdev.dynamicreports.report.base.DRHyperLink;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HyperLinkTarget;
+import software.xdev.dynamicreports.report.constant.HyperLinkType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -54,7 +54,7 @@ protected HyperLinkBuilder(String link) {
     /**
      * <p>Constructor for HyperLinkBuilder.</p>
      *
-     * @param linkExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param linkExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected HyperLinkBuilder(DRIExpression<String> linkExpression) {
         super(new DRHyperLink());
@@ -65,7 +65,7 @@ protected HyperLinkBuilder(DRIExpression<String> linkExpression) {
      * <p>setLink.</p>
      *
      * @param link a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setLink(String link) {
         Validate.notNull(link, "link must not be null");
@@ -75,8 +75,8 @@ public HyperLinkBuilder setLink(String link) {
     /**
      * <p>setLink.</p>
      *
-     * @param linkExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param linkExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setLink(DRIExpression<String> linkExpression) {
         Validate.notNull(linkExpression, "linkExpression must not be null");
@@ -89,7 +89,7 @@ public HyperLinkBuilder setLink(DRIExpression<String> linkExpression) {
      * <p>setAnchor.</p>
      *
      * @param anchor a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setAnchor(String anchor) {
         getObject().setAnchorExpression(Expressions.text(anchor));
@@ -99,8 +99,8 @@ public HyperLinkBuilder setAnchor(String anchor) {
     /**
      * <p>setAnchor.</p>
      *
-     * @param anchorExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param anchorExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setAnchor(DRIExpression<String> anchorExpression) {
         getObject().setAnchorExpression(anchorExpression);
@@ -111,7 +111,7 @@ public HyperLinkBuilder setAnchor(DRIExpression<String> anchorExpression) {
      * <p>setPage.</p>
      *
      * @param page a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setPage(Integer page) {
         getObject().setPageExpression(Expressions.value(page));
@@ -121,8 +121,8 @@ public HyperLinkBuilder setPage(Integer page) {
     /**
      * <p>setPage.</p>
      *
-     * @param pageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param pageExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setPage(DRIExpression<Integer> pageExpression) {
         getObject().setPageExpression(pageExpression);
@@ -133,7 +133,7 @@ public HyperLinkBuilder setPage(DRIExpression<Integer> pageExpression) {
      * <p>setReference.</p>
      *
      * @param reference a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setReference(String reference) {
         getObject().setReferenceExpression(Expressions.text(reference));
@@ -143,8 +143,8 @@ public HyperLinkBuilder setReference(String reference) {
     /**
      * <p>setReference.</p>
      *
-     * @param referenceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param referenceExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setReference(DRIExpression<String> referenceExpression) {
         getObject().setReferenceExpression(referenceExpression);
@@ -155,7 +155,7 @@ public HyperLinkBuilder setReference(DRIExpression<String> referenceExpression)
      * <p>setTooltip.</p>
      *
      * @param tooltip a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setTooltip(String tooltip) {
         getObject().setTooltipExpression(Expressions.text(tooltip));
@@ -165,8 +165,8 @@ public HyperLinkBuilder setTooltip(String tooltip) {
     /**
      * <p>setTooltip.</p>
      *
-     * @param tooltipExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param tooltipExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setTooltip(DRIExpression<String> tooltipExpression) {
         getObject().setTooltipExpression(tooltipExpression);
@@ -176,8 +176,8 @@ public HyperLinkBuilder setTooltip(DRIExpression<String> tooltipExpression) {
     /**
      * <p>setType.</p>
      *
-     * @param hyperLinkType a {@link net.sf.dynamicreports.report.constant.HyperLinkType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param hyperLinkType a {@link software.xdev.dynamicreports.report.constant.HyperLinkType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setType(HyperLinkType hyperLinkType) {
         getObject().setType(hyperLinkType.name());
@@ -188,7 +188,7 @@ public HyperLinkBuilder setType(HyperLinkType hyperLinkType) {
      * <p>setType.</p>
      *
      * @param hyperLinkType a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setType(String hyperLinkType) {
         getObject().setType(hyperLinkType);
@@ -198,8 +198,8 @@ public HyperLinkBuilder setType(String hyperLinkType) {
     /**
      * <p>setTarget.</p>
      *
-     * @param hyperLinkTarget a {@link net.sf.dynamicreports.report.constant.HyperLinkTarget} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param hyperLinkTarget a {@link software.xdev.dynamicreports.report.constant.HyperLinkTarget} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setTarget(HyperLinkTarget hyperLinkTarget) {
         getObject().setTarget(hyperLinkTarget.name());
@@ -210,7 +210,7 @@ public HyperLinkBuilder setTarget(HyperLinkTarget hyperLinkTarget) {
      * <p>setTarget.</p>
      *
      * @param hyperLinkTarget a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      */
     public HyperLinkBuilder setTarget(String hyperLinkTarget) {
         getObject().setTarget(hyperLinkTarget);
@@ -220,7 +220,7 @@ public HyperLinkBuilder setTarget(String hyperLinkTarget) {
     /**
      * <p>getHyperLink.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRHyperLink} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRHyperLink} object.
      */
     public DRHyperLink getHyperLink() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/MarginBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/MarginBuilder.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/MarginBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/MarginBuilder.java
index f3ae376..b5d7ce9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/MarginBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/MarginBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
-import net.sf.dynamicreports.report.base.DRMargin;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.DRMargin;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>MarginBuilder class.</p>
@@ -49,7 +49,7 @@ protected MarginBuilder(int margin) {
      * <p>setTop.</p>
      *
      * @param top a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.MarginBuilder} object.
      */
     public MarginBuilder setTop(int top) {
         getObject().setTop(top);
@@ -60,7 +60,7 @@ public MarginBuilder setTop(int top) {
      * <p>setLeft.</p>
      *
      * @param left a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.MarginBuilder} object.
      */
     public MarginBuilder setLeft(int left) {
         getObject().setLeft(left);
@@ -71,7 +71,7 @@ public MarginBuilder setLeft(int left) {
      * <p>setBottom.</p>
      *
      * @param bottom a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.MarginBuilder} object.
      */
     public MarginBuilder setBottom(int bottom) {
         getObject().setBottom(bottom);
@@ -82,7 +82,7 @@ public MarginBuilder setBottom(int bottom) {
      * <p>setRight.</p>
      *
      * @param right a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.MarginBuilder} object.
      */
     public MarginBuilder setRight(int right) {
         getObject().setRight(right);
@@ -92,7 +92,7 @@ public MarginBuilder setRight(int right) {
     /**
      * <p>getMargin.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRMargin} object.
      */
     public DRMargin getMargin() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ParameterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ParameterBuilder.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ParameterBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ParameterBuilder.java
index f33bdaa..a136a63 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ParameterBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ParameterBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
-import net.sf.dynamicreports.report.base.DRParameter;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.DRParameter;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>ParameterBuilder class.</p>
@@ -52,7 +52,7 @@ protected ParameterBuilder(String name, Class<T> valueClass) {
     /**
      * <p>getParameter.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRParameter} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRParameter} object.
      */
     public DRParameter<T> getParameter() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/QueryBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/QueryBuilder.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/QueryBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/QueryBuilder.java
index ca652f4..de178d5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/QueryBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/QueryBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
-import net.sf.dynamicreports.report.base.DRQuery;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.DRQuery;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>QueryBuilder class.</p>
@@ -42,7 +42,7 @@ protected QueryBuilder(String text, String language) {
     /**
      * <p>getQuery.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRQuery} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRQuery} object.
      */
     public DRQuery getQuery() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ReportBuilder.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ReportBuilder.java
index 24fcf34..da1a8bb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ReportBuilder.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
 import java.util.Locale;
 import java.util.Map;
@@ -24,40 +24,40 @@
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.DRGroup;
-import net.sf.dynamicreports.report.base.DRReport;
-import net.sf.dynamicreports.report.base.grid.DRColumnGrid;
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
-import net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.builder.group.Groups;
-import net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder;
-import net.sf.dynamicreports.report.builder.style.FontBuilder;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.SubtotalBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.QueryLanguage;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.SubtotalPosition;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.DRGroup;
+import software.xdev.dynamicreports.report.base.DRReport;
+import software.xdev.dynamicreports.report.base.grid.DRColumnGrid;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilder;
+import software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.builder.group.Groups;
+import software.xdev.dynamicreports.report.builder.style.ConditionalStyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.FontBuilder;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.SubtotalBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.QueryLanguage;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.SubtotalPosition;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportTemplateBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ReportTemplateBuilder.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportTemplateBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ReportTemplateBuilder.java
index 1cd62ec..bd8d501 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/ReportTemplateBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/ReportTemplateBuilder.java
@@ -15,33 +15,33 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
 import java.util.Locale;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.DRReportTemplate;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
-import net.sf.dynamicreports.report.builder.style.FontBuilder;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.base.DRReportTemplate;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilder;
+import software.xdev.dynamicreports.report.builder.style.FontBuilder;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
 
 
 /**
@@ -66,8 +66,8 @@ protected ReportTemplateBuilder()
 	/**
 	 * <p>templateStyles.</p>
 	 *
-	 * @param templateStyles a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param templateStyles a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder templateStyles(final TemplateStylesBuilder... templateStyles)
 	{
@@ -77,8 +77,8 @@ public ReportTemplateBuilder templateStyles(final TemplateStylesBuilder... templ
 	/**
 	 * <p>addTemplateStyle.</p>
 	 *
-	 * @param templateStyles a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param templateStyles a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder addTemplateStyle(final TemplateStylesBuilder... templateStyles)
 	{
@@ -97,8 +97,8 @@ public ReportTemplateBuilder addTemplateStyle(final TemplateStylesBuilder... tem
 	/**
 	 * <p>templateStyles.</p>
 	 *
-	 * @param templateStyles a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param templateStyles a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder templateStyles(final StyleBuilder... templateStyles)
 	{
@@ -108,8 +108,8 @@ public ReportTemplateBuilder templateStyles(final StyleBuilder... templateStyles
 	/**
 	 * <p>addTemplateStyle.</p>
 	 *
-	 * @param templateStyles a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param templateStyles a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder addTemplateStyle(final StyleBuilder... templateStyles)
 	{
@@ -126,7 +126,7 @@ public ReportTemplateBuilder addTemplateStyle(final StyleBuilder... templateStyl
 	 * <p>setLocale.</p>
 	 *
 	 * @param locale a {@link java.util.Locale} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setLocale(final Locale locale)
 	{
@@ -138,7 +138,7 @@ public ReportTemplateBuilder setLocale(final Locale locale)
 	 * <p>setShowColumnTitle.</p>
 	 *
 	 * @param showColumnTitle a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setShowColumnTitle(final Boolean showColumnTitle)
 	{
@@ -150,7 +150,7 @@ public ReportTemplateBuilder setShowColumnTitle(final Boolean showColumnTitle)
 	 * <p>setShowColumnValues.</p>
 	 *
 	 * @param showColumnValues a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setShowColumnValues(final Boolean showColumnValues)
 	{
@@ -161,7 +161,7 @@ public ReportTemplateBuilder setShowColumnValues(final Boolean showColumnValues)
 	/**
 	 * <p>ignorePagination.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder ignorePagination()
 	{
@@ -172,7 +172,7 @@ public ReportTemplateBuilder ignorePagination()
 	 * <p>setIgnorePagination.</p>
 	 *
 	 * @param ignorePagination a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setIgnorePagination(final Boolean ignorePagination)
 	{
@@ -183,8 +183,8 @@ public ReportTemplateBuilder setIgnorePagination(final Boolean ignorePagination)
 	/**
 	 * <p>setWhenNoDataType.</p>
 	 *
-	 * @param whenNoDataType a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param whenNoDataType a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setWhenNoDataType(final WhenNoDataType whenNoDataType)
 	{
@@ -195,8 +195,8 @@ public ReportTemplateBuilder setWhenNoDataType(final WhenNoDataType whenNoDataTy
 	/**
 	 * <p>setWhenResourceMissingType.</p>
 	 *
-	 * @param whenResourceMissingType a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param whenResourceMissingType a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setWhenResourceMissingType(final WhenResourceMissingType whenResourceMissingType)
 	{
@@ -207,7 +207,7 @@ public ReportTemplateBuilder setWhenResourceMissingType(final WhenResourceMissin
 	/**
 	 * <p>titleOnANewPage.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder titleOnANewPage()
 	{
@@ -218,7 +218,7 @@ public ReportTemplateBuilder titleOnANewPage()
 	 * <p>setTitleOnANewPage.</p>
 	 *
 	 * @param titleOnANewPage a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTitleOnANewPage(final Boolean titleOnANewPage)
 	{
@@ -229,7 +229,7 @@ public ReportTemplateBuilder setTitleOnANewPage(final Boolean titleOnANewPage)
 	/**
 	 * <p>summaryOnANewPage.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder summaryOnANewPage()
 	{
@@ -240,7 +240,7 @@ public ReportTemplateBuilder summaryOnANewPage()
 	 * <p>setSummaryOnANewPage.</p>
 	 *
 	 * @param summaryOnANewPage a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSummaryOnANewPage(final Boolean summaryOnANewPage)
 	{
@@ -251,7 +251,7 @@ public ReportTemplateBuilder setSummaryOnANewPage(final Boolean summaryOnANewPag
 	/**
 	 * <p>summaryWithPageHeaderAndFooter.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder summaryWithPageHeaderAndFooter()
 	{
@@ -262,7 +262,7 @@ public ReportTemplateBuilder summaryWithPageHeaderAndFooter()
 	 * <p>setSummaryWithPageHeaderAndFooter.</p>
 	 *
 	 * @param summaryWithPageHeaderAndFooter a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSummaryWithPageHeaderAndFooter(final Boolean summaryWithPageHeaderAndFooter)
 	{
@@ -273,7 +273,7 @@ public ReportTemplateBuilder setSummaryWithPageHeaderAndFooter(final Boolean sum
 	/**
 	 * <p>floatColumnFooter.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder floatColumnFooter()
 	{
@@ -284,7 +284,7 @@ public ReportTemplateBuilder floatColumnFooter()
 	 * <p>setFloatColumnFooter.</p>
 	 *
 	 * @param floatColumnFooter a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setFloatColumnFooter(final Boolean floatColumnFooter)
 	{
@@ -295,8 +295,8 @@ public ReportTemplateBuilder setFloatColumnFooter(final Boolean floatColumnFoote
 	/**
 	 * <p>setPrintOrder.</p>
 	 *
-	 * @param printOrder a {@link net.sf.dynamicreports.report.constant.Orientation} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param printOrder a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPrintOrder(final Orientation printOrder)
 	{
@@ -307,8 +307,8 @@ public ReportTemplateBuilder setPrintOrder(final Orientation printOrder)
 	/**
 	 * <p>setColumnDirection.</p>
 	 *
-	 * @param columnDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param columnDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnDirection(final RunDirection columnDirection)
 	{
@@ -320,7 +320,7 @@ public ReportTemplateBuilder setColumnDirection(final RunDirection columnDirecti
 	 * <p>setLanguage.</p>
 	 *
 	 * @param language a {@link java.lang.String} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setLanguage(final String language)
 	{
@@ -332,7 +332,7 @@ public ReportTemplateBuilder setLanguage(final String language)
 	 * <p>setUseFieldNameAsDescription.</p>
 	 *
 	 * @param useFieldNameAsDescription a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setUseFieldNameAsDescription(final Boolean useFieldNameAsDescription)
 	{
@@ -343,7 +343,7 @@ public ReportTemplateBuilder setUseFieldNameAsDescription(final Boolean useField
 	/**
 	 * <p>highlightDetailOddRows.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder highlightDetailOddRows()
 	{
@@ -354,7 +354,7 @@ public ReportTemplateBuilder highlightDetailOddRows()
 	 * <p>setHighlightDetailOddRows.</p>
 	 *
 	 * @param highlightDetailOddRows a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setHighlightDetailOddRows(final Boolean highlightDetailOddRows)
 	{
@@ -365,8 +365,8 @@ public ReportTemplateBuilder setHighlightDetailOddRows(final Boolean highlightDe
 	/**
 	 * <p>setDetailOddRowStyle.</p>
 	 *
-	 * @param detailOddRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param detailOddRowStyle a {@link software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailOddRowStyle(final SimpleStyleBuilder detailOddRowStyle)
 	{
@@ -384,7 +384,7 @@ public ReportTemplateBuilder setDetailOddRowStyle(final SimpleStyleBuilder detai
 	/**
 	 * <p>highlightDetailEvenRows.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder highlightDetailEvenRows()
 	{
@@ -395,7 +395,7 @@ public ReportTemplateBuilder highlightDetailEvenRows()
 	 * <p>setHighlightDetailEvenRows.</p>
 	 *
 	 * @param highlightDetailEvenRows a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setHighlightDetailEvenRows(final Boolean highlightDetailEvenRows)
 	{
@@ -406,8 +406,8 @@ public ReportTemplateBuilder setHighlightDetailEvenRows(final Boolean highlightD
 	/**
 	 * <p>setDetailEvenRowStyle.</p>
 	 *
-	 * @param detailEvenRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param detailEvenRowStyle a {@link software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailEvenRowStyle(final SimpleStyleBuilder detailEvenRowStyle)
 	{
@@ -425,8 +425,8 @@ public ReportTemplateBuilder setDetailEvenRowStyle(final SimpleStyleBuilder deta
 	/**
 	 * <p>setDefaultFont.</p>
 	 *
-	 * @param defaultFont a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param defaultFont a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDefaultFont(final FontBuilder defaultFont)
 	{
@@ -444,8 +444,8 @@ public ReportTemplateBuilder setDefaultFont(final FontBuilder defaultFont)
 	/**
 	 * <p>setTextStyle.</p>
 	 *
-	 * @param textStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param textStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTextStyle(final ReportStyleBuilder textStyle)
 	{
@@ -463,8 +463,8 @@ public ReportTemplateBuilder setTextStyle(final ReportStyleBuilder textStyle)
 	/**
 	 * <p>setColumnTitleStyle.</p>
 	 *
-	 * @param columnTitleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param columnTitleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnTitleStyle(final ReportStyleBuilder columnTitleStyle)
 	{
@@ -482,8 +482,8 @@ public ReportTemplateBuilder setColumnTitleStyle(final ReportStyleBuilder column
 	/**
 	 * <p>setColumnStyle.</p>
 	 *
-	 * @param columnStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param columnStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnStyle(final ReportStyleBuilder columnStyle)
 	{
@@ -501,8 +501,8 @@ public ReportTemplateBuilder setColumnStyle(final ReportStyleBuilder columnStyle
 	/**
 	 * <p>setGroupTitleStyle.</p>
 	 *
-	 * @param groupTitleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param groupTitleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupTitleStyle(final ReportStyleBuilder groupTitleStyle)
 	{
@@ -520,8 +520,8 @@ public ReportTemplateBuilder setGroupTitleStyle(final ReportStyleBuilder groupTi
 	/**
 	 * <p>setGroupStyle.</p>
 	 *
-	 * @param groupStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param groupStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupStyle(final ReportStyleBuilder groupStyle)
 	{
@@ -539,8 +539,8 @@ public ReportTemplateBuilder setGroupStyle(final ReportStyleBuilder groupStyle)
 	/**
 	 * <p>setSubtotalStyle.</p>
 	 *
-	 * @param subtotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param subtotalStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSubtotalStyle(final ReportStyleBuilder subtotalStyle)
 	{
@@ -558,8 +558,8 @@ public ReportTemplateBuilder setSubtotalStyle(final ReportStyleBuilder subtotalS
 	/**
 	 * <p>setImageStyle.</p>
 	 *
-	 * @param imageStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param imageStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setImageStyle(final ReportStyleBuilder imageStyle)
 	{
@@ -577,8 +577,8 @@ public ReportTemplateBuilder setImageStyle(final ReportStyleBuilder imageStyle)
 	/**
 	 * <p>setPageFormat.</p>
 	 *
-	 * @param pageType a {@link net.sf.dynamicreports.report.constant.PageType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param pageType a {@link software.xdev.dynamicreports.report.constant.PageType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageFormat(final PageType pageType)
 	{
@@ -588,9 +588,9 @@ public ReportTemplateBuilder setPageFormat(final PageType pageType)
 	/**
 	 * <p>setPageFormat.</p>
 	 *
-	 * @param pageType    a {@link net.sf.dynamicreports.report.constant.PageType} object.
-	 * @param orientation a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param pageType    a {@link software.xdev.dynamicreports.report.constant.PageType} object.
+	 * @param orientation a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageFormat(final PageType pageType, final PageOrientation orientation)
 	{
@@ -601,8 +601,8 @@ public ReportTemplateBuilder setPageFormat(final PageType pageType, final PageOr
 	/**
 	 * <p>setPageMargin.</p>
 	 *
-	 * @param pageMargin a {@link net.sf.dynamicreports.report.builder.MarginBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param pageMargin a {@link software.xdev.dynamicreports.report.builder.MarginBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageMargin(final MarginBuilder pageMargin)
 	{
@@ -621,7 +621,7 @@ public ReportTemplateBuilder setPageMargin(final MarginBuilder pageMargin)
 	 * <p>setPageColumnsPerPage.</p>
 	 *
 	 * @param pageColumnsPerPage a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageColumnsPerPage(final Integer pageColumnsPerPage)
 	{
@@ -633,7 +633,7 @@ public ReportTemplateBuilder setPageColumnsPerPage(final Integer pageColumnsPerP
 	 * <p>setPageColumnSpace.</p>
 	 *
 	 * @param pageColumnSpace a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageColumnSpace(final Integer pageColumnSpace)
 	{
@@ -645,7 +645,7 @@ public ReportTemplateBuilder setPageColumnSpace(final Integer pageColumnSpace)
 	 * <p>setIgnorePageWidth.</p>
 	 *
 	 * @param ignorePageWidth a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setIgnorePageWidth(final Boolean ignorePageWidth)
 	{
@@ -657,7 +657,7 @@ public ReportTemplateBuilder setIgnorePageWidth(final Boolean ignorePageWidth)
 	 * <p>setColumnPrintRepeatedDetailValues.</p>
 	 *
 	 * @param columnPrintRepeatedDetailValues a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnPrintRepeatedDetailValues(final Boolean columnPrintRepeatedDetailValues)
 	{
@@ -669,7 +669,7 @@ public ReportTemplateBuilder setColumnPrintRepeatedDetailValues(final Boolean co
 	 * <p>setColumnWidth.</p>
 	 *
 	 * @param columnWidth a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnWidth(final Integer columnWidth)
 	{
@@ -680,8 +680,8 @@ public ReportTemplateBuilder setColumnWidth(final Integer columnWidth)
 	/**
 	 * <p>setGroupHeaderLayout.</p>
 	 *
-	 * @param groupHeaderLayout a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param groupHeaderLayout a {@link software.xdev.dynamicreports.report.constant.GroupHeaderLayout} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupHeaderLayout(final GroupHeaderLayout groupHeaderLayout)
 	{
@@ -693,7 +693,7 @@ public ReportTemplateBuilder setGroupHeaderLayout(final GroupHeaderLayout groupH
 	 * <p>setGroupHideColumn.</p>
 	 *
 	 * @param groupHideColumn a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupHideColumn(final Boolean groupHideColumn)
 	{
@@ -705,7 +705,7 @@ public ReportTemplateBuilder setGroupHideColumn(final Boolean groupHideColumn)
 	 * <p>setGroupShowColumnHeaderAndFooter.</p>
 	 *
 	 * @param groupShowColumnHeaderAndFooter a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupShowColumnHeaderAndFooter(final Boolean groupShowColumnHeaderAndFooter)
 	{
@@ -717,7 +717,7 @@ public ReportTemplateBuilder setGroupShowColumnHeaderAndFooter(final Boolean gro
 	 * <p>setGroupPadding.</p>
 	 *
 	 * @param groupPadding a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupPadding(final Integer groupPadding)
 	{
@@ -729,7 +729,7 @@ public ReportTemplateBuilder setGroupPadding(final Integer groupPadding)
 	 * <p>setGroupStartInNewPage.</p>
 	 *
 	 * @param groupStartInNewPage a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupStartInNewPage(final Boolean groupStartInNewPage)
 	{
@@ -741,7 +741,7 @@ public ReportTemplateBuilder setGroupStartInNewPage(final Boolean groupStartInNe
 	 * <p>setGroupStartInNewColumn.</p>
 	 *
 	 * @param groupStartInNewColumn a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupStartInNewColumn(final Boolean groupStartInNewColumn)
 	{
@@ -753,7 +753,7 @@ public ReportTemplateBuilder setGroupStartInNewColumn(final Boolean groupStartIn
 	 * <p>setGroupReprintHeaderOnEachPage.</p>
 	 *
 	 * @param groupReprintHeaderOnEachPage a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupReprintHeaderOnEachPage(final Boolean groupReprintHeaderOnEachPage)
 	{
@@ -765,7 +765,7 @@ public ReportTemplateBuilder setGroupReprintHeaderOnEachPage(final Boolean group
 	 * <p>setGroupResetPageNumber.</p>
 	 *
 	 * @param groupResetPageNumber a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupResetPageNumber(final Boolean groupResetPageNumber)
 	{
@@ -776,8 +776,8 @@ public ReportTemplateBuilder setGroupResetPageNumber(final Boolean groupResetPag
 	/**
 	 * <p>setGroupFooterPosition.</p>
 	 *
-	 * @param groupFooterPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param groupFooterPosition a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupFooterPosition(final GroupFooterPosition groupFooterPosition)
 	{
@@ -789,7 +789,7 @@ public ReportTemplateBuilder setGroupFooterPosition(final GroupFooterPosition gr
 	 * <p>setGroupKeepTogether.</p>
 	 *
 	 * @param groupKeepTogether a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupKeepTogether(final Boolean groupKeepTogether)
 	{
@@ -801,7 +801,7 @@ public ReportTemplateBuilder setGroupKeepTogether(final Boolean groupKeepTogethe
 	 * <p>setGroupHeaderWithSubtotal.</p>
 	 *
 	 * @param groupHeaderWithSubtotal a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupHeaderWithSubtotal(final Boolean groupHeaderWithSubtotal)
 	{
@@ -812,8 +812,8 @@ public ReportTemplateBuilder setGroupHeaderWithSubtotal(final Boolean groupHeade
 	/**
 	 * <p>setSubtotalLabelPosition.</p>
 	 *
-	 * @param subtotalLabelPosition a {@link net.sf.dynamicreports.report.constant.Position} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param subtotalLabelPosition a {@link software.xdev.dynamicreports.report.constant.Position} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSubtotalLabelPosition(final Position subtotalLabelPosition)
 	{
@@ -824,7 +824,7 @@ public ReportTemplateBuilder setSubtotalLabelPosition(final Position subtotalLab
 	/**
 	 * <p>tableOfContents.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder tableOfContents()
 	{
@@ -835,7 +835,7 @@ public ReportTemplateBuilder tableOfContents()
 	 * <p>setTableOfContents.</p>
 	 *
 	 * @param tableOfContents a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTableOfContents(final Boolean tableOfContents)
 	{
@@ -855,9 +855,9 @@ public ReportTemplateBuilder setTableOfContents(final Boolean tableOfContents)
 	 *
 	 *
 	 *
-	 *                           net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder}
+	 *                           software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder}
 	 *                                  object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTableOfContentsCustomizer(final TableOfContentsCustomizerBuilder tableOfContentsCustomizer)
 	{
@@ -868,9 +868,9 @@ public ReportTemplateBuilder setTableOfContentsCustomizer(final TableOfContentsC
 	/**
 	 * <p>setTableOfContentsCustomizer.</p>
 	 *
-	 * @param tableOfContentsCustomizer a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer}
+	 * @param tableOfContentsCustomizer a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer}
 	 *                                  object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTableOfContentsCustomizer(final DRITableOfContentsCustomizer tableOfContentsCustomizer)
 	{
@@ -882,7 +882,7 @@ public ReportTemplateBuilder setTableOfContentsCustomizer(final DRITableOfConten
 	 * <p>setTextFieldWidth.</p>
 	 *
 	 * @param textFieldWidth a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTextFieldWidth(final Integer textFieldWidth)
 	{
@@ -894,7 +894,7 @@ public ReportTemplateBuilder setTextFieldWidth(final Integer textFieldWidth)
 	 * <p>setImageHeight.</p>
 	 *
 	 * @param imageHeight a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setImageHeight(final Integer imageHeight)
 	{
@@ -906,7 +906,7 @@ public ReportTemplateBuilder setImageHeight(final Integer imageHeight)
 	 * <p>setImageWidth.</p>
 	 *
 	 * @param imageWidth a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setImageWidth(final Integer imageWidth)
 	{
@@ -918,7 +918,7 @@ public ReportTemplateBuilder setImageWidth(final Integer imageWidth)
 	 * <p>setListgap.</p>
 	 *
 	 * @param listgap a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setListgap(final Integer listgap)
 	{
@@ -930,7 +930,7 @@ public ReportTemplateBuilder setListgap(final Integer listgap)
 	 * <p>setMultiPageListHeight.</p>
 	 *
 	 * @param multiPageListHeight a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setMultiPageListHeight(final Integer multiPageListHeight)
 	{
@@ -942,7 +942,7 @@ public ReportTemplateBuilder setMultiPageListHeight(final Integer multiPageListH
 	 * <p>setMultiPageListWidth.</p>
 	 *
 	 * @param multiPageListWidth a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setMultiPageListWidth(final Integer multiPageListWidth)
 	{
@@ -954,7 +954,7 @@ public ReportTemplateBuilder setMultiPageListWidth(final Integer multiPageListWi
 	 * <p>setSubreportHeight.</p>
 	 *
 	 * @param subreportHeight a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSubreportHeight(final Integer subreportHeight)
 	{
@@ -966,7 +966,7 @@ public ReportTemplateBuilder setSubreportHeight(final Integer subreportHeight)
 	 * <p>setSubreportWidth.</p>
 	 *
 	 * @param subreportWidth a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSubreportWidth(final Integer subreportWidth)
 	{
@@ -978,7 +978,7 @@ public ReportTemplateBuilder setSubreportWidth(final Integer subreportWidth)
 	 * <p>setCrosstabHeight.</p>
 	 *
 	 * @param crosstabHeight a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabHeight(final Integer crosstabHeight)
 	{
@@ -990,7 +990,7 @@ public ReportTemplateBuilder setCrosstabHeight(final Integer crosstabHeight)
 	 * <p>setCrosstabWidth.</p>
 	 *
 	 * @param crosstabWidth a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabWidth(final Integer crosstabWidth)
 	{
@@ -1001,7 +1001,7 @@ public ReportTemplateBuilder setCrosstabWidth(final Integer crosstabWidth)
 	/**
 	 * <p>crosstabHighlightOddRows.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder crosstabHighlightOddRows()
 	{
@@ -1012,7 +1012,7 @@ public ReportTemplateBuilder crosstabHighlightOddRows()
 	 * <p>setCrosstabHighlightOddRows.</p>
 	 *
 	 * @param crosstabHighlightOddRows a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabHighlightOddRows(final Boolean crosstabHighlightOddRows)
 	{
@@ -1023,8 +1023,8 @@ public ReportTemplateBuilder setCrosstabHighlightOddRows(final Boolean crosstabH
 	/**
 	 * <p>setCrosstabOddRowStyle.</p>
 	 *
-	 * @param crosstabOddRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param crosstabOddRowStyle a {@link software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabOddRowStyle(final SimpleStyleBuilder crosstabOddRowStyle)
 	{
@@ -1042,7 +1042,7 @@ public ReportTemplateBuilder setCrosstabOddRowStyle(final SimpleStyleBuilder cro
 	/**
 	 * <p>crosstabHighlightEvenRows.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder crosstabHighlightEvenRows()
 	{
@@ -1053,7 +1053,7 @@ public ReportTemplateBuilder crosstabHighlightEvenRows()
 	 * <p>setCrosstabHighlightEvenRows.</p>
 	 *
 	 * @param crosstabHighlightEvenRows a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabHighlightEvenRows(final Boolean crosstabHighlightEvenRows)
 	{
@@ -1064,8 +1064,8 @@ public ReportTemplateBuilder setCrosstabHighlightEvenRows(final Boolean crosstab
 	/**
 	 * <p>setCrosstabEvenRowStyle.</p>
 	 *
-	 * @param crosstabEvenRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param crosstabEvenRowStyle a {@link software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabEvenRowStyle(final SimpleStyleBuilder crosstabEvenRowStyle)
 	{
@@ -1083,8 +1083,8 @@ public ReportTemplateBuilder setCrosstabEvenRowStyle(final SimpleStyleBuilder cr
 	/**
 	 * <p>setCrosstabGroupStyle.</p>
 	 *
-	 * @param crosstabGroupStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param crosstabGroupStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabGroupStyle(final ReportStyleBuilder crosstabGroupStyle)
 	{
@@ -1102,8 +1102,8 @@ public ReportTemplateBuilder setCrosstabGroupStyle(final ReportStyleBuilder cros
 	/**
 	 * <p>setCrosstabGroupTotalStyle.</p>
 	 *
-	 * @param crosstabGroupTotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param crosstabGroupTotalStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabGroupTotalStyle(final ReportStyleBuilder crosstabGroupTotalStyle)
 	{
@@ -1121,8 +1121,8 @@ public ReportTemplateBuilder setCrosstabGroupTotalStyle(final ReportStyleBuilder
 	/**
 	 * <p>setCrosstabGrandTotalStyle.</p>
 	 *
-	 * @param crosstabGrandTotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param crosstabGrandTotalStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabGrandTotalStyle(final ReportStyleBuilder crosstabGrandTotalStyle)
 	{
@@ -1140,8 +1140,8 @@ public ReportTemplateBuilder setCrosstabGrandTotalStyle(final ReportStyleBuilder
 	/**
 	 * <p>setCrosstabCellStyle.</p>
 	 *
-	 * @param crosstabCellStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param crosstabCellStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabCellStyle(final ReportStyleBuilder crosstabCellStyle)
 	{
@@ -1159,8 +1159,8 @@ public ReportTemplateBuilder setCrosstabCellStyle(final ReportStyleBuilder cross
 	/**
 	 * <p>setCrosstabMeasureTitleStyle.</p>
 	 *
-	 * @param crosstabMeasureTitleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param crosstabMeasureTitleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setCrosstabMeasureTitleStyle(final ReportStyleBuilder crosstabMeasureTitleStyle)
 	{
@@ -1178,8 +1178,8 @@ public ReportTemplateBuilder setCrosstabMeasureTitleStyle(final ReportStyleBuild
 	/**
 	 * <p>setBooleanComponentType.</p>
 	 *
-	 * @param booleanComponentType a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param booleanComponentType a {@link software.xdev.dynamicreports.report.constant.BooleanComponentType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setBooleanComponentType(final BooleanComponentType booleanComponentType)
 	{
@@ -1191,7 +1191,7 @@ public ReportTemplateBuilder setBooleanComponentType(final BooleanComponentType
 	 * <p>setBooleanEmptyWhenNullValue.</p>
 	 *
 	 * @param booleanEmptyWhenNullValue a {@link java.lang.Boolean} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setBooleanEmptyWhenNullValue(final Boolean booleanEmptyWhenNullValue)
 	{
@@ -1203,7 +1203,7 @@ public ReportTemplateBuilder setBooleanEmptyWhenNullValue(final Boolean booleanE
 	 * Use setBooleanImageWidth(Integer booleanImageWidth)
 	 *
 	 * @param booleanColumnImageWidth a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	@Deprecated
 	public ReportTemplateBuilder setBooleanColumnImageWidth(final Integer booleanColumnImageWidth)
@@ -1215,7 +1215,7 @@ public ReportTemplateBuilder setBooleanColumnImageWidth(final Integer booleanCol
 	 * <p>setBooleanImageWidth.</p>
 	 *
 	 * @param booleanImageWidth a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setBooleanImageWidth(final Integer booleanImageWidth)
 	{
@@ -1227,7 +1227,7 @@ public ReportTemplateBuilder setBooleanImageWidth(final Integer booleanImageWidt
 	 * Use setBooleanImageHeight(Integer booleanImageHeight)
 	 *
 	 * @param booleanColumnImageHeight a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	@Deprecated
 	public ReportTemplateBuilder setBooleanColumnImageHeight(final Integer booleanColumnImageHeight)
@@ -1239,7 +1239,7 @@ public ReportTemplateBuilder setBooleanColumnImageHeight(final Integer booleanCo
 	 * <p>setBooleanImageHeight.</p>
 	 *
 	 * @param booleanImageHeight a {@link java.lang.Integer} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setBooleanImageHeight(final Integer booleanImageHeight)
 	{
@@ -1250,8 +1250,8 @@ public ReportTemplateBuilder setBooleanImageHeight(final Integer booleanImageHei
 	/**
 	 * <p>setBooleanColumnStyle.</p>
 	 *
-	 * @param cooleanColumnStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param cooleanColumnStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setBooleanColumnStyle(final ReportStyleBuilder cooleanColumnStyle)
 	{
@@ -1271,8 +1271,8 @@ public ReportTemplateBuilder setBooleanColumnStyle(final ReportStyleBuilder cool
 	/**
 	 * <p>setDefaultSplitType.</p>
 	 *
-	 * @param defaultSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param defaultSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDefaultSplitType(final SplitType defaultSplitType)
 	{
@@ -1283,8 +1283,8 @@ public ReportTemplateBuilder setDefaultSplitType(final SplitType defaultSplitTyp
 	/**
 	 * <p>setTitleSplitType.</p>
 	 *
-	 * @param titleSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param titleSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTitleSplitType(final SplitType titleSplitType)
 	{
@@ -1295,8 +1295,8 @@ public ReportTemplateBuilder setTitleSplitType(final SplitType titleSplitType)
 	/**
 	 * <p>setPageHeaderSplitType.</p>
 	 *
-	 * @param pageHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param pageHeaderSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageHeaderSplitType(final SplitType pageHeaderSplitType)
 	{
@@ -1307,8 +1307,8 @@ public ReportTemplateBuilder setPageHeaderSplitType(final SplitType pageHeaderSp
 	/**
 	 * <p>setPageFooterSplitType.</p>
 	 *
-	 * @param pageFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param pageFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageFooterSplitType(final SplitType pageFooterSplitType)
 	{
@@ -1319,8 +1319,8 @@ public ReportTemplateBuilder setPageFooterSplitType(final SplitType pageFooterSp
 	/**
 	 * <p>setColumnHeaderSplitType.</p>
 	 *
-	 * @param columnHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param columnHeaderSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnHeaderSplitType(final SplitType columnHeaderSplitType)
 	{
@@ -1331,8 +1331,8 @@ public ReportTemplateBuilder setColumnHeaderSplitType(final SplitType columnHead
 	/**
 	 * <p>setColumnFooterSplitType.</p>
 	 *
-	 * @param columnFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param columnFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnFooterSplitType(final SplitType columnFooterSplitType)
 	{
@@ -1343,8 +1343,8 @@ public ReportTemplateBuilder setColumnFooterSplitType(final SplitType columnFoot
 	/**
 	 * <p>setGroupHeaderSplitType.</p>
 	 *
-	 * @param groupHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param groupHeaderSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupHeaderSplitType(final SplitType groupHeaderSplitType)
 	{
@@ -1355,8 +1355,8 @@ public ReportTemplateBuilder setGroupHeaderSplitType(final SplitType groupHeader
 	/**
 	 * <p>setGroupFooterSplitType.</p>
 	 *
-	 * @param groupFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param groupFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupFooterSplitType(final SplitType groupFooterSplitType)
 	{
@@ -1367,8 +1367,8 @@ public ReportTemplateBuilder setGroupFooterSplitType(final SplitType groupFooter
 	/**
 	 * <p>setDetailHeaderSplitType.</p>
 	 *
-	 * @param detailHeaderSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param detailHeaderSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailHeaderSplitType(final SplitType detailHeaderSplitType)
 	{
@@ -1379,8 +1379,8 @@ public ReportTemplateBuilder setDetailHeaderSplitType(final SplitType detailHead
 	/**
 	 * <p>setDetailSplitType.</p>
 	 *
-	 * @param detailSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param detailSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailSplitType(final SplitType detailSplitType)
 	{
@@ -1391,8 +1391,8 @@ public ReportTemplateBuilder setDetailSplitType(final SplitType detailSplitType)
 	/**
 	 * <p>setDetailFooterSplitType.</p>
 	 *
-	 * @param detailFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param detailFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailFooterSplitType(final SplitType detailFooterSplitType)
 	{
@@ -1403,8 +1403,8 @@ public ReportTemplateBuilder setDetailFooterSplitType(final SplitType detailFoot
 	/**
 	 * <p>setLastPageFooterSplitType.</p>
 	 *
-	 * @param lastPageFooterSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param lastPageFooterSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setLastPageFooterSplitType(final SplitType lastPageFooterSplitType)
 	{
@@ -1415,8 +1415,8 @@ public ReportTemplateBuilder setLastPageFooterSplitType(final SplitType lastPage
 	/**
 	 * <p>setSummarySplitType.</p>
 	 *
-	 * @param summarySplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param summarySplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSummarySplitType(final SplitType summarySplitType)
 	{
@@ -1427,8 +1427,8 @@ public ReportTemplateBuilder setSummarySplitType(final SplitType summarySplitTyp
 	/**
 	 * <p>setNoDataSplitType.</p>
 	 *
-	 * @param noDataSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param noDataSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setNoDataSplitType(final SplitType noDataSplitType)
 	{
@@ -1439,8 +1439,8 @@ public ReportTemplateBuilder setNoDataSplitType(final SplitType noDataSplitType)
 	/**
 	 * <p>setBackgroundSplitType.</p>
 	 *
-	 * @param backgroundSplitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundSplitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setBackgroundSplitType(final SplitType backgroundSplitType)
 	{
@@ -1453,8 +1453,8 @@ public ReportTemplateBuilder setBackgroundSplitType(final SplitType backgroundSp
 	/**
 	 * <p>setTitleStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTitleStyle(final ReportStyleBuilder style)
 	{
@@ -1472,8 +1472,8 @@ public ReportTemplateBuilder setTitleStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setPageHeaderStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageHeaderStyle(final ReportStyleBuilder style)
 	{
@@ -1491,8 +1491,8 @@ public ReportTemplateBuilder setPageHeaderStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setPageFooterStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageFooterStyle(final ReportStyleBuilder style)
 	{
@@ -1510,8 +1510,8 @@ public ReportTemplateBuilder setPageFooterStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setColumnHeaderStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnHeaderStyle(final ReportStyleBuilder style)
 	{
@@ -1529,8 +1529,8 @@ public ReportTemplateBuilder setColumnHeaderStyle(final ReportStyleBuilder style
 	/**
 	 * <p>setColumnFooterStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnFooterStyle(final ReportStyleBuilder style)
 	{
@@ -1548,8 +1548,8 @@ public ReportTemplateBuilder setColumnFooterStyle(final ReportStyleBuilder style
 	/**
 	 * <p>setGroupHeaderStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupHeaderStyle(final ReportStyleBuilder style)
 	{
@@ -1567,8 +1567,8 @@ public ReportTemplateBuilder setGroupHeaderStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setGroupFooterStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupFooterStyle(final ReportStyleBuilder style)
 	{
@@ -1586,8 +1586,8 @@ public ReportTemplateBuilder setGroupFooterStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setDetailHeaderStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailHeaderStyle(final ReportStyleBuilder style)
 	{
@@ -1605,8 +1605,8 @@ public ReportTemplateBuilder setDetailHeaderStyle(final ReportStyleBuilder style
 	/**
 	 * <p>setDetailStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailStyle(final ReportStyleBuilder style)
 	{
@@ -1624,8 +1624,8 @@ public ReportTemplateBuilder setDetailStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setDetailFooterStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailFooterStyle(final ReportStyleBuilder style)
 	{
@@ -1643,8 +1643,8 @@ public ReportTemplateBuilder setDetailFooterStyle(final ReportStyleBuilder style
 	/**
 	 * <p>setLastPageFooterStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setLastPageFooterStyle(final ReportStyleBuilder style)
 	{
@@ -1662,8 +1662,8 @@ public ReportTemplateBuilder setLastPageFooterStyle(final ReportStyleBuilder sty
 	/**
 	 * <p>setSummaryStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSummaryStyle(final ReportStyleBuilder style)
 	{
@@ -1681,8 +1681,8 @@ public ReportTemplateBuilder setSummaryStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setNoDataStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setNoDataStyle(final ReportStyleBuilder style)
 	{
@@ -1700,8 +1700,8 @@ public ReportTemplateBuilder setNoDataStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setBackgroundStyle.</p>
 	 *
-	 * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setBackgroundStyle(final ReportStyleBuilder style)
 	{
@@ -1719,8 +1719,8 @@ public ReportTemplateBuilder setBackgroundStyle(final ReportStyleBuilder style)
 	/**
 	 * <p>setTitleBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setTitleBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1732,8 +1732,8 @@ public ReportTemplateBuilder setTitleBackgroundComponent(final ComponentBuilder<
 	/**
 	 * <p>setPageHeaderBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1745,8 +1745,8 @@ public ReportTemplateBuilder setPageHeaderBackgroundComponent(final ComponentBui
 	/**
 	 * <p>setPageFooterBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setPageFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1758,8 +1758,8 @@ public ReportTemplateBuilder setPageFooterBackgroundComponent(final ComponentBui
 	/**
 	 * <p>setColumnHeaderBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1771,8 +1771,8 @@ public ReportTemplateBuilder setColumnHeaderBackgroundComponent(final ComponentB
 	/**
 	 * <p>setColumnFooterBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setColumnFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1784,8 +1784,8 @@ public ReportTemplateBuilder setColumnFooterBackgroundComponent(final ComponentB
 	/**
 	 * <p>setGroupHeaderBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1797,8 +1797,8 @@ public ReportTemplateBuilder setGroupHeaderBackgroundComponent(final ComponentBu
 	/**
 	 * <p>setGroupFooterBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setGroupFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1810,8 +1810,8 @@ public ReportTemplateBuilder setGroupFooterBackgroundComponent(final ComponentBu
 	/**
 	 * <p>setDetailHeaderBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailHeaderBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1823,8 +1823,8 @@ public ReportTemplateBuilder setDetailHeaderBackgroundComponent(final ComponentB
 	/**
 	 * <p>setDetailBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1836,8 +1836,8 @@ public ReportTemplateBuilder setDetailBackgroundComponent(final ComponentBuilder
 	/**
 	 * <p>setDetailFooterBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setDetailFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1849,8 +1849,8 @@ public ReportTemplateBuilder setDetailFooterBackgroundComponent(final ComponentB
 	/**
 	 * <p>setLastPageFooterBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setLastPageFooterBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1862,8 +1862,8 @@ public ReportTemplateBuilder setLastPageFooterBackgroundComponent(final Componen
 	/**
 	 * <p>setSummaryBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setSummaryBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1875,8 +1875,8 @@ public ReportTemplateBuilder setSummaryBackgroundComponent(final ComponentBuilde
 	/**
 	 * <p>setNoDataBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setNoDataBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1888,8 +1888,8 @@ public ReportTemplateBuilder setNoDataBackgroundComponent(final ComponentBuilder
 	/**
 	 * <p>setBackgroundBackgroundComponent.</p>
 	 *
-	 * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-	 * @return a {@link net.sf.dynamicreports.report.builder.ReportTemplateBuilder} object.
+	 * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+	 * @return a {@link software.xdev.dynamicreports.report.builder.ReportTemplateBuilder} object.
 	 */
 	public ReportTemplateBuilder setBackgroundBackgroundComponent(final ComponentBuilder<?, ?> backgroundComponent)
 	{
@@ -1901,7 +1901,7 @@ public ReportTemplateBuilder setBackgroundBackgroundComponent(final ComponentBui
 	/**
 	 * <p>getReportTemplate.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.DRReportTemplate} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.DRReportTemplate} object.
 	 */
 	public DRReportTemplate getReportTemplate()
 	{
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/SortBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/SortBuilder.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/SortBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/SortBuilder.java
index a168d22..18de84f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/SortBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/SortBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
-import net.sf.dynamicreports.report.base.DRSort;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.DRSort;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -36,7 +36,7 @@ public class SortBuilder extends AbstractBuilder<SortBuilder, DRSort> {
     /**
      * <p>Constructor for SortBuilder.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.TextColumnBuilder} object.
      */
     protected SortBuilder(TextColumnBuilder<?> column) {
         super(new DRSort());
@@ -47,7 +47,7 @@ protected SortBuilder(TextColumnBuilder<?> column) {
     /**
      * <p>Constructor for SortBuilder.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected SortBuilder(FieldBuilder<?> field) {
         super(new DRSort());
@@ -58,7 +58,7 @@ protected SortBuilder(FieldBuilder<?> field) {
     /**
      * <p>Constructor for SortBuilder.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     protected SortBuilder(VariableBuilder<?> variable) {
         super(new DRSort());
@@ -69,7 +69,7 @@ protected SortBuilder(VariableBuilder<?> variable) {
     /**
      * <p>Constructor for SortBuilder.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected SortBuilder(DRIExpression<?> expression) {
         super(new DRSort());
@@ -79,8 +79,8 @@ protected SortBuilder(DRIExpression<?> expression) {
     /**
      * <p>setOrderType.</p>
      *
-     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.SortBuilder} object.
+     * @param orderType a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.SortBuilder} object.
      */
     public SortBuilder setOrderType(OrderType orderType) {
         getObject().setOrderType(orderType);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/Units.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/Units.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/Units.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/Units.java
index 3d841fe..a18e971 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/Units.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/Units.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
+package software.xdev.dynamicreports.report.builder;
 
 /**
  * A set of methods of converting unit values to pixels.
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/VariableBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/VariableBuilder.java
similarity index 58%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/VariableBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/VariableBuilder.java
index 7010788..12fcb9e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/VariableBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/VariableBuilder.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder;
-
-import net.sf.dynamicreports.report.base.DRVariable;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
+package software.xdev.dynamicreports.report.builder;
+
+import software.xdev.dynamicreports.report.base.DRVariable;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIJasperExpression;
 
 /**
  * <p>VariableBuilder class.</p>
@@ -41,8 +41,8 @@ public class VariableBuilder<T> extends AbstractBuilder<VariableBuilder<T>, DRVa
     /**
      * <p>Constructor for VariableBuilder.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected VariableBuilder(ValueColumnBuilder<?, ?> column, Calculation calculation) {
         super(new DRVariable<T>(column.build(), calculation));
@@ -52,8 +52,8 @@ protected VariableBuilder(ValueColumnBuilder<?, ?> column, Calculation calculati
      * <p>Constructor for VariableBuilder.</p>
      *
      * @param name        a {@link java.lang.String} object.
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected VariableBuilder(String name, ValueColumnBuilder<?, ?> column, Calculation calculation) {
         super(new DRVariable<T>(name, column.build(), calculation));
@@ -64,8 +64,8 @@ protected VariableBuilder(String name, ValueColumnBuilder<?, ?> column, Calculat
     /**
      * <p>Constructor for VariableBuilder.</p>
      *
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected VariableBuilder(FieldBuilder<?> field, Calculation calculation) {
         super(new DRVariable<T>(field.getField(), calculation));
@@ -75,8 +75,8 @@ protected VariableBuilder(FieldBuilder<?> field, Calculation calculation) {
      * <p>Constructor for VariableBuilder.</p>
      *
      * @param name        a {@link java.lang.String} object.
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected VariableBuilder(String name, FieldBuilder<?> field, Calculation calculation) {
         super(new DRVariable<T>(name, field.getField(), calculation));
@@ -87,8 +87,8 @@ protected VariableBuilder(String name, FieldBuilder<?> field, Calculation calcul
     /**
      * <p>Constructor for VariableBuilder.</p>
      *
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected VariableBuilder(DRIExpression<?> expression, Calculation calculation) {
         super(new DRVariable<T>(expression, calculation));
@@ -98,8 +98,8 @@ protected VariableBuilder(DRIExpression<?> expression, Calculation calculation)
      * <p>Constructor for VariableBuilder.</p>
      *
      * @param name        a {@link java.lang.String} object.
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected VariableBuilder(String name, DRIExpression<?> expression, Calculation calculation) {
         super(new DRVariable<T>(name, expression, calculation));
@@ -108,8 +108,8 @@ protected VariableBuilder(String name, DRIExpression<?> expression, Calculation
     /**
      * <p>setInitialValueExpression.</p>
      *
-     * @param initialValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIJasperExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param initialValueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIJasperExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public VariableBuilder<T> setInitialValueExpression(DRIJasperExpression<?> initialValueExpression) {
         getObject().setInitialValueExpression(initialValueExpression);
@@ -119,8 +119,8 @@ public VariableBuilder<T> setInitialValueExpression(DRIJasperExpression<?> initi
     /**
      * <p>setResetType.</p>
      *
-     * @param resetType a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param resetType a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public VariableBuilder<T> setResetType(Evaluation resetType) {
         getObject().setResetType(resetType);
@@ -130,8 +130,8 @@ public VariableBuilder<T> setResetType(Evaluation resetType) {
     /**
      * <p>setResetGroup.</p>
      *
-     * @param resetGroup a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param resetGroup a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     public VariableBuilder<T> setResetGroup(GroupBuilder<?> resetGroup) {
         if (resetGroup != null) {
@@ -146,7 +146,7 @@ public VariableBuilder<T> setResetGroup(GroupBuilder<?> resetGroup) {
     /**
      * <p>getVariable.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRVariable} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRVariable} object.
      */
     public DRVariable<T> getVariable() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/BooleanColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/BooleanColumnBuilder.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/BooleanColumnBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/BooleanColumnBuilder.java
index e852d9b..f361333 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/BooleanColumnBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/BooleanColumnBuilder.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.column;
-
-import net.sf.dynamicreports.report.base.column.DRBooleanColumn;
-import net.sf.dynamicreports.report.base.component.DRBooleanField;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+package software.xdev.dynamicreports.report.builder.column;
+
+import software.xdev.dynamicreports.report.base.column.DRBooleanColumn;
+import software.xdev.dynamicreports.report.base.component.DRBooleanField;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -42,7 +42,7 @@ public class BooleanColumnBuilder extends ColumnBuilder<BooleanColumnBuilder, DR
     /**
      * <p>Constructor for BooleanColumnBuilder.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected BooleanColumnBuilder(FieldBuilder<Boolean> field) {
         super(new DRBooleanColumn(new DRBooleanField()));
@@ -53,7 +53,7 @@ protected BooleanColumnBuilder(FieldBuilder<Boolean> field) {
     /**
      * <p>Constructor for BooleanColumnBuilder.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected BooleanColumnBuilder(DRIExpression<Boolean> valueExpression) {
         super(new DRBooleanColumn(new DRBooleanField()));
@@ -66,7 +66,7 @@ protected BooleanColumnBuilder(DRIExpression<Boolean> valueExpression) {
      * @param width the column preferred width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public BooleanColumnBuilder setWidth(Integer width) {
         getComponent().setWidth(width);
@@ -79,7 +79,7 @@ public BooleanColumnBuilder setWidth(Integer width) {
      * @param width the column fixed width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public BooleanColumnBuilder setFixedWidth(Integer width) {
         getComponent().setWidth(width);
@@ -93,7 +93,7 @@ public BooleanColumnBuilder setFixedWidth(Integer width) {
      * @param width the column minimum width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public BooleanColumnBuilder setMinWidth(Integer width) {
         getComponent().setWidth(width);
@@ -107,7 +107,7 @@ public BooleanColumnBuilder setMinWidth(Integer width) {
      * @param height the column preferred height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public BooleanColumnBuilder setHeight(Integer height) {
         getComponent().setHeight(height);
@@ -120,7 +120,7 @@ public BooleanColumnBuilder setHeight(Integer height) {
      * @param height the column fixed height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public BooleanColumnBuilder setFixedHeight(Integer height) {
         getComponent().setHeight(height);
@@ -134,7 +134,7 @@ public BooleanColumnBuilder setFixedHeight(Integer height) {
      * @param height the column minimum height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public BooleanColumnBuilder setMinHeight(Integer height) {
         getComponent().setHeight(height);
@@ -159,7 +159,7 @@ public BooleanColumnBuilder setComponentType(BooleanComponentType booleanCompone
      * <p>setEmptyWhenNullValue.</p>
      *
      * @param emptyWhenNullValue a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.column.BooleanColumnBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.column.BooleanColumnBuilder} object.
      */
     public BooleanColumnBuilder setEmptyWhenNullValue(Boolean emptyWhenNullValue) {
         getComponent().setEmptyWhenNullValue(emptyWhenNullValue);
@@ -204,7 +204,7 @@ public BooleanColumnBuilder setImageHeight(Integer height) {
     /**
      * Sets the column value horizontal alignment.
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
      * @return a column builder
      * @deprecated use setHorizontalImageAlignment instead
      */
@@ -221,7 +221,7 @@ public BooleanColumnBuilder setHorizontalAlignment(HorizontalAlignment horizonta
     /**
      * Sets the column value horizontal image alignment.
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      * @return a column builder
      */
     public BooleanColumnBuilder setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
@@ -232,7 +232,7 @@ public BooleanColumnBuilder setHorizontalImageAlignment(HorizontalImageAlignment
     /**
      * Sets the column value horizontal text alignment.
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      * @return a column builder
      */
     public BooleanColumnBuilder setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ColumnBuilder.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ColumnBuilder.java
index fd20c13..022b067 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ColumnBuilder.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.column;
+package software.xdev.dynamicreports.report.builder.column;
 
-import net.sf.dynamicreports.report.base.column.DRColumn;
-import net.sf.dynamicreports.report.base.component.DRComponent;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.base.column.DRColumn;
+import software.xdev.dynamicreports.report.base.component.DRComponent;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
 
 /**
  * <p>Abstract ColumnBuilder class.</p>
@@ -155,7 +155,7 @@ public T setTitleMinRows(final Integer rows) {
      * @param height the column title preferred height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setTitleHeight(final Integer height) {
         getObject().setTitleHeight(height);
@@ -168,7 +168,7 @@ public T setTitleHeight(final Integer height) {
      * @param height the column title fixed height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setTitleFixedHeight(final Integer height) {
         getObject().setTitleHeight(height);
@@ -182,7 +182,7 @@ public T setTitleFixedHeight(final Integer height) {
      * @param height the column title minimum height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setTitleMinHeight(final Integer height) {
         getObject().setTitleHeight(height);
@@ -206,7 +206,7 @@ public T setTitleStretchWithOverflow(final Boolean stretchWithOverflow) {
     /**
      * <p>setTitleTextAdjust.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      * @return a T object.
      */
     public T setTitleTextAdjust(final TextAdjust textAdjust) {
@@ -252,7 +252,7 @@ public T addTitleProperty(final String name, final String value) {
     /**
      * <p>getComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.component.DRComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.component.DRComponent} object.
      */
     protected DRComponent getComponent() {
         return (DRComponent) getObject().getComponent();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ColumnBuilders.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ColumnBuilders.java
index 1d3bd93..1359c15 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ColumnBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ColumnBuilders.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.column;
+package software.xdev.dynamicreports.report.builder.column;
 
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilder;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * A set of methods of creating report columns.<br/> It is used to display data in a multi-column layout.
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/Columns.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/Columns.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/Columns.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/Columns.java
index bcee4d2..c6641ba 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/Columns.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/Columns.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.column;
+package software.xdev.dynamicreports.report.builder.column;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * A set of methods of creating report columns.<br/> It is used to display data in a multi-column layout.
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ComponentColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ComponentColumnBuilder.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ComponentColumnBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ComponentColumnBuilder.java
index be5b031..4e6df09 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ComponentColumnBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ComponentColumnBuilder.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.column;
+package software.xdev.dynamicreports.report.builder.column;
 
-import net.sf.dynamicreports.report.base.column.DRColumn;
-import net.sf.dynamicreports.report.base.component.DRComponent;
-import net.sf.dynamicreports.report.base.component.DRDimensionComponent;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
-import net.sf.dynamicreports.report.exception.DRReportException;
+import software.xdev.dynamicreports.report.base.column.DRColumn;
+import software.xdev.dynamicreports.report.base.component.DRComponent;
+import software.xdev.dynamicreports.report.base.component.DRDimensionComponent;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilder;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent;
+import software.xdev.dynamicreports.report.exception.DRReportException;
 
 /**
  * It is used to display custom components (e.g. images or complex content) in columns.
@@ -38,7 +38,7 @@ public class ComponentColumnBuilder extends ColumnBuilder<ComponentColumnBuilder
     /**
      * <p>Constructor for ComponentColumnBuilder.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      */
     protected ComponentColumnBuilder(ComponentBuilder<?, ?> component) {
         super(new DRColumn<DRComponent>(component.getComponent()));
@@ -50,7 +50,7 @@ protected ComponentColumnBuilder(ComponentBuilder<?, ?> component) {
      * @param width the column preferred width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ComponentColumnBuilder setWidth(Integer width) {
         getDimensionComponent().setWidth(width);
@@ -63,7 +63,7 @@ public ComponentColumnBuilder setWidth(Integer width) {
      * @param width the column fixed width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ComponentColumnBuilder setFixedWidth(Integer width) {
         getDimensionComponent().setWidth(width);
@@ -77,7 +77,7 @@ public ComponentColumnBuilder setFixedWidth(Integer width) {
      * @param width the column minimum width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ComponentColumnBuilder setMinWidth(Integer width) {
         getDimensionComponent().setWidth(width);
@@ -91,7 +91,7 @@ public ComponentColumnBuilder setMinWidth(Integer width) {
      * @param height the column preferred height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ComponentColumnBuilder setHeight(Integer height) {
         getDimensionComponent().setHeight(height);
@@ -104,7 +104,7 @@ public ComponentColumnBuilder setHeight(Integer height) {
      * @param height the column fixed height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ComponentColumnBuilder setFixedHeight(Integer height) {
         getDimensionComponent().setHeight(height);
@@ -118,7 +118,7 @@ public ComponentColumnBuilder setFixedHeight(Integer height) {
      * @param height the column minimum height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ComponentColumnBuilder setMinHeight(Integer height) {
         getDimensionComponent().setHeight(height);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/PercentageColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/PercentageColumnBuilder.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/PercentageColumnBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/PercentageColumnBuilder.java
index 634fb39..0ee3364 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/PercentageColumnBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/PercentageColumnBuilder.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.column;
+package software.xdev.dynamicreports.report.builder.column;
 
-import net.sf.dynamicreports.report.base.DRGroup;
-import net.sf.dynamicreports.report.base.DRVariable;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.datatype.DataTypes;
-import net.sf.dynamicreports.report.builder.expression.PercentageExpression;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.constant.PercentageTotalType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRReportException;
+import software.xdev.dynamicreports.report.base.DRGroup;
+import software.xdev.dynamicreports.report.base.DRVariable;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.datatype.DataTypes;
+import software.xdev.dynamicreports.report.builder.expression.PercentageExpression;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.constant.PercentageTotalType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRReportException;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -47,7 +47,7 @@ public class PercentageColumnBuilder extends ValueColumnBuilder<PercentageColumn
     /**
      * <p>Constructor for PercentageColumnBuilder.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      */
     protected PercentageColumnBuilder(ValueColumnBuilder<?, ? extends Number> column) {
         Validate.notNull(column, "column must not be null");
@@ -57,7 +57,7 @@ protected PercentageColumnBuilder(ValueColumnBuilder<?, ? extends Number> column
     /**
      * <p>Constructor for PercentageColumnBuilder.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected PercentageColumnBuilder(FieldBuilder<? extends Number> field) {
         Validate.notNull(field, "field must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/TextColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/TextColumnBuilder.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/TextColumnBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/TextColumnBuilder.java
index d47f153..27b4d24 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/TextColumnBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/TextColumnBuilder.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.column;
-
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.expression.AddExpression;
-import net.sf.dynamicreports.report.builder.expression.DivideExpression;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.builder.expression.MultiplyExpression;
-import net.sf.dynamicreports.report.builder.expression.SubtractExpression;
-import net.sf.dynamicreports.report.builder.expression.ValueExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+package software.xdev.dynamicreports.report.builder.column;
+
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.expression.AddExpression;
+import software.xdev.dynamicreports.report.builder.expression.DivideExpression;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.builder.expression.MultiplyExpression;
+import software.xdev.dynamicreports.report.builder.expression.SubtractExpression;
+import software.xdev.dynamicreports.report.builder.expression.ValueExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 import java.math.BigDecimal;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * It is used to show values from the data source.
@@ -45,7 +45,7 @@ public class TextColumnBuilder<T> extends ValueColumnBuilder<TextColumnBuilder<T
     /**
      * <p>Constructor for TextColumnBuilder.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected TextColumnBuilder(FieldBuilder<T> field) {
         Validate.notNull(field, "field must not be null");
@@ -55,7 +55,7 @@ protected TextColumnBuilder(FieldBuilder<T> field) {
     /**
      * <p>Constructor for TextColumnBuilder.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected TextColumnBuilder(DRIExpression<T> valueExpression) {
         setValueExpression(valueExpression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ValueColumnBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ValueColumnBuilder.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ValueColumnBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ValueColumnBuilder.java
index 5e83095..1b34f0a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/column/ValueColumnBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/column/ValueColumnBuilder.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.column;
-
-import net.sf.dynamicreports.report.base.column.DRValueColumn;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+package software.xdev.dynamicreports.report.builder.column;
+
+import software.xdev.dynamicreports.report.base.column.DRValueColumn;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.builder.HyperLinkBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 
 /**
  * <p>Abstract ValueColumnBuilder class.</p>
@@ -51,7 +51,7 @@ protected ValueColumnBuilder() {
     /**
      * <p>setValueExpression.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected void setValueExpression(final DRIExpression<U> valueExpression) {
         getComponent().setValueExpression(valueExpression);
@@ -71,7 +71,7 @@ public T setPrintRepeatedDetailValues(final Boolean printRepeatedDetailValues) {
     /**
      * Sets the column value horizontal alignment.
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
      * @return a column builder
      * @deprecated use setHorizontalTextAlignment instead
      */
@@ -89,7 +89,7 @@ public T setHorizontalAlignment(final HorizontalAlignment horizontalAlignment) {
     /**
      * Sets the column value horizontal text alignment.
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      * @return a column builder
      */
     public T setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
@@ -231,7 +231,7 @@ public T setAnchorName(final String anchorName) {
     /**
      * <p>setAnchorName.</p>
      *
-     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param anchorNameExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setAnchorName(final DRIExpression<String> anchorNameExpression) {
@@ -271,7 +271,7 @@ public T setHyperLink(final HyperLinkBuilder hyperLink) {
      * @param width the column preferred width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setWidth(final Integer width) {
         getComponent().setWidth(width);
@@ -284,7 +284,7 @@ public T setWidth(final Integer width) {
      * @param width the column fixed width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setFixedWidth(final Integer width) {
         getComponent().setWidth(width);
@@ -298,7 +298,7 @@ public T setFixedWidth(final Integer width) {
      * @param width the column minimum width >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setMinWidth(final Integer width) {
         getComponent().setWidth(width);
@@ -312,7 +312,7 @@ public T setMinWidth(final Integer width) {
      * @param height the column preferred height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setHeight(final Integer height) {
         getComponent().setHeight(height);
@@ -325,7 +325,7 @@ public T setHeight(final Integer height) {
      * @param height the column fixed height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setFixedHeight(final Integer height) {
         getComponent().setHeight(height);
@@ -339,7 +339,7 @@ public T setFixedHeight(final Integer height) {
      * @param height the column minimum height >= 0
      * @return a column builder
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setMinHeight(final Integer height) {
         getComponent().setHeight(height);
@@ -363,7 +363,7 @@ public T setStretchWithOverflow(final Boolean stretchWithOverflow) {
     /**
      * <p>setTextAdjust.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      * @return a T object.
      */
     public T setTextAdjust(final TextAdjust textAdjust) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java
index 1a1ccc5..a0cafc7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/AbstractFormatFieldBuilder.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRFormatField;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.component.DRFormatField;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>Abstract AbstractFormatFieldBuilder class.</p>
@@ -57,7 +57,7 @@ public T setFormatExpression(String format) {
     /**
      * <p>setFormatExpression.</p>
      *
-     * @param formatExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param formatExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setFormatExpression(DRIExpression<String> formatExpression) {
@@ -68,7 +68,7 @@ public T setFormatExpression(DRIExpression<String> formatExpression) {
     /**
      * <p>setHorizontalAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
      * @return a T object.
      * @deprecated use setHorizontalTextAlignment instead
      */
@@ -85,7 +85,7 @@ public T setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
     /**
      * <p>setHorizontalTextAlignment.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      * @return a T object.
      */
     public T setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BooleanFieldBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/BooleanFieldBuilder.java
similarity index 67%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BooleanFieldBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/BooleanFieldBuilder.java
index 65020d3..889811a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BooleanFieldBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/BooleanFieldBuilder.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRBooleanField;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.component.DRBooleanField;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -48,8 +48,8 @@ protected BooleanFieldBuilder() {
     /**
      * <p>setValue.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder setValue(FieldBuilder<Boolean> field) {
         Validate.notNull(field, "field must not be null");
@@ -60,8 +60,8 @@ public BooleanFieldBuilder setValue(FieldBuilder<Boolean> field) {
     /**
      * <p>setValue.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder setValue(DRIExpression<Boolean> valueExpression) {
         getObject().setValueExpression(valueExpression);
@@ -72,7 +72,7 @@ public BooleanFieldBuilder setValue(DRIExpression<Boolean> valueExpression) {
      * <p>setValue.</p>
      *
      * @param value a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder setValue(Boolean value) {
         getObject().setValueExpression(Expressions.value(value));
@@ -82,8 +82,8 @@ public BooleanFieldBuilder setValue(Boolean value) {
     /**
      * <p>setComponentType.</p>
      *
-     * @param booleanComponentType a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param booleanComponentType a {@link software.xdev.dynamicreports.report.constant.BooleanComponentType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder setComponentType(BooleanComponentType booleanComponentType) {
         getObject().setComponentType(booleanComponentType);
@@ -94,7 +94,7 @@ public BooleanFieldBuilder setComponentType(BooleanComponentType booleanComponen
      * <p>setEmptyWhenNullValue.</p>
      *
      * @param emptyWhenNullValue a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder setEmptyWhenNullValue(Boolean emptyWhenNullValue) {
         getObject().setEmptyWhenNullValue(emptyWhenNullValue);
@@ -139,8 +139,8 @@ public BooleanFieldBuilder setImageHeight(Integer height) {
     /**
      * <p>setHorizontalImageAlignment.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
         getObject().setHorizontalImageAlignment(horizontalImageAlignment);
@@ -150,8 +150,8 @@ public BooleanFieldBuilder setHorizontalImageAlignment(HorizontalImageAlignment
     /**
      * <p>setHorizontalAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      * @deprecated use setHorizontalImageAlignment instead
      */
     @Deprecated
@@ -167,8 +167,8 @@ public BooleanFieldBuilder setHorizontalAlignment(HorizontalAlignment horizontal
     /**
      * <p>setHorizontalTextAlignment.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
         getObject().setHorizontalTextAlignment(horizontalTextAlignment);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BreakBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/BreakBuilder.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BreakBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/BreakBuilder.java
index 87c0f1c..4cb591d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/BreakBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/BreakBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRBreak;
-import net.sf.dynamicreports.report.constant.BreakType;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRBreak;
+import software.xdev.dynamicreports.report.constant.BreakType;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>BreakBuilder class.</p>
@@ -40,8 +40,8 @@ protected BreakBuilder() {
     /**
      * <p>setType.</p>
      *
-     * @param breakType a {@link net.sf.dynamicreports.report.constant.BreakType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     * @param breakType a {@link software.xdev.dynamicreports.report.constant.BreakType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BreakBuilder} object.
      */
     public BreakBuilder setType(BreakType breakType) {
         getObject().setType(breakType);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ComponentBuilder.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ComponentBuilder.java
index 64b2268..8737ab5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ComponentBuilder.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRComponent;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.base.component.DRComponent;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -50,7 +50,7 @@ protected ComponentBuilder(U object) {
     /**
      * <p>setStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setStyle(ReportStyleBuilder style) {
@@ -65,7 +65,7 @@ public T setStyle(ReportStyleBuilder style) {
     /**
      * <p>setPrintWhenExpression.</p>
      *
-     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param printWhenExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
@@ -96,7 +96,7 @@ public T setRemoveLineWhenBlank(Boolean removeLineWhenBlank) {
     /**
      * <p>addProperty.</p>
      *
-     * @param propertyExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
+     * @param propertyExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression} object.
      * @return a T object.
      */
     public T addProperty(DRIPropertyExpression propertyExpression) {
@@ -108,7 +108,7 @@ public T addProperty(DRIPropertyExpression propertyExpression) {
      * <p>addProperty.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T addProperty(String name, DRIExpression<String> valueExpression) {
@@ -142,7 +142,7 @@ public T setTableOfContentsHeading(String label) {
     /**
      * <p>setTableOfContentsHeading.</p>
      *
-     * @param tocHeading a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @param tocHeading a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
      * @return a T object.
      */
     public T setTableOfContentsHeading(TableOfContentsHeadingBuilder tocHeading) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ComponentBuilders.java
similarity index 58%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ComponentBuilders.java
index d09bc16..62a0a70 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ComponentBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ComponentBuilders.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.VariableBuilder;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.VariableBuilder;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.renderers.Renderable;
 
@@ -42,7 +42,7 @@ public class ComponentBuilders {
     /**
      * <p>horizontalList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder horizontalList() {
         return Components.horizontalList();
@@ -51,8 +51,8 @@ public HorizontalListBuilder horizontalList() {
     /**
      * <p>horizontalList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder horizontalList(ComponentBuilder<?, ?>... components) {
         return Components.horizontalList(components);
@@ -61,8 +61,8 @@ public HorizontalListBuilder horizontalList(ComponentBuilder<?, ?>... components
     /**
      * <p>horizontalList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder horizontalList(HorizontalListCellBuilder... cells) {
         return Components.horizontalList(cells);
@@ -71,8 +71,8 @@ public HorizontalListBuilder horizontalList(HorizontalListCellBuilder... cells)
     /**
      * <p>hListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public HorizontalListCellBuilder hListCell(ComponentBuilder<?, ?> component) {
         return Components.hListCell(component);
@@ -83,7 +83,7 @@ public HorizontalListCellBuilder hListCell(ComponentBuilder<?, ?> component) {
     /**
      * <p>horizontalFlowList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder horizontalFlowList() {
         return Components.horizontalFlowList();
@@ -92,8 +92,8 @@ public HorizontalListBuilder horizontalFlowList() {
     /**
      * <p>horizontalFlowList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder horizontalFlowList(ComponentBuilder<?, ?>... components) {
         return Components.horizontalFlowList(components);
@@ -102,8 +102,8 @@ public HorizontalListBuilder horizontalFlowList(ComponentBuilder<?, ?>... compon
     /**
      * <p>horizontalFlowList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder horizontalFlowList(HorizontalListCellBuilder... cells) {
         return Components.horizontalFlowList(cells);
@@ -114,7 +114,7 @@ public HorizontalListBuilder horizontalFlowList(HorizontalListCellBuilder... cel
     /**
      * <p>verticalList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder verticalList() {
         return Components.verticalList();
@@ -123,8 +123,8 @@ public VerticalListBuilder verticalList() {
     /**
      * <p>verticalList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder verticalList(ComponentBuilder<?, ?>... components) {
         return Components.verticalList(components);
@@ -133,8 +133,8 @@ public VerticalListBuilder verticalList(ComponentBuilder<?, ?>... components) {
     /**
      * <p>verticalList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder verticalList(VerticalListCellBuilder... cells) {
         return Components.verticalList(cells);
@@ -143,8 +143,8 @@ public VerticalListBuilder verticalList(VerticalListCellBuilder... cells) {
     /**
      * <p>vListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public VerticalListCellBuilder vListCell(ComponentBuilder<?, ?> component) {
         return Components.vListCell(component);
@@ -155,7 +155,7 @@ public VerticalListCellBuilder vListCell(ComponentBuilder<?, ?> component) {
     /**
      * <p>xyList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListBuilder} object.
      */
     public XyListBuilder xyList() {
         return Components.xyList();
@@ -164,8 +164,8 @@ public XyListBuilder xyList() {
     /**
      * <p>xyList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListBuilder} object.
      */
     public XyListBuilder xyList(XyListCellBuilder... cells) {
         return Components.xyList(cells);
@@ -176,8 +176,8 @@ public XyListBuilder xyList(XyListCellBuilder... cells) {
      *
      * @param x         a {@link java.lang.Integer} object.
      * @param y         a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListCellBuilder} object.
      */
     public XyListCellBuilder xyListCell(Integer x, Integer y, ComponentBuilder<?, ?> component) {
         return Components.xyListCell(x, y, component);
@@ -190,8 +190,8 @@ public XyListCellBuilder xyListCell(Integer x, Integer y, ComponentBuilder<?, ?>
      * @param y         a {@link java.lang.Integer} object.
      * @param width     a {@link java.lang.Integer} object.
      * @param height    a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListCellBuilder} object.
      */
     public XyListCellBuilder xyListCell(Integer x, Integer y, Integer width, Integer height, ComponentBuilder<?, ?> component) {
         return Components.xyListCell(x, y, width, height, component);
@@ -202,7 +202,7 @@ public XyListCellBuilder xyListCell(Integer x, Integer y, Integer width, Integer
     /**
      * <p>multiPageList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder} object.
      */
     public MultiPageListBuilder multiPageList() {
         return Components.multiPageList();
@@ -211,8 +211,8 @@ public MultiPageListBuilder multiPageList() {
     /**
      * <p>multiPageList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder} object.
      */
     public MultiPageListBuilder multiPageList(ComponentBuilder<?, ?>... components) {
         return Components.multiPageList(components);
@@ -221,7 +221,7 @@ public MultiPageListBuilder multiPageList(ComponentBuilder<?, ?>... components)
     /**
      * <p>currentDate.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.CurrentDateBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.CurrentDateBuilder} object.
      */
     public CurrentDateBuilder currentDate() {
         return Components.currentDate();
@@ -230,7 +230,7 @@ public CurrentDateBuilder currentDate() {
     /**
      * <p>pageNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageNumberBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageNumberBuilder} object.
      */
     public PageNumberBuilder pageNumber() {
         return Components.pageNumber();
@@ -239,7 +239,7 @@ public PageNumberBuilder pageNumber() {
     /**
      * <p>pageXofY.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXofYBuilder} object.
      */
     public PageXofYBuilder pageXofY() {
         return Components.pageXofY();
@@ -248,7 +248,7 @@ public PageXofYBuilder pageXofY() {
     /**
      * <p>pageXslashY.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXslashYBuilder} object.
      */
     public PageXslashYBuilder pageXslashY() {
         return Components.pageXslashY();
@@ -257,7 +257,7 @@ public PageXslashYBuilder pageXslashY() {
     /**
      * <p>totalPages.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TotalPagesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TotalPagesBuilder} object.
      */
     public TotalPagesBuilder totalPages() {
         return Components.totalPages();
@@ -269,7 +269,7 @@ public TotalPagesBuilder totalPages() {
      * <p>text.</p>
      *
      * @param text a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<String> text(String text) {
         return Components.text(text);
@@ -279,7 +279,7 @@ public TextFieldBuilder<String> text(String text) {
      * <p>text.</p>
      *
      * @param date a {@link java.util.Date} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<Date> text(Date date) {
         return Components.text(date);
@@ -289,7 +289,7 @@ public TextFieldBuilder<Date> text(Date date) {
      * <p>text.</p>
      *
      * @param number a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public <T extends Number> TextFieldBuilder<T> text(T number) {
         return Components.text(number);
@@ -298,9 +298,9 @@ public <T extends Number> TextFieldBuilder<T> text(T number) {
     /**
      * <p>text.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public <T> TextFieldBuilder<T> text(FieldBuilder<T> field) {
         return Components.text(field);
@@ -309,9 +309,9 @@ public <T> TextFieldBuilder<T> text(FieldBuilder<T> field) {
     /**
      * <p>text.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      * @param <T>      a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public <T> TextFieldBuilder<T> text(VariableBuilder<T> variable) {
         return Components.text(variable);
@@ -320,9 +320,9 @@ public <T> TextFieldBuilder<T> text(VariableBuilder<T> variable) {
     /**
      * <p>text.</p>
      *
-     * @param textExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param textExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>            a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public <T> TextFieldBuilder<T> text(DRIExpression<T> textExpression) {
         return Components.text(textExpression);
@@ -333,7 +333,7 @@ public <T> TextFieldBuilder<T> text(DRIExpression<T> textExpression) {
     /**
      * <p>filler.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.FillerBuilder} object.
      */
     public FillerBuilder filler() {
         return Components.filler();
@@ -343,7 +343,7 @@ public FillerBuilder filler() {
      * <p>horizontalGap.</p>
      *
      * @param width a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.FillerBuilder} object.
      */
     public FillerBuilder horizontalGap(int width) {
         return Components.horizontalGap(width);
@@ -353,7 +353,7 @@ public FillerBuilder horizontalGap(int width) {
      * <p>verticalGap.</p>
      *
      * @param height a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.FillerBuilder} object.
      */
     public FillerBuilder verticalGap(int height) {
         return Components.verticalGap(height);
@@ -364,7 +364,7 @@ public FillerBuilder verticalGap(int height) {
      *
      * @param width  a int.
      * @param height a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.FillerBuilder} object.
      */
     public FillerBuilder gap(int width, int height) {
         return Components.gap(width, height);
@@ -375,8 +375,8 @@ public FillerBuilder gap(int width, int height) {
     /**
      * <p>image.</p>
      *
-     * @param imageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @param imageExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder image(DRIExpression<?> imageExpression) {
         return Components.image(imageExpression);
@@ -386,7 +386,7 @@ public ImageBuilder image(DRIExpression<?> imageExpression) {
      * <p>image.</p>
      *
      * @param imagePath a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder image(String imagePath) {
         return Components.image(imagePath);
@@ -396,7 +396,7 @@ public ImageBuilder image(String imagePath) {
      * <p>image.</p>
      *
      * @param image a {@link java.awt.Image} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder image(Image image) {
         return Components.image(image);
@@ -406,7 +406,7 @@ public ImageBuilder image(Image image) {
      * <p>image.</p>
      *
      * @param imageInputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder image(InputStream imageInputStream) {
         return Components.image(imageInputStream);
@@ -416,7 +416,7 @@ public ImageBuilder image(InputStream imageInputStream) {
      * <p>image.</p>
      *
      * @param imageUrl a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder image(URL imageUrl) {
         return Components.image(imageUrl);
@@ -426,7 +426,7 @@ public ImageBuilder image(URL imageUrl) {
      * <p>image.</p>
      *
      * @param image a {@link net.sf.jasperreports.renderers.Renderable} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder image(Renderable image) {
         return Components.image(image);
@@ -436,7 +436,7 @@ public ImageBuilder image(Renderable image) {
      * <p>image.</p>
      *
      * @param image a {@link net.sf.jasperreports.engine.Renderable} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      * @deprecated use image(net.sf.jasperreports.renderers.Renderable image) instead
      */
     @Deprecated
@@ -449,8 +449,8 @@ public ImageBuilder image(net.sf.jasperreports.engine.Renderable image) {
     /**
      * <p>subreport.</p>
      *
-     * @param reportBuilder a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param reportBuilder a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder subreport(JasperReportBuilder reportBuilder) {
         return Components.subreport(reportBuilder);
@@ -460,7 +460,7 @@ public SubreportBuilder subreport(JasperReportBuilder reportBuilder) {
      * <p>subreport.</p>
      *
      * @param jasperReport a {@link net.sf.jasperreports.engine.JasperReport} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder subreport(JasperReport jasperReport) {
         return Components.subreport(jasperReport);
@@ -469,8 +469,8 @@ public SubreportBuilder subreport(JasperReport jasperReport) {
     /**
      * <p>subreport.</p>
      *
-     * @param reportExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param reportExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder subreport(DRIExpression<?> reportExpression) {
         return Components.subreport(reportExpression);
@@ -481,7 +481,7 @@ public SubreportBuilder subreport(DRIExpression<?> reportExpression) {
     /**
      * <p>line.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.LineBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.LineBuilder} object.
      */
     public LineBuilder line() {
         return Components.line();
@@ -492,7 +492,7 @@ public LineBuilder line() {
     /**
      * <p>pageBreak.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BreakBuilder} object.
      */
     public BreakBuilder pageBreak() {
         return Components.pageBreak();
@@ -501,7 +501,7 @@ public BreakBuilder pageBreak() {
     /**
      * <p>columnBreak.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BreakBuilder} object.
      */
     public BreakBuilder columnBreak() {
         return Components.columnBreak();
@@ -515,7 +515,7 @@ public BreakBuilder columnBreak() {
      * @param namespace a {@link java.lang.String} object.
      * @param namespace a {@link java.lang.String} object.
      * @param name      a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.GenericElementBuilder} object.
      */
     public GenericElementBuilder genericElement(String namespace, String name) {
         return Components.genericElement(namespace, name);
@@ -527,7 +527,7 @@ public GenericElementBuilder genericElement(String namespace, String name) {
      * <p>booleanField.</p>
      *
      * @param value a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder booleanField(Boolean value) {
         return Components.booleanField(value);
@@ -536,8 +536,8 @@ public BooleanFieldBuilder booleanField(Boolean value) {
     /**
      * <p>booleanField.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder booleanField(FieldBuilder<Boolean> field) {
         return Components.booleanField(field);
@@ -546,8 +546,8 @@ public BooleanFieldBuilder booleanField(FieldBuilder<Boolean> field) {
     /**
      * <p>booleanField.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public BooleanFieldBuilder booleanField(DRIExpression<Boolean> valueExpression) {
         return Components.booleanField(valueExpression);
@@ -558,7 +558,7 @@ public BooleanFieldBuilder booleanField(DRIExpression<Boolean> valueExpression)
     /**
      * <p>ellipse.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.EllipseBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.EllipseBuilder} object.
      */
     public EllipseBuilder ellipse() {
         return Components.ellipse();
@@ -569,7 +569,7 @@ public EllipseBuilder ellipse() {
     /**
      * <p>rectangle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.RectangleBuilder} object.
      */
     public RectangleBuilder rectangle() {
         return Components.rectangle();
@@ -578,7 +578,7 @@ public RectangleBuilder rectangle() {
     /**
      * <p>roundRectangle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.RectangleBuilder} object.
      */
     public RectangleBuilder roundRectangle() {
         return Components.roundRectangle();
@@ -588,7 +588,7 @@ public RectangleBuilder roundRectangle() {
      * <p>roundRectangle.</p>
      *
      * @param radius a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.RectangleBuilder} object.
      */
     public RectangleBuilder roundRectangle(int radius) {
         return Components.roundRectangle(radius);
@@ -599,7 +599,7 @@ public RectangleBuilder roundRectangle(int radius) {
     /**
      * <p>map.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public MapBuilder map() {
         return Components.map();
@@ -611,7 +611,7 @@ public MapBuilder map() {
      * @param latitude  a {@link java.lang.Float} object.
      * @param longitude a {@link java.lang.Float} object.
      * @param zoom      a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public MapBuilder map(Float latitude, Float longitude, Integer zoom) {
         return Components.map(latitude, longitude, zoom);
@@ -622,8 +622,8 @@ public MapBuilder map(Float latitude, Float longitude, Integer zoom) {
     /**
      * <p>centerHorizontal.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder centerHorizontal(ComponentBuilder<?, ?> component) {
         return Components.centerHorizontal(component);
@@ -632,8 +632,8 @@ public HorizontalListBuilder centerHorizontal(ComponentBuilder<?, ?> component)
     /**
      * <p>centerVertical.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder centerVertical(ComponentBuilder<?, ?> component) {
         return Components.centerVertical(component);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/Components.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/Components.java
similarity index 61%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/Components.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/Components.java
index e68b358..e091eaf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/Components.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/Components.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.VariableBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.BreakType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+package software.xdev.dynamicreports.report.builder.component;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.VariableBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.BreakType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.renderers.Renderable;
 import org.apache.commons.lang3.Validate;
@@ -45,7 +45,7 @@ public class Components {
     /**
      * <p>horizontalList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public static HorizontalListBuilder horizontalList() {
         return new HorizontalListBuilder();
@@ -54,8 +54,8 @@ public static HorizontalListBuilder horizontalList() {
     /**
      * <p>horizontalList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public static HorizontalListBuilder horizontalList(ComponentBuilder<?, ?>... components) {
         return new HorizontalListBuilder().add(components);
@@ -64,8 +64,8 @@ public static HorizontalListBuilder horizontalList(ComponentBuilder<?, ?>... com
     /**
      * <p>horizontalList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public static HorizontalListBuilder horizontalList(HorizontalListCellBuilder... cells) {
         return new HorizontalListBuilder().add(cells);
@@ -74,8 +74,8 @@ public static HorizontalListBuilder horizontalList(HorizontalListCellBuilder...
     /**
      * <p>hListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public static HorizontalListCellBuilder hListCell(ComponentBuilder<?, ?> component) {
         Validate.notNull(component, "component must not be null");
@@ -87,7 +87,7 @@ public static HorizontalListCellBuilder hListCell(ComponentBuilder<?, ?> compone
     /**
      * <p>horizontalFlowList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public static HorizontalListBuilder horizontalFlowList() {
         return new HorizontalFlowListBuilder();
@@ -96,8 +96,8 @@ public static HorizontalListBuilder horizontalFlowList() {
     /**
      * <p>horizontalFlowList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public static HorizontalListBuilder horizontalFlowList(ComponentBuilder<?, ?>... components) {
         return new HorizontalFlowListBuilder().add(components);
@@ -106,8 +106,8 @@ public static HorizontalListBuilder horizontalFlowList(ComponentBuilder<?, ?>...
     /**
      * <p>horizontalFlowList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public static HorizontalListBuilder horizontalFlowList(HorizontalListCellBuilder... cells) {
         return new HorizontalFlowListBuilder().add(cells);
@@ -118,7 +118,7 @@ public static HorizontalListBuilder horizontalFlowList(HorizontalListCellBuilder
     /**
      * <p>verticalList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public static VerticalListBuilder verticalList() {
         return new VerticalListBuilder();
@@ -127,8 +127,8 @@ public static VerticalListBuilder verticalList() {
     /**
      * <p>verticalList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public static VerticalListBuilder verticalList(ComponentBuilder<?, ?>... components) {
         return new VerticalListBuilder().add(components);
@@ -137,8 +137,8 @@ public static VerticalListBuilder verticalList(ComponentBuilder<?, ?>... compone
     /**
      * <p>verticalList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public static VerticalListBuilder verticalList(VerticalListCellBuilder... cells) {
         return new VerticalListBuilder().add(cells);
@@ -147,8 +147,8 @@ public static VerticalListBuilder verticalList(VerticalListCellBuilder... cells)
     /**
      * <p>vListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public static VerticalListCellBuilder vListCell(ComponentBuilder<?, ?> component) {
         Validate.notNull(component, "component must not be null");
@@ -160,7 +160,7 @@ public static VerticalListCellBuilder vListCell(ComponentBuilder<?, ?> component
     /**
      * <p>xyList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListBuilder} object.
      */
     public static XyListBuilder xyList() {
         return new XyListBuilder();
@@ -169,8 +169,8 @@ public static XyListBuilder xyList() {
     /**
      * <p>xyList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListBuilder} object.
      */
     public static XyListBuilder xyList(XyListCellBuilder... cells) {
         return new XyListBuilder().add(cells);
@@ -181,8 +181,8 @@ public static XyListBuilder xyList(XyListCellBuilder... cells) {
      *
      * @param x         a {@link java.lang.Integer} object.
      * @param y         a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListCellBuilder} object.
      */
     public static XyListCellBuilder xyListCell(Integer x, Integer y, ComponentBuilder<?, ?> component) {
         Validate.notNull(component, "component must not be null");
@@ -196,8 +196,8 @@ public static XyListCellBuilder xyListCell(Integer x, Integer y, ComponentBuilde
      * @param y         a {@link java.lang.Integer} object.
      * @param width     a {@link java.lang.Integer} object.
      * @param height    a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListCellBuilder} object.
      */
     public static XyListCellBuilder xyListCell(Integer x, Integer y, Integer width, Integer height, ComponentBuilder<?, ?> component) {
         Validate.notNull(component, "component must not be null");
@@ -209,7 +209,7 @@ public static XyListCellBuilder xyListCell(Integer x, Integer y, Integer width,
     /**
      * <p>multiPageList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder} object.
      */
     public static MultiPageListBuilder multiPageList() {
         return new MultiPageListBuilder();
@@ -218,8 +218,8 @@ public static MultiPageListBuilder multiPageList() {
     /**
      * <p>multiPageList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder} object.
      */
     public static MultiPageListBuilder multiPageList(ComponentBuilder<?, ?>... components) {
         return new MultiPageListBuilder().add(components);
@@ -228,7 +228,7 @@ public static MultiPageListBuilder multiPageList(ComponentBuilder<?, ?>... compo
     /**
      * <p>currentDate.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.CurrentDateBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.CurrentDateBuilder} object.
      */
     public static CurrentDateBuilder currentDate() {
         return new CurrentDateBuilder();
@@ -237,7 +237,7 @@ public static CurrentDateBuilder currentDate() {
     /**
      * <p>pageNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageNumberBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageNumberBuilder} object.
      */
     public static PageNumberBuilder pageNumber() {
         return new PageNumberBuilder();
@@ -246,7 +246,7 @@ public static PageNumberBuilder pageNumber() {
     /**
      * <p>pageXofY.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXofYBuilder} object.
      */
     public static PageXofYBuilder pageXofY() {
         return new PageXofYBuilder();
@@ -255,7 +255,7 @@ public static PageXofYBuilder pageXofY() {
     /**
      * <p>pageXslashY.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXslashYBuilder} object.
      */
     public static PageXslashYBuilder pageXslashY() {
         return new PageXslashYBuilder();
@@ -264,7 +264,7 @@ public static PageXslashYBuilder pageXslashY() {
     /**
      * <p>totalPages.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TotalPagesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TotalPagesBuilder} object.
      */
     public static TotalPagesBuilder totalPages() {
         return new TotalPagesBuilder();
@@ -276,7 +276,7 @@ public static TotalPagesBuilder totalPages() {
      * <p>text.</p>
      *
      * @param text a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public static TextFieldBuilder<String> text(String text) {
         return new TextFieldBuilder<String>().setText(text);
@@ -286,7 +286,7 @@ public static TextFieldBuilder<String> text(String text) {
      * <p>text.</p>
      *
      * @param date a {@link java.util.Date} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public static TextFieldBuilder<Date> text(Date date) {
         return new TextFieldBuilder<Date>().setText(date);
@@ -296,7 +296,7 @@ public static TextFieldBuilder<Date> text(Date date) {
      * <p>text.</p>
      *
      * @param number a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public static <T extends Number> TextFieldBuilder<T> text(T number) {
         return new TextFieldBuilder<T>().setText(number);
@@ -305,9 +305,9 @@ public static <T extends Number> TextFieldBuilder<T> text(T number) {
     /**
      * <p>text.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public static <T> TextFieldBuilder<T> text(FieldBuilder<T> field) {
         return new TextFieldBuilder<T>().setText(field);
@@ -316,9 +316,9 @@ public static <T> TextFieldBuilder<T> text(FieldBuilder<T> field) {
     /**
      * <p>text.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      * @param <T>      a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public static <T> TextFieldBuilder<T> text(VariableBuilder<T> variable) {
         return new TextFieldBuilder<T>().setText(variable);
@@ -327,9 +327,9 @@ public static <T> TextFieldBuilder<T> text(VariableBuilder<T> variable) {
     /**
      * <p>text.</p>
      *
-     * @param textExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param textExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>            a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public static <T> TextFieldBuilder<T> text(DRIExpression<T> textExpression) {
         return new TextFieldBuilder<T>().setText(textExpression);
@@ -340,7 +340,7 @@ public static <T> TextFieldBuilder<T> text(DRIExpression<T> textExpression) {
     /**
      * <p>filler.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.FillerBuilder} object.
      */
     public static FillerBuilder filler() {
         return new FillerBuilder();
@@ -350,7 +350,7 @@ public static FillerBuilder filler() {
      * <p>horizontalGap.</p>
      *
      * @param width a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.FillerBuilder} object.
      */
     public static FillerBuilder horizontalGap(int width) {
         return new FillerBuilder().setFixedWidth(width);
@@ -360,7 +360,7 @@ public static FillerBuilder horizontalGap(int width) {
      * <p>verticalGap.</p>
      *
      * @param height a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.FillerBuilder} object.
      */
     public static FillerBuilder verticalGap(int height) {
         return new FillerBuilder().setFixedHeight(height);
@@ -371,7 +371,7 @@ public static FillerBuilder verticalGap(int height) {
      *
      * @param width  a int.
      * @param height a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.FillerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.FillerBuilder} object.
      */
     public static FillerBuilder gap(int width, int height) {
         return new FillerBuilder().setFixedDimension(width, height);
@@ -382,8 +382,8 @@ public static FillerBuilder gap(int width, int height) {
     /**
      * <p>image.</p>
      *
-     * @param imageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @param imageExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public static ImageBuilder image(DRIExpression<?> imageExpression) {
         return new ImageBuilder().setImage(imageExpression);
@@ -393,7 +393,7 @@ public static ImageBuilder image(DRIExpression<?> imageExpression) {
      * <p>image.</p>
      *
      * @param imagePath a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public static ImageBuilder image(String imagePath) {
         return new ImageBuilder().setImage(imagePath);
@@ -403,7 +403,7 @@ public static ImageBuilder image(String imagePath) {
      * <p>image.</p>
      *
      * @param image a {@link java.awt.Image} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public static ImageBuilder image(Image image) {
         return new ImageBuilder().setImage(image);
@@ -413,7 +413,7 @@ public static ImageBuilder image(Image image) {
      * <p>image.</p>
      *
      * @param imageInputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public static ImageBuilder image(InputStream imageInputStream) {
         return new ImageBuilder().setImage(imageInputStream);
@@ -423,7 +423,7 @@ public static ImageBuilder image(InputStream imageInputStream) {
      * <p>image.</p>
      *
      * @param imageUrl a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public static ImageBuilder image(URL imageUrl) {
         return new ImageBuilder().setImage(imageUrl);
@@ -433,7 +433,7 @@ public static ImageBuilder image(URL imageUrl) {
      * <p>image.</p>
      *
      * @param image a {@link net.sf.jasperreports.renderers.Renderable} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public static ImageBuilder image(Renderable image) {
         return new ImageBuilder().setImage(Expressions.value(image, Renderable.class));
@@ -443,7 +443,7 @@ public static ImageBuilder image(Renderable image) {
      * <p>image.</p>
      *
      * @param image a {@link net.sf.jasperreports.engine.Renderable} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      * @deprecated use image(net.sf.jasperreports.renderers.Renderable image) instead
      */
     @Deprecated
@@ -456,8 +456,8 @@ public static ImageBuilder image(net.sf.jasperreports.engine.Renderable image) {
     /**
      * <p>subreport.</p>
      *
-     * @param reportBuilder a {@link net.sf.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param reportBuilder a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public static SubreportBuilder subreport(JasperReportBuilder reportBuilder) {
         SubreportBuilder subreport = new SubreportBuilder();
@@ -475,7 +475,7 @@ public static SubreportBuilder subreport(JasperReportBuilder reportBuilder) {
      * <p>subreport.</p>
      *
      * @param jasperReport a {@link net.sf.jasperreports.engine.JasperReport} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public static SubreportBuilder subreport(JasperReport jasperReport) {
         return new SubreportBuilder().setReport(jasperReport);
@@ -484,8 +484,8 @@ public static SubreportBuilder subreport(JasperReport jasperReport) {
     /**
      * <p>subreport.</p>
      *
-     * @param reportExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param reportExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public static SubreportBuilder subreport(DRIExpression<?> reportExpression) {
         return new SubreportBuilder().setReport(reportExpression);
@@ -496,7 +496,7 @@ public static SubreportBuilder subreport(DRIExpression<?> reportExpression) {
     /**
      * <p>line.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.LineBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.LineBuilder} object.
      */
     public static LineBuilder line() {
         return new LineBuilder();
@@ -507,7 +507,7 @@ public static LineBuilder line() {
     /**
      * <p>pageBreak.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BreakBuilder} object.
      */
     public static BreakBuilder pageBreak() {
         return new BreakBuilder().setType(BreakType.PAGE);
@@ -516,7 +516,7 @@ public static BreakBuilder pageBreak() {
     /**
      * <p>columnBreak.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BreakBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BreakBuilder} object.
      */
     public static BreakBuilder columnBreak() {
         return new BreakBuilder().setType(BreakType.COLUMN);
@@ -530,7 +530,7 @@ public static BreakBuilder columnBreak() {
      * @param namespace a {@link java.lang.String} object.
      * @param namespace a {@link java.lang.String} object.
      * @param name      a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.GenericElementBuilder} object.
      */
     public static GenericElementBuilder genericElement(String namespace, String name) {
         return new GenericElementBuilder(namespace, name);
@@ -542,7 +542,7 @@ public static GenericElementBuilder genericElement(String namespace, String name
      * <p>booleanField.</p>
      *
      * @param value a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public static BooleanFieldBuilder booleanField(Boolean value) {
         return new BooleanFieldBuilder().setValue(value);
@@ -551,8 +551,8 @@ public static BooleanFieldBuilder booleanField(Boolean value) {
     /**
      * <p>booleanField.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public static BooleanFieldBuilder booleanField(FieldBuilder<Boolean> field) {
         return new BooleanFieldBuilder().setValue(field);
@@ -561,8 +561,8 @@ public static BooleanFieldBuilder booleanField(FieldBuilder<Boolean> field) {
     /**
      * <p>booleanField.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.BooleanFieldBuilder} object.
      */
     public static BooleanFieldBuilder booleanField(DRIExpression<Boolean> valueExpression) {
         return new BooleanFieldBuilder().setValue(valueExpression);
@@ -573,7 +573,7 @@ public static BooleanFieldBuilder booleanField(DRIExpression<Boolean> valueExpre
     /**
      * <p>ellipse.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.EllipseBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.EllipseBuilder} object.
      */
     public static EllipseBuilder ellipse() {
         return new EllipseBuilder();
@@ -584,7 +584,7 @@ public static EllipseBuilder ellipse() {
     /**
      * <p>rectangle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.RectangleBuilder} object.
      */
     public static RectangleBuilder rectangle() {
         return new RectangleBuilder();
@@ -593,7 +593,7 @@ public static RectangleBuilder rectangle() {
     /**
      * <p>roundRectangle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.RectangleBuilder} object.
      */
     public static RectangleBuilder roundRectangle() {
         return new RectangleBuilder().setRadius(10);
@@ -603,7 +603,7 @@ public static RectangleBuilder roundRectangle() {
      * <p>roundRectangle.</p>
      *
      * @param radius a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.RectangleBuilder} object.
      */
     public static RectangleBuilder roundRectangle(int radius) {
         return new RectangleBuilder().setRadius(radius);
@@ -614,7 +614,7 @@ public static RectangleBuilder roundRectangle(int radius) {
     /**
      * <p>map.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public static MapBuilder map() {
         return new MapBuilder();
@@ -626,7 +626,7 @@ public static MapBuilder map() {
      * @param latitude  a {@link java.lang.Float} object.
      * @param longitude a {@link java.lang.Float} object.
      * @param zoom      a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public static MapBuilder map(Float latitude, Float longitude, Integer zoom) {
         MapBuilder mapBuilder = new MapBuilder();
@@ -641,8 +641,8 @@ public static MapBuilder map(Float latitude, Float longitude, Integer zoom) {
     /**
      * <p>centerHorizontal.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public static HorizontalListBuilder centerHorizontal(ComponentBuilder<?, ?> component) {
         HorizontalListBuilder list = horizontalList();
@@ -655,8 +655,8 @@ public static HorizontalListBuilder centerHorizontal(ComponentBuilder<?, ?> comp
     /**
      * <p>centerVertical.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public static VerticalListBuilder centerVertical(ComponentBuilder<?, ?> component) {
         VerticalListBuilder list = verticalList();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/CurrentDateBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/CurrentDateBuilder.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/CurrentDateBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/CurrentDateBuilder.java
index 00012ca..c058b92 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/CurrentDateBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/CurrentDateBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRCurrentDate;
-import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRCurrentDate;
+import software.xdev.dynamicreports.report.builder.expression.SystemMessageExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>CurrentDateBuilder class.</p>
@@ -41,7 +41,7 @@ protected CurrentDateBuilder() {
      * <p>setPattern.</p>
      *
      * @param pattern a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.CurrentDateBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.CurrentDateBuilder} object.
      */
     public CurrentDateBuilder setPattern(String pattern) {
         getObject().setPattern(pattern);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/DimensionComponentBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/DimensionComponentBuilder.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/DimensionComponentBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/DimensionComponentBuilder.java
index ed61f77..5377643 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/DimensionComponentBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/DimensionComponentBuilder.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRDimensionComponent;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.report.base.component.DRDimensionComponent;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.StretchType;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -66,7 +66,7 @@ public DimensionComponentBuilder(U component) {
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setDimension(Integer width, Integer height) {
         getObject().setWidth(width);
@@ -96,7 +96,7 @@ public T setDimension(Integer width, Integer height) {
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setFixedDimension(Integer width, Integer height) {
         getObject().setWidth(width);
@@ -128,7 +128,7 @@ public T setFixedDimension(Integer width, Integer height) {
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setMinDimension(Integer width, Integer height) {
         getObject().setWidth(width);
@@ -144,7 +144,7 @@ public T setMinDimension(Integer width, Integer height) {
      * @param width the component preferred width >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setWidth(Integer width) {
         getObject().setWidth(width);
@@ -157,7 +157,7 @@ public T setWidth(Integer width) {
      * @param width the component fixed width >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setFixedWidth(Integer width) {
         getObject().setWidth(width);
@@ -171,7 +171,7 @@ public T setFixedWidth(Integer width) {
      * @param width the component minimum width >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setMinWidth(Integer width) {
         getObject().setWidth(width);
@@ -185,7 +185,7 @@ public T setMinWidth(Integer width) {
      * @param height the component preferred height >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setHeight(Integer height) {
         getObject().setHeight(height);
@@ -198,7 +198,7 @@ public T setHeight(Integer height) {
      * @param height the component fixed height >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setFixedHeight(Integer height) {
         getObject().setHeight(height);
@@ -212,7 +212,7 @@ public T setFixedHeight(Integer height) {
      * @param height the component minimum height >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setMinHeight(Integer height) {
         getObject().setHeight(height);
@@ -223,7 +223,7 @@ public T setMinHeight(Integer height) {
     /**
      * <p>setPositionType.</p>
      *
-     * @param positionType a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     * @param positionType a {@link software.xdev.dynamicreports.report.constant.ComponentPositionType} object.
      * @return a T object.
      */
     public T setPositionType(ComponentPositionType positionType) {
@@ -234,7 +234,7 @@ public T setPositionType(ComponentPositionType positionType) {
     /**
      * <p>setStretchType.</p>
      *
-     * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     * @param stretchType a {@link software.xdev.dynamicreports.report.constant.StretchType} object.
      * @return a T object.
      */
     public T setStretchType(StretchType stretchType) {
@@ -267,7 +267,7 @@ public T setPrintWhenDetailOverflows(Boolean printWhenDetailOverflows) {
     /**
      * <p>setPrintWhenGroupChanges.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
      * @return a T object.
      */
     public T setPrintWhenGroupChanges(GroupBuilder<?> group) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/EllipseBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/EllipseBuilder.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/EllipseBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/EllipseBuilder.java
index 220de0c..54a922d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/EllipseBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/EllipseBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DREllipse;
-import net.sf.dynamicreports.report.builder.style.PenBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DREllipse;
+import software.xdev.dynamicreports.report.builder.style.PenBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>EllipseBuilder class.</p>
@@ -40,8 +40,8 @@ protected EllipseBuilder() {
     /**
      * <p>setPen.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.EllipseBuilder} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.EllipseBuilder} object.
      */
     public EllipseBuilder setPen(PenBuilder pen) {
         if (pen != null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/FillerBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/FillerBuilder.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/FillerBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/FillerBuilder.java
index 8d3c983..842b35a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/FillerBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/FillerBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRFiller;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRFiller;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>FillerBuilder class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/GenericElementBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/GenericElementBuilder.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/GenericElementBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/GenericElementBuilder.java
index c70244b..b9355a0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/GenericElementBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/GenericElementBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRGenericElement;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+import software.xdev.dynamicreports.report.base.component.DRGenericElement;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression;
 
 /**
  * <p>GenericElementBuilder class.</p>
@@ -46,8 +46,8 @@ protected GenericElementBuilder(String namespace, String name) {
     /**
      * <p>addParameter.</p>
      *
-     * @param parameterExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIParameterExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     * @param parameterExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.GenericElementBuilder} object.
      */
     public GenericElementBuilder addParameter(DRIParameterExpression parameterExpression) {
         getComponent().addParameterExpression(parameterExpression);
@@ -58,8 +58,8 @@ public GenericElementBuilder addParameter(DRIParameterExpression parameterExpres
      * <p>addParameter.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.GenericElementBuilder} object.
      */
     public GenericElementBuilder addParameter(String name, DRIExpression<?> valueExpression) {
         getComponent().addParameterExpression(Expressions.parameter(name, valueExpression));
@@ -71,7 +71,7 @@ public GenericElementBuilder addParameter(String name, DRIExpression<?> valueExp
      *
      * @param name  a {@link java.lang.String} object.
      * @param value a {@link java.lang.Object} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.GenericElementBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.GenericElementBuilder} object.
      */
     public GenericElementBuilder addParameter(String name, Object value) {
         getComponent().addParameterExpression(Expressions.parameter(name, value));
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java
index e5187c2..6079b25 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalFlowListBuilder.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>HorizontalFlowListBuilder class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalListBuilder.java
similarity index 67%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalListBuilder.java
index 62205b9..4c3a816 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalListBuilder.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRList;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.StretchType;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.base.component.DRList;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -55,8 +55,8 @@ protected void init() {
     /**
      * <p>add.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder add(ComponentBuilder<?, ?>... components) {
         Validate.notNull(components, "components must not be null");
@@ -71,8 +71,8 @@ public HorizontalListBuilder add(ComponentBuilder<?, ?>... components) {
      * <p>add.</p>
      *
      * @param gap        a int.
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder add(int gap, ComponentBuilder<?, ?>... components) {
         Validate.notNull(components, "components must not be null");
@@ -86,8 +86,8 @@ public HorizontalListBuilder add(int gap, ComponentBuilder<?, ?>... components)
     /**
      * <p>add.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder add(HorizontalListCellBuilder... cells) {
         Validate.notNull(cells, "cells must not be null");
@@ -102,8 +102,8 @@ public HorizontalListBuilder add(HorizontalListCellBuilder... cells) {
      * <p>add.</p>
      *
      * @param gap   a int.
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder add(int gap, HorizontalListCellBuilder... cells) {
         Validate.notNull(cells, "cells must not be null");
@@ -116,7 +116,7 @@ public HorizontalListBuilder add(int gap, HorizontalListCellBuilder... cells) {
     /**
      * <p>newRow.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder newRow() {
         return newRow(0);
@@ -126,7 +126,7 @@ public HorizontalListBuilder newRow() {
      * <p>newRow.</p>
      *
      * @param verticalGap a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder newRow(Integer verticalGap) {
         return newRow(verticalGap, ListType.HORIZONTAL);
@@ -135,7 +135,7 @@ public HorizontalListBuilder newRow(Integer verticalGap) {
     /**
      * <p>newFlowRow.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder newFlowRow() {
         return newFlowRow(0);
@@ -145,7 +145,7 @@ public HorizontalListBuilder newFlowRow() {
      * <p>newFlowRow.</p>
      *
      * @param verticalGap a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder newFlowRow(Integer verticalGap) {
         return newRow(verticalGap, ListType.HORIZONTAL_FLOW);
@@ -167,7 +167,7 @@ private HorizontalListBuilder newRow(Integer verticalGap, ListType listType) {
      * <p>setGap.</p>
      *
      * @param gap a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder setGap(Integer gap) {
         row.setGap(gap);
@@ -188,8 +188,8 @@ public HorizontalListBuilder setStyle(ReportStyleBuilder style) {
     /**
      * <p>setBaseStretchType.</p>
      *
-     * @param stretchType a {@link net.sf.dynamicreports.report.constant.StretchType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param stretchType a {@link software.xdev.dynamicreports.report.constant.StretchType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder setBaseStretchType(StretchType stretchType) {
         row.setStretchType(stretchType);
@@ -200,7 +200,7 @@ public HorizontalListBuilder setBaseStretchType(StretchType stretchType) {
      * <p>setBaseGap.</p>
      *
      * @param gap a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder setBaseGap(Integer gap) {
         getObject().setGap(gap);
@@ -210,8 +210,8 @@ public HorizontalListBuilder setBaseGap(Integer gap) {
     /**
      * <p>setBaseStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder setBaseStyle(ReportStyleBuilder style) {
         if (style != null) {
@@ -225,8 +225,8 @@ public HorizontalListBuilder setBaseStyle(ReportStyleBuilder style) {
     /**
      * <p>setBaseBackgroundComponent.</p>
      *
-     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder setBaseBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
         Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
@@ -237,8 +237,8 @@ public HorizontalListBuilder setBaseBackgroundComponent(ComponentBuilder<?, ?> b
     /**
      * <p>setBackgroundComponent.</p>
      *
-     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListBuilder} object.
+     * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder} object.
      */
     public HorizontalListBuilder setBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
         Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
@@ -249,7 +249,7 @@ public HorizontalListBuilder setBackgroundComponent(ComponentBuilder<?, ?> backg
     /**
      * <p>getList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.component.DRList} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.component.DRList} object.
      */
     public DRList getList() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalListCellBuilder.java
similarity index 67%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListCellBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalListCellBuilder.java
index 573234b..7681dfb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HorizontalListCellBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HorizontalListCellBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRListCell;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.base.component.DRListCell;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 
 /**
  * <p>HorizontalListCellBuilder class.</p>
@@ -35,7 +35,7 @@ public class HorizontalListCellBuilder extends AbstractBuilder<HorizontalListCel
     /**
      * <p>Constructor for HorizontalListCellBuilder.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      */
     protected HorizontalListCellBuilder(ComponentBuilder<?, ?> component) {
         super(new DRListCell(component.build()));
@@ -46,7 +46,7 @@ protected HorizontalListCellBuilder(ComponentBuilder<?, ?> component) {
     /**
      * <p>widthFixed.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public HorizontalListCellBuilder widthFixed() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.LEFT);
@@ -56,7 +56,7 @@ public HorizontalListCellBuilder widthFixed() {
     /**
      * <p>widthFloat.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public HorizontalListCellBuilder widthFloat() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.FLOAT);
@@ -66,7 +66,7 @@ public HorizontalListCellBuilder widthFloat() {
     /**
      * <p>widthExpand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public HorizontalListCellBuilder widthExpand() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.EXPAND);
@@ -78,7 +78,7 @@ public HorizontalListCellBuilder widthExpand() {
     /**
      * <p>heightFixedOnTop.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public HorizontalListCellBuilder heightFixedOnTop() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.TOP);
@@ -88,7 +88,7 @@ public HorizontalListCellBuilder heightFixedOnTop() {
     /**
      * <p>heightFixedOnMiddle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public HorizontalListCellBuilder heightFixedOnMiddle() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.MIDDLE);
@@ -98,7 +98,7 @@ public HorizontalListCellBuilder heightFixedOnMiddle() {
     /**
      * <p>heightFixedOnBottom.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public HorizontalListCellBuilder heightFixedOnBottom() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.BOTTOM);
@@ -108,7 +108,7 @@ public HorizontalListCellBuilder heightFixedOnBottom() {
     /**
      * <p>heightExpand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.HorizontalListCellBuilder} object.
      */
     public HorizontalListCellBuilder heightExpand() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.EXPAND);
@@ -118,7 +118,7 @@ public HorizontalListCellBuilder heightExpand() {
     /**
      * <p>getListCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.component.DRListCell} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.component.DRListCell} object.
      */
     public DRListCell getListCell() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java
index cac8092..dffe1c4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/HyperLinkComponentBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRHyperLinkComponent;
-import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.component.DRHyperLinkComponent;
+import software.xdev.dynamicreports.report.builder.HyperLinkBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>Abstract HyperLinkComponentBuilder class.</p>
@@ -56,7 +56,7 @@ public T setAnchorName(String anchorName) {
     /**
      * <p>setAnchorName.</p>
      *
-     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param anchorNameExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setAnchorName(DRIExpression<String> anchorNameExpression) {
@@ -78,7 +78,7 @@ public T setBookmarkLevel(Integer bookmarkLevel) {
     /**
      * <p>setHyperLink.</p>
      *
-     * @param hyperLink a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param hyperLink a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      * @return a T object.
      */
     public T setHyperLink(HyperLinkBuilder hyperLink) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ImageBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ImageBuilder.java
similarity index 66%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ImageBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ImageBuilder.java
index 8695ac2..76d4e07 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/ImageBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/ImageBuilder.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRImage;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.component.DRImage;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.awt.Image;
 import java.io.InputStream;
@@ -49,8 +49,8 @@ protected ImageBuilder() {
     /**
      * <p>setImage.</p>
      *
-     * @param imageExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @param imageExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setImage(DRIExpression<?> imageExpression) {
         getObject().setImageExpression(imageExpression);
@@ -61,7 +61,7 @@ public ImageBuilder setImage(DRIExpression<?> imageExpression) {
      * <p>setImage.</p>
      *
      * @param imagePath a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setImage(String imagePath) {
         getObject().setImageExpression(Expressions.text(imagePath));
@@ -73,7 +73,7 @@ public ImageBuilder setImage(String imagePath) {
      * <p>setImage.</p>
      *
      * @param image a {@link java.awt.Image} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setImage(Image image) {
         getObject().setImageExpression(Expressions.image(image));
@@ -85,7 +85,7 @@ public ImageBuilder setImage(Image image) {
      * <p>setImage.</p>
      *
      * @param imageInputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setImage(InputStream imageInputStream) {
         getObject().setImageExpression(Expressions.inputStream(imageInputStream));
@@ -97,7 +97,7 @@ public ImageBuilder setImage(InputStream imageInputStream) {
      * <p>setImage.</p>
      *
      * @param imageUrl a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setImage(URL imageUrl) {
         getObject().setImageExpression(Expressions.url(imageUrl));
@@ -108,8 +108,8 @@ public ImageBuilder setImage(URL imageUrl) {
     /**
      * <p>setImageScale.</p>
      *
-     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @param imageScale a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setImageScale(ImageScale imageScale) {
         getObject().setImageScale(imageScale);
@@ -120,7 +120,7 @@ public ImageBuilder setImageScale(ImageScale imageScale) {
      * <p>setUsingCache.</p>
      *
      * @param usingCache a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setUsingCache(Boolean usingCache) {
         getObject().setUsingCache(usingCache);
@@ -131,7 +131,7 @@ public ImageBuilder setUsingCache(Boolean usingCache) {
      * <p>setLazy.</p>
      *
      * @param lazy a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setLazy(Boolean lazy) {
         getObject().setLazy(lazy);
@@ -141,8 +141,8 @@ public ImageBuilder setLazy(Boolean lazy) {
     /**
      * <p>setHorizontalAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      * @deprecated use setHorizontalImageAlignment instead
      */
     @Deprecated
@@ -158,8 +158,8 @@ public ImageBuilder setHorizontalAlignment(HorizontalAlignment horizontalAlignme
     /**
      * <p>setHorizontalImageAlignment.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ImageBuilder} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ImageBuilder} object.
      */
     public ImageBuilder setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
         getObject().setHorizontalImageAlignment(horizontalImageAlignment);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/LineBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/LineBuilder.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/LineBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/LineBuilder.java
index 3595580..c9c9fa8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/LineBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/LineBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRLine;
-import net.sf.dynamicreports.report.builder.style.PenBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.LineDirection;
+import software.xdev.dynamicreports.report.base.component.DRLine;
+import software.xdev.dynamicreports.report.builder.style.PenBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.LineDirection;
 
 /**
  * <p>LineBuilder class.</p>
@@ -41,8 +41,8 @@ protected LineBuilder() {
     /**
      * <p>setDirection.</p>
      *
-     * @param lineDirection a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.LineBuilder} object.
+     * @param lineDirection a {@link software.xdev.dynamicreports.report.constant.LineDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.LineBuilder} object.
      */
     public LineBuilder setDirection(LineDirection lineDirection) {
         getObject().setDirection(lineDirection);
@@ -52,8 +52,8 @@ public LineBuilder setDirection(LineDirection lineDirection) {
     /**
      * <p>setPen.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.LineBuilder} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.LineBuilder} object.
      */
     public LineBuilder setPen(PenBuilder pen) {
         if (pen != null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MapBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/MapBuilder.java
similarity index 66%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MapBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/MapBuilder.java
index 1995214..0702c40 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MapBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/MapBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRMap;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.component.DRMap;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>MapBuilder class.</p>
@@ -42,7 +42,7 @@ protected MapBuilder() {
      * <p>setLatitude.</p>
      *
      * @param latitude a {@link java.lang.Float} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public MapBuilder setLatitude(Float latitude) {
         getObject().setLatitudeExpression(Expressions.value(latitude));
@@ -52,8 +52,8 @@ public MapBuilder setLatitude(Float latitude) {
     /**
      * <p>setLatitude.</p>
      *
-     * @param latitudeExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @param latitudeExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public MapBuilder setLatitude(DRIExpression<Float> latitudeExpression) {
         getObject().setLatitudeExpression(latitudeExpression);
@@ -64,7 +64,7 @@ public MapBuilder setLatitude(DRIExpression<Float> latitudeExpression) {
      * <p>setLongitude.</p>
      *
      * @param longitude a {@link java.lang.Float} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public MapBuilder setLongitude(Float longitude) {
         getObject().setLongitudeExpression(Expressions.value(longitude));
@@ -74,8 +74,8 @@ public MapBuilder setLongitude(Float longitude) {
     /**
      * <p>setLongitude.</p>
      *
-     * @param longitudeExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @param longitudeExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public MapBuilder setLongitude(DRIExpression<Float> longitudeExpression) {
         getObject().setLongitudeExpression(longitudeExpression);
@@ -86,7 +86,7 @@ public MapBuilder setLongitude(DRIExpression<Float> longitudeExpression) {
      * <p>setZoom.</p>
      *
      * @param zoom a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public MapBuilder setZoom(Integer zoom) {
         getObject().setZoomExpression(Expressions.value(zoom));
@@ -96,8 +96,8 @@ public MapBuilder setZoom(Integer zoom) {
     /**
      * <p>setZoom.</p>
      *
-     * @param zoomExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MapBuilder} object.
+     * @param zoomExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MapBuilder} object.
      */
     public MapBuilder setZoom(DRIExpression<Integer> zoomExpression) {
         getObject().setZoomExpression(zoomExpression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MultiPageListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/MultiPageListBuilder.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MultiPageListBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/MultiPageListBuilder.java
index 7d008d3..6be902f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/MultiPageListBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/MultiPageListBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRMultiPageList;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.component.DRMultiPageList;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -43,8 +43,8 @@ protected MultiPageListBuilder() {
     /**
      * <p>add.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder} object.
      */
     public MultiPageListBuilder add(ComponentBuilder<?, ?>... components) {
         Validate.notNull(components, "components must not be null");
@@ -58,7 +58,7 @@ public MultiPageListBuilder add(ComponentBuilder<?, ?>... components) {
     /**
      * <p>newPage.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder} object.
      */
     public MultiPageListBuilder newPage() {
         BreakBuilder pageBreak = Components.pageBreak();
@@ -70,8 +70,8 @@ public MultiPageListBuilder newPage() {
     /**
      * <p>setSplitType.</p>
      *
-     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.MultiPageListBuilder} object.
+     * @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder} object.
      */
     public MultiPageListBuilder setSplitType(SplitType splitType) {
         getObject().setSplitType(splitType);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageNumberBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageNumberBuilder.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageNumberBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageNumberBuilder.java
index d207730..032590f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageNumberBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageNumberBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRPageNumber;
-import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRPageNumber;
+import software.xdev.dynamicreports.report.builder.expression.SystemMessageExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>PageNumberBuilder class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXofYBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageXofYBuilder.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXofYBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageXofYBuilder.java
index b8443e3..55a7232 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXofYBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageXofYBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRPageXofY;
-import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRPageXofY;
+import software.xdev.dynamicreports.report.builder.expression.SystemMessageExpression;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>PageXofYBuilder class.</p>
@@ -42,9 +42,9 @@ protected PageXofYBuilder() {
      * Sets the pageX component preferred width.
      *
      * @param width the pageX component preferred width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXofYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXofYBuilder setPageXWidth(Integer width) {
         getObject().setPageXWidth(width);
@@ -55,9 +55,9 @@ public PageXofYBuilder setPageXWidth(Integer width) {
      * Sets the pageX component fixed width.
      *
      * @param width the pageX component fixed width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXofYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXofYBuilder setPageXFixedWidth(Integer width) {
         getObject().setPageXWidth(width);
@@ -69,9 +69,9 @@ public PageXofYBuilder setPageXFixedWidth(Integer width) {
      * Sets the pageX component minimum width.
      *
      * @param width the pageX component minimum width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXofYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXofYBuilder setPageXMinWidth(Integer width) {
         getObject().setPageXWidth(width);
@@ -83,9 +83,9 @@ public PageXofYBuilder setPageXMinWidth(Integer width) {
      * Sets the pageY component preferred width.
      *
      * @param width the pageY component preferred width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXofYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXofYBuilder setPageYWidth(Integer width) {
         getObject().setPageYWidth(width);
@@ -96,9 +96,9 @@ public PageXofYBuilder setPageYWidth(Integer width) {
      * Sets the pageY component fixed width.
      *
      * @param width the pageY component fixed width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXofYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXofYBuilder setPageYFixedWidth(Integer width) {
         getObject().setPageYWidth(width);
@@ -110,9 +110,9 @@ public PageXofYBuilder setPageYFixedWidth(Integer width) {
      * Sets the pageY component minimum width.
      *
      * @param width the pageY component minimum width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXofYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXofYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXofYBuilder setPageYMinWidth(Integer width) {
         getObject().setPageYWidth(width);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXslashYBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageXslashYBuilder.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXslashYBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageXslashYBuilder.java
index febbcbd..a8dca24 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/PageXslashYBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/PageXslashYBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRPageXofY;
-import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRPageXofY;
+import software.xdev.dynamicreports.report.builder.expression.SystemMessageExpression;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>PageXslashYBuilder class.</p>
@@ -42,9 +42,9 @@ protected PageXslashYBuilder() {
      * Sets the pageX component preferred width.
      *
      * @param width the pageX component preferred width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXslashYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXslashYBuilder setPageXWidth(Integer width) {
         getObject().setPageXWidth(width);
@@ -55,9 +55,9 @@ public PageXslashYBuilder setPageXWidth(Integer width) {
      * Sets the pageX component fixed width.
      *
      * @param width the pageX component fixed width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXslashYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXslashYBuilder setPageXFixedWidth(Integer width) {
         getObject().setPageXWidth(width);
@@ -69,9 +69,9 @@ public PageXslashYBuilder setPageXFixedWidth(Integer width) {
      * Sets the pageX component minimum width.
      *
      * @param width the pageX component minimum width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXslashYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXslashYBuilder setPageXMinWidth(Integer width) {
         getObject().setPageXWidth(width);
@@ -83,9 +83,9 @@ public PageXslashYBuilder setPageXMinWidth(Integer width) {
      * Sets the pageY component preferred width.
      *
      * @param width the pageY component preferred width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXslashYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXslashYBuilder setPageYWidth(Integer width) {
         getObject().setPageYWidth(width);
@@ -96,9 +96,9 @@ public PageXslashYBuilder setPageYWidth(Integer width) {
      * Sets the pageY component fixed width.
      *
      * @param width the pageY component fixed width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXslashYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXslashYBuilder setPageYFixedWidth(Integer width) {
         getObject().setPageYWidth(width);
@@ -110,9 +110,9 @@ public PageXslashYBuilder setPageYFixedWidth(Integer width) {
      * Sets the pageY component minimum width.
      *
      * @param width the pageY component minimum width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.PageXslashYBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.PageXslashYBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public PageXslashYBuilder setPageYMinWidth(Integer width) {
         getObject().setPageYWidth(width);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/RectangleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/RectangleBuilder.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/RectangleBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/RectangleBuilder.java
index 19ea9e4..c3a2505 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/RectangleBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/RectangleBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRRectangle;
-import net.sf.dynamicreports.report.builder.style.PenBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRRectangle;
+import software.xdev.dynamicreports.report.builder.style.PenBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>RectangleBuilder class.</p>
@@ -41,7 +41,7 @@ protected RectangleBuilder() {
      * <p>setRadius.</p>
      *
      * @param radius a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.RectangleBuilder} object.
      */
     public RectangleBuilder setRadius(Integer radius) {
         getObject().setRadius(radius);
@@ -51,8 +51,8 @@ public RectangleBuilder setRadius(Integer radius) {
     /**
      * <p>setPen.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.RectangleBuilder} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.RectangleBuilder} object.
      */
     public RectangleBuilder setPen(PenBuilder pen) {
         if (pen != null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/SubreportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/SubreportBuilder.java
similarity index 66%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/SubreportBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/SubreportBuilder.java
index faf3858..435f22b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/SubreportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/SubreportBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRSubreport;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.component.DRSubreport;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JasperReport;
 
@@ -49,8 +49,8 @@ protected SubreportBuilder() {
     /**
      * <p>setReport.</p>
      *
-     * @param reportBuilder a {@link net.sf.dynamicreports.report.builder.ReportBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param reportBuilder a {@link software.xdev.dynamicreports.report.builder.ReportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setReport(ReportBuilder<?> reportBuilder) {
         getObject().setReportExpression(Expressions.value(reportBuilder));
@@ -61,7 +61,7 @@ public SubreportBuilder setReport(ReportBuilder<?> reportBuilder) {
      * <p>setReport.</p>
      *
      * @param jasperReport a {@link net.sf.jasperreports.engine.JasperReport} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setReport(JasperReport jasperReport) {
         getObject().setReportExpression(Expressions.value(jasperReport));
@@ -71,8 +71,8 @@ public SubreportBuilder setReport(JasperReport jasperReport) {
     /**
      * <p>setReport.</p>
      *
-     * @param reportExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param reportExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setReport(DRIExpression<?> reportExpression) {
         getObject().setReportExpression(reportExpression);
@@ -85,7 +85,7 @@ public SubreportBuilder setReport(DRIExpression<?> reportExpression) {
      * <p>setParameters.</p>
      *
      * @param parameters a {@link java.util.Map} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setParameters(Map<String, Object> parameters) {
         getObject().setParametersExpression(Expressions.value(parameters));
@@ -95,8 +95,8 @@ public SubreportBuilder setParameters(Map<String, Object> parameters) {
     /**
      * <p>setParameters.</p>
      *
-     * @param parametersExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param parametersExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setParameters(DRIExpression<Map<String, Object>> parametersExpression) {
         getObject().setParametersExpression(parametersExpression);
@@ -109,7 +109,7 @@ public SubreportBuilder setParameters(DRIExpression<Map<String, Object>> paramet
      * <p>setConnection.</p>
      *
      * @param connection a {@link java.sql.Connection} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setConnection(Connection connection) {
         getObject().setConnectionExpression(Expressions.value(connection));
@@ -119,8 +119,8 @@ public SubreportBuilder setConnection(Connection connection) {
     /**
      * <p>setConnection.</p>
      *
-     * @param connectionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param connectionExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setConnection(DRIExpression<Connection> connectionExpression) {
         getObject().setConnectionExpression(connectionExpression);
@@ -133,7 +133,7 @@ public SubreportBuilder setConnection(DRIExpression<Connection> connectionExpres
      * <p>setDataSource.</p>
      *
      * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setDataSource(JRDataSource dataSource) {
         getObject().setDataSourceExpression(Expressions.dataSource(dataSource));
@@ -143,8 +143,8 @@ public SubreportBuilder setDataSource(JRDataSource dataSource) {
     /**
      * <p>setDataSource.</p>
      *
-     * @param dataSourceExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @param dataSourceExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setDataSource(DRIExpression<JRDataSource> dataSourceExpression) {
         getObject().setDataSourceExpression(dataSourceExpression);
@@ -155,7 +155,7 @@ public SubreportBuilder setDataSource(DRIExpression<JRDataSource> dataSourceExpr
      * <p>setRunToBottom.</p>
      *
      * @param runToBottom a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.SubreportBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.SubreportBuilder} object.
      */
     public SubreportBuilder setRunToBottom(Boolean runToBottom) {
         getObject().setRunToBottom(runToBottom);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TextFieldBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/TextFieldBuilder.java
similarity index 66%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TextFieldBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/TextFieldBuilder.java
index 888bd6a..4a86a26 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TextFieldBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/TextFieldBuilder.java
@@ -15,28 +15,28 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
 import java.util.Date;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.VariableBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.VariableBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 
 /**
  * <p>TextFieldBuilder class.</p>
@@ -58,8 +58,8 @@ protected TextFieldBuilder() {
     /**
      * <p>setText.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setText(final VariableBuilder<T> variable) {
         Validate.notNull(variable, "variable must not be null");
@@ -70,8 +70,8 @@ public TextFieldBuilder<T> setText(final VariableBuilder<T> variable) {
     /**
      * <p>setText.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setText(final FieldBuilder<T> field) {
         Validate.notNull(field, "field must not be null");
@@ -85,8 +85,8 @@ public TextFieldBuilder<T> setText(final FieldBuilder<T> field) {
     /**
      * <p>setText.</p>
      *
-     * @param textExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param textExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setText(final DRIExpression<T> textExpression) {
         getObject().setValueExpression(textExpression);
@@ -100,7 +100,7 @@ public TextFieldBuilder<T> setText(final DRIExpression<T> textExpression) {
      * <p>setText.</p>
      *
      * @param text a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     @SuppressWarnings("unchecked")
     public TextFieldBuilder<T> setText(final String text) {
@@ -112,7 +112,7 @@ public TextFieldBuilder<T> setText(final String text) {
      * <p>setText.</p>
      *
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     @SuppressWarnings("unchecked")
     public TextFieldBuilder<T> setText(final Number number) {
@@ -124,7 +124,7 @@ public TextFieldBuilder<T> setText(final Number number) {
      * <p>setText.</p>
      *
      * @param date a {@link java.util.Date} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     @SuppressWarnings("unchecked")
     public TextFieldBuilder<T> setText(final Date date) {
@@ -136,7 +136,7 @@ public TextFieldBuilder<T> setText(final Date date) {
      * <p>setPattern.</p>
      *
      * @param pattern a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setPattern(final String pattern) {
         getObject().setPattern(pattern);
@@ -146,8 +146,8 @@ public TextFieldBuilder<T> setPattern(final String pattern) {
     /**
      * <p>setPattern.</p>
      *
-     * @param patternExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param patternExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setPattern(final DRIExpression<String> patternExpression) {
         getObject().setPatternExpression(patternExpression);
@@ -157,8 +157,8 @@ public TextFieldBuilder<T> setPattern(final DRIExpression<String> patternExpress
     /**
      * <p>setHorizontalAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      * @deprecated use setHorizontalTextAlignment instead
      */
     @Deprecated
@@ -174,8 +174,8 @@ public TextFieldBuilder<T> setHorizontalAlignment(final HorizontalAlignment hori
     /**
      * <p>setHorizontalTextAlignment.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
         getObject().setHorizontalTextAlignment(horizontalTextAlignment);
@@ -185,8 +185,8 @@ public TextFieldBuilder<T> setHorizontalTextAlignment(final HorizontalTextAlignm
     /**
      * <p>setValueFormatter.</p>
      *
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setValueFormatter(final DRIValueFormatter<?, ? super T> valueFormatter) {
         getObject().setValueFormatter(valueFormatter);
@@ -196,8 +196,8 @@ public TextFieldBuilder<T> setValueFormatter(final DRIValueFormatter<?, ? super
     /**
      * <p>setDataType.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setDataType(final DRIDataType<? super T, T> dataType) {
         getObject().setDataType(dataType);
@@ -208,7 +208,7 @@ public TextFieldBuilder<T> setDataType(final DRIDataType<? super T, T> dataType)
      * This method is used to define the preferred width of a textField. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
      *
      * @param columns the number of preferred columns >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
      */
     public TextFieldBuilder<T> setColumns(final Integer columns) {
@@ -220,7 +220,7 @@ public TextFieldBuilder<T> setColumns(final Integer columns) {
      * This method is used to define the fixed width of a textField. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
      *
      * @param columns the number of fixed columns >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
      */
     public TextFieldBuilder<T> setFixedColumns(final Integer columns) {
@@ -233,7 +233,7 @@ public TextFieldBuilder<T> setFixedColumns(final Integer columns) {
      * This method is used to define the minimum width of a textField. The width is set to the <code>columns</code> multiplied by width of the character <em>m</em> for the font used
      *
      * @param columns the number of minimum columns >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
      */
     public TextFieldBuilder<T> setMinColumns(final Integer columns) {
@@ -246,7 +246,7 @@ public TextFieldBuilder<T> setMinColumns(final Integer columns) {
      * This method is used to define the preferred height of a textField. The height is set to the <code>rows</code> multiplied by height of the font
      *
      * @param rows the number of preferred rows >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
      */
     public TextFieldBuilder<T> setRows(final Integer rows) {
@@ -258,7 +258,7 @@ public TextFieldBuilder<T> setRows(final Integer rows) {
      * This method is used to define the fixed height of a textField. The height is set to the <code>rows</code> multiplied by height of the font
      *
      * @param rows the number of fixed rows >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
      */
     public TextFieldBuilder<T> setFixedRows(final Integer rows) {
@@ -271,7 +271,7 @@ public TextFieldBuilder<T> setFixedRows(final Integer rows) {
      * This method is used to define the minimum height of a textField. The height is set to the <code>rows</code> multiplied by height of the font
      *
      * @param rows the number of minimum rows >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
      */
     public TextFieldBuilder<T> setMinRows(final Integer rows) {
@@ -283,8 +283,8 @@ public TextFieldBuilder<T> setMinRows(final Integer rows) {
     /**
      * <p>setEvaluationTime.</p>
      *
-     * @param evaluationTime a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param evaluationTime a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setEvaluationTime(final Evaluation evaluationTime) {
         getObject().setEvaluationTime(evaluationTime);
@@ -294,8 +294,8 @@ public TextFieldBuilder<T> setEvaluationTime(final Evaluation evaluationTime) {
     /**
      * <p>setEvaluationGroup.</p>
      *
-     * @param evaluationGroup a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param evaluationGroup a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setEvaluationGroup(final GroupBuilder<?> evaluationGroup) {
         Validate.notNull(evaluationGroup, "evaluationGroup must not be null");
@@ -307,8 +307,8 @@ public TextFieldBuilder<T> setEvaluationGroup(final GroupBuilder<?> evaluationGr
     /**
      * <p>setMarkup.</p>
      *
-     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @param markup a {@link software.xdev.dynamicreports.report.constant.Markup} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setMarkup(final Markup markup) {
         getObject().setMarkup(markup);
@@ -319,7 +319,7 @@ public TextFieldBuilder<T> setMarkup(final Markup markup) {
      * <p>setStretchWithOverflow.</p>
      *
      * @param stretchWithOverflow a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      * @deprecated replaced by {@link #setTextAdjust(TextAdjust)}
      */
     @Deprecated
@@ -331,7 +331,7 @@ public TextFieldBuilder<T> setStretchWithOverflow(final Boolean stretchWithOverf
     /**
      * <p>setTextAdjust.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      * @return a T object.
      */
     public TextFieldBuilder<T> setTextAdjust(final TextAdjust textAdjust) {
@@ -343,7 +343,7 @@ public TextFieldBuilder<T> setTextAdjust(final TextAdjust textAdjust) {
      * <p>setPrintRepeatedValues.</p>
      *
      * @param printRepeatedValues a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.TextFieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.TextFieldBuilder} object.
      */
     public TextFieldBuilder<T> setPrintRepeatedValues(final Boolean printRepeatedValues) {
         getObject().setPrintRepeatedValues(printRepeatedValues);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TotalPagesBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/TotalPagesBuilder.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TotalPagesBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/TotalPagesBuilder.java
index 264a56d..5f3f8c5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/TotalPagesBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/TotalPagesBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRTotalPages;
-import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRTotalPages;
+import software.xdev.dynamicreports.report.builder.expression.SystemMessageExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>TotalPagesBuilder class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/VerticalListBuilder.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/VerticalListBuilder.java
index 2d33cd0..85ae4ba 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/VerticalListBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRList;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.base.component.DRList;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ListType;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -41,8 +41,8 @@ protected VerticalListBuilder() {
     /**
      * <p>add.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder add(ComponentBuilder<?, ?>... components) {
         Validate.notNull(components, "components must not be null");
@@ -57,8 +57,8 @@ public VerticalListBuilder add(ComponentBuilder<?, ?>... components) {
      * <p>add.</p>
      *
      * @param gap        a {@link java.lang.Integer} object.
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder add(Integer gap, ComponentBuilder<?, ?>... components) {
         Validate.notNull(components, "components must not be null");
@@ -72,8 +72,8 @@ public VerticalListBuilder add(Integer gap, ComponentBuilder<?, ?>... components
     /**
      * <p>add.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder add(VerticalListCellBuilder... cells) {
         Validate.notNull(cells, "cells must not be null");
@@ -88,8 +88,8 @@ public VerticalListBuilder add(VerticalListCellBuilder... cells) {
      * <p>add.</p>
      *
      * @param gap   a {@link java.lang.Integer} object.
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder add(Integer gap, VerticalListCellBuilder... cells) {
         Validate.notNull(cells, "cells must not be null");
@@ -103,7 +103,7 @@ public VerticalListBuilder add(Integer gap, VerticalListCellBuilder... cells) {
      * <p>setGap.</p>
      *
      * @param gap a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder setGap(Integer gap) {
         getObject().setGap(gap);
@@ -113,8 +113,8 @@ public VerticalListBuilder setGap(Integer gap) {
     /**
      * <p>setBackgroundComponent.</p>
      *
-     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListBuilder} object.
+     * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListBuilder} object.
      */
     public VerticalListBuilder setBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
         Validate.notNull(backgroundComponent, "backgroundComponent must not be null");
@@ -125,7 +125,7 @@ public VerticalListBuilder setBackgroundComponent(ComponentBuilder<?, ?> backgro
     /**
      * <p>getList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.component.DRList} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.component.DRList} object.
      */
     public DRList getList() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/VerticalListCellBuilder.java
similarity index 67%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListCellBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/VerticalListCellBuilder.java
index 2785cfc..b8993d3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/VerticalListCellBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/VerticalListCellBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRListCell;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.base.component.DRListCell;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 
 /**
  * <p>VerticalListCellBuilder class.</p>
@@ -35,7 +35,7 @@ public class VerticalListCellBuilder extends AbstractBuilder<VerticalListCellBui
     /**
      * <p>Constructor for VerticalListCellBuilder.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      */
     protected VerticalListCellBuilder(ComponentBuilder<?, ?> component) {
         super(new DRListCell(component.build()));
@@ -46,7 +46,7 @@ protected VerticalListCellBuilder(ComponentBuilder<?, ?> component) {
     /**
      * <p>widthFixedOnLeft.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public VerticalListCellBuilder widthFixedOnLeft() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.LEFT);
@@ -56,7 +56,7 @@ public VerticalListCellBuilder widthFixedOnLeft() {
     /**
      * <p>widthFixedOnCenter.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public VerticalListCellBuilder widthFixedOnCenter() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.CENTER);
@@ -66,7 +66,7 @@ public VerticalListCellBuilder widthFixedOnCenter() {
     /**
      * <p>widthFixedOnRight.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public VerticalListCellBuilder widthFixedOnRight() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.RIGHT);
@@ -76,7 +76,7 @@ public VerticalListCellBuilder widthFixedOnRight() {
     /**
      * <p>widthFloat.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public VerticalListCellBuilder widthFloat() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.FLOAT);
@@ -86,7 +86,7 @@ public VerticalListCellBuilder widthFloat() {
     /**
      * <p>widthExpand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public VerticalListCellBuilder widthExpand() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.EXPAND);
@@ -98,7 +98,7 @@ public VerticalListCellBuilder widthExpand() {
     /**
      * <p>heightFixed.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public VerticalListCellBuilder heightFixed() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.TOP);
@@ -108,7 +108,7 @@ public VerticalListCellBuilder heightFixed() {
     /**
      * <p>heightExpand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.VerticalListCellBuilder} object.
      */
     public VerticalListCellBuilder heightExpand() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.EXPAND);
@@ -118,7 +118,7 @@ public VerticalListCellBuilder heightExpand() {
     /**
      * <p>getListCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.component.DRListCell} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.component.DRListCell} object.
      */
     public DRListCell getListCell() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/XyListBuilder.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/XyListBuilder.java
index e7044ec..6a13e70 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/XyListBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRXyList;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRXyList;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -42,8 +42,8 @@ protected XyListBuilder() {
      *
      * @param x         a {@link java.lang.Integer} object.
      * @param y         a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListBuilder} object.
      */
     public XyListBuilder add(Integer x, Integer y, ComponentBuilder<?, ?> component) {
         Validate.notNull(x, "x must not be null");
@@ -60,8 +60,8 @@ public XyListBuilder add(Integer x, Integer y, ComponentBuilder<?, ?> component)
      * @param y         a {@link java.lang.Integer} object.
      * @param width     a {@link java.lang.Integer} object.
      * @param height    a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListBuilder} object.
      */
     public XyListBuilder add(Integer x, Integer y, Integer width, Integer height, ComponentBuilder<?, ?> component) {
         Validate.notNull(x, "x must not be null");
@@ -78,8 +78,8 @@ public XyListBuilder add(Integer x, Integer y, Integer width, Integer height, Co
     /**
      * <p>add.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.component.XyListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.XyListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.component.XyListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.XyListBuilder} object.
      */
     public XyListBuilder add(XyListCellBuilder... cells) {
         Validate.notNull(cells, "cells must not be null");
@@ -93,7 +93,7 @@ public XyListBuilder add(XyListCellBuilder... cells) {
     /**
      * <p>getXyList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.component.DRXyList} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.component.DRXyList} object.
      */
     public DRXyList getXyList() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/XyListCellBuilder.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListCellBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/XyListCellBuilder.java
index 6fb9df7..66a2379 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/component/XyListCellBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/component/XyListCellBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.component;
+package software.xdev.dynamicreports.report.builder.component;
 
-import net.sf.dynamicreports.report.base.component.DRXyListCell;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.component.DRXyListCell;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>XyListCellBuilder class.</p>
@@ -35,7 +35,7 @@ public class XyListCellBuilder extends AbstractBuilder<XyListCellBuilder, DRXyLi
      *
      * @param x         a {@link java.lang.Integer} object.
      * @param y         a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      */
     protected XyListCellBuilder(Integer x, Integer y, ComponentBuilder<?, ?> component) {
         super(new DRXyListCell(x, y, component.build()));
@@ -48,7 +48,7 @@ protected XyListCellBuilder(Integer x, Integer y, ComponentBuilder<?, ?> compone
      * @param y         a {@link java.lang.Integer} object.
      * @param width     a {@link java.lang.Integer} object.
      * @param height    a {@link java.lang.Integer} object.
-     * @param component a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      */
     protected XyListCellBuilder(Integer x, Integer y, Integer width, Integer height, ComponentBuilder<?, ?> component) {
         super(new DRXyListCell(x, y, component.build()));
@@ -61,7 +61,7 @@ protected XyListCellBuilder(Integer x, Integer y, Integer width, Integer height,
     /**
      * <p>getXyListCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.component.DRXyListCell} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.component.DRXyListCell} object.
      */
     public DRXyListCell getXyListCell() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java
index 831bec4..b4199ce 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractBetweenValueExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -39,7 +39,7 @@ public abstract class AbstractBetweenValueExpression<T extends Number> extends A
     /**
      * <p>Constructor for AbstractBetweenValueExpression.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param min   a {@link java.lang.Number} object.
      * @param max   a {@link java.lang.Number} object.
      */
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractValueExpression.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractValueExpression.java
index 55d3c77..3dfc338 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractValueExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -38,7 +38,7 @@ public abstract class AbstractValueExpression<T extends Number> extends Abstract
     /**
      * <p>Constructor for AbstractValueExpression.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
      */
     public AbstractValueExpression(DRIValue<T> value, Number number) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValuesExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractValuesExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValuesExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractValuesExpression.java
index ad1ee5a..7da69d6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/AbstractValuesExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/AbstractValuesExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -38,7 +38,7 @@ public abstract class AbstractValuesExpression<T extends Number> extends Abstrac
     /**
      * <p>Constructor for AbstractValuesExpression.</p>
      *
-     * @param value   a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value   a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param numbers a {@link java.lang.Number} object.
      */
     public AbstractValuesExpression(DRIValue<T> value, Number... numbers) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/BetweenValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/BetweenValueExpression.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/BetweenValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/BetweenValueExpression.java
index 18c59e8..7764252 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/BetweenValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/BetweenValueExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * <p>BetweenValueExpression class.</p>
@@ -32,7 +32,7 @@ public class BetweenValueExpression<T extends Number> extends AbstractBetweenVal
     /**
      * <p>Constructor for BetweenValueExpression.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param min   a {@link java.lang.Number} object.
      * @param max   a {@link java.lang.Number} object.
      */
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/ConditionBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/ConditionBuilders.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/ConditionBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/ConditionBuilders.java
index 2be3b7b..56659b1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/ConditionBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/ConditionBuilders.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * A set of build in condition expressions
@@ -30,11 +30,11 @@ public class ConditionBuilders {
     /**
      * <p>equal.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param values a T object.
      * @param values a T object.
      * @param <T>    a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.EqualExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.EqualExpression} object.
      */
     @SuppressWarnings("unchecked")
     public <T> EqualExpression equal(DRIValue<T> value, T... values) {
@@ -44,9 +44,9 @@ public <T> EqualExpression equal(DRIValue<T> value, T... values) {
     /**
      * <p>equal.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.EqualValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.EqualValueExpression} object.
      */
     public <T extends Number> EqualValueExpression<T> equal(DRIValue<T> value, Number... number) {
         return Conditions.equal(value, number);
@@ -55,11 +55,11 @@ public <T extends Number> EqualValueExpression<T> equal(DRIValue<T> value, Numbe
     /**
      * <p>unEqual.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param values a T object.
      * @param values a T object.
      * @param <T>    a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.UnEqualExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.UnEqualExpression} object.
      */
     @SuppressWarnings("unchecked")
     public <T> UnEqualExpression unEqual(DRIValue<T> value, T... values) {
@@ -69,9 +69,9 @@ public <T> UnEqualExpression unEqual(DRIValue<T> value, T... values) {
     /**
      * <p>unEqual.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.UnEqualValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.UnEqualValueExpression} object.
      */
     public <T extends Number> UnEqualValueExpression<T> unEqual(DRIValue<T> value, Number... number) {
         return Conditions.unEqual(value, number);
@@ -80,9 +80,9 @@ public <T extends Number> UnEqualValueExpression<T> unEqual(DRIValue<T> value, N
     /**
      * <p>smaller.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.SmallerValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.SmallerValueExpression} object.
      */
     public <T extends Number> SmallerValueExpression<T> smaller(DRIValue<T> value, Number number) {
         return Conditions.smaller(value, number);
@@ -91,9 +91,9 @@ public <T extends Number> SmallerValueExpression<T> smaller(DRIValue<T> value, N
     /**
      * <p>smallerOrEquals.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.SmallerOrEqualsValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.SmallerOrEqualsValueExpression} object.
      */
     public <T extends Number> SmallerOrEqualsValueExpression<T> smallerOrEquals(DRIValue<T> value, Number number) {
         return Conditions.smallerOrEquals(value, number);
@@ -102,9 +102,9 @@ public <T extends Number> SmallerOrEqualsValueExpression<T> smallerOrEquals(DRIV
     /**
      * <p>greater.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.GreaterValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.GreaterValueExpression} object.
      */
     public <T extends Number> GreaterValueExpression<T> greater(DRIValue<T> value, Number number) {
         return Conditions.greater(value, number);
@@ -113,9 +113,9 @@ public <T extends Number> GreaterValueExpression<T> greater(DRIValue<T> value, N
     /**
      * <p>greaterOrEquals.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.GreaterOrEqualsValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.GreaterOrEqualsValueExpression} object.
      */
     public <T extends Number> GreaterOrEqualsValueExpression<T> greaterOrEquals(DRIValue<T> value, Number number) {
         return Conditions.greaterOrEquals(value, number);
@@ -124,10 +124,10 @@ public <T extends Number> GreaterOrEqualsValueExpression<T> greaterOrEquals(DRIV
     /**
      * <p>between.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param min   a {@link java.lang.Number} object.
      * @param max   a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.BetweenValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.BetweenValueExpression} object.
      */
     public <T extends Number> BetweenValueExpression<T> between(DRIValue<T> value, Number min, Number max) {
         return Conditions.between(value, min, max);
@@ -136,10 +136,10 @@ public <T extends Number> BetweenValueExpression<T> between(DRIValue<T> value, N
     /**
      * <p>notBetween.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param min   a {@link java.lang.Number} object.
      * @param max   a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.NotBetweenValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.NotBetweenValueExpression} object.
      */
     public <T extends Number> NotBetweenValueExpression<T> notBetween(DRIValue<T> value, Number min, Number max) {
         return Conditions.notBetween(value, min, max);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/Conditions.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/Conditions.java
similarity index 64%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/Conditions.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/Conditions.java
index 46f6a02..a9acdf3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/Conditions.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/Conditions.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * A set of build in condition expressions
@@ -30,11 +30,11 @@ public class Conditions {
     /**
      * <p>equal.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param values a T object.
      * @param values a T object.
      * @param <T>    a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.EqualExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.EqualExpression} object.
      */
     @SafeVarargs
     public static <T> EqualExpression equal(DRIValue<T> value, T... values) {
@@ -44,9 +44,9 @@ public static <T> EqualExpression equal(DRIValue<T> value, T... values) {
     /**
      * <p>equal.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.EqualValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.EqualValueExpression} object.
      */
     public static <T extends Number> EqualValueExpression<T> equal(DRIValue<T> value, Number... number) {
         return new EqualValueExpression<T>(value, number);
@@ -55,11 +55,11 @@ public static <T extends Number> EqualValueExpression<T> equal(DRIValue<T> value
     /**
      * <p>unEqual.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param values a T object.
      * @param values a T object.
      * @param <T>    a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.UnEqualExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.UnEqualExpression} object.
      */
     @SafeVarargs
     public static <T> UnEqualExpression unEqual(DRIValue<T> value, T... values) {
@@ -69,9 +69,9 @@ public static <T> UnEqualExpression unEqual(DRIValue<T> value, T... values) {
     /**
      * <p>unEqual.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.UnEqualValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.UnEqualValueExpression} object.
      */
     public static <T extends Number> UnEqualValueExpression<T> unEqual(DRIValue<T> value, Number... number) {
         return new UnEqualValueExpression<T>(value, number);
@@ -80,9 +80,9 @@ public static <T extends Number> UnEqualValueExpression<T> unEqual(DRIValue<T> v
     /**
      * <p>smaller.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.SmallerValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.SmallerValueExpression} object.
      */
     public static <T extends Number> SmallerValueExpression<T> smaller(DRIValue<T> value, Number number) {
         return new SmallerValueExpression<T>(value, number);
@@ -91,9 +91,9 @@ public static <T extends Number> SmallerValueExpression<T> smaller(DRIValue<T> v
     /**
      * <p>smallerOrEquals.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.SmallerOrEqualsValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.SmallerOrEqualsValueExpression} object.
      */
     public static <T extends Number> SmallerOrEqualsValueExpression<T> smallerOrEquals(DRIValue<T> value, Number number) {
         return new SmallerOrEqualsValueExpression<T>(value, number);
@@ -102,9 +102,9 @@ public static <T extends Number> SmallerOrEqualsValueExpression<T> smallerOrEqua
     /**
      * <p>greater.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.GreaterValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.GreaterValueExpression} object.
      */
     public static <T extends Number> GreaterValueExpression<T> greater(DRIValue<T> value, Number number) {
         return new GreaterValueExpression<T>(value, number);
@@ -113,9 +113,9 @@ public static <T extends Number> GreaterValueExpression<T> greater(DRIValue<T> v
     /**
      * <p>greaterOrEquals.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.GreaterOrEqualsValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.GreaterOrEqualsValueExpression} object.
      */
     public static <T extends Number> GreaterOrEqualsValueExpression<T> greaterOrEquals(DRIValue<T> value, Number number) {
         return new GreaterOrEqualsValueExpression<T>(value, number);
@@ -124,10 +124,10 @@ public static <T extends Number> GreaterOrEqualsValueExpression<T> greaterOrEqua
     /**
      * <p>between.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param min   a {@link java.lang.Number} object.
      * @param max   a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.BetweenValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.BetweenValueExpression} object.
      */
     public static <T extends Number> BetweenValueExpression<T> between(DRIValue<T> value, Number min, Number max) {
         return new BetweenValueExpression<T>(value, min, max);
@@ -136,10 +136,10 @@ public static <T extends Number> BetweenValueExpression<T> between(DRIValue<T> v
     /**
      * <p>notBetween.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param min   a {@link java.lang.Number} object.
      * @param max   a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.condition.NotBetweenValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.condition.NotBetweenValueExpression} object.
      */
     public static <T extends Number> NotBetweenValueExpression<T> notBetween(DRIValue<T> value, Number min, Number max) {
         return new NotBetweenValueExpression<T>(value, min, max);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/EqualExpression.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/EqualExpression.java
index d590c26..ffd2b05 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/EqualExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -39,7 +39,7 @@ public class EqualExpression extends AbstractSimpleExpression<Boolean> {
     /**
      * Constructor for EqualExpression.
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param values a T object.
      * @param <T> a T object.
      */
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/EqualValueExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/EqualValueExpression.java
index dea221f..34c3406 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/EqualValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/EqualValueExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * <p>EqualValueExpression class.</p>
@@ -32,7 +32,7 @@ public class EqualValueExpression<T extends Number> extends AbstractValuesExpres
     /**
      * <p>Constructor for EqualValueExpression.</p>
      *
-     * @param value   a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value   a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param numbers a {@link java.lang.Number} object.
      */
     public EqualValueExpression(DRIValue<T> value, Number... numbers) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java
index c4ffc4d..016a9bc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/GreaterOrEqualsValueExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * <p>GreaterOrEqualsValueExpression class.</p>
@@ -32,7 +32,7 @@ public class GreaterOrEqualsValueExpression<T extends Number> extends AbstractVa
     /**
      * <p>Constructor for GreaterOrEqualsValueExpression.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
      */
     public GreaterOrEqualsValueExpression(DRIValue<T> value, Number number) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/GreaterValueExpression.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/GreaterValueExpression.java
index f41f785..dc62dd9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/GreaterValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/GreaterValueExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * <p>GreaterValueExpression class.</p>
@@ -32,7 +32,7 @@ public class GreaterValueExpression<T extends Number> extends AbstractValueExpre
     /**
      * <p>Constructor for GreaterValueExpression.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
      */
     public GreaterValueExpression(DRIValue<T> value, Number number) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/NotBetweenValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/NotBetweenValueExpression.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/NotBetweenValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/NotBetweenValueExpression.java
index 569f881..cdde217 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/NotBetweenValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/NotBetweenValueExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * <p>NotBetweenValueExpression class.</p>
@@ -32,7 +32,7 @@ public class NotBetweenValueExpression<T extends Number> extends AbstractBetween
     /**
      * <p>Constructor for NotBetweenValueExpression.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param min   a {@link java.lang.Number} object.
      * @param max   a {@link java.lang.Number} object.
      */
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java
index 643f9f7..9715889 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/SmallerOrEqualsValueExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * <p>SmallerOrEqualsValueExpression class.</p>
@@ -32,7 +32,7 @@ public class SmallerOrEqualsValueExpression<T extends Number> extends AbstractVa
     /**
      * <p>Constructor for SmallerOrEqualsValueExpression.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
      */
     public SmallerOrEqualsValueExpression(DRIValue<T> value, Number number) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/SmallerValueExpression.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/SmallerValueExpression.java
index cf2f575..f2605d8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/SmallerValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/SmallerValueExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * <p>SmallerValueExpression class.</p>
@@ -32,7 +32,7 @@ public class SmallerValueExpression<T extends Number> extends AbstractValueExpre
     /**
      * <p>Constructor for SmallerValueExpression.</p>
      *
-     * @param value  a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value  a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param number a {@link java.lang.Number} object.
      */
     public SmallerValueExpression(DRIValue<T> value, Number number) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/UnEqualExpression.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/UnEqualExpression.java
index 31963b4..42cae79 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/UnEqualExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -39,7 +39,7 @@ public class UnEqualExpression extends AbstractSimpleExpression<Boolean> {
     /**
      * <p>Constructor for UnEqualExpression.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param values a T object.
      * @param <T> a T object.
      */
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/UnEqualValueExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/UnEqualValueExpression.java
index 0a1a112..37b06f4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/condition/UnEqualValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/condition/UnEqualValueExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.condition;
+package software.xdev.dynamicreports.report.builder.condition;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
 
 /**
  * <p>UnEqualValueExpression class.</p>
@@ -32,7 +32,7 @@ public class UnEqualValueExpression<T extends Number> extends AbstractValuesExpr
     /**
      * <p>Constructor for UnEqualValueExpression.</p>
      *
-     * @param value   a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value   a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param numbers a {@link java.lang.Number} object.
      */
     public UnEqualValueExpression(DRIValue<T> value, Number... numbers) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java
index fee7da1..8a509e1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/AbstractCrosstabGroupBuilder.java
@@ -15,32 +15,32 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.crosstab;
+package software.xdev.dynamicreports.report.builder.crosstab;
 
 import java.util.Comparator;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.column.DRValueColumn;
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabGroup;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.base.column.DRValueColumn;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabGroup;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.HyperLinkBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.CrosstabTotalPosition;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 
 /**
  * <p>Abstract AbstractCrosstabGroupBuilder class.</p>
@@ -55,7 +55,7 @@ public abstract class AbstractCrosstabGroupBuilder<T extends AbstractCrosstabGro
     /**
      * <p>Constructor for AbstractCrosstabGroupBuilder.</p>
      *
-     * @param column        a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column        a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      * @param crosstabGroup a U object.
      */
     protected AbstractCrosstabGroupBuilder(final ValueColumnBuilder<?, V> column, final U crosstabGroup) {
@@ -70,7 +70,7 @@ protected AbstractCrosstabGroupBuilder(final ValueColumnBuilder<?, V> column, fi
     /**
      * <p>Constructor for AbstractCrosstabGroupBuilder.</p>
      *
-     * @param field         a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field         a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      * @param crosstabGroup a U object.
      */
     protected AbstractCrosstabGroupBuilder(final FieldBuilder<V> field, final U crosstabGroup) {
@@ -83,7 +83,7 @@ protected AbstractCrosstabGroupBuilder(final FieldBuilder<V> field, final U cros
     /**
      * <p>Constructor for AbstractCrosstabGroupBuilder.</p>
      *
-     * @param expression    a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression    a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param crosstabGroup a U object.
      */
     protected AbstractCrosstabGroupBuilder(final DRIExpression<V> expression, final U crosstabGroup) {
@@ -108,7 +108,7 @@ public T setHeaderPattern(final String pattern) {
     /**
      * <p>setHeaderHorizontalAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
      * @return a T object.
      * @deprecated use setHeaderHorizontalTextAlignment instead
      */
@@ -125,7 +125,7 @@ public T setHeaderHorizontalAlignment(final HorizontalAlignment horizontalAlignm
     /**
      * <p>setHeaderHorizontalTextAlignment.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      * @return a T object.
      */
     public T setHeaderHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
@@ -136,7 +136,7 @@ public T setHeaderHorizontalTextAlignment(final HorizontalTextAlignment horizont
     /**
      * <p>setHeaderValueFormatter.</p>
      *
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      * @return a T object.
      */
     public T setHeaderValueFormatter(final DRIValueFormatter<?, ? super V> valueFormatter) {
@@ -160,7 +160,7 @@ public T setHeaderStretchWithOverflow(final Boolean stretchWithOverflow) {
     /**
      * <p>setHeaderTextAdjust.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      * @return a T object.
      */
     public T setHeaderTextAdjust(final TextAdjust textAdjust) {
@@ -186,7 +186,7 @@ public T setHeaderHyperLink(final HyperLinkBuilder hyperLink) {
     /**
      * <p>setHeaderStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setHeaderStyle(final ReportStyleBuilder style) {
@@ -247,7 +247,7 @@ public T setShowTotal(final Boolean showTotal) {
     /**
      * <p>setTotalPosition.</p>
      *
-     * @param totalPosition a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     * @param totalPosition a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
      * @return a T object.
      */
     public T setTotalPosition(final CrosstabTotalPosition totalPosition) {
@@ -258,7 +258,7 @@ public T setTotalPosition(final CrosstabTotalPosition totalPosition) {
     /**
      * <p>setTotalHeader.</p>
      *
-     * @param totalHeaderExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param totalHeaderExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setTotalHeader(final DRIExpression<?> totalHeaderExpression) {
@@ -293,7 +293,7 @@ public T setTotalHeaderStretchWithOverflow(final Boolean stretchWithOverflow) {
     /**
      * <p>setTotalHeaderTextAdjust.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      * @return a T object.
      */
     public T setTotalHeaderTextAdjust(final TextAdjust textAdjust) {
@@ -304,7 +304,7 @@ public T setTotalHeaderTextAdjust(final TextAdjust textAdjust) {
     /**
      * <p>setTotalHeaderStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setTotalHeaderStyle(final ReportStyleBuilder style) {
@@ -354,7 +354,7 @@ public T addTotalHeaderProperty(final String name, final String value) {
     /**
      * <p>setDataType.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      * @return a T object.
      */
     public T setDataType(final DRIDataType<? super V, V> dataType) {
@@ -365,7 +365,7 @@ public T setDataType(final DRIDataType<? super V, V> dataType) {
     /**
      * <p>setOrderType.</p>
      *
-     * @param orderType a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @param orderType a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      * @return a T object.
      */
     public T setOrderType(final OrderType orderType) {
@@ -376,7 +376,7 @@ public T setOrderType(final OrderType orderType) {
     /**
      * <p>setOrderByExpression.</p>
      *
-     * @param orderByExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param orderByExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setOrderByExpression(final DRIExpression<? extends Comparable<?>> orderByExpression) {
@@ -386,7 +386,7 @@ public T setOrderByExpression(final DRIExpression<? extends Comparable<?>> order
     /**
      * <p>orderBy.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      * @return a T object.
      */
     public T orderBy(final CrosstabMeasureBuilder<? extends Comparable<?>> measure) {
@@ -396,7 +396,7 @@ public T orderBy(final CrosstabMeasureBuilder<? extends Comparable<?>> measure)
     /**
      * <p>orderBy.</p>
      *
-     * @param orderByExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param orderByExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T orderBy(final DRIExpression<? extends Comparable<?>> orderByExpression) {
@@ -407,7 +407,7 @@ public T orderBy(final DRIExpression<? extends Comparable<?>> orderByExpression)
     /**
      * <p>setComparatorExpression.</p>
      *
-     * @param comparatorExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param comparatorExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setComparatorExpression(final DRIExpression<? extends Comparator<?>> comparatorExpression) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabBuilder.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabBuilder.java
index 6cc6efd..4ce53fd 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabBuilder.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.crosstab;
-
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstab;
-import net.sf.dynamicreports.report.builder.DatasetBuilder;
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
-import net.sf.dynamicreports.report.builder.component.DimensionComponentBuilder;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.RunDirection;
+package software.xdev.dynamicreports.report.builder.crosstab;
+
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstab;
+import software.xdev.dynamicreports.report.builder.DatasetBuilder;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilder;
+import software.xdev.dynamicreports.report.builder.component.DimensionComponentBuilder;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.RunDirection;
 import net.sf.jasperreports.engine.JRDataSource;
 import org.apache.commons.lang3.Validate;
 
@@ -51,7 +51,7 @@ protected CrosstabBuilder() {
      * <p>setRepeatColumnHeaders.</p>
      *
      * @param repeatColumnHeaders a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setRepeatColumnHeaders(Boolean repeatColumnHeaders) {
         getObject().setRepeatColumnHeaders(repeatColumnHeaders);
@@ -62,7 +62,7 @@ public CrosstabBuilder setRepeatColumnHeaders(Boolean repeatColumnHeaders) {
      * <p>setRepeatRowHeaders.</p>
      *
      * @param repeatRowHeaders a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setRepeatRowHeaders(Boolean repeatRowHeaders) {
         getObject().setRepeatRowHeaders(repeatRowHeaders);
@@ -73,7 +73,7 @@ public CrosstabBuilder setRepeatRowHeaders(Boolean repeatRowHeaders) {
      * <p>setColumnBreakOffset.</p>
      *
      * @param columnBreakOffset a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setColumnBreakOffset(Integer columnBreakOffset) {
         getObject().setColumnBreakOffset(columnBreakOffset);
@@ -84,7 +84,7 @@ public CrosstabBuilder setColumnBreakOffset(Integer columnBreakOffset) {
      * <p>setIgnoreWidth.</p>
      *
      * @param ignoreWidth a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setIgnoreWidth(Boolean ignoreWidth) {
         getObject().setIgnoreWidth(ignoreWidth);
@@ -94,8 +94,8 @@ public CrosstabBuilder setIgnoreWidth(Boolean ignoreWidth) {
     /**
      * <p>setRunDirection.</p>
      *
-     * @param runDirection a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param runDirection a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setRunDirection(RunDirection runDirection) {
         getObject().setRunDirection(runDirection);
@@ -106,7 +106,7 @@ public CrosstabBuilder setRunDirection(RunDirection runDirection) {
      * <p>setCellWidth.</p>
      *
      * @param cellWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setCellWidth(Integer cellWidth) {
         getObject().setCellWidth(cellWidth);
@@ -117,7 +117,7 @@ public CrosstabBuilder setCellWidth(Integer cellWidth) {
      * <p>setCellHeight.</p>
      *
      * @param cellHeight a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setCellHeight(Integer cellHeight) {
         getObject().setCellHeight(cellHeight);
@@ -127,7 +127,7 @@ public CrosstabBuilder setCellHeight(Integer cellHeight) {
     /**
      * <p>highlightOddRows.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder highlightOddRows() {
         return setHighlightOddRows(true);
@@ -137,7 +137,7 @@ public CrosstabBuilder highlightOddRows() {
      * <p>setHighlightOddRows.</p>
      *
      * @param highlightOddRows a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setHighlightOddRows(Boolean highlightOddRows) {
         getObject().setHighlightOddRows(highlightOddRows);
@@ -147,8 +147,8 @@ public CrosstabBuilder setHighlightOddRows(Boolean highlightOddRows) {
     /**
      * <p>setOddRowStyle.</p>
      *
-     * @param oddRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param oddRowStyle a {@link software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setOddRowStyle(SimpleStyleBuilder oddRowStyle) {
         if (oddRowStyle != null) {
@@ -162,8 +162,8 @@ public CrosstabBuilder setOddRowStyle(SimpleStyleBuilder oddRowStyle) {
     /**
      * <p>setGroupStyle.</p>
      *
-     * @param groupStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param groupStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setGroupStyle(ReportStyleBuilder groupStyle) {
         if (groupStyle != null) {
@@ -177,8 +177,8 @@ public CrosstabBuilder setGroupStyle(ReportStyleBuilder groupStyle) {
     /**
      * <p>setGroupTotalStyle.</p>
      *
-     * @param groupTotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param groupTotalStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setGroupTotalStyle(ReportStyleBuilder groupTotalStyle) {
         if (groupTotalStyle != null) {
@@ -192,8 +192,8 @@ public CrosstabBuilder setGroupTotalStyle(ReportStyleBuilder groupTotalStyle) {
     /**
      * <p>setGrandTotalStyle.</p>
      *
-     * @param grandTotalStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param grandTotalStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setGrandTotalStyle(ReportStyleBuilder grandTotalStyle) {
         if (grandTotalStyle != null) {
@@ -207,8 +207,8 @@ public CrosstabBuilder setGrandTotalStyle(ReportStyleBuilder grandTotalStyle) {
     /**
      * <p>setCellStyle.</p>
      *
-     * @param cellStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param cellStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setCellStyle(ReportStyleBuilder cellStyle) {
         if (cellStyle != null) {
@@ -222,8 +222,8 @@ public CrosstabBuilder setCellStyle(ReportStyleBuilder cellStyle) {
     /**
      * <p>setMeasureTitleStyle.</p>
      *
-     * @param measureTitleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param measureTitleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setMeasureTitleStyle(ReportStyleBuilder measureTitleStyle) {
         if (measureTitleStyle != null) {
@@ -237,7 +237,7 @@ public CrosstabBuilder setMeasureTitleStyle(ReportStyleBuilder measureTitleStyle
     /**
      * <p>highlightEvenRows.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder highlightEvenRows() {
         return setHighlightEvenRows(true);
@@ -247,7 +247,7 @@ public CrosstabBuilder highlightEvenRows() {
      * <p>setHighlightEvenRows.</p>
      *
      * @param highlightEvenRows a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setHighlightEvenRows(Boolean highlightEvenRows) {
         getObject().setHighlightEvenRows(highlightEvenRows);
@@ -257,8 +257,8 @@ public CrosstabBuilder setHighlightEvenRows(Boolean highlightEvenRows) {
     /**
      * <p>setEvenRowStyle.</p>
      *
-     * @param evenRowStyle a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param evenRowStyle a {@link software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setEvenRowStyle(SimpleStyleBuilder evenRowStyle) {
         if (evenRowStyle != null) {
@@ -272,8 +272,8 @@ public CrosstabBuilder setEvenRowStyle(SimpleStyleBuilder evenRowStyle) {
     /**
      * <p>whenNoDataCell.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder whenNoDataCell(ComponentBuilder<?, ?>... components) {
         return addWhenNoDataCell(components);
@@ -282,8 +282,8 @@ public CrosstabBuilder whenNoDataCell(ComponentBuilder<?, ?>... components) {
     /**
      * <p>addWhenNoDataCell.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder addWhenNoDataCell(ComponentBuilder<?, ?>... components) {
         Validate.notNull(components, "components must not be null");
@@ -297,8 +297,8 @@ public CrosstabBuilder addWhenNoDataCell(ComponentBuilder<?, ?>... components) {
     /**
      * <p>headerCell.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder headerCell(ComponentBuilder<?, ?>... components) {
         return addHeaderCell(components);
@@ -307,8 +307,8 @@ public CrosstabBuilder headerCell(ComponentBuilder<?, ?>... components) {
     /**
      * <p>addHeaderCell.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder addHeaderCell(ComponentBuilder<?, ?>... components) {
         Validate.notNull(components, "components must not be null");
@@ -322,8 +322,8 @@ public CrosstabBuilder addHeaderCell(ComponentBuilder<?, ?>... components) {
     /**
      * <p>columnGroups.</p>
      *
-     * @param columnGroups a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param columnGroups a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder columnGroups(CrosstabColumnGroupBuilder<?>... columnGroups) {
         return addColumnGroup(columnGroups);
@@ -332,8 +332,8 @@ public CrosstabBuilder columnGroups(CrosstabColumnGroupBuilder<?>... columnGroup
     /**
      * <p>addColumnGroup.</p>
      *
-     * @param columnGroups a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param columnGroups a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder addColumnGroup(CrosstabColumnGroupBuilder<?>... columnGroups) {
         Validate.notNull(columnGroups, "columnGroups must not be null");
@@ -347,8 +347,8 @@ public CrosstabBuilder addColumnGroup(CrosstabColumnGroupBuilder<?>... columnGro
     /**
      * <p>rowGroups.</p>
      *
-     * @param rowGroups a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param rowGroups a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder rowGroups(CrosstabRowGroupBuilder<?>... rowGroups) {
         return addRowGroup(rowGroups);
@@ -357,8 +357,8 @@ public CrosstabBuilder rowGroups(CrosstabRowGroupBuilder<?>... rowGroups) {
     /**
      * <p>addRowGroup.</p>
      *
-     * @param rowGroups a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param rowGroups a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder addRowGroup(CrosstabRowGroupBuilder<?>... rowGroups) {
         Validate.notNull(rowGroups, "rowGroups must not be null");
@@ -372,8 +372,8 @@ public CrosstabBuilder addRowGroup(CrosstabRowGroupBuilder<?>... rowGroups) {
     /**
      * <p>variables.</p>
      *
-     * @param variables a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param variables a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder variables(CrosstabVariableBuilder<?>... variables) {
         return addVariable(variables);
@@ -382,8 +382,8 @@ public CrosstabBuilder variables(CrosstabVariableBuilder<?>... variables) {
     /**
      * <p>addVariable.</p>
      *
-     * @param variables a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param variables a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder addVariable(CrosstabVariableBuilder<?>... variables) {
         Validate.notNull(variables, "variables must not be null");
@@ -397,8 +397,8 @@ public CrosstabBuilder addVariable(CrosstabVariableBuilder<?>... variables) {
     /**
      * <p>measures.</p>
      *
-     * @param measures a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param measures a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder measures(CrosstabMeasureBuilder<?>... measures) {
         return addMeasure(measures);
@@ -407,8 +407,8 @@ public CrosstabBuilder measures(CrosstabMeasureBuilder<?>... measures) {
     /**
      * <p>addMeasure.</p>
      *
-     * @param measures a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param measures a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder addMeasure(CrosstabMeasureBuilder<?>... measures) {
         Validate.notNull(measures, "measures must not be null");
@@ -424,8 +424,8 @@ public CrosstabBuilder addMeasure(CrosstabMeasureBuilder<?>... measures) {
     /**
      * <p>setSubDataset.</p>
      *
-     * @param subDataset a {@link net.sf.dynamicreports.report.builder.DatasetBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @param subDataset a {@link software.xdev.dynamicreports.report.builder.DatasetBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setSubDataset(DatasetBuilder subDataset) {
         Validate.notNull(subDataset, "subDataset must not be null");
@@ -437,7 +437,7 @@ public CrosstabBuilder setSubDataset(DatasetBuilder subDataset) {
      * <p>setDataSource.</p>
      *
      * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setDataSource(JRDataSource dataSource) {
         DatasetBuilder dataset = DynamicReports.dataset();
@@ -450,7 +450,7 @@ public CrosstabBuilder setDataSource(JRDataSource dataSource) {
      *
      * @param sql        a {@link java.lang.String} object.
      * @param connection a {@link java.sql.Connection} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setDataSource(String sql, Connection connection) {
         DatasetBuilder dataset = DynamicReports.dataset();
@@ -462,7 +462,7 @@ public CrosstabBuilder setDataSource(String sql, Connection connection) {
      * <p>setDataPreSorted.</p>
      *
      * @param dataPreSorted a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder setDataPreSorted(Boolean dataPreSorted) {
         getObject().getDataset().setDataPreSorted(dataPreSorted);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabBuilders.java
similarity index 55%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabBuilders.java
index 987c5b2..c7bce2a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabBuilders.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.crosstab;
+package software.xdev.dynamicreports.report.builder.crosstab;
 
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * A set of methods of creating and customizing crosstabs
@@ -33,7 +33,7 @@ public class CrosstabBuilders {
     /**
      * <p>crosstab.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public CrosstabBuilder crosstab() {
         return Crosstabs.crosstab();
@@ -44,9 +44,9 @@ public CrosstabBuilder crosstab() {
     /**
      * <p>columnGroup.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      * @param <T>    a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public <T> CrosstabColumnGroupBuilder<T> columnGroup(ValueColumnBuilder<?, T> column) {
         return Crosstabs.columnGroup(column);
@@ -55,9 +55,9 @@ public <T> CrosstabColumnGroupBuilder<T> columnGroup(ValueColumnBuilder<?, T> co
     /**
      * <p>columnGroup.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public <T> CrosstabColumnGroupBuilder<T> columnGroup(FieldBuilder<T> field) {
         return Crosstabs.columnGroup(field);
@@ -69,7 +69,7 @@ public <T> CrosstabColumnGroupBuilder<T> columnGroup(FieldBuilder<T> field) {
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public <T> CrosstabColumnGroupBuilder<T> columnGroup(String fieldName, Class<T> valueClass) {
         return Crosstabs.columnGroup(fieldName, valueClass);
@@ -78,9 +78,9 @@ public <T> CrosstabColumnGroupBuilder<T> columnGroup(String fieldName, Class<T>
     /**
      * <p>columnGroup.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public <T> CrosstabColumnGroupBuilder<T> columnGroup(DRIExpression<T> expression) {
         return Crosstabs.columnGroup(expression);
@@ -91,9 +91,9 @@ public <T> CrosstabColumnGroupBuilder<T> columnGroup(DRIExpression<T> expression
     /**
      * <p>rowGroup.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      * @param <T>    a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public <T> CrosstabRowGroupBuilder<T> rowGroup(ValueColumnBuilder<?, T> column) {
         return Crosstabs.rowGroup(column);
@@ -102,9 +102,9 @@ public <T> CrosstabRowGroupBuilder<T> rowGroup(ValueColumnBuilder<?, T> column)
     /**
      * <p>rowGroup.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public <T> CrosstabRowGroupBuilder<T> rowGroup(FieldBuilder<T> field) {
         return Crosstabs.rowGroup(field);
@@ -116,7 +116,7 @@ public <T> CrosstabRowGroupBuilder<T> rowGroup(FieldBuilder<T> field) {
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public <T> CrosstabRowGroupBuilder<T> rowGroup(String fieldName, Class<T> valueClass) {
         return Crosstabs.rowGroup(fieldName, valueClass);
@@ -125,9 +125,9 @@ public <T> CrosstabRowGroupBuilder<T> rowGroup(String fieldName, Class<T> valueC
     /**
      * <p>rowGroup.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public <T> CrosstabRowGroupBuilder<T> rowGroup(DRIExpression<T> expression) {
         return Crosstabs.rowGroup(expression);
@@ -138,10 +138,10 @@ public <T> CrosstabRowGroupBuilder<T> rowGroup(DRIExpression<T> expression) {
     /**
      * <p>variable.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public <T> CrosstabVariableBuilder<T> variable(ValueColumnBuilder<?, ?> column, Calculation calculation) {
         return Crosstabs.variable(column, calculation);
@@ -150,10 +150,10 @@ public <T> CrosstabVariableBuilder<T> variable(ValueColumnBuilder<?, ?> column,
     /**
      * <p>variable.</p>
      *
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public <T> CrosstabVariableBuilder<T> variable(FieldBuilder<T> field, Calculation calculation) {
         return Crosstabs.variable(field, calculation);
@@ -164,9 +164,9 @@ public <T> CrosstabVariableBuilder<T> variable(FieldBuilder<T> field, Calculatio
      *
      * @param fieldName   a {@link java.lang.String} object.
      * @param valueClass  a {@link java.lang.Class} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public <T> CrosstabVariableBuilder<T> variable(String fieldName, Class<?> valueClass, Calculation calculation) {
         return Crosstabs.variable(fieldName, valueClass, calculation);
@@ -175,10 +175,10 @@ public <T> CrosstabVariableBuilder<T> variable(String fieldName, Class<?> valueC
     /**
      * <p>variable.</p>
      *
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public <T> CrosstabVariableBuilder<T> variable(DRIExpression<?> expression, Calculation calculation) {
         return Crosstabs.variable(expression, calculation);
@@ -189,10 +189,10 @@ public <T> CrosstabVariableBuilder<T> variable(DRIExpression<?> expression, Calc
     /**
      * <p>measure.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(ValueColumnBuilder<?, ?> column, Calculation calculation) {
         return Crosstabs.measure(column, calculation);
@@ -202,10 +202,10 @@ public <T> CrosstabMeasureBuilder<T> measure(ValueColumnBuilder<?, ?> column, Ca
      * <p>measure.</p>
      *
      * @param title       a {@link java.lang.String} object.
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(String title, ValueColumnBuilder<?, ?> column, Calculation calculation) {
         return Crosstabs.measure(title, column, calculation);
@@ -214,10 +214,10 @@ public <T> CrosstabMeasureBuilder<T> measure(String title, ValueColumnBuilder<?,
     /**
      * <p>measure.</p>
      *
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(FieldBuilder<T> field, Calculation calculation) {
         return Crosstabs.measure(field, calculation);
@@ -227,10 +227,10 @@ public <T> CrosstabMeasureBuilder<T> measure(FieldBuilder<T> field, Calculation
      * <p>measure.</p>
      *
      * @param title       a {@link java.lang.String} object.
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(String title, FieldBuilder<T> field, Calculation calculation) {
         return Crosstabs.measure(title, field, calculation);
@@ -241,9 +241,9 @@ public <T> CrosstabMeasureBuilder<T> measure(String title, FieldBuilder<T> field
      *
      * @param fieldName   a {@link java.lang.String} object.
      * @param valueClass  a {@link java.lang.Class} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(String fieldName, Class<?> valueClass, Calculation calculation) {
         return Crosstabs.measure(fieldName, valueClass, calculation);
@@ -255,9 +255,9 @@ public <T> CrosstabMeasureBuilder<T> measure(String fieldName, Class<?> valueCla
      * @param title       a {@link java.lang.String} object.
      * @param fieldName   a {@link java.lang.String} object.
      * @param valueClass  a {@link java.lang.Class} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(String title, String fieldName, Class<?> valueClass, Calculation calculation) {
         return Crosstabs.measure(title, fieldName, valueClass, calculation);
@@ -266,10 +266,10 @@ public <T> CrosstabMeasureBuilder<T> measure(String title, String fieldName, Cla
     /**
      * <p>measure.</p>
      *
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression, Calculation calculation) {
         return Crosstabs.measure(expression, calculation);
@@ -279,10 +279,10 @@ public <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression, Calcul
      * <p>measure.</p>
      *
      * @param title       a {@link java.lang.String} object.
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expression, Calculation calculation) {
         return Crosstabs.measure(title, expression, calculation);
@@ -291,9 +291,9 @@ public <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expr
     /**
      * <p>measure.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression) {
         return Crosstabs.measure(expression);
@@ -303,9 +303,9 @@ public <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression) {
      * <p>measure.</p>
      *
      * @param title      a {@link java.lang.String} object.
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expression) {
         return Crosstabs.measure(title, expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java
index 72677d4..e3217bb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabColumnGroupBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.crosstab;
+package software.xdev.dynamicreports.report.builder.crosstab;
 
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabColumnGroup;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabColumnGroup;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>CrosstabColumnGroupBuilder class.</p>
@@ -35,7 +35,7 @@ public class CrosstabColumnGroupBuilder<T> extends AbstractCrosstabGroupBuilder<
     /**
      * <p>Constructor for CrosstabColumnGroupBuilder.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      */
     protected CrosstabColumnGroupBuilder(ValueColumnBuilder<?, T> column) {
         super(column, new DRCrosstabColumnGroup<T>());
@@ -44,7 +44,7 @@ protected CrosstabColumnGroupBuilder(ValueColumnBuilder<?, T> column) {
     /**
      * <p>Constructor for CrosstabColumnGroupBuilder.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected CrosstabColumnGroupBuilder(FieldBuilder<T> field) {
         super(field, new DRCrosstabColumnGroup<T>());
@@ -53,7 +53,7 @@ protected CrosstabColumnGroupBuilder(FieldBuilder<T> field) {
     /**
      * <p>Constructor for CrosstabColumnGroupBuilder.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected CrosstabColumnGroupBuilder(DRIExpression<T> expression) {
         super(expression, new DRCrosstabColumnGroup<T>());
@@ -63,7 +63,7 @@ protected CrosstabColumnGroupBuilder(DRIExpression<T> expression) {
      * <p>setHeaderHeight.</p>
      *
      * @param headerHeight a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public CrosstabColumnGroupBuilder<T> setHeaderHeight(Integer headerHeight) {
         getObject().setHeaderHeight(headerHeight);
@@ -74,7 +74,7 @@ public CrosstabColumnGroupBuilder<T> setHeaderHeight(Integer headerHeight) {
      * <p>setTotalHeaderWidth.</p>
      *
      * @param totalHeaderWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public CrosstabColumnGroupBuilder<T> setTotalHeaderWidth(Integer totalHeaderWidth) {
         getObject().setTotalHeaderWidth(totalHeaderWidth);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java
index b6ddf09..2fe51a7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabMeasureBuilder.java
@@ -15,34 +15,34 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.crosstab;
+package software.xdev.dynamicreports.report.builder.crosstab;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabCellStyle;
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabMeasure;
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabVariable;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.builder.datatype.DataTypes;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.DRICrosstabValue;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.exception.DRReportException;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabCellStyle;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabMeasure;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabVariable;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.HyperLinkBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.builder.datatype.DataTypes;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.DRICrosstabValue;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.exception.DRReportException;
 
 /**
  * <p>CrosstabMeasureBuilder class.</p>
@@ -57,8 +57,8 @@ public class CrosstabMeasureBuilder<T> extends AbstractBuilder<CrosstabMeasureBu
     /**
      * <p>Constructor for CrosstabMeasureBuilder.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected CrosstabMeasureBuilder(final ValueColumnBuilder<?, ?> column, final Calculation calculation) {
         super(new DRCrosstabMeasure<T>(Crosstabs.variable(column, calculation).build()));
@@ -76,8 +76,8 @@ protected CrosstabMeasureBuilder(final ValueColumnBuilder<?, ?> column, final Ca
     /**
      * <p>Constructor for CrosstabMeasureBuilder.</p>
      *
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected CrosstabMeasureBuilder(final FieldBuilder<?> field, final Calculation calculation) {
         super(new DRCrosstabMeasure<T>(Crosstabs.variable(field, calculation).build()));
@@ -93,8 +93,8 @@ protected CrosstabMeasureBuilder(final FieldBuilder<?> field, final Calculation
     /**
      * <p>Constructor for CrosstabMeasureBuilder.</p>
      *
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected CrosstabMeasureBuilder(final DRIExpression<?> expression, final Calculation calculation) {
         super(new DRCrosstabMeasure<T>(Crosstabs.variable(expression, calculation).build()));
@@ -110,7 +110,7 @@ protected CrosstabMeasureBuilder(final DRIExpression<?> expression, final Calcul
     /**
      * <p>Constructor for CrosstabMeasureBuilder.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected CrosstabMeasureBuilder(final DRIExpression<?> expression) {
         super(new DRCrosstabMeasure<T>(expression));
@@ -119,8 +119,8 @@ protected CrosstabMeasureBuilder(final DRIExpression<?> expression) {
     /**
      * <p>setDataType.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     @SuppressWarnings( {"unchecked", "rawtypes"})
     public CrosstabMeasureBuilder<T> setDataType(final DRIDataType dataType) {
@@ -131,8 +131,8 @@ public CrosstabMeasureBuilder<T> setDataType(final DRIDataType dataType) {
     /**
      * <p>setPercentageType.</p>
      *
-     * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param percentageType a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setPercentageType(final CrosstabPercentageType percentageType) {
         if (getObject().getExpression() instanceof DRCrosstabVariable<?>) {
@@ -152,7 +152,7 @@ public CrosstabMeasureBuilder<T> setPercentageType(final CrosstabPercentageType
      * <p>setPattern.</p>
      *
      * @param pattern a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setPattern(final String pattern) {
         getObject().setPattern(pattern);
@@ -162,8 +162,8 @@ public CrosstabMeasureBuilder<T> setPattern(final String pattern) {
     /**
      * <p>setHorizontalAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      * @deprecated use setHorizontalTextAlignment instead
      */
     @Deprecated
@@ -179,8 +179,8 @@ public CrosstabMeasureBuilder<T> setHorizontalAlignment(final HorizontalAlignmen
     /**
      * <p>setHorizontalTextAlignment.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setHorizontalTextAlignment(final HorizontalTextAlignment horizontalTextAlignment) {
         getObject().setHorizontalTextAlignment(horizontalTextAlignment);
@@ -190,8 +190,8 @@ public CrosstabMeasureBuilder<T> setHorizontalTextAlignment(final HorizontalText
     /**
      * <p>setValueFormatter.</p>
      *
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setValueFormatter(final DRIValueFormatter<?, ? super T> valueFormatter) {
         getObject().setValueFormatter(valueFormatter);
@@ -202,7 +202,7 @@ public CrosstabMeasureBuilder<T> setValueFormatter(final DRIValueFormatter<?, ?
      * <p>setStretchWithOverflow.</p>
      *
      * @param stretchWithOverflow a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      * @deprecated replaced by {@link #setTextAdjust(TextAdjust)}
      */
     @Deprecated
@@ -214,7 +214,7 @@ public CrosstabMeasureBuilder<T> setStretchWithOverflow(final Boolean stretchWit
     /**
      * <p>setTotalHeaderTextAdjust.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      * @return a T object.
      */
     public CrosstabMeasureBuilder<T> setTextAdjust(final TextAdjust textAdjust) {
@@ -275,8 +275,8 @@ public CrosstabMeasureBuilder<T> addProperty(final String name, final String val
     /**
      * <p>setStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style) {
         Validate.notNull(style, "style must not be null");
@@ -287,9 +287,9 @@ public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style) {
     /**
      * <p>setStyle.</p>
      *
-     * @param style    a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @param rowGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param style    a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param rowGroup a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final CrosstabRowGroupBuilder<?> rowGroup) {
         Validate.notNull(style, "style must not be null");
@@ -301,9 +301,9 @@ public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final
     /**
      * <p>setStyle.</p>
      *
-     * @param style       a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param style       a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param columnGroup a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final CrosstabColumnGroupBuilder<?> columnGroup) {
         Validate.notNull(style, "style must not be null");
@@ -315,10 +315,10 @@ public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final
     /**
      * <p>setStyle.</p>
      *
-     * @param style       a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @param rowGroup    a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
-     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param style       a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param rowGroup    a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @param columnGroup a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final CrosstabRowGroupBuilder<?> rowGroup, final CrosstabColumnGroupBuilder<?> columnGroup) {
         Validate.notNull(style, "style must not be null");
@@ -331,8 +331,8 @@ public CrosstabMeasureBuilder<T> setStyle(final ReportStyleBuilder style, final
     /**
      * <p>setTitle.</p>
      *
-     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param titleExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setTitle(final DRIExpression<?> titleExpression) {
         getObject().setTitleExpression(titleExpression);
@@ -343,7 +343,7 @@ public CrosstabMeasureBuilder<T> setTitle(final DRIExpression<?> titleExpression
      * <p>setTitle.</p>
      *
      * @param title a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setTitle(final String title) {
         getObject().setTitleExpression(Expressions.text(title));
@@ -353,8 +353,8 @@ public CrosstabMeasureBuilder<T> setTitle(final String title) {
     /**
      * <p>setTitleStyle.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public CrosstabMeasureBuilder<T> setTitleStyle(final ReportStyleBuilder titleStyle) {
         if (titleStyle != null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java
index 4cf9a2a..2f3e130 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabRowGroupBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.crosstab;
+package software.xdev.dynamicreports.report.builder.crosstab;
 
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabRowGroup;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabRowGroup;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>CrosstabRowGroupBuilder class.</p>
@@ -35,7 +35,7 @@ public class CrosstabRowGroupBuilder<T> extends AbstractCrosstabGroupBuilder<Cro
     /**
      * <p>Constructor for CrosstabRowGroupBuilder.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      */
     protected CrosstabRowGroupBuilder(ValueColumnBuilder<?, T> column) {
         super(column, new DRCrosstabRowGroup<T>());
@@ -44,7 +44,7 @@ protected CrosstabRowGroupBuilder(ValueColumnBuilder<?, T> column) {
     /**
      * <p>Constructor for CrosstabRowGroupBuilder.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected CrosstabRowGroupBuilder(FieldBuilder<T> field) {
         super(field, new DRCrosstabRowGroup<T>());
@@ -53,7 +53,7 @@ protected CrosstabRowGroupBuilder(FieldBuilder<T> field) {
     /**
      * <p>Constructor for CrosstabRowGroupBuilder.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected CrosstabRowGroupBuilder(DRIExpression<T> expression) {
         super(expression, new DRCrosstabRowGroup<T>());
@@ -63,7 +63,7 @@ protected CrosstabRowGroupBuilder(DRIExpression<T> expression) {
      * <p>setHeaderWidth.</p>
      *
      * @param headerWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public CrosstabRowGroupBuilder<T> setHeaderWidth(Integer headerWidth) {
         getObject().setHeaderWidth(headerWidth);
@@ -74,7 +74,7 @@ public CrosstabRowGroupBuilder<T> setHeaderWidth(Integer headerWidth) {
      * <p>setTotalHeaderHeight.</p>
      *
      * @param totalHeaderHeight a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public CrosstabRowGroupBuilder<T> setTotalHeaderHeight(Integer totalHeaderHeight) {
         getObject().setTotalHeaderHeight(totalHeaderHeight);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java
similarity index 58%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java
index eae5f04..3a14da9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/CrosstabVariableBuilder.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.crosstab;
+package software.xdev.dynamicreports.report.builder.crosstab;
 
-import net.sf.dynamicreports.report.base.crosstab.DRCrosstabVariable;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.definition.DRICrosstabValue;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.crosstab.DRCrosstabVariable;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.definition.DRICrosstabValue;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>CrosstabVariableBuilder class.</p>
@@ -39,8 +39,8 @@ public class CrosstabVariableBuilder<T> extends AbstractBuilder<CrosstabVariable
     /**
      * <p>Constructor for CrosstabVariableBuilder.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected CrosstabVariableBuilder(ValueColumnBuilder<?, ?> column, Calculation calculation) {
         super(new DRCrosstabVariable<T>(column.build(), calculation));
@@ -49,8 +49,8 @@ protected CrosstabVariableBuilder(ValueColumnBuilder<?, ?> column, Calculation c
     /**
      * <p>Constructor for CrosstabVariableBuilder.</p>
      *
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected CrosstabVariableBuilder(FieldBuilder<?> field, Calculation calculation) {
         super(new DRCrosstabVariable<T>(field.getField(), calculation));
@@ -59,8 +59,8 @@ protected CrosstabVariableBuilder(FieldBuilder<?> field, Calculation calculation
     /**
      * <p>Constructor for CrosstabVariableBuilder.</p>
      *
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected CrosstabVariableBuilder(DRIExpression<?> expression, Calculation calculation) {
         super(new DRCrosstabVariable<T>(expression, calculation));
@@ -69,8 +69,8 @@ protected CrosstabVariableBuilder(DRIExpression<?> expression, Calculation calcu
     /**
      * <p>setPercentageType.</p>
      *
-     * @param percentageType a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @param percentageType a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public CrosstabVariableBuilder<T> setPercentageType(CrosstabPercentageType percentageType) {
         getObject().setPercentageType(percentageType);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/Crosstabs.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/Crosstabs.java
similarity index 58%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/Crosstabs.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/Crosstabs.java
index a90d462..0cb1918 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/crosstab/Crosstabs.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/crosstab/Crosstabs.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.crosstab;
+package software.xdev.dynamicreports.report.builder.crosstab;
 
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -35,7 +35,7 @@ public class Crosstabs {
     /**
      * <p>crosstab.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder} object.
      */
     public static CrosstabBuilder crosstab() {
         return new CrosstabBuilder();
@@ -46,9 +46,9 @@ public static CrosstabBuilder crosstab() {
     /**
      * <p>columnGroup.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      * @param <T>    a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public static <T> CrosstabColumnGroupBuilder<T> columnGroup(ValueColumnBuilder<?, T> column) {
         return new CrosstabColumnGroupBuilder<T>(column);
@@ -57,9 +57,9 @@ public static <T> CrosstabColumnGroupBuilder<T> columnGroup(ValueColumnBuilder<?
     /**
      * <p>columnGroup.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public static <T> CrosstabColumnGroupBuilder<T> columnGroup(FieldBuilder<T> field) {
         return new CrosstabColumnGroupBuilder<T>(field);
@@ -71,7 +71,7 @@ public static <T> CrosstabColumnGroupBuilder<T> columnGroup(FieldBuilder<T> fiel
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public static <T> CrosstabColumnGroupBuilder<T> columnGroup(String fieldName, Class<T> valueClass) {
         return new CrosstabColumnGroupBuilder<T>(DynamicReports.<T>field(fieldName, valueClass));
@@ -80,9 +80,9 @@ public static <T> CrosstabColumnGroupBuilder<T> columnGroup(String fieldName, Cl
     /**
      * <p>columnGroup.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     public static <T> CrosstabColumnGroupBuilder<T> columnGroup(DRIExpression<T> expression) {
         return new CrosstabColumnGroupBuilder<T>(expression);
@@ -93,9 +93,9 @@ public static <T> CrosstabColumnGroupBuilder<T> columnGroup(DRIExpression<T> exp
     /**
      * <p>rowGroup.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      * @param <T>    a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public static <T> CrosstabRowGroupBuilder<T> rowGroup(ValueColumnBuilder<?, T> column) {
         return new CrosstabRowGroupBuilder<T>(column);
@@ -104,9 +104,9 @@ public static <T> CrosstabRowGroupBuilder<T> rowGroup(ValueColumnBuilder<?, T> c
     /**
      * <p>rowGroup.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public static <T> CrosstabRowGroupBuilder<T> rowGroup(FieldBuilder<T> field) {
         return new CrosstabRowGroupBuilder<T>(field);
@@ -118,7 +118,7 @@ public static <T> CrosstabRowGroupBuilder<T> rowGroup(FieldBuilder<T> field) {
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public static <T> CrosstabRowGroupBuilder<T> rowGroup(String fieldName, Class<T> valueClass) {
         return new CrosstabRowGroupBuilder<T>(DynamicReports.<T>field(fieldName, valueClass));
@@ -127,9 +127,9 @@ public static <T> CrosstabRowGroupBuilder<T> rowGroup(String fieldName, Class<T>
     /**
      * <p>rowGroup.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
      */
     public static <T> CrosstabRowGroupBuilder<T> rowGroup(DRIExpression<T> expression) {
         return new CrosstabRowGroupBuilder<T>(expression);
@@ -140,10 +140,10 @@ public static <T> CrosstabRowGroupBuilder<T> rowGroup(DRIExpression<T> expressio
     /**
      * <p>variable.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public static <T> CrosstabVariableBuilder<T> variable(ValueColumnBuilder<?, ?> column, Calculation calculation) {
         Validate.notNull(column, "column must not be null");
@@ -153,10 +153,10 @@ public static <T> CrosstabVariableBuilder<T> variable(ValueColumnBuilder<?, ?> c
     /**
      * <p>variable.</p>
      *
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public static <T> CrosstabVariableBuilder<T> variable(FieldBuilder<T> field, Calculation calculation) {
         Validate.notNull(field, "field must not be null");
@@ -168,9 +168,9 @@ public static <T> CrosstabVariableBuilder<T> variable(FieldBuilder<T> field, Cal
      *
      * @param fieldName   a {@link java.lang.String} object.
      * @param valueClass  a {@link java.lang.Class} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public static <T> CrosstabVariableBuilder<T> variable(String fieldName, Class<?> valueClass, Calculation calculation) {
         return new CrosstabVariableBuilder<T>(DynamicReports.field(fieldName, valueClass), calculation);
@@ -179,10 +179,10 @@ public static <T> CrosstabVariableBuilder<T> variable(String fieldName, Class<?>
     /**
      * <p>variable.</p>
      *
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder} object.
      */
     public static <T> CrosstabVariableBuilder<T> variable(DRIExpression<?> expression, Calculation calculation) {
         return new CrosstabVariableBuilder<T>(expression, calculation);
@@ -193,10 +193,10 @@ public static <T> CrosstabVariableBuilder<T> variable(DRIExpression<?> expressio
     /**
      * <p>measure.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(ValueColumnBuilder<?, ?> column, Calculation calculation) {
         Validate.notNull(column, "column must not be null");
@@ -207,10 +207,10 @@ public static <T> CrosstabMeasureBuilder<T> measure(ValueColumnBuilder<?, ?> col
      * <p>measure.</p>
      *
      * @param title       a {@link java.lang.String} object.
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(String title, ValueColumnBuilder<?, ?> column, Calculation calculation) {
         CrosstabMeasureBuilder<T> measure = measure(column, calculation);
@@ -220,10 +220,10 @@ public static <T> CrosstabMeasureBuilder<T> measure(String title, ValueColumnBui
     /**
      * <p>measure.</p>
      *
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(FieldBuilder<T> field, Calculation calculation) {
         Validate.notNull(field, "field must not be null");
@@ -234,10 +234,10 @@ public static <T> CrosstabMeasureBuilder<T> measure(FieldBuilder<T> field, Calcu
      * <p>measure.</p>
      *
      * @param title       a {@link java.lang.String} object.
-     * @param field       a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field       a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(String title, FieldBuilder<T> field, Calculation calculation) {
         return measure(field, calculation).setTitle(title);
@@ -248,9 +248,9 @@ public static <T> CrosstabMeasureBuilder<T> measure(String title, FieldBuilder<T
      *
      * @param fieldName   a {@link java.lang.String} object.
      * @param valueClass  a {@link java.lang.Class} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(String fieldName, Class<?> valueClass, Calculation calculation) {
         return new CrosstabMeasureBuilder<T>(DynamicReports.field(fieldName, valueClass), calculation);
@@ -262,9 +262,9 @@ public static <T> CrosstabMeasureBuilder<T> measure(String fieldName, Class<?> v
      * @param title       a {@link java.lang.String} object.
      * @param fieldName   a {@link java.lang.String} object.
      * @param valueClass  a {@link java.lang.Class} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(String title, String fieldName, Class<?> valueClass, Calculation calculation) {
         CrosstabMeasureBuilder<T> measure = measure(fieldName, valueClass, calculation);
@@ -274,10 +274,10 @@ public static <T> CrosstabMeasureBuilder<T> measure(String title, String fieldNa
     /**
      * <p>measure.</p>
      *
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression, Calculation calculation) {
         return new CrosstabMeasureBuilder<T>(expression, calculation);
@@ -287,10 +287,10 @@ public static <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression,
      * <p>measure.</p>
      *
      * @param title       a {@link java.lang.String} object.
-     * @param expression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expression, Calculation calculation) {
         CrosstabMeasureBuilder<T> measure = measure(expression, calculation);
@@ -300,9 +300,9 @@ public static <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<
     /**
      * <p>measure.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression) {
         return new CrosstabMeasureBuilder<T>(expression);
@@ -312,9 +312,9 @@ public static <T> CrosstabMeasureBuilder<T> measure(DRIExpression<?> expression)
      * <p>measure.</p>
      *
      * @param title      a {@link java.lang.String} object.
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public static <T> CrosstabMeasureBuilder<T> measure(String title, DRIExpression<?> expression) {
         CrosstabMeasureBuilder<T> measure = measure(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigDecimalType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigDecimalType.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigDecimalType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigDecimalType.java
index 2da68e2..ed5d474 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigDecimalType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigDecimalType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 import java.math.BigDecimal;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigIntegerType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigIntegerType.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigIntegerType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigIntegerType.java
index 6e646f1..7effa6c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BigIntegerType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigIntegerType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 import java.math.BigInteger;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BooleanType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BooleanType.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BooleanType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BooleanType.java
index 9599c84..d9e0c71 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/BooleanType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BooleanType.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.base.datatype.AbstractDataType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.Locale;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ByteType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ByteType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ByteType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ByteType.java
index f0dcf24..ea613ac 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ByteType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ByteType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>ByteType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/CharacterType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/CharacterType.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/CharacterType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/CharacterType.java
index 5861e25..5c4114e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/CharacterType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/CharacterType.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.base.datatype.AbstractDataType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.exception.DRException;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Locale;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypeBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DataTypeBuilders.java
similarity index 64%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypeBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DataTypeBuilders.java
index 33bd899..9b8e334 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypeBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DataTypeBuilders.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 /**
  * A set of build in data types
@@ -34,7 +34,7 @@ public class DataTypeBuilders {
      * @param dataType a {@link java.lang.Class} object.
      * @param <U>      a U object.
      * @return a T object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public <U, T extends DRIDataType<? super U, U>> T detectType(Class<U> dataType) throws DRException {
         return DataTypes.detectType(dataType);
@@ -45,7 +45,7 @@ public <U, T extends DRIDataType<? super U, U>> T detectType(Class<U> dataType)
      *
      * @param dataType a {@link java.lang.String} object.
      * @return a T object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public <T extends DRIDataType<?, ?>> T detectType(String dataType) throws DRException {
         return DataTypes.detectType(dataType);
@@ -54,7 +54,7 @@ public <U, T extends DRIDataType<? super U, U>> T detectType(Class<U> dataType)
     /**
      * <p>bigDecimalType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BigDecimalType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.BigDecimalType} object.
      */
     public BigDecimalType bigDecimalType() {
         return DataTypes.bigDecimalType();
@@ -63,7 +63,7 @@ public BigDecimalType bigDecimalType() {
     /**
      * <p>bigIntegerType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BigIntegerType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.BigIntegerType} object.
      */
     public BigIntegerType bigIntegerType() {
         return DataTypes.bigIntegerType();
@@ -72,7 +72,7 @@ public BigIntegerType bigIntegerType() {
     /**
      * <p>booleanType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BooleanType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.BooleanType} object.
      */
     public BooleanType booleanType() {
         return DataTypes.booleanType();
@@ -81,7 +81,7 @@ public BooleanType booleanType() {
     /**
      * <p>byteType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ByteType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.ByteType} object.
      */
     public ByteType byteType() {
         return DataTypes.byteType();
@@ -90,7 +90,7 @@ public ByteType byteType() {
     /**
      * <p>dateType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateType} object.
      */
     public DateType dateType() {
         return DataTypes.dateType();
@@ -99,7 +99,7 @@ public DateType dateType() {
     /**
      * <p>dateYearToFractionType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToFractionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToFractionType} object.
      */
     public DateYearToFractionType dateYearToFractionType() {
         return DataTypes.dateYearToFractionType();
@@ -108,7 +108,7 @@ public DateYearToFractionType dateYearToFractionType() {
     /**
      * <p>dateYearToHourType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToHourType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToHourType} object.
      */
     public DateYearToHourType dateYearToHourType() {
         return DataTypes.dateYearToHourType();
@@ -117,7 +117,7 @@ public DateYearToHourType dateYearToHourType() {
     /**
      * <p>dateYearToMinuteType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToMinuteType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToMinuteType} object.
      */
     public DateYearToMinuteType dateYearToMinuteType() {
         return DataTypes.dateYearToMinuteType();
@@ -126,7 +126,7 @@ public DateYearToMinuteType dateYearToMinuteType() {
     /**
      * <p>dateYearToMonthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToMonthType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToMonthType} object.
      */
     public DateYearToMonthType dateYearToMonthType() {
         return DataTypes.dateYearToMonthType();
@@ -135,7 +135,7 @@ public DateYearToMonthType dateYearToMonthType() {
     /**
      * <p>dateYearToSecondType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToSecondType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToSecondType} object.
      */
     public DateYearToSecondType dateYearToSecondType() {
         return DataTypes.dateYearToSecondType();
@@ -144,7 +144,7 @@ public DateYearToSecondType dateYearToSecondType() {
     /**
      * <p>dateYearType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearType} object.
      */
     public DateYearType dateYearType() {
         return DataTypes.dateYearType();
@@ -153,7 +153,7 @@ public DateYearType dateYearType() {
     /**
      * <p>dateMonthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateMonthType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateMonthType} object.
      */
     public DateMonthType dateMonthType() {
         return DataTypes.dateMonthType();
@@ -162,7 +162,7 @@ public DateMonthType dateMonthType() {
     /**
      * <p>dateDayType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateDayType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateDayType} object.
      */
     public DateDayType dateDayType() {
         return DataTypes.dateDayType();
@@ -171,7 +171,7 @@ public DateDayType dateDayType() {
     /**
      * <p>doubleType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DoubleType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DoubleType} object.
      */
     public DoubleType doubleType() {
         return DataTypes.doubleType();
@@ -180,7 +180,7 @@ public DoubleType doubleType() {
     /**
      * <p>floatType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.FloatType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.FloatType} object.
      */
     public FloatType floatType() {
         return DataTypes.floatType();
@@ -189,7 +189,7 @@ public FloatType floatType() {
     /**
      * <p>characterType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.CharacterType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.CharacterType} object.
      */
     public CharacterType characterType() {
         return DataTypes.characterType();
@@ -198,7 +198,7 @@ public CharacterType characterType() {
     /**
      * <p>integerType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.IntegerType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.IntegerType} object.
      */
     public IntegerType integerType() {
         return DataTypes.integerType();
@@ -207,7 +207,7 @@ public IntegerType integerType() {
     /**
      * <p>longType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.LongType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.LongType} object.
      */
     public LongType longType() {
         return DataTypes.longType();
@@ -216,7 +216,7 @@ public LongType longType() {
     /**
      * <p>shortType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ShortType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.ShortType} object.
      */
     public ShortType shortType() {
         return DataTypes.shortType();
@@ -225,7 +225,7 @@ public ShortType shortType() {
     /**
      * <p>stringType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.StringType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.StringType} object.
      */
     public StringType stringType() {
         return DataTypes.stringType();
@@ -234,7 +234,7 @@ public StringType stringType() {
     /**
      * <p>listType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ListType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.ListType} object.
      */
     public ListType listType() {
         return DataTypes.listType();
@@ -243,7 +243,7 @@ public ListType listType() {
     /**
      * <p>timeHourToFractionType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToFractionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.TimeHourToFractionType} object.
      */
     public TimeHourToFractionType timeHourToFractionType() {
         return DataTypes.timeHourToFractionType();
@@ -252,7 +252,7 @@ public TimeHourToFractionType timeHourToFractionType() {
     /**
      * <p>timeHourToMinuteType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToMinuteType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.TimeHourToMinuteType} object.
      */
     public TimeHourToMinuteType timeHourToMinuteType() {
         return DataTypes.timeHourToMinuteType();
@@ -261,7 +261,7 @@ public TimeHourToMinuteType timeHourToMinuteType() {
     /**
      * <p>timeHourToSecondType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToSecondType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.TimeHourToSecondType} object.
      */
     public TimeHourToSecondType timeHourToSecondType() {
         return DataTypes.timeHourToSecondType();
@@ -270,7 +270,7 @@ public TimeHourToSecondType timeHourToSecondType() {
     /**
      * <p>percentageType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.PercentageType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.PercentageType} object.
      */
     public PercentageType percentageType() {
         return DataTypes.percentageType();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypes.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DataTypes.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypes.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DataTypes.java
index f37ed7a..6fc1ea0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DataTypes.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DataTypes.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.exception.DRException;
 import org.apache.commons.lang3.Validate;
 
 import java.math.BigDecimal;
@@ -65,7 +65,7 @@ public class DataTypes {
      * @param dataType a {@link java.lang.Class} object.
      * @param <U>      a U object.
      * @return a T object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public static <U, T extends DRIDataType<? super U, U>> T detectType(Class<U> dataType) throws DRException {
         return detectType(dataType.getName());
@@ -76,7 +76,7 @@ public static <U, T extends DRIDataType<? super U, U>> T detectType(Class<U> dat
      *
      * @param dataType a {@link java.lang.String} object.
      * @return a T object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     @SuppressWarnings("unchecked")
     public static <T extends DRIDataType<?, ?>> T detectType(String dataType) throws DRException {
@@ -165,7 +165,7 @@ public static <U, T extends DRIDataType<? super U, U>> T detectType(Class<U> dat
     /**
      * <p>bigDecimalType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BigDecimalType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.BigDecimalType} object.
      */
     public static BigDecimalType bigDecimalType() {
         return bigDecimalType;
@@ -174,7 +174,7 @@ public static BigDecimalType bigDecimalType() {
     /**
      * <p>bigIntegerType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BigIntegerType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.BigIntegerType} object.
      */
     public static BigIntegerType bigIntegerType() {
         return bigIntegerType;
@@ -183,7 +183,7 @@ public static BigIntegerType bigIntegerType() {
     /**
      * <p>booleanType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.BooleanType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.BooleanType} object.
      */
     public static BooleanType booleanType() {
         return booleanType;
@@ -192,7 +192,7 @@ public static BooleanType booleanType() {
     /**
      * <p>byteType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ByteType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.ByteType} object.
      */
     public static ByteType byteType() {
         return byteType;
@@ -201,7 +201,7 @@ public static ByteType byteType() {
     /**
      * <p>dateType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateType} object.
      */
     public static DateType dateType() {
         return dateType;
@@ -210,7 +210,7 @@ public static DateType dateType() {
     /**
      * <p>dateYearToFractionType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToFractionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToFractionType} object.
      */
     public static DateYearToFractionType dateYearToFractionType() {
         return dateYearToFractionType;
@@ -219,7 +219,7 @@ public static DateYearToFractionType dateYearToFractionType() {
     /**
      * <p>dateYearType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearType} object.
      */
     public static DateYearType dateYearType() {
         return dateYearType;
@@ -228,7 +228,7 @@ public static DateYearType dateYearType() {
     /**
      * <p>dateMonthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateMonthType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateMonthType} object.
      */
     public static DateMonthType dateMonthType() {
         return dateMonthType;
@@ -237,7 +237,7 @@ public static DateMonthType dateMonthType() {
     /**
      * <p>dateDayType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateDayType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateDayType} object.
      */
     public static DateDayType dateDayType() {
         return dateDayType;
@@ -246,7 +246,7 @@ public static DateDayType dateDayType() {
     /**
      * <p>dateYearToHourType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToHourType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToHourType} object.
      */
     public static DateYearToHourType dateYearToHourType() {
         return dateYearToHourType;
@@ -255,7 +255,7 @@ public static DateYearToHourType dateYearToHourType() {
     /**
      * <p>dateYearToMinuteType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToMinuteType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToMinuteType} object.
      */
     public static DateYearToMinuteType dateYearToMinuteType() {
         return dateYearToMinuteType;
@@ -264,7 +264,7 @@ public static DateYearToMinuteType dateYearToMinuteType() {
     /**
      * <p>dateYearToMonthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToMonthType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToMonthType} object.
      */
     public static DateYearToMonthType dateYearToMonthType() {
         return dateYearToMonthType;
@@ -273,7 +273,7 @@ public static DateYearToMonthType dateYearToMonthType() {
     /**
      * <p>dateYearToSecondType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DateYearToSecondType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DateYearToSecondType} object.
      */
     public static DateYearToSecondType dateYearToSecondType() {
         return dateYearToSecondType;
@@ -282,7 +282,7 @@ public static DateYearToSecondType dateYearToSecondType() {
     /**
      * <p>doubleType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.DoubleType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.DoubleType} object.
      */
     public static DoubleType doubleType() {
         return doubleType;
@@ -291,7 +291,7 @@ public static DoubleType doubleType() {
     /**
      * <p>floatType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.FloatType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.FloatType} object.
      */
     public static FloatType floatType() {
         return floatType;
@@ -300,7 +300,7 @@ public static FloatType floatType() {
     /**
      * <p>characterType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.CharacterType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.CharacterType} object.
      */
     public static CharacterType characterType() {
         return characterType;
@@ -309,7 +309,7 @@ public static CharacterType characterType() {
     /**
      * <p>integerType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.IntegerType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.IntegerType} object.
      */
     public static IntegerType integerType() {
         return integerType;
@@ -318,7 +318,7 @@ public static IntegerType integerType() {
     /**
      * <p>longType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.LongType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.LongType} object.
      */
     public static LongType longType() {
         return longType;
@@ -327,7 +327,7 @@ public static LongType longType() {
     /**
      * <p>shortType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ShortType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.ShortType} object.
      */
     public static ShortType shortType() {
         return shortType;
@@ -336,7 +336,7 @@ public static ShortType shortType() {
     /**
      * <p>stringType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.StringType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.StringType} object.
      */
     public static StringType stringType() {
         return stringType;
@@ -345,7 +345,7 @@ public static StringType stringType() {
     /**
      * <p>listType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.ListType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.ListType} object.
      */
     public static ListType listType() {
         return listType;
@@ -354,7 +354,7 @@ public static ListType listType() {
     /**
      * <p>timeHourToFractionType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToFractionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.TimeHourToFractionType} object.
      */
     public static TimeHourToFractionType timeHourToFractionType() {
         return timeHourToFractionType;
@@ -363,7 +363,7 @@ public static TimeHourToFractionType timeHourToFractionType() {
     /**
      * <p>timeHourToMinuteType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToMinuteType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.TimeHourToMinuteType} object.
      */
     public static TimeHourToMinuteType timeHourToMinuteType() {
         return timeHourToMinuteType;
@@ -372,7 +372,7 @@ public static TimeHourToMinuteType timeHourToMinuteType() {
     /**
      * <p>timeHourToSecondType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.TimeHourToSecondType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.TimeHourToSecondType} object.
      */
     public static TimeHourToSecondType timeHourToSecondType() {
         return timeHourToSecondType;
@@ -381,7 +381,7 @@ public static TimeHourToSecondType timeHourToSecondType() {
     /**
      * <p>percentageType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.datatype.PercentageType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.datatype.PercentageType} object.
      */
     public static PercentageType percentageType() {
         return percentageType;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateDayType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateDayType.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateDayType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateDayType.java
index 4d8cf08..495edf5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateDayType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateDayType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DateDayType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateMonthType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateMonthType.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateMonthType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateMonthType.java
index fc6f187..f585cb1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateMonthType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateMonthType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DateMonthType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateType.java
index a63f14c..32988c5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateType.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.base.datatype.AbstractDataType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToFractionType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToFractionType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToFractionType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToFractionType.java
index 55f2954..4efe114 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToFractionType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToFractionType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DateYearToFractionType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToHourType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToHourType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToHourType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToHourType.java
index c20599f..5cc1f5a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToHourType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToHourType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DateYearToHourType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMinuteType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToMinuteType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMinuteType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToMinuteType.java
index a921633..e66c120 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMinuteType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToMinuteType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DateYearToMinuteType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMonthType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToMonthType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMonthType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToMonthType.java
index 5cd3588..6406c60 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToMonthType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToMonthType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DateYearToMonthType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToSecondType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToSecondType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToSecondType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToSecondType.java
index 81361e3..fed04fa 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearToSecondType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearToSecondType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DateYearToSecondType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearType.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearType.java
index 9229459..66a733a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DateYearType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DateYearType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DateYearType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DoubleType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DoubleType.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DoubleType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DoubleType.java
index d2289b5..fc8f12d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/DoubleType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/DoubleType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>DoubleType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/FloatType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/FloatType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/FloatType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/FloatType.java
index a8d0c76..a030845 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/FloatType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/FloatType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>FloatType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/IntegerType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/IntegerType.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/IntegerType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/IntegerType.java
index b70242e..5c0db92 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/IntegerType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/IntegerType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>IntegerType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ListType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ListType.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ListType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ListType.java
index 13480e0..1ddf5ba 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ListType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ListType.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.base.datatype.AbstractDataType;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 
 import java.util.List;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/LongType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/LongType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/LongType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/LongType.java
index 4aabb5a..cbb1ff8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/LongType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/LongType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>LongType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/NumberType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/NumberType.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/NumberType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/NumberType.java
index 7249197..509468f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/NumberType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/NumberType.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.base.datatype.AbstractDataType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/PercentageType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/PercentageType.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/PercentageType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/PercentageType.java
index 1ef1142..2f46c10 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/PercentageType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/PercentageType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>PercentageType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ShortType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ShortType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ShortType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ShortType.java
index 0d9f430..df878c3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/ShortType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/ShortType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>ShortType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/StringType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/StringType.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/StringType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/StringType.java
index 10dee93..dd607a4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/StringType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/StringType.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.base.datatype.AbstractDataType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.base.datatype.AbstractDataType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.util.Locale;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToFractionType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToFractionType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToFractionType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToFractionType.java
index ab7d4c3..5e86e6c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToFractionType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToFractionType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>TimeHourToFractionType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java
index e383513..a7656b8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToMinuteType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>TimeHourToMinuteType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToSecondType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToSecondType.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToSecondType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToSecondType.java
index b4f4779..a4db885 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/datatype/TimeHourToSecondType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/TimeHourToSecondType.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.datatype;
+package software.xdev.dynamicreports.report.builder.datatype;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Defaults;
 
 /**
  * <p>TimeHourToSecondType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AbstractComplexExpression.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractComplexExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AbstractComplexExpression.java
index df9053b..6626b1c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractComplexExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AbstractComplexExpression.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
-
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.base.DRField;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.VariableBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIComplexExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+package software.xdev.dynamicreports.report.builder.expression;
+
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.base.DRField;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.VariableBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIComplexExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
@@ -62,7 +62,7 @@ public String getName() {
     /**
      * <p>addExpression.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected void addExpression(FieldBuilder<?> field) {
         Validate.notNull(field, "field must not be null");
@@ -83,7 +83,7 @@ protected void addExpression(String fieldName, Class<?> valueClass) {
     /**
      * <p>addExpression.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.TextColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.TextColumnBuilder} object.
      */
     protected void addExpression(TextColumnBuilder<?> column) {
         Validate.notNull(column, "column must not be null");
@@ -93,7 +93,7 @@ protected void addExpression(TextColumnBuilder<?> column) {
     /**
      * <p>addExpression.</p>
      *
-     * @param variable a {@link net.sf.dynamicreports.report.builder.VariableBuilder} object.
+     * @param variable a {@link software.xdev.dynamicreports.report.builder.VariableBuilder} object.
      */
     protected void addExpression(VariableBuilder<?> variable) {
         Validate.notNull(variable, "variable must not be null");
@@ -103,7 +103,7 @@ protected void addExpression(VariableBuilder<?> variable) {
     /**
      * <p>addExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected void addExpression(DRIExpression<?> expression) {
         Validate.notNull(expression, "expression must not be null");
@@ -113,7 +113,7 @@ protected void addExpression(DRIExpression<?> expression) {
     /**
      * <p>addExpression.</p>
      *
-     * @param crosstabGroup a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param crosstabGroup a {@link software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
      */
     protected void addExpression(AbstractCrosstabGroupBuilder<?, ?, ?> crosstabGroup) {
         Validate.notNull(crosstabGroup, "crosstabGroup must not be null");
@@ -123,7 +123,7 @@ protected void addExpression(AbstractCrosstabGroupBuilder<?, ?, ?> crosstabGroup
     /**
      * <p>addExpression.</p>
      *
-     * @param crosstabMeasure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param crosstabMeasure a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     protected void addExpression(CrosstabMeasureBuilder<?> crosstabMeasure) {
         Validate.notNull(crosstabMeasure, "crosstabMeasure must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java
index cf4a045..1b8586c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AbstractSubDatasourceExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 import org.apache.commons.lang3.Validate;
 
@@ -48,7 +48,7 @@ protected AbstractSubDatasourceExpression(String fieldName) {
     /**
      * <p>Constructor for AbstractSubDatasourceExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected AbstractSubDatasourceExpression(DRIExpression<? extends T> expression) {
         addExpression(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AddExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AddExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AddExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AddExpression.java
index efcd154..2e1fd0c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/AddExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/AddExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.math.BigDecimal;
 
@@ -35,7 +35,7 @@ public class AddExpression extends CalculationExpression {
     /**
      * <p>Constructor for AddExpression.</p>
      *
-     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expressions a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public AddExpression(DRIExpression<? extends Number>... expressions) {
         super(expressions);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java
index f34f30f..c2ffe2f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/BeanArraySubDatasourceExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.data.JRBeanArrayDataSource;
 
@@ -43,7 +43,7 @@ public BeanArraySubDatasourceExpression(String fieldName) {
     /**
      * <p>Constructor for BeanArraySubDatasourceExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public BeanArraySubDatasourceExpression(DRIExpression<? extends Object[]> expression) {
         super(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java
index f21090d..5122763 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/BeanCollectionSubDatasourceExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
@@ -45,7 +45,7 @@ public BeanCollectionSubDatasourceExpression(String fieldName) {
     /**
      * <p>Constructor for BeanCollectionSubDatasourceExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public BeanCollectionSubDatasourceExpression(DRIExpression<? extends Collection<?>> expression) {
         super(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CalculationExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CalculationExpression.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CalculationExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CalculationExpression.java
index 32f55a0..6fbbbcf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CalculationExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CalculationExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 import java.math.BigDecimal;
@@ -35,7 +35,7 @@ abstract class CalculationExpression extends AbstractComplexExpression<BigDecima
     /**
      * <p>Constructor for CalculationExpression.</p>
      *
-     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expressions a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected CalculationExpression(DRIExpression<? extends Number>... expressions) {
         Validate.notNull(expressions, "expressions must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ColumnNumberExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnNumberExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ColumnNumberExpression.java
index 6c9084b..e6ac6cd 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnNumberExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ColumnNumberExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>ColumnNumberExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java
index 52c8639..d637fb2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ColumnRowNumberExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>ColumnRowNumberExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CrosstabValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CrosstabValueExpression.java
similarity index 60%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CrosstabValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CrosstabValueExpression.java
index 355f246..943be06 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/CrosstabValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CrosstabValueExpression.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSystemExpression;
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRICrosstabValue;
+import software.xdev.dynamicreports.report.base.expression.AbstractSystemExpression;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRICrosstabValue;
 
 /**
  * <p>CrosstabValueExpression class.</p>
@@ -36,7 +36,7 @@ public final class CrosstabValueExpression<T> extends AbstractSystemExpression<T
     /**
      * <p>Constructor for CrosstabValueExpression.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
      */
     protected CrosstabValueExpression(AbstractCrosstabGroupBuilder<?, ?, ?> group) {
         super(group.getName());
@@ -45,7 +45,7 @@ protected CrosstabValueExpression(AbstractCrosstabGroupBuilder<?, ?, ?> group) {
     /**
      * <p>Constructor for CrosstabValueExpression.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
      */
     protected CrosstabValueExpression(DRICrosstabValue<T> measure) {
         super(measure.getName());
@@ -54,8 +54,8 @@ protected CrosstabValueExpression(DRICrosstabValue<T> measure) {
     /**
      * <p>Constructor for CrosstabValueExpression.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
-     * @param group   a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param group   a {@link software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
      */
     protected CrosstabValueExpression(DRICrosstabValue<T> measure, AbstractCrosstabGroupBuilder<?, ?, ?> group) {
         super(measure.getName() + "_" + group.getName() + "_ALL");
@@ -64,9 +64,9 @@ protected CrosstabValueExpression(DRICrosstabValue<T> measure, AbstractCrosstabG
     /**
      * <p>Constructor for CrosstabValueExpression.</p>
      *
-     * @param measure     a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
-     * @param rowGroup    a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
-     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @param measure     a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param rowGroup    a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @param columnGroup a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      */
     protected CrosstabValueExpression(DRICrosstabValue<T> measure, CrosstabRowGroupBuilder<?> rowGroup, CrosstabColumnGroupBuilder<?> columnGroup) {
         super(measure.getName() + "_" + rowGroup.getName() + "_" + columnGroup.getName() + "_ALL");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DataSourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/DataSourceExpression.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DataSourceExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/DataSourceExpression.java
index 4ec9f7b..02864f8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DataSourceExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/DataSourceExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRRewindableDataSource;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DivideExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/DivideExpression.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DivideExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/DivideExpression.java
index 1376ee4..a13f35f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/DivideExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/DivideExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.math.BigDecimal;
 
@@ -38,7 +38,7 @@ public class DivideExpression extends CalculationExpression {
      * <p>Constructor for DivideExpression.</p>
      *
      * @param scale a int.
-     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expressions a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DivideExpression(int scale, DRIExpression<? extends Number>... expressions) {
         super(expressions);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ExpressionBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ExpressionBuilders.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ExpressionBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ExpressionBuilders.java
index 0415d57..002f582 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ExpressionBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ExpressionBuilders.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
 import java.awt.Image;
 import java.io.InputStream;
@@ -24,14 +24,14 @@
 import java.util.Date;
 import java.util.Map;
 
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.definition.DRICrosstabValue;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.definition.DRICrosstabValue;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
@@ -45,7 +45,7 @@ public class ExpressionBuilders {
     /**
      * <p>printInFirstPage.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInFirstPageExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintInFirstPageExpression} object.
      */
     public PrintInFirstPageExpression printInFirstPage() {
         return Expressions.printInFirstPage();
@@ -54,7 +54,7 @@ public PrintInFirstPageExpression printInFirstPage() {
     /**
      * <p>printNotInFirstPage.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintNotInFirstPageExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintNotInFirstPageExpression} object.
      */
     public PrintNotInFirstPageExpression printNotInFirstPage() {
         return Expressions.printNotInFirstPage();
@@ -64,7 +64,7 @@ public PrintNotInFirstPageExpression printNotInFirstPage() {
      * <p>printWhenGroupHasMoreThanOneRow.</p>
      *
      * @param groupName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
      */
     public PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow(final String groupName) {
         return Expressions.printWhenGroupHasMoreThanOneRow(groupName);
@@ -73,8 +73,8 @@ public PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow
     /**
      * <p>printWhenGroupHasMoreThanOneRow.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
      */
     public PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow(final GroupBuilder<?> group) {
         return Expressions.printWhenGroupHasMoreThanOneRow(group);
@@ -83,7 +83,7 @@ public PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow
     /**
      * <p>reportRowNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ReportRowNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ReportRowNumberExpression} object.
      */
     public ReportRowNumberExpression reportRowNumber() {
         return Expressions.reportRowNumber();
@@ -92,7 +92,7 @@ public ReportRowNumberExpression reportRowNumber() {
     /**
      * <p>pageRowNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PageRowNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PageRowNumberExpression} object.
      */
     public PageRowNumberExpression pageRowNumber() {
         return Expressions.pageRowNumber();
@@ -101,7 +101,7 @@ public PageRowNumberExpression pageRowNumber() {
     /**
      * <p>columnRowNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ColumnRowNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ColumnRowNumberExpression} object.
      */
     public ColumnRowNumberExpression columnRowNumber() {
         return Expressions.columnRowNumber();
@@ -110,7 +110,7 @@ public ColumnRowNumberExpression columnRowNumber() {
     /**
      * <p>pageNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PageNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PageNumberExpression} object.
      */
     public PageNumberExpression pageNumber() {
         return Expressions.pageNumber();
@@ -119,7 +119,7 @@ public PageNumberExpression pageNumber() {
     /**
      * <p>columnNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ColumnNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ColumnNumberExpression} object.
      */
     public ColumnNumberExpression columnNumber() {
         return Expressions.columnNumber();
@@ -129,7 +129,7 @@ public ColumnNumberExpression columnNumber() {
      * <p>groupRowNumber.</p>
      *
      * @param groupName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
      */
     public GroupRowNumberExpression groupRowNumber(final String groupName) {
         return Expressions.groupRowNumber(groupName);
@@ -138,8 +138,8 @@ public GroupRowNumberExpression groupRowNumber(final String groupName) {
     /**
      * <p>groupRowNumber.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
      */
     public GroupRowNumberExpression groupRowNumber(final GroupBuilder<?> group) {
         return Expressions.groupRowNumber(group);
@@ -149,7 +149,7 @@ public GroupRowNumberExpression groupRowNumber(final GroupBuilder<?> group) {
      * <p>date.</p>
      *
      * @param date a {@link java.util.Date} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public ValueExpression<Date> date(final Date date) {
         return Expressions.date(date);
@@ -159,7 +159,7 @@ public ValueExpression<Date> date(final Date date) {
      * <p>number.</p>
      *
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public ValueExpression<Number> number(final Number number) {
         return Expressions.number(number);
@@ -169,7 +169,7 @@ public ValueExpression<Number> number(final Number number) {
      * <p>image.</p>
      *
      * @param image a {@link java.awt.Image} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public ValueExpression<Image> image(final Image image) {
         return Expressions.image(image);
@@ -179,7 +179,7 @@ public ValueExpression<Image> image(final Image image) {
      * <p>inputStream.</p>
      *
      * @param inputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public ValueExpression<InputStream> inputStream(final InputStream inputStream) {
         return Expressions.inputStream(inputStream);
@@ -189,7 +189,7 @@ public ValueExpression<InputStream> inputStream(final InputStream inputStream) {
      * <p>url.</p>
      *
      * @param url a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public ValueExpression<URL> url(final URL url) {
         return Expressions.url(url);
@@ -200,7 +200,7 @@ public ValueExpression<URL> url(final URL url) {
      *
      * @param value a T object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public <T> ValueExpression<T> value(final T value) {
         return Expressions.value(value);
@@ -213,7 +213,7 @@ public <T> ValueExpression<T> value(final T value) {
      * @param valueClass a {@link java.lang.Class} object.
      * @param valueClass a {@link java.lang.Class} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public <T> ValueExpression<T> value(final T value, final Class<? super T> valueClass) {
         return Expressions.value(value, valueClass);
@@ -223,7 +223,7 @@ public <T> ValueExpression<T> value(final T value, final Class<? super T> valueC
      * <p>text.</p>
      *
      * @param text a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public ValueExpression<String> text(final String text) {
         return Expressions.text(text);
@@ -233,7 +233,7 @@ public ValueExpression<String> text(final String text) {
      * <p>dataSource.</p>
      *
      * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.DataSourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.DataSourceExpression} object.
      */
     public DataSourceExpression dataSource(final JRDataSource dataSource) {
         return Expressions.dataSource(dataSource);
@@ -243,7 +243,7 @@ public DataSourceExpression dataSource(final JRDataSource dataSource) {
      * <p>message.</p>
      *
      * @param key a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MessageExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MessageExpression} object.
      */
     public MessageExpression message(final String key) {
         return Expressions.message(key);
@@ -254,7 +254,7 @@ public MessageExpression message(final String key) {
      *
      * @param key       a {@link java.lang.String} object.
      * @param arguments an array of {@link java.lang.Object} objects.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MessageExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MessageExpression} object.
      */
     public MessageExpression message(final String key, final Object[] arguments) {
         return Expressions.message(key, arguments);
@@ -291,8 +291,8 @@ public JasperExpression jasperSyntax(final String expression) {
      * <p>property.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRISimpleExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PropertyExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PropertyExpression} object.
      */
     public PropertyExpression property(final String name, final DRISimpleExpression<String> valueExpression) {
         return Expressions.property(name, valueExpression);
@@ -303,7 +303,7 @@ public PropertyExpression property(final String name, final DRISimpleExpression<
      *
      * @param name  a {@link java.lang.String} object.
      * @param value a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PropertyExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PropertyExpression} object.
      */
     public PropertyExpression property(final String name, final String value) {
         return Expressions.property(name, value);
@@ -315,8 +315,8 @@ public PropertyExpression property(final String name, final String value) {
      * <p>parameter.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRISimpleExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ParameterExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ParameterExpression} object.
      */
     public ParameterExpression parameter(final String name, final DRISimpleExpression<?> valueExpression) {
         return Expressions.parameter(name, valueExpression);
@@ -327,7 +327,7 @@ public ParameterExpression parameter(final String name, final DRISimpleExpressio
      *
      * @param name  a {@link java.lang.String} object.
      * @param value a {@link java.lang.Object} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ParameterExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ParameterExpression} object.
      */
     public ParameterExpression parameter(final String name, final Object value) {
         return Expressions.parameter(name, value);
@@ -336,7 +336,7 @@ public ParameterExpression parameter(final String name, final Object value) {
     /**
      * <p>printInOddRow.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInOddRowExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintInOddRowExpression} object.
      */
     public PrintInOddRowExpression printInOddRow() {
         return Expressions.printInOddRow();
@@ -345,7 +345,7 @@ public PrintInOddRowExpression printInOddRow() {
     /**
      * <p>printInEvenRow.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInEvenRowExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintInEvenRowExpression} object.
      */
     public PrintInEvenRowExpression printInEvenRow() {
         return Expressions.printInEvenRow();
@@ -357,7 +357,7 @@ public PrintInEvenRowExpression printInEvenRow() {
      * <p>subDatasourceBeanCollection.</p>
      *
      * @param fieldName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
      */
     public BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final String fieldName) {
         return Expressions.subDatasourceBeanCollection(fieldName);
@@ -366,8 +366,8 @@ public BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final S
     /**
      * <p>subDatasourceBeanCollection.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
      */
     public BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final DRIExpression<? extends Collection<?>> expression) {
         return Expressions.subDatasourceBeanCollection(expression);
@@ -377,7 +377,7 @@ public BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final D
      * <p>subDatasourceBeanArray.</p>
      *
      * @param fieldName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
      */
     public BeanArraySubDatasourceExpression subDatasourceBeanArray(final String fieldName) {
         return Expressions.subDatasourceBeanArray(fieldName);
@@ -386,8 +386,8 @@ public BeanArraySubDatasourceExpression subDatasourceBeanArray(final String fiel
     /**
      * <p>subDatasourceBeanArray.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
      */
     public BeanArraySubDatasourceExpression subDatasourceBeanArray(final DRIExpression<? extends Object[]> expression) {
         return Expressions.subDatasourceBeanArray(expression);
@@ -397,7 +397,7 @@ public BeanArraySubDatasourceExpression subDatasourceBeanArray(final DRIExpressi
      * <p>subDatasourceMapCollection.</p>
      *
      * @param fieldName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
      */
     public MapCollectionSubDatasourceExpression subDatasourceMapCollection(final String fieldName) {
         return Expressions.subDatasourceMapCollection(fieldName);
@@ -406,8 +406,8 @@ public MapCollectionSubDatasourceExpression subDatasourceMapCollection(final Str
     /**
      * <p>subDatasourceMapCollection.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
      */
     public MapCollectionSubDatasourceExpression subDatasourceMapCollection(final DRIExpression<? extends Collection<Map<String, ?>>> expression) {
         return Expressions.subDatasourceMapCollection(expression);
@@ -417,7 +417,7 @@ public MapCollectionSubDatasourceExpression subDatasourceMapCollection(final DRI
      * <p>subDatasourceMapArray.</p>
      *
      * @param fieldName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
      */
     public MapArraySubDatasourceExpression subDatasourceMapArray(final String fieldName) {
         return Expressions.subDatasourceMapArray(fieldName);
@@ -426,8 +426,8 @@ public MapArraySubDatasourceExpression subDatasourceMapArray(final String fieldN
     /**
      * <p>subDatasourceMapArray.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
      */
     public MapArraySubDatasourceExpression subDatasourceMapArray(final DRIExpression<? extends Object[]> expression) {
         return Expressions.subDatasourceMapArray(expression);
@@ -438,8 +438,8 @@ public MapArraySubDatasourceExpression subDatasourceMapArray(final DRIExpression
     /**
      * <p>orderBy.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.OrderByExpression} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.OrderByExpression} object.
      */
     public OrderByExpression orderBy(final CrosstabMeasureBuilder<? extends Comparable<?>> measure) {
         return Expressions.orderBy(measure);
@@ -448,9 +448,9 @@ public OrderByExpression orderBy(final CrosstabMeasureBuilder<? extends Comparab
     /**
      * <p>crosstabValue.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
      */
     public <T> CrosstabValueExpression<T> crosstabValue(final AbstractCrosstabGroupBuilder<?, ?, ?> group) {
         return Expressions.crosstabValue(group);
@@ -459,9 +459,9 @@ public <T> CrosstabValueExpression<T> crosstabValue(final AbstractCrosstabGroupB
     /**
      * <p>crosstabValue.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
      * @param <T>     a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
      */
     public <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure) {
         return Expressions.crosstabValue(measure);
@@ -470,10 +470,10 @@ public <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> me
     /**
      * <p>crosstabValue.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
-     * @param group   a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param group   a {@link software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
      * @param <T>     a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
      */
     public <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure, final AbstractCrosstabGroupBuilder<?, ?, ?> group) {
         return Expressions.crosstabValue(measure, group);
@@ -482,11 +482,11 @@ public <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> me
     /**
      * <p>crosstabValue.</p>
      *
-     * @param measure     a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
-     * @param rowGroup    a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
-     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @param measure     a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param rowGroup    a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @param columnGroup a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
      */
     public <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure, final CrosstabRowGroupBuilder<?> rowGroup, final CrosstabColumnGroupBuilder<?> columnGroup) {
         return Expressions.crosstabValue(measure, rowGroup, columnGroup);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/Expressions.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/Expressions.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/Expressions.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/Expressions.java
index c5f034f..26a2562 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/Expressions.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/Expressions.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
 import java.awt.Image;
 import java.io.InputStream;
@@ -26,13 +26,13 @@
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.definition.DRICrosstabValue;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.definition.DRICrosstabValue;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
@@ -55,7 +55,7 @@ public class Expressions {
     /**
      * <p>printInFirstPage.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInFirstPageExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintInFirstPageExpression} object.
      */
     public static PrintInFirstPageExpression printInFirstPage() {
         return printInFirstPage;
@@ -64,7 +64,7 @@ public static PrintInFirstPageExpression printInFirstPage() {
     /**
      * <p>printNotInFirstPage.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintNotInFirstPageExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintNotInFirstPageExpression} object.
      */
     public static PrintNotInFirstPageExpression printNotInFirstPage() {
         return printNotInFirstPage;
@@ -74,7 +74,7 @@ public static PrintNotInFirstPageExpression printNotInFirstPage() {
      * <p>printWhenGroupHasMoreThanOneRow.</p>
      *
      * @param groupName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
      */
     public static PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow(final String groupName) {
         return new PrintWhenGroupHasMoreThanOneRowExpression(groupName);
@@ -83,8 +83,8 @@ public static PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreTha
     /**
      * <p>printWhenGroupHasMoreThanOneRow.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintWhenGroupHasMoreThanOneRowExpression} object.
      */
     public static PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreThanOneRow(final GroupBuilder<?> group) {
         Validate.notNull(group, "group must not be null");
@@ -94,7 +94,7 @@ public static PrintWhenGroupHasMoreThanOneRowExpression printWhenGroupHasMoreTha
     /**
      * <p>reportRowNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ReportRowNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ReportRowNumberExpression} object.
      */
     public static ReportRowNumberExpression reportRowNumber() {
         return reportRowNumber;
@@ -103,7 +103,7 @@ public static ReportRowNumberExpression reportRowNumber() {
     /**
      * <p>pageRowNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PageRowNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PageRowNumberExpression} object.
      */
     public static PageRowNumberExpression pageRowNumber() {
         return pageRowNumber;
@@ -112,7 +112,7 @@ public static PageRowNumberExpression pageRowNumber() {
     /**
      * <p>columnRowNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ColumnRowNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ColumnRowNumberExpression} object.
      */
     public static ColumnRowNumberExpression columnRowNumber() {
         return columnRowNumber;
@@ -121,7 +121,7 @@ public static ColumnRowNumberExpression columnRowNumber() {
     /**
      * <p>pageNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PageNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PageNumberExpression} object.
      */
     public static PageNumberExpression pageNumber() {
         return pageNumber;
@@ -130,7 +130,7 @@ public static PageNumberExpression pageNumber() {
     /**
      * <p>columnNumber.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ColumnNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ColumnNumberExpression} object.
      */
     public static ColumnNumberExpression columnNumber() {
         return columnNumber;
@@ -140,7 +140,7 @@ public static ColumnNumberExpression columnNumber() {
      * <p>groupRowNumber.</p>
      *
      * @param groupName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
      */
     public static GroupRowNumberExpression groupRowNumber(final String groupName) {
         return new GroupRowNumberExpression(groupName);
@@ -149,8 +149,8 @@ public static GroupRowNumberExpression groupRowNumber(final String groupName) {
     /**
      * <p>groupRowNumber.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.GroupRowNumberExpression} object.
      */
     public static GroupRowNumberExpression groupRowNumber(final GroupBuilder<?> group) {
         Validate.notNull(group, "group must not be null");
@@ -161,7 +161,7 @@ public static GroupRowNumberExpression groupRowNumber(final GroupBuilder<?> grou
      * <p>date.</p>
      *
      * @param date a {@link java.util.Date} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public static ValueExpression<Date> date(final Date date) {
         return value(date, Date.class);
@@ -171,7 +171,7 @@ public static ValueExpression<Date> date(final Date date) {
      * <p>number.</p>
      *
      * @param number a {@link java.lang.Number} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public static ValueExpression<Number> number(final Number number) {
         return value(number, Number.class);
@@ -181,7 +181,7 @@ public static ValueExpression<Number> number(final Number number) {
      * <p>image.</p>
      *
      * @param image a {@link java.awt.Image} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public static ValueExpression<Image> image(final Image image) {
         return value(image, Image.class);
@@ -191,7 +191,7 @@ public static ValueExpression<Image> image(final Image image) {
      * <p>inputStream.</p>
      *
      * @param inputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public static ValueExpression<InputStream> inputStream(final InputStream inputStream) {
         return value(inputStream, InputStream.class);
@@ -201,7 +201,7 @@ public static ValueExpression<InputStream> inputStream(final InputStream inputSt
      * <p>url.</p>
      *
      * @param url a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public static ValueExpression<URL> url(final URL url) {
         return value(url, URL.class);
@@ -212,7 +212,7 @@ public static ValueExpression<URL> url(final URL url) {
      *
      * @param value a T object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public static <T> ValueExpression<T> value(final T value) {
         return new ValueExpression<>(value);
@@ -225,7 +225,7 @@ public static <T> ValueExpression<T> value(final T value) {
      * @param valueClass a {@link java.lang.Class} object.
      * @param valueClass a {@link java.lang.Class} object.
      * @param <T>        a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public static <T> ValueExpression<T> value(final T value, final Class<? super T> valueClass) {
         return new ValueExpression<>(value, valueClass);
@@ -235,7 +235,7 @@ public static <T> ValueExpression<T> value(final T value, final Class<? super T>
      * <p>text.</p>
      *
      * @param text a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ValueExpression} object.
      */
     public static ValueExpression<String> text(final String text) {
         return value(text, String.class);
@@ -245,7 +245,7 @@ public static ValueExpression<String> text(final String text) {
      * <p>dataSource.</p>
      *
      * @param dataSource a {@link net.sf.jasperreports.engine.JRDataSource} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.DataSourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.DataSourceExpression} object.
      */
     public static DataSourceExpression dataSource(final JRDataSource dataSource) {
         return new DataSourceExpression(dataSource);
@@ -255,7 +255,7 @@ public static DataSourceExpression dataSource(final JRDataSource dataSource) {
      * <p>message.</p>
      *
      * @param key a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MessageExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MessageExpression} object.
      */
     public static MessageExpression message(final String key) {
         if (key != null) {
@@ -269,7 +269,7 @@ public static MessageExpression message(final String key) {
      *
      * @param key       a {@link java.lang.String} object.
      * @param arguments an array of {@link java.lang.Object} objects.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MessageExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MessageExpression} object.
      */
     public static MessageExpression message(final String key, final Object[] arguments) {
         if (key != null) {
@@ -309,8 +309,8 @@ public static JasperExpression jasperSyntax(final String expression) {
      * <p>property.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PropertyExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PropertyExpression} object.
      */
     public static PropertyExpression property(final String name, final DRIExpression<String> valueExpression) {
         return new PropertyExpression(name, valueExpression);
@@ -321,7 +321,7 @@ public static PropertyExpression property(final String name, final DRIExpression
      *
      * @param name  a {@link java.lang.String} object.
      * @param value a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PropertyExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PropertyExpression} object.
      */
     public static PropertyExpression property(final String name, final String value) {
         return new PropertyExpression(name, text(value));
@@ -333,8 +333,8 @@ public static PropertyExpression property(final String name, final String value)
      * <p>parameter.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ParameterExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ParameterExpression} object.
      */
     public static ParameterExpression parameter(final String name, final DRIExpression<?> valueExpression) {
         return new ParameterExpression(name, valueExpression);
@@ -345,7 +345,7 @@ public static ParameterExpression parameter(final String name, final DRIExpressi
      *
      * @param name  a {@link java.lang.String} object.
      * @param value a {@link java.lang.Object} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.ParameterExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.ParameterExpression} object.
      */
     public static ParameterExpression parameter(final String name, final Object value) {
         return new ParameterExpression(name, value(value));
@@ -354,7 +354,7 @@ public static ParameterExpression parameter(final String name, final Object valu
     /**
      * <p>printInOddRow.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInOddRowExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintInOddRowExpression} object.
      */
     public static PrintInOddRowExpression printInOddRow() {
         return printInOddRow;
@@ -363,7 +363,7 @@ public static PrintInOddRowExpression printInOddRow() {
     /**
      * <p>printInEvenRow.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.PrintInEvenRowExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.PrintInEvenRowExpression} object.
      */
     public static PrintInEvenRowExpression printInEvenRow() {
         return printInEvenRow;
@@ -375,7 +375,7 @@ public static PrintInEvenRowExpression printInEvenRow() {
      * <p>subDatasourceBeanCollection.</p>
      *
      * @param fieldName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
      */
     public static BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final String fieldName) {
         return new BeanCollectionSubDatasourceExpression(fieldName);
@@ -384,8 +384,8 @@ public static BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(
     /**
      * <p>subDatasourceBeanCollection.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.BeanCollectionSubDatasourceExpression} object.
      */
     public static BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(final DRIExpression<? extends Collection<?>> expression) {
         return new BeanCollectionSubDatasourceExpression(expression);
@@ -395,7 +395,7 @@ public static BeanCollectionSubDatasourceExpression subDatasourceBeanCollection(
      * <p>subDatasourceBeanArray.</p>
      *
      * @param fieldName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
      */
     public static BeanArraySubDatasourceExpression subDatasourceBeanArray(final String fieldName) {
         return new BeanArraySubDatasourceExpression(fieldName);
@@ -404,8 +404,8 @@ public static BeanArraySubDatasourceExpression subDatasourceBeanArray(final Stri
     /**
      * <p>subDatasourceBeanArray.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.BeanArraySubDatasourceExpression} object.
      */
     public static BeanArraySubDatasourceExpression subDatasourceBeanArray(final DRIExpression<? extends Object[]> expression) {
         return new BeanArraySubDatasourceExpression(expression);
@@ -415,7 +415,7 @@ public static BeanArraySubDatasourceExpression subDatasourceBeanArray(final DRIE
      * <p>subDatasourceMapCollection.</p>
      *
      * @param fieldName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
      */
     public static MapCollectionSubDatasourceExpression subDatasourceMapCollection(final String fieldName) {
         return new MapCollectionSubDatasourceExpression(fieldName);
@@ -424,8 +424,8 @@ public static MapCollectionSubDatasourceExpression subDatasourceMapCollection(fi
     /**
      * <p>subDatasourceMapCollection.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MapCollectionSubDatasourceExpression} object.
      */
     public static MapCollectionSubDatasourceExpression subDatasourceMapCollection(final DRIExpression<? extends Collection<Map<String, ?>>> expression) {
         return new MapCollectionSubDatasourceExpression(expression);
@@ -435,7 +435,7 @@ public static MapCollectionSubDatasourceExpression subDatasourceMapCollection(fi
      * <p>subDatasourceMapArray.</p>
      *
      * @param fieldName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
      */
     public static MapArraySubDatasourceExpression subDatasourceMapArray(final String fieldName) {
         return new MapArraySubDatasourceExpression(fieldName);
@@ -444,8 +444,8 @@ public static MapArraySubDatasourceExpression subDatasourceMapArray(final String
     /**
      * <p>subDatasourceMapArray.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.MapArraySubDatasourceExpression} object.
      */
     public static MapArraySubDatasourceExpression subDatasourceMapArray(final DRIExpression<? extends Object[]> expression) {
         return new MapArraySubDatasourceExpression(expression);
@@ -456,8 +456,8 @@ public static MapArraySubDatasourceExpression subDatasourceMapArray(final DRIExp
     /**
      * <p>orderBy.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.OrderByExpression} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.OrderByExpression} object.
      */
     public static OrderByExpression orderBy(final CrosstabMeasureBuilder<? extends Comparable<?>> measure) {
         return new OrderByExpression(measure);
@@ -466,9 +466,9 @@ public static OrderByExpression orderBy(final CrosstabMeasureBuilder<? extends C
     /**
      * <p>crosstabValue.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
      * @param <T>   a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
      */
     public static <T> CrosstabValueExpression<T> crosstabValue(final AbstractCrosstabGroupBuilder<?, ?, ?> group) {
         return new CrosstabValueExpression<>(group);
@@ -477,9 +477,9 @@ public static <T> CrosstabValueExpression<T> crosstabValue(final AbstractCrossta
     /**
      * <p>crosstabValue.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
      * @param <T>     a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
      */
     public static <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure) {
         return new CrosstabValueExpression<>(measure);
@@ -488,10 +488,10 @@ public static <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValu
     /**
      * <p>crosstabValue.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
-     * @param group   a {@link net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param group   a {@link software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder} object.
      * @param <T>     a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
      */
     public static <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure, final AbstractCrosstabGroupBuilder<?, ?, ?> group) {
         return new CrosstabValueExpression<>(measure, group);
@@ -500,11 +500,11 @@ public static <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValu
     /**
      * <p>crosstabValue.</p>
      *
-     * @param measure     a {@link net.sf.dynamicreports.report.definition.DRICrosstabValue} object.
-     * @param rowGroup    a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
-     * @param columnGroup a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
+     * @param measure     a {@link software.xdev.dynamicreports.report.definition.DRICrosstabValue} object.
+     * @param rowGroup    a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder} object.
+     * @param columnGroup a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder} object.
      * @param <T>         a T object.
-     * @return a {@link net.sf.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.expression.CrosstabValueExpression} object.
      */
     public static <T> CrosstabValueExpression<T> crosstabValue(final DRICrosstabValue<T> measure, final CrosstabRowGroupBuilder<?> rowGroup, final CrosstabColumnGroupBuilder<?> columnGroup) {
         return new CrosstabValueExpression<>(measure, rowGroup, columnGroup);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/GroupRowNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/GroupRowNumberExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/GroupRowNumberExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/GroupRowNumberExpression.java
index c8fb972..344e022 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/GroupRowNumberExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/GroupRowNumberExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>GroupRowNumberExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/JasperExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/JasperExpression.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/JasperExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/JasperExpression.java
index ad9aeda..a7420e3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/JasperExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/JasperExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.ReportUtils;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIJasperExpression;
+import software.xdev.dynamicreports.report.ReportUtils;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIJasperExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java
index 1b97a80..db0cbc3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MapArraySubDatasourceExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.data.JRMapArrayDataSource;
 
@@ -43,7 +43,7 @@ public MapArraySubDatasourceExpression(String fieldName) {
     /**
      * <p>Constructor for MapArraySubDatasourceExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public MapArraySubDatasourceExpression(DRIExpression<? extends Object[]> expression) {
         super(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java
index da88353..8e38f40 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MapCollectionSubDatasourceExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
 
@@ -46,7 +46,7 @@ public MapCollectionSubDatasourceExpression(String fieldName) {
     /**
      * <p>Constructor for MapCollectionSubDatasourceExpression.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public MapCollectionSubDatasourceExpression(DRIExpression<? extends Collection<Map<String, ?>>> expression) {
         super(expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MessageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MessageExpression.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MessageExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MessageExpression.java
index 25b86d7..b3e74e0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MessageExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MessageExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>MessageExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MultiplyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MultiplyExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MultiplyExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MultiplyExpression.java
index 93d1592..f0159f9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/MultiplyExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/MultiplyExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.math.BigDecimal;
 
@@ -35,7 +35,7 @@ public class MultiplyExpression extends CalculationExpression {
     /**
      * <p>Constructor for MultiplyExpression.</p>
      *
-     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expressions a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public MultiplyExpression(DRIExpression<? extends Number>... expressions) {
         super(expressions);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/OrderByExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/OrderByExpression.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/OrderByExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/OrderByExpression.java
index 674a328..94434be 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/OrderByExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/OrderByExpression.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>OrderByExpression class.</p>
@@ -36,7 +36,7 @@ public class OrderByExpression extends AbstractSimpleExpression<Comparable<?>> {
     /**
      * <p>Constructor for OrderByExpression.</p>
      *
-     * @param measure a {@link net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
+     * @param measure a {@link software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder} object.
      */
     public OrderByExpression(CrosstabMeasureBuilder<? extends Comparable<?>> measure) {
         this.measure = measure;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PageNumberExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageNumberExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PageNumberExpression.java
index eca44eb..2975a16 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageNumberExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PageNumberExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSystemExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.SystemExpression;
+import software.xdev.dynamicreports.report.base.expression.AbstractSystemExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.SystemExpression;
 
 /**
  * <p>PageNumberExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageRowNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PageRowNumberExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageRowNumberExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PageRowNumberExpression.java
index f74658f..7070410 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PageRowNumberExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PageRowNumberExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>PageRowNumberExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ParameterExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ParameterExpression.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ParameterExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ParameterExpression.java
index 3946e60..dd6baf6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ParameterExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ParameterExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -38,7 +38,7 @@ public class ParameterExpression implements DRIParameterExpression {
      * <p>Constructor for ParameterExpression.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public ParameterExpression(String name, DRIExpression<?> valueExpression) {
         Validate.notNull(name, "name must not be null");
@@ -71,7 +71,7 @@ public DRIExpression<?> getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setValueExpression(DRIExpression<?> valueExpression) {
         this.valueExpression = valueExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PercentageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PercentageExpression.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PercentageExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PercentageExpression.java
index 294cd3b..0ba0a98 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PercentageExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PercentageExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.util.List;
 
@@ -35,8 +35,8 @@ public class PercentageExpression extends AbstractComplexExpression<Double> {
     /**
      * <p>Constructor for PercentageExpression.</p>
      *
-     * @param actualExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param totalExpression  a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param actualExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param totalExpression  a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public PercentageExpression(DRIExpression<? extends Number> actualExpression, DRIExpression<? extends Number> totalExpression) {
         addExpression(actualExpression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java
index 8fc2814..b572b3c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInEvenRowExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>PrintInEvenRowExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java
index 29fbdfc..378d282 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInFirstPageExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>PrintInFirstPageExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInOddRowExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInOddRowExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInOddRowExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInOddRowExpression.java
index 9d99aca..578a925 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintInOddRowExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintInOddRowExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>PrintInOddRowExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java
index 1f81cac..8e574dc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintNotInFirstPageExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>PrintNotInFirstPageExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java
index 737e317..68c00be 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PrintWhenGroupHasMoreThanOneRowExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>PrintWhenGroupHasMoreThanOneRowExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PropertyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PropertyExpression.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PropertyExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PropertyExpression.java
index a2a6cb1..033426d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/PropertyExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/PropertyExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -38,7 +38,7 @@ public class PropertyExpression implements DRIPropertyExpression {
      * <p>Constructor for PropertyExpression.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public PropertyExpression(String name, DRIExpression<String> valueExpression) {
         Validate.notNull(name, "name must not be null");
@@ -71,7 +71,7 @@ public DRIExpression<String> getValueExpression() {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public void setValueExpression(DRIExpression<String> valueExpression) {
         this.valueExpression = valueExpression;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ReportRowNumberExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ReportRowNumberExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ReportRowNumberExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ReportRowNumberExpression.java
index e582be4..e929e5f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ReportRowNumberExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ReportRowNumberExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>ReportRowNumberExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SubtractExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/SubtractExpression.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SubtractExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/SubtractExpression.java
index 5dbe097..b877f74 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SubtractExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/SubtractExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.math.BigDecimal;
 
@@ -35,7 +35,7 @@ public class SubtractExpression extends CalculationExpression {
     /**
      * <p>Constructor for SubtractExpression.</p>
      *
-     * @param expressions a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param expressions a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public SubtractExpression(DRIExpression<? extends Number>... expressions) {
         super(expressions);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SystemMessageExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/SystemMessageExpression.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SystemMessageExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/SystemMessageExpression.java
index 580e66e..2bf7ea4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/SystemMessageExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/SystemMessageExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.ResourceBundle;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ValueExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ValueExpression.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ValueExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ValueExpression.java
index 4ab992f..2c87785 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/expression/ValueExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/ValueExpression.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.expression;
+package software.xdev.dynamicreports.report.builder.expression;
 
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java
index 5cdda26..5bbfd0a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/ColumnGridComponentBuilder.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent;
 
 /**
  * <p>ColumnGridComponentBuilder interface.</p>
@@ -30,7 +30,7 @@ public interface ColumnGridComponentBuilder {
     /**
      * <p>build.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
      */
     public DRIColumnGridComponent build();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java
index 097c1ae..87f176e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/ColumnTitleGroupBuilder.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
 import org.apache.commons.lang3.Validate;
 
-import net.sf.dynamicreports.report.base.grid.DRColumnTitleGroup;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.base.grid.DRColumnTitleGroup;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
 
 /**
  * <p>ColumnTitleGroupBuilder class.</p>
@@ -48,8 +48,8 @@ protected ColumnTitleGroupBuilder() {
     /**
      * <p>add.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public ColumnTitleGroupBuilder add(final ColumnGridComponentBuilder... components) {
         Validate.notNull(components, "components must not be null");
@@ -63,8 +63,8 @@ public ColumnTitleGroupBuilder add(final ColumnGridComponentBuilder... component
     /**
      * <p>setTitle.</p>
      *
-     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @param titleExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public ColumnTitleGroupBuilder setTitle(final DRIExpression<?> titleExpression) {
         getObject().setTitleExpression(titleExpression);
@@ -75,7 +75,7 @@ public ColumnTitleGroupBuilder setTitle(final DRIExpression<?> titleExpression)
      * <p>setTitle.</p>
      *
      * @param title a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public ColumnTitleGroupBuilder setTitle(final String title) {
         getObject().setTitleExpression(Expressions.text(title));
@@ -85,8 +85,8 @@ public ColumnTitleGroupBuilder setTitle(final String title) {
     /**
      * <p>setTitleStyle.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public ColumnTitleGroupBuilder setTitleStyle(final ReportStyleBuilder titleStyle) {
         if (titleStyle != null) {
@@ -101,7 +101,7 @@ public ColumnTitleGroupBuilder setTitleStyle(final ReportStyleBuilder titleStyle
      * This method is used to define the preferred width of a column title. The width is set to the <code>columns</code> multiplied by width of the font
      *
      * @param columns the number of preferred columns >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
      */
     public ColumnTitleGroupBuilder setTitleColumns(final Integer columns) {
@@ -113,7 +113,7 @@ public ColumnTitleGroupBuilder setTitleColumns(final Integer columns) {
      * This method is used to define the fixed width of a column title. The width is set to the <code>columns</code> multiplied by width of the font
      *
      * @param columns the number of fixed columns >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
      */
     public ColumnTitleGroupBuilder setTitleFixedColumns(final Integer columns) {
@@ -126,7 +126,7 @@ public ColumnTitleGroupBuilder setTitleFixedColumns(final Integer columns) {
      * This method is used to define the minimum width of a column title. The width is set to the <code>columns</code> multiplied by width of the font
      *
      * @param columns the number of minimum columns >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>columns</code> is < 0
      */
     public ColumnTitleGroupBuilder setTitleMinColumns(final Integer columns) {
@@ -139,9 +139,9 @@ public ColumnTitleGroupBuilder setTitleMinColumns(final Integer columns) {
      * Sets the preferred width of a column title.
      *
      * @param width the column title preferred width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ColumnTitleGroupBuilder setTitleWidth(final Integer width) {
         getObject().setTitleWidth(width);
@@ -152,9 +152,9 @@ public ColumnTitleGroupBuilder setTitleWidth(final Integer width) {
      * Sets the fixed width of a column title.
      *
      * @param width the column title fixed width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ColumnTitleGroupBuilder setTitleFixedWidth(final Integer width) {
         getObject().setTitleWidth(width);
@@ -166,9 +166,9 @@ public ColumnTitleGroupBuilder setTitleFixedWidth(final Integer width) {
      * Sets the minimum width of a column title.
      *
      * @param width the column title minimum width >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ColumnTitleGroupBuilder setTitleMinWidth(final Integer width) {
         getObject().setTitleWidth(width);
@@ -180,7 +180,7 @@ public ColumnTitleGroupBuilder setTitleMinWidth(final Integer width) {
      * This method is used to define the preferred height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
      *
      * @param rows the number of preferred rows >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
      */
     public ColumnTitleGroupBuilder setTitleRows(final Integer rows) {
@@ -192,7 +192,7 @@ public ColumnTitleGroupBuilder setTitleRows(final Integer rows) {
      * This method is used to define the fixed height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
      *
      * @param rows the number of fixed rows >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
      */
     public ColumnTitleGroupBuilder setTitleFixedRows(final Integer rows) {
@@ -205,7 +205,7 @@ public ColumnTitleGroupBuilder setTitleFixedRows(final Integer rows) {
      * This method is used to define the minimum height of a column title. The height is set to the <code>rows</code> multiplied by height of the font
      *
      * @param rows the number of minimum rows >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>rows</code> is < 0
      */
     public ColumnTitleGroupBuilder setTitleMinRows(final Integer rows) {
@@ -218,9 +218,9 @@ public ColumnTitleGroupBuilder setTitleMinRows(final Integer rows) {
      * Sets the preferred height of a column title.
      *
      * @param height the column title preferred height >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ColumnTitleGroupBuilder setTitleHeight(final Integer height) {
         getObject().setTitleHeight(height);
@@ -231,9 +231,9 @@ public ColumnTitleGroupBuilder setTitleHeight(final Integer height) {
      * Sets the fixed height of a column title.
      *
      * @param height the column title fixed height >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ColumnTitleGroupBuilder setTitleFixedHeight(final Integer height) {
         getObject().setTitleHeight(height);
@@ -245,9 +245,9 @@ public ColumnTitleGroupBuilder setTitleFixedHeight(final Integer height) {
      * Sets the minimum height of a column title.
      *
      * @param height the column title minimum height >= 0
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @throws java.lang.IllegalArgumentException if <code>height</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public ColumnTitleGroupBuilder setTitleMinHeight(final Integer height) {
         getObject().setTitleHeight(height);
@@ -259,7 +259,7 @@ public ColumnTitleGroupBuilder setTitleMinHeight(final Integer height) {
      * <p>setTitleStretchWithOverflow.</p>
      *
      * @param stretchWithOverflow a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      * @deprecated replaced by {@link #setTitleTextAdjust(TextAdjust)}
      */
     @Deprecated
@@ -271,7 +271,7 @@ public ColumnTitleGroupBuilder setTitleStretchWithOverflow(final Boolean stretch
     /**
      * <p>setTitleTextAdjust.</p>
      *
-     * @param textAdjust a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @param textAdjust a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      * @return a T object.
      */
     public ColumnTitleGroupBuilder setTitleTextAdjust(final TextAdjust textAdjust) {
@@ -317,7 +317,7 @@ public ColumnTitleGroupBuilder addTitleProperty(final String name, final String
     /**
      * <p>getColumnGridTitleGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnTitleGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.grid.DRColumnTitleGroup} object.
      */
     public DRColumnTitleGroup getColumnGridTitleGroup() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/GridBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/GridBuilders.java
similarity index 59%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/GridBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/GridBuilders.java
index 7defc87..93bcb9d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/GridBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/GridBuilders.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
 /**
  * A set of methods of customizing columns layout
@@ -30,7 +30,7 @@ public class GridBuilders {
     /**
      * <p>horizontalColumnGridList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder horizontalColumnGridList() {
         return Grids.horizontalColumnGridList();
@@ -39,8 +39,8 @@ public HorizontalColumnGridListBuilder horizontalColumnGridList() {
     /**
      * <p>horizontalColumnGridList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder horizontalColumnGridList(ColumnGridComponentBuilder... components) {
         return Grids.horizontalColumnGridList(components);
@@ -49,8 +49,8 @@ public HorizontalColumnGridListBuilder horizontalColumnGridList(ColumnGridCompon
     /**
      * <p>horizontalColumnGridList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder horizontalColumnGridList(HorizontalColumnGridListCellBuilder... cells) {
         return Grids.horizontalColumnGridList(cells);
@@ -59,8 +59,8 @@ public HorizontalColumnGridListBuilder horizontalColumnGridList(HorizontalColumn
     /**
      * <p>hColumnGridListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public HorizontalColumnGridListCellBuilder hColumnGridListCell(ColumnGridComponentBuilder component) {
         return Grids.hColumnGridListCell(component);
@@ -71,7 +71,7 @@ public HorizontalColumnGridListCellBuilder hColumnGridListCell(ColumnGridCompone
     /**
      * <p>horizontalFlowColumnGridList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder horizontalFlowColumnGridList() {
         return Grids.horizontalFlowColumnGridList();
@@ -80,8 +80,8 @@ public HorizontalColumnGridListBuilder horizontalFlowColumnGridList() {
     /**
      * <p>horizontalFlowColumnGridList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder horizontalFlowColumnGridList(ColumnGridComponentBuilder... components) {
         return Grids.horizontalFlowColumnGridList(components);
@@ -90,8 +90,8 @@ public HorizontalColumnGridListBuilder horizontalFlowColumnGridList(ColumnGridCo
     /**
      * <p>horizontalFlowColumnGridList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder horizontalFlowColumnGridList(HorizontalColumnGridListCellBuilder... cells) {
         return Grids.horizontalFlowColumnGridList(cells);
@@ -102,7 +102,7 @@ public HorizontalColumnGridListBuilder horizontalFlowColumnGridList(HorizontalCo
     /**
      * <p>verticalColumnGridList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public VerticalColumnGridListBuilder verticalColumnGridList() {
         return Grids.verticalColumnGridList();
@@ -111,8 +111,8 @@ public VerticalColumnGridListBuilder verticalColumnGridList() {
     /**
      * <p>verticalColumnGridList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public VerticalColumnGridListBuilder verticalColumnGridList(ColumnGridComponentBuilder... components) {
         return Grids.verticalColumnGridList(components);
@@ -121,8 +121,8 @@ public VerticalColumnGridListBuilder verticalColumnGridList(ColumnGridComponentB
     /**
      * <p>verticalColumnGridList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public VerticalColumnGridListBuilder verticalColumnGridList(VerticalColumnGridListCellBuilder... cells) {
         return Grids.verticalColumnGridList(cells);
@@ -131,8 +131,8 @@ public VerticalColumnGridListBuilder verticalColumnGridList(VerticalColumnGridLi
     /**
      * <p>vColumnGridListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public VerticalColumnGridListCellBuilder vColumnGridListCell(ColumnGridComponentBuilder component) {
         return Grids.vColumnGridListCell(component);
@@ -143,7 +143,7 @@ public VerticalColumnGridListCellBuilder vColumnGridListCell(ColumnGridComponent
     /**
      * <p>titleGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public ColumnTitleGroupBuilder titleGroup() {
         return Grids.titleGroup();
@@ -152,8 +152,8 @@ public ColumnTitleGroupBuilder titleGroup() {
     /**
      * <p>titleGroup.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public ColumnTitleGroupBuilder titleGroup(ColumnGridComponentBuilder... components) {
         return Grids.titleGroup(components);
@@ -163,8 +163,8 @@ public ColumnTitleGroupBuilder titleGroup(ColumnGridComponentBuilder... componen
      * <p>titleGroup.</p>
      *
      * @param title      a {@link java.lang.String} object.
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public ColumnTitleGroupBuilder titleGroup(String title, ColumnGridComponentBuilder... components) {
         return Grids.titleGroup(title, components);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/Grids.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/Grids.java
similarity index 61%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/Grids.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/Grids.java
index bb96aee..5f2ad88 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/Grids.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/Grids.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
 import org.apache.commons.lang3.Validate;
 
@@ -32,7 +32,7 @@ public class Grids {
     /**
      * <p>horizontalColumnGridList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public static HorizontalColumnGridListBuilder horizontalColumnGridList() {
         return new HorizontalColumnGridListBuilder();
@@ -41,8 +41,8 @@ public static HorizontalColumnGridListBuilder horizontalColumnGridList() {
     /**
      * <p>horizontalColumnGridList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public static HorizontalColumnGridListBuilder horizontalColumnGridList(ColumnGridComponentBuilder... components) {
         return new HorizontalColumnGridListBuilder().add(components);
@@ -51,8 +51,8 @@ public static HorizontalColumnGridListBuilder horizontalColumnGridList(ColumnGri
     /**
      * <p>horizontalColumnGridList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public static HorizontalColumnGridListBuilder horizontalColumnGridList(HorizontalColumnGridListCellBuilder... cells) {
         return new HorizontalColumnGridListBuilder().add(cells);
@@ -61,8 +61,8 @@ public static HorizontalColumnGridListBuilder horizontalColumnGridList(Horizonta
     /**
      * <p>hColumnGridListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public static HorizontalColumnGridListCellBuilder hColumnGridListCell(ColumnGridComponentBuilder component) {
         Validate.notNull(component, "component must not be null");
@@ -74,7 +74,7 @@ public static HorizontalColumnGridListCellBuilder hColumnGridListCell(ColumnGrid
     /**
      * <p>horizontalFlowColumnGridList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList() {
         return new HorizontalFlowColumnGridListBuilder();
@@ -83,8 +83,8 @@ public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList() {
     /**
      * <p>horizontalFlowColumnGridList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList(ColumnGridComponentBuilder... components) {
         return new HorizontalFlowColumnGridListBuilder().add(components);
@@ -93,8 +93,8 @@ public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList(Colum
     /**
      * <p>horizontalFlowColumnGridList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList(HorizontalColumnGridListCellBuilder... cells) {
         return new HorizontalFlowColumnGridListBuilder().add(cells);
@@ -105,7 +105,7 @@ public static HorizontalColumnGridListBuilder horizontalFlowColumnGridList(Horiz
     /**
      * <p>verticalColumnGridList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public static VerticalColumnGridListBuilder verticalColumnGridList() {
         return new VerticalColumnGridListBuilder();
@@ -114,8 +114,8 @@ public static VerticalColumnGridListBuilder verticalColumnGridList() {
     /**
      * <p>verticalColumnGridList.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public static VerticalColumnGridListBuilder verticalColumnGridList(ColumnGridComponentBuilder... components) {
         return new VerticalColumnGridListBuilder().add(components);
@@ -124,8 +124,8 @@ public static VerticalColumnGridListBuilder verticalColumnGridList(ColumnGridCom
     /**
      * <p>verticalColumnGridList.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public static VerticalColumnGridListBuilder verticalColumnGridList(VerticalColumnGridListCellBuilder... cells) {
         return new VerticalColumnGridListBuilder().add(cells);
@@ -134,8 +134,8 @@ public static VerticalColumnGridListBuilder verticalColumnGridList(VerticalColum
     /**
      * <p>vColumnGridListCell.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public static VerticalColumnGridListCellBuilder vColumnGridListCell(ColumnGridComponentBuilder component) {
         Validate.notNull(component, "component must not be null");
@@ -147,7 +147,7 @@ public static VerticalColumnGridListCellBuilder vColumnGridListCell(ColumnGridCo
     /**
      * <p>titleGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public static ColumnTitleGroupBuilder titleGroup() {
         return new ColumnTitleGroupBuilder();
@@ -156,8 +156,8 @@ public static ColumnTitleGroupBuilder titleGroup() {
     /**
      * <p>titleGroup.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public static ColumnTitleGroupBuilder titleGroup(ColumnGridComponentBuilder... components) {
         return new ColumnTitleGroupBuilder().add(components);
@@ -167,8 +167,8 @@ public static ColumnTitleGroupBuilder titleGroup(ColumnGridComponentBuilder... c
      * <p>titleGroup.</p>
      *
      * @param title      a {@link java.lang.String} object.
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder} object.
      */
     public static ColumnTitleGroupBuilder titleGroup(String title, ColumnGridComponentBuilder... components) {
         return titleGroup(components).setTitle(title);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java
index 3a1385a..92bc04f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalColumnGridListBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
-import net.sf.dynamicreports.report.base.grid.DRColumnGridList;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.base.grid.DRColumnGridList;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ListType;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -52,8 +52,8 @@ protected void init() {
     /**
      * <p>add.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder add(ColumnGridComponentBuilder... components) {
         Validate.notNull(components, "components must not be null");
@@ -67,8 +67,8 @@ public HorizontalColumnGridListBuilder add(ColumnGridComponentBuilder... compone
     /**
      * <p>add.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder add(HorizontalColumnGridListCellBuilder... cells) {
         Validate.notNull(cells, "cells must not be null");
@@ -82,7 +82,7 @@ public HorizontalColumnGridListBuilder add(HorizontalColumnGridListCellBuilder..
     /**
      * <p>newRow.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder newRow() {
         return newRow(ListType.HORIZONTAL);
@@ -91,7 +91,7 @@ public HorizontalColumnGridListBuilder newRow() {
     /**
      * <p>newFlowRow.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder newFlowRow() {
         return newRow(ListType.HORIZONTAL_FLOW);
@@ -107,7 +107,7 @@ private HorizontalColumnGridListBuilder newRow(ListType listType) {
      * <p>setGap.</p>
      *
      * @param gap a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder setGap(int gap) {
         row.setGap(gap);
@@ -118,7 +118,7 @@ public HorizontalColumnGridListBuilder setGap(int gap) {
      * <p>setVerticalGap.</p>
      *
      * @param gap a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListBuilder} object.
      */
     public HorizontalColumnGridListBuilder setVerticalGap(int gap) {
         getObject().setGap(gap);
@@ -128,7 +128,7 @@ public HorizontalColumnGridListBuilder setVerticalGap(int gap) {
     /**
      * <p>getColumnGridList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridList} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.grid.DRColumnGridList} object.
      */
     public DRColumnGridList getColumnGridList() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java
similarity index 68%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java
index 72e68da..02eb125 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalColumnGridListCellBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
-import net.sf.dynamicreports.report.base.grid.DRColumnGridListCell;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.base.grid.DRColumnGridListCell;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 
 /**
  * <p>HorizontalColumnGridListCellBuilder class.</p>
@@ -35,7 +35,7 @@ public class HorizontalColumnGridListCellBuilder extends AbstractBuilder<Horizon
     /**
      * <p>Constructor for HorizontalColumnGridListCellBuilder.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
      */
     protected HorizontalColumnGridListCellBuilder(ColumnGridComponentBuilder component) {
         super(new DRColumnGridListCell(component.build()));
@@ -46,7 +46,7 @@ protected HorizontalColumnGridListCellBuilder(ColumnGridComponentBuilder compone
     /**
      * <p>widthFixed.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public HorizontalColumnGridListCellBuilder widthFixed() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.LEFT);
@@ -56,7 +56,7 @@ public HorizontalColumnGridListCellBuilder widthFixed() {
     /**
      * <p>widthFloat.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public HorizontalColumnGridListCellBuilder widthFloat() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.FLOAT);
@@ -66,7 +66,7 @@ public HorizontalColumnGridListCellBuilder widthFloat() {
     /**
      * <p>widthExpand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public HorizontalColumnGridListCellBuilder widthExpand() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.EXPAND);
@@ -78,7 +78,7 @@ public HorizontalColumnGridListCellBuilder widthExpand() {
     /**
      * <p>heightFixedOnTop.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public HorizontalColumnGridListCellBuilder heightFixedOnTop() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.TOP);
@@ -88,7 +88,7 @@ public HorizontalColumnGridListCellBuilder heightFixedOnTop() {
     /**
      * <p>heightFixedOnMiddle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public HorizontalColumnGridListCellBuilder heightFixedOnMiddle() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.MIDDLE);
@@ -98,7 +98,7 @@ public HorizontalColumnGridListCellBuilder heightFixedOnMiddle() {
     /**
      * <p>heightFixedOnBottom.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public HorizontalColumnGridListCellBuilder heightFixedOnBottom() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.BOTTOM);
@@ -108,7 +108,7 @@ public HorizontalColumnGridListCellBuilder heightFixedOnBottom() {
     /**
      * <p>heightExpand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.HorizontalColumnGridListCellBuilder} object.
      */
     public HorizontalColumnGridListCellBuilder heightExpand() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.EXPAND);
@@ -118,7 +118,7 @@ public HorizontalColumnGridListCellBuilder heightExpand() {
     /**
      * <p>getColumnGridListCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridListCell} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.grid.DRColumnGridListCell} object.
      */
     public DRColumnGridListCell getColumnGridListCell() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java
index 33a9ae7..88811e8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/HorizontalFlowColumnGridListBuilder.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>HorizontalFlowColumnGridListBuilder class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java
index 3e179e6..e32a5ae 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/VerticalColumnGridListBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
-import net.sf.dynamicreports.report.base.grid.DRColumnGridList;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.base.grid.DRColumnGridList;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.ListType;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -42,8 +42,8 @@ protected VerticalColumnGridListBuilder() {
     /**
      * <p>add.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public VerticalColumnGridListBuilder add(ColumnGridComponentBuilder... components) {
         Validate.notNull(components, "components must not be null");
@@ -57,8 +57,8 @@ public VerticalColumnGridListBuilder add(ColumnGridComponentBuilder... component
     /**
      * <p>add.</p>
      *
-     * @param cells a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @param cells a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public VerticalColumnGridListBuilder add(VerticalColumnGridListCellBuilder... cells) {
         Validate.notNull(cells, "cells must not be null");
@@ -73,7 +73,7 @@ public VerticalColumnGridListBuilder add(VerticalColumnGridListCellBuilder... ce
      * <p>setGap.</p>
      *
      * @param gap a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListBuilder} object.
      */
     public VerticalColumnGridListBuilder setGap(int gap) {
         getObject().setGap(gap);
@@ -83,7 +83,7 @@ public VerticalColumnGridListBuilder setGap(int gap) {
     /**
      * <p>getColumnGridList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridList} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.grid.DRColumnGridList} object.
      */
     public DRColumnGridList getColumnGridList() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java
similarity index 68%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java
index f0b5c82..45a6af5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/grid/VerticalColumnGridListCellBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.grid;
+package software.xdev.dynamicreports.report.builder.grid;
 
-import net.sf.dynamicreports.report.base.grid.DRColumnGridListCell;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.base.grid.DRColumnGridListCell;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 
 /**
  * <p>VerticalColumnGridListCellBuilder class.</p>
@@ -35,7 +35,7 @@ public class VerticalColumnGridListCellBuilder extends AbstractBuilder<VerticalC
     /**
      * <p>Constructor for VerticalColumnGridListCellBuilder.</p>
      *
-     * @param component a {@link net.sf.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
+     * @param component a {@link software.xdev.dynamicreports.report.builder.grid.ColumnGridComponentBuilder} object.
      */
     protected VerticalColumnGridListCellBuilder(ColumnGridComponentBuilder component) {
         super(new DRColumnGridListCell(component.build()));
@@ -46,7 +46,7 @@ protected VerticalColumnGridListCellBuilder(ColumnGridComponentBuilder component
     /**
      * <p>widthFixedOnLeft.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public VerticalColumnGridListCellBuilder widthFixedOnLeft() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.LEFT);
@@ -56,7 +56,7 @@ public VerticalColumnGridListCellBuilder widthFixedOnLeft() {
     /**
      * <p>widthFixedOnCenter.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public VerticalColumnGridListCellBuilder widthFixedOnCenter() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.CENTER);
@@ -66,7 +66,7 @@ public VerticalColumnGridListCellBuilder widthFixedOnCenter() {
     /**
      * <p>widthFixedOnRight.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public VerticalColumnGridListCellBuilder widthFixedOnRight() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.RIGHT);
@@ -76,7 +76,7 @@ public VerticalColumnGridListCellBuilder widthFixedOnRight() {
     /**
      * <p>widthFloat.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public VerticalColumnGridListCellBuilder widthFloat() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.FLOAT);
@@ -86,7 +86,7 @@ public VerticalColumnGridListCellBuilder widthFloat() {
     /**
      * <p>widthExpand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public VerticalColumnGridListCellBuilder widthExpand() {
         getObject().setHorizontalAlignment(HorizontalCellComponentAlignment.EXPAND);
@@ -98,7 +98,7 @@ public VerticalColumnGridListCellBuilder widthExpand() {
     /**
      * <p>heightFixed.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public VerticalColumnGridListCellBuilder heightFixed() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.TOP);
@@ -108,7 +108,7 @@ public VerticalColumnGridListCellBuilder heightFixed() {
     /**
      * <p>heightExpand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.grid.VerticalColumnGridListCellBuilder} object.
      */
     public VerticalColumnGridListCellBuilder heightExpand() {
         getObject().setVerticalAlignment(VerticalCellComponentAlignment.EXPAND);
@@ -118,7 +118,7 @@ public VerticalColumnGridListCellBuilder heightExpand() {
     /**
      * <p>getColumnGridListCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.grid.DRColumnGridListCell} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.grid.DRColumnGridListCell} object.
      */
     public DRColumnGridListCell getColumnGridListCell() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/ColumnGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/ColumnGroupBuilder.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/ColumnGroupBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/ColumnGroupBuilder.java
index bf0ef8d..8c1973d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/ColumnGroupBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/ColumnGroupBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.group;
+package software.xdev.dynamicreports.report.builder.group;
 
-import net.sf.dynamicreports.report.base.column.DRValueColumn;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.base.column.DRValueColumn;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -37,7 +37,7 @@ public class ColumnGroupBuilder extends GroupBuilder<ColumnGroupBuilder> {
     /**
      * <p>Constructor for ColumnGroupBuilder.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      */
     protected ColumnGroupBuilder(ValueColumnBuilder<?, ?> column) {
         Validate.notNull(column, "column must not be null");
@@ -49,7 +49,7 @@ protected ColumnGroupBuilder(ValueColumnBuilder<?, ?> column) {
      * <p>Constructor for ColumnGroupBuilder.</p>
      *
      * @param name   a {@link java.lang.String} object.
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      */
     protected ColumnGroupBuilder(String name, ValueColumnBuilder<?, ?> column) {
         super(name);
@@ -75,7 +75,7 @@ private void init() {
      * <p>setHideColumn.</p>
      *
      * @param hideColumn a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
      */
     public ColumnGroupBuilder setHideColumn(Boolean hideColumn) {
         getObject().setHideColumn(hideColumn);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/CustomGroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/CustomGroupBuilder.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/CustomGroupBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/CustomGroupBuilder.java
index 4aae74c..3d350c5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/CustomGroupBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/CustomGroupBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.group;
+package software.xdev.dynamicreports.report.builder.group;
 
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -36,7 +36,7 @@ public class CustomGroupBuilder extends GroupBuilder<CustomGroupBuilder> {
     /**
      * <p>Constructor for CustomGroupBuilder.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected CustomGroupBuilder(FieldBuilder<?> field) {
         Validate.notNull(field, "field must not be null");
@@ -47,7 +47,7 @@ protected CustomGroupBuilder(FieldBuilder<?> field) {
      * <p>Constructor for CustomGroupBuilder.</p>
      *
      * @param name  a {@link java.lang.String} object.
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
      */
     protected CustomGroupBuilder(String name, FieldBuilder<?> field) {
         super(name);
@@ -58,7 +58,7 @@ protected CustomGroupBuilder(String name, FieldBuilder<?> field) {
     /**
      * <p>Constructor for CustomGroupBuilder.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected CustomGroupBuilder(DRIExpression<?> valueExpression) {
         setValueExpression(valueExpression);
@@ -68,7 +68,7 @@ protected CustomGroupBuilder(DRIExpression<?> valueExpression) {
      * <p>Constructor for CustomGroupBuilder.</p>
      *
      * @param name            a {@link java.lang.String} object.
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected CustomGroupBuilder(String name, DRIExpression<?> valueExpression) {
         super(name);
@@ -78,8 +78,8 @@ protected CustomGroupBuilder(String name, DRIExpression<?> valueExpression) {
     /**
      * <p>setTitle.</p>
      *
-     * @param titleExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param titleExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public CustomGroupBuilder setTitle(DRIExpression<?> titleExpression) {
         getObject().setTitleExpression(titleExpression);
@@ -91,7 +91,7 @@ public CustomGroupBuilder setTitle(DRIExpression<?> titleExpression) {
      * <p>setTitle.</p>
      *
      * @param title a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public CustomGroupBuilder setTitle(String title) {
         getObject().setTitleExpression(Expressions.text(title));
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/GroupBuilder.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/GroupBuilder.java
index 39f1fe4..a64d8d1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/GroupBuilder.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.group;
-
-import net.sf.dynamicreports.report.base.DRGroup;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+package software.xdev.dynamicreports.report.builder.group;
+
+import software.xdev.dynamicreports.report.base.DRGroup;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilder;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -62,7 +62,7 @@ protected GroupBuilder(String name) {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected void setValueExpression(DRIExpression<?> valueExpression) {
         this.valueExpression = valueExpression;
@@ -71,7 +71,7 @@ protected void setValueExpression(DRIExpression<?> valueExpression) {
     /**
      * <p>setHeaderLayout.</p>
      *
-     * @param headerLayout a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+     * @param headerLayout a {@link software.xdev.dynamicreports.report.constant.GroupHeaderLayout} object.
      * @return a T object.
      */
     public T setHeaderLayout(GroupHeaderLayout headerLayout) {
@@ -113,7 +113,7 @@ public T setAddToTableOfContents(Boolean addToTableOfContents) {
     /**
      * <p>setPrintSubtotalsWhenExpression.</p>
      *
-     * @param printSubtotalsWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param printSubtotalsWhenExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setPrintSubtotalsWhenExpression(DRIExpression<Boolean> printSubtotalsWhenExpression) {
@@ -226,7 +226,7 @@ public T setMinHeightToStartNewPage(Integer minHeightToStartNewPage) {
     /**
      * <p>setFooterPosition.</p>
      *
-     * @param footerPosition a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     * @param footerPosition a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
      * @return a T object.
      */
     public T setFooterPosition(GroupFooterPosition footerPosition) {
@@ -297,7 +297,7 @@ public T setGroupByDataType(Boolean groupByDataType) {
     /**
      * <p>setStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setStyle(ReportStyleBuilder style) {
@@ -312,7 +312,7 @@ public T setStyle(ReportStyleBuilder style) {
     /**
      * <p>setHorizontalAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
      * @return a T object.
      * @deprecated use setHorizontalTextAlignment instead
      */
@@ -329,7 +329,7 @@ public T setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
     /**
      * <p>setHorizontalTextAlignment.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      * @return a T object.
      */
     public T setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
@@ -340,7 +340,7 @@ public T setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignm
     /**
      * <p>setTitleStyle.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setTitleStyle(ReportStyleBuilder titleStyle) {
@@ -368,7 +368,7 @@ public T setTitleWidth(Integer titleWidth) {
     /**
      * <p>setHeaderSplitType.</p>
      *
-     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      * @return a T object.
      */
     public T setHeaderSplitType(SplitType splitType) {
@@ -379,7 +379,7 @@ public T setHeaderSplitType(SplitType splitType) {
     /**
      * <p>setHeaderPrintWhenExpression.</p>
      *
-     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param printWhenExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setHeaderPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
@@ -390,7 +390,7 @@ public T setHeaderPrintWhenExpression(DRIExpression<Boolean> printWhenExpression
     /**
      * <p>setHeaderStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setHeaderStyle(ReportStyleBuilder style) {
@@ -405,7 +405,7 @@ public T setHeaderStyle(ReportStyleBuilder style) {
     /**
      * <p>setHeaderBackgroundComponent.</p>
      *
-     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      * @return a T object.
      */
     public T setHeaderBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
@@ -417,7 +417,7 @@ public T setHeaderBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent
     /**
      * <p>addHeaderComponent.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      * @return a T object.
      */
     public T addHeaderComponent(ComponentBuilder<?, ?>... components) {
@@ -432,7 +432,7 @@ public T addHeaderComponent(ComponentBuilder<?, ?>... components) {
     /**
      * <p>header.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      * @return a T object.
      */
     public T header(ComponentBuilder<?, ?>... components) {
@@ -444,7 +444,7 @@ public T header(ComponentBuilder<?, ?>... components) {
     /**
      * <p>setFooterSplitType.</p>
      *
-     * @param splitType a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @param splitType a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      * @return a T object.
      */
     public T setFooterSplitType(SplitType splitType) {
@@ -455,7 +455,7 @@ public T setFooterSplitType(SplitType splitType) {
     /**
      * <p>setFooterPrintWhenExpression.</p>
      *
-     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param printWhenExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setFooterPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
@@ -466,7 +466,7 @@ public T setFooterPrintWhenExpression(DRIExpression<Boolean> printWhenExpression
     /**
      * <p>setFooterStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setFooterStyle(ReportStyleBuilder style) {
@@ -481,7 +481,7 @@ public T setFooterStyle(ReportStyleBuilder style) {
     /**
      * <p>setFooterBackgroundComponent.</p>
      *
-     * @param backgroundComponent a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param backgroundComponent a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      * @return a T object.
      */
     public T setFooterBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent) {
@@ -493,7 +493,7 @@ public T setFooterBackgroundComponent(ComponentBuilder<?, ?> backgroundComponent
     /**
      * <p>addFooterComponent.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      * @return a T object.
      */
     public T addFooterComponent(ComponentBuilder<?, ?>... components) {
@@ -508,7 +508,7 @@ public T addFooterComponent(ComponentBuilder<?, ?>... components) {
     /**
      * <p>footer.</p>
      *
-     * @param components a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @param components a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      * @return a T object.
      */
     public T footer(ComponentBuilder<?, ?>... components) {
@@ -525,7 +525,7 @@ protected void configure() {
     /**
      * <p>getGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRGroup} object.
      */
     public DRGroup getGroup() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/GroupBuilders.java
similarity index 61%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/GroupBuilders.java
index a26694a..9a14f75 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/GroupBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/GroupBuilders.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.group;
+package software.xdev.dynamicreports.report.builder.group;
 
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * A set of methods of creating report groups
@@ -34,8 +34,8 @@ public class GroupBuilders {
     /**
      * <p>group.</p>
      *
-     * @param groupColumn a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     * @param groupColumn a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
      */
     public ColumnGroupBuilder group(ValueColumnBuilder<?, ?> groupColumn) {
         return Groups.group(groupColumn);
@@ -45,8 +45,8 @@ public ColumnGroupBuilder group(ValueColumnBuilder<?, ?> groupColumn) {
      * <p>group.</p>
      *
      * @param name        a {@link java.lang.String} object.
-     * @param groupColumn a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     * @param groupColumn a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
      */
     public ColumnGroupBuilder group(String name, ValueColumnBuilder<?, ?> groupColumn) {
         return Groups.group(name, groupColumn);
@@ -59,7 +59,7 @@ public ColumnGroupBuilder group(String name, ValueColumnBuilder<?, ?> groupColum
      *
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public CustomGroupBuilder group(String fieldName, Class<?> valueClass) {
         return Groups.group(fieldName, valueClass);
@@ -71,7 +71,7 @@ public CustomGroupBuilder group(String fieldName, Class<?> valueClass) {
      * @param name       a {@link java.lang.String} object.
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public CustomGroupBuilder group(String name, String fieldName, Class<?> valueClass) {
         return Groups.group(name, fieldName, valueClass);
@@ -80,8 +80,8 @@ public CustomGroupBuilder group(String name, String fieldName, Class<?> valueCla
     /**
      * <p>group.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public CustomGroupBuilder group(FieldBuilder<?> field) {
         return Groups.group(field);
@@ -91,8 +91,8 @@ public CustomGroupBuilder group(FieldBuilder<?> field) {
      * <p>group.</p>
      *
      * @param name  a {@link java.lang.String} object.
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public CustomGroupBuilder group(String name, FieldBuilder<?> field) {
         return Groups.group(name, field);
@@ -101,8 +101,8 @@ public CustomGroupBuilder group(String name, FieldBuilder<?> field) {
     /**
      * <p>group.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public CustomGroupBuilder group(DRIExpression<?> expression) {
         return Groups.group(expression);
@@ -112,8 +112,8 @@ public CustomGroupBuilder group(DRIExpression<?> expression) {
      * <p>group.</p>
      *
      * @param name       a {@link java.lang.String} object.
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public CustomGroupBuilder group(String name, DRIExpression<?> expression) {
         return Groups.group(name, expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/Groups.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/Groups.java
similarity index 62%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/Groups.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/Groups.java
index 3177790..ac5d73c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/group/Groups.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/group/Groups.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.group;
+package software.xdev.dynamicreports.report.builder.group;
 
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * A set of methods of creating report groups
@@ -35,8 +35,8 @@ public class Groups {
     /**
      * <p>group.</p>
      *
-     * @param groupColumn a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     * @param groupColumn a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
      */
     public static ColumnGroupBuilder group(ValueColumnBuilder<?, ?> groupColumn) {
         return new ColumnGroupBuilder(groupColumn);
@@ -46,8 +46,8 @@ public static ColumnGroupBuilder group(ValueColumnBuilder<?, ?> groupColumn) {
      * <p>group.</p>
      *
      * @param name        a {@link java.lang.String} object.
-     * @param groupColumn a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
+     * @param groupColumn a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder} object.
      */
     public static ColumnGroupBuilder group(String name, ValueColumnBuilder<?, ?> groupColumn) {
         return new ColumnGroupBuilder(name, groupColumn);
@@ -60,7 +60,7 @@ public static ColumnGroupBuilder group(String name, ValueColumnBuilder<?, ?> gro
      *
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public static CustomGroupBuilder group(String fieldName, Class<?> valueClass) {
         return group(DynamicReports.field(fieldName, valueClass));
@@ -72,7 +72,7 @@ public static CustomGroupBuilder group(String fieldName, Class<?> valueClass) {
      * @param name       a {@link java.lang.String} object.
      * @param fieldName  a {@link java.lang.String} object.
      * @param valueClass a {@link java.lang.Class} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public static CustomGroupBuilder group(String name, String fieldName, Class<?> valueClass) {
         return group(name, DynamicReports.field(fieldName, valueClass));
@@ -81,8 +81,8 @@ public static CustomGroupBuilder group(String name, String fieldName, Class<?> v
     /**
      * <p>group.</p>
      *
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public static CustomGroupBuilder group(FieldBuilder<?> field) {
         return new CustomGroupBuilder(field);
@@ -92,8 +92,8 @@ public static CustomGroupBuilder group(FieldBuilder<?> field) {
      * <p>group.</p>
      *
      * @param name  a {@link java.lang.String} object.
-     * @param field a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param field a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public static CustomGroupBuilder group(String name, FieldBuilder<?> field) {
         return new CustomGroupBuilder(name, field);
@@ -102,8 +102,8 @@ public static CustomGroupBuilder group(String name, FieldBuilder<?> field) {
     /**
      * <p>group.</p>
      *
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public static CustomGroupBuilder group(DRIExpression<?> expression) {
         return new CustomGroupBuilder(expression);
@@ -113,8 +113,8 @@ public static CustomGroupBuilder group(DRIExpression<?> expression) {
      * <p>group.</p>
      *
      * @param name       a {@link java.lang.String} object.
-     * @param expression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.group.CustomGroupBuilder} object.
+     * @param expression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder} object.
      */
     public static CustomGroupBuilder group(String name, DRIExpression<?> expression) {
         return new CustomGroupBuilder(name, expression);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BaseStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/BaseStyleBuilder.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BaseStyleBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/BaseStyleBuilder.java
index be39228..58c133f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BaseStyleBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/BaseStyleBuilder.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
-
-import net.sf.dynamicreports.report.base.style.DRBaseStyle;
-import net.sf.dynamicreports.report.base.style.DRTabStop;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.LineSpacing;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.Rotation;
-import net.sf.dynamicreports.report.constant.TabStopAlignment;
-import net.sf.dynamicreports.report.constant.VerticalAlignment;
-import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
-import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+package software.xdev.dynamicreports.report.builder.style;
+
+import software.xdev.dynamicreports.report.base.style.DRBaseStyle;
+import software.xdev.dynamicreports.report.base.style.DRTabStop;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.LineSpacing;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.Rotation;
+import software.xdev.dynamicreports.report.constant.TabStopAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
 import org.apache.commons.lang3.Validate;
 
 import java.awt.Color;
@@ -69,7 +69,7 @@ public T setBackgroundColor(Color backgroundColor) {
     /**
      * <p>setBorder.</p>
      *
-     * @param border a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @param border a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      * @return a T object.
      */
     public T setBorder(BorderBuilder border) {
@@ -84,7 +84,7 @@ public T setBorder(BorderBuilder border) {
     /**
      * <p>setBorder.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      * @return a T object.
      */
     public T setBorder(PenBuilder pen) {
@@ -94,7 +94,7 @@ public T setBorder(PenBuilder pen) {
     /**
      * <p>setTopBorder.</p>
      *
-     * @param topPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param topPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      * @return a T object.
      */
     public T setTopBorder(PenBuilder topPen) {
@@ -109,7 +109,7 @@ public T setTopBorder(PenBuilder topPen) {
     /**
      * <p>setLeftBorder.</p>
      *
-     * @param leftPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param leftPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      * @return a T object.
      */
     public T setLeftBorder(PenBuilder leftPen) {
@@ -124,7 +124,7 @@ public T setLeftBorder(PenBuilder leftPen) {
     /**
      * <p>setBottomBorder.</p>
      *
-     * @param bottomPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param bottomPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      * @return a T object.
      */
     public T setBottomBorder(PenBuilder bottomPen) {
@@ -139,7 +139,7 @@ public T setBottomBorder(PenBuilder bottomPen) {
     /**
      * <p>setRightBorder.</p>
      *
-     * @param rightPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param rightPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      * @return a T object.
      */
     public T setRightBorder(PenBuilder rightPen) {
@@ -154,7 +154,7 @@ public T setRightBorder(PenBuilder rightPen) {
     /**
      * <p>setFont.</p>
      *
-     * @param font a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @param font a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      * @return a T object.
      */
     public T setFont(FontBuilder font) {
@@ -328,7 +328,7 @@ public T setForegroundColor(Color foregroudColor) {
     /**
      * <p>setHorizontalAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
      * @return a T object.
      * @deprecated use setHorizontalTextAlignment instead
      */
@@ -345,7 +345,7 @@ public T setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
     /**
      * <p>setHorizontalTextAlignment.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      * @return a T object.
      */
     public T setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignment) {
@@ -356,7 +356,7 @@ public T setHorizontalTextAlignment(HorizontalTextAlignment horizontalTextAlignm
     /**
      * <p>setHorizontalImageAlignment.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      * @return a T object.
      */
     public T setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAlignment) {
@@ -367,7 +367,7 @@ public T setHorizontalImageAlignment(HorizontalImageAlignment horizontalImageAli
     /**
      * <p>setImageScale.</p>
      *
-     * @param imageScale a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @param imageScale a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      * @return a T object.
      */
     public T setImageScale(ImageScale imageScale) {
@@ -378,7 +378,7 @@ public T setImageScale(ImageScale imageScale) {
     /**
      * <p>setPadding.</p>
      *
-     * @param padding a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @param padding a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      * @return a T object.
      */
     public T setPadding(PaddingBuilder padding) {
@@ -469,7 +469,7 @@ public T setRadius(Integer radius) {
     /**
      * <p>setRotation.</p>
      *
-     * @param rotation a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     * @param rotation a {@link software.xdev.dynamicreports.report.constant.Rotation} object.
      * @return a T object.
      */
     public T setRotation(Rotation rotation) {
@@ -480,8 +480,8 @@ public T setRotation(Rotation rotation) {
     /**
      * <p>setAlignment.</p>
      *
-     * @param horizontalAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalAlignment} object.
-     * @param verticalAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalAlignment} object.
+     * @param horizontalAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalAlignment} object.
+     * @param verticalAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalAlignment} object.
      * @return a T object.
      * @deprecated use setTextAlignment instead
      */
@@ -503,8 +503,8 @@ public T setAlignment(HorizontalAlignment horizontalAlignment, VerticalAlignment
     /**
      * <p>setTextAlignment.</p>
      *
-     * @param horizontalTextAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
-     * @param verticalTextAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     * @param horizontalTextAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @param verticalTextAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalTextAlignment} object.
      * @return a T object.
      */
     public T setTextAlignment(HorizontalTextAlignment horizontalTextAlignment, VerticalTextAlignment verticalTextAlignment) {
@@ -516,8 +516,8 @@ public T setTextAlignment(HorizontalTextAlignment horizontalTextAlignment, Verti
     /**
      * <p>setImageAlignment.</p>
      *
-     * @param horizontalImageAlignment a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
-     * @param verticalImageAlignment   a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     * @param horizontalImageAlignment a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @param verticalImageAlignment   a {@link software.xdev.dynamicreports.report.constant.VerticalImageAlignment} object.
      * @return a T object.
      */
     public T setImageAlignment(HorizontalImageAlignment horizontalImageAlignment, VerticalImageAlignment verticalImageAlignment) {
@@ -529,7 +529,7 @@ public T setImageAlignment(HorizontalImageAlignment horizontalImageAlignment, Ve
     /**
      * <p>setVerticalAlignment.</p>
      *
-     * @param verticalAlignment a {@link net.sf.dynamicreports.report.constant.VerticalAlignment} object.
+     * @param verticalAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalAlignment} object.
      * @return a T object.
      * @deprecated use setVerticalTextAlignment instead
      */
@@ -546,7 +546,7 @@ public T setVerticalAlignment(VerticalAlignment verticalAlignment) {
     /**
      * <p>setVerticalTextAlignment.</p>
      *
-     * @param verticalTextAlignment a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     * @param verticalTextAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalTextAlignment} object.
      * @return a T object.
      */
     public T setVerticalTextAlignment(VerticalTextAlignment verticalTextAlignment) {
@@ -557,7 +557,7 @@ public T setVerticalTextAlignment(VerticalTextAlignment verticalTextAlignment) {
     /**
      * <p>setVerticalImageAlignment.</p>
      *
-     * @param verticalImageAlignment a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     * @param verticalImageAlignment a {@link software.xdev.dynamicreports.report.constant.VerticalImageAlignment} object.
      * @return a T object.
      */
     public T setVerticalImageAlignment(VerticalImageAlignment verticalImageAlignment) {
@@ -568,7 +568,7 @@ public T setVerticalImageAlignment(VerticalImageAlignment verticalImageAlignment
     /**
      * <p>setMarkup.</p>
      *
-     * @param markup a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @param markup a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      * @return a T object.
      */
     public T setMarkup(Markup markup) {
@@ -579,7 +579,7 @@ public T setMarkup(Markup markup) {
     /**
      * <p>setLineSpacing.</p>
      *
-     * @param lineSpacing a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     * @param lineSpacing a {@link software.xdev.dynamicreports.report.constant.LineSpacing} object.
      * @return a T object.
      */
     public T setLineSpacing(LineSpacing lineSpacing) {
@@ -668,7 +668,7 @@ public T setTabStopWidth(Integer tabStopWidth) {
      * <p>addTabStop.</p>
      *
      * @param position  a int.
-     * @param alignment a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     * @param alignment a {@link software.xdev.dynamicreports.report.constant.TabStopAlignment} object.
      * @return a T object.
      */
     public T addTabStop(int position, TabStopAlignment alignment) {
@@ -683,7 +683,7 @@ public T addTabStop(int position, TabStopAlignment alignment) {
     /**
      * <p>setLinePen.</p>
      *
-     * @param linePen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param linePen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      * @return a T object.
      */
     public T setLinePen(PenBuilder linePen) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BorderBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/BorderBuilder.java
similarity index 68%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BorderBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/BorderBuilder.java
index cbb97e2..e7f4221 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/BorderBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/BorderBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.base.style.DRBorder;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.style.DRBorder;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>BorderBuilder class.</p>
@@ -40,7 +40,7 @@ protected BorderBuilder() {
     /**
      * <p>Constructor for BorderBuilder.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     protected BorderBuilder(PenBuilder pen) {
         super(new DRBorder(pen.build()));
@@ -49,8 +49,8 @@ protected BorderBuilder(PenBuilder pen) {
     /**
      * <p>setTopPen.</p>
      *
-     * @param topPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @param topPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      */
     public BorderBuilder setTopPen(PenBuilder topPen) {
         if (topPen != null) {
@@ -64,8 +64,8 @@ public BorderBuilder setTopPen(PenBuilder topPen) {
     /**
      * <p>setLeftPen.</p>
      *
-     * @param leftPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @param leftPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      */
     public BorderBuilder setLeftPen(PenBuilder leftPen) {
         if (leftPen != null) {
@@ -79,8 +79,8 @@ public BorderBuilder setLeftPen(PenBuilder leftPen) {
     /**
      * <p>setBottomPen.</p>
      *
-     * @param bottomPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @param bottomPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      */
     public BorderBuilder setBottomPen(PenBuilder bottomPen) {
         if (bottomPen != null) {
@@ -94,8 +94,8 @@ public BorderBuilder setBottomPen(PenBuilder bottomPen) {
     /**
      * <p>setRightPen.</p>
      *
-     * @param rightPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @param rightPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      */
     public BorderBuilder setRightPen(PenBuilder rightPen) {
         if (rightPen != null) {
@@ -109,7 +109,7 @@ public BorderBuilder setRightPen(PenBuilder rightPen) {
     /**
      * <p>getBorder.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.style.DRBorder} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.style.DRBorder} object.
      */
     public DRBorder getBorder() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ConditionalStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/ConditionalStyleBuilder.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ConditionalStyleBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/ConditionalStyleBuilder.java
index e0039ad..20148a8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ConditionalStyleBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/ConditionalStyleBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.base.style.DRConditionalStyle;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.style.DRConditionalStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>ConditionalStyleBuilder class.</p>
@@ -33,7 +33,7 @@ public class ConditionalStyleBuilder extends BaseStyleBuilder<ConditionalStyleBu
     /**
      * <p>Constructor for ConditionalStyleBuilder.</p>
      *
-     * @param conditionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param conditionExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected ConditionalStyleBuilder(DRIExpression<Boolean> conditionExpression) {
         super(new DRConditionalStyle(conditionExpression));
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/FontBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/FontBuilder.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/FontBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/FontBuilder.java
index 2a45b7f..f1dfaee 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/FontBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/FontBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.base.style.DRFont;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>FontBuilder class.</p>
@@ -53,7 +53,7 @@ protected FontBuilder(String fontName, Boolean bold, Boolean italic, Integer fon
      * <p>setFontName.</p>
      *
      * @param fontName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setFontName(String fontName) {
         getObject().setFontName(fontName);
@@ -64,7 +64,7 @@ public FontBuilder setFontName(String fontName) {
      * <p>setFontSize.</p>
      *
      * @param fontSize a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setFontSize(Integer fontSize) {
         getObject().setFontSize(fontSize);
@@ -74,7 +74,7 @@ public FontBuilder setFontSize(Integer fontSize) {
     /**
      * <p>bold.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder bold() {
         return setBold(true);
@@ -84,7 +84,7 @@ public FontBuilder bold() {
      * <p>setBold.</p>
      *
      * @param bold a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setBold(Boolean bold) {
         getObject().setBold(bold);
@@ -94,7 +94,7 @@ public FontBuilder setBold(Boolean bold) {
     /**
      * <p>italic.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder italic() {
         return setItalic(true);
@@ -104,7 +104,7 @@ public FontBuilder italic() {
      * <p>setItalic.</p>
      *
      * @param italic a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setItalic(Boolean italic) {
         getObject().setItalic(italic);
@@ -114,7 +114,7 @@ public FontBuilder setItalic(Boolean italic) {
     /**
      * <p>boldItalic.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder boldItalic() {
         setBold(true);
@@ -126,7 +126,7 @@ public FontBuilder boldItalic() {
      * You should configure the fonts.xml file
      *
      * @param pdfEmbedded a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setPdfEmbedded(Boolean pdfEmbedded) {
         getObject().setPdfEmbedded(pdfEmbedded);
@@ -138,7 +138,7 @@ public FontBuilder setPdfEmbedded(Boolean pdfEmbedded) {
      * You should configure the fonts.xml file
      *
      * @param pdfEncoding a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setPdfEncoding(String pdfEncoding) {
         getObject().setPdfEncoding(pdfEncoding);
@@ -150,7 +150,7 @@ public FontBuilder setPdfEncoding(String pdfEncoding) {
      * You should configure the fonts.xml file
      *
      * @param pdfFontName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setPdfFontName(String pdfFontName) {
         getObject().setPdfFontName(pdfFontName);
@@ -160,7 +160,7 @@ public FontBuilder setPdfFontName(String pdfFontName) {
     /**
      * <p>strikeThrough.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder strikeThrough() {
         return setStrikeThrough(true);
@@ -170,7 +170,7 @@ public FontBuilder strikeThrough() {
      * <p>setStrikeThrough.</p>
      *
      * @param strikeThrough a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setStrikeThrough(Boolean strikeThrough) {
         getObject().setStrikeThrough(strikeThrough);
@@ -180,7 +180,7 @@ public FontBuilder setStrikeThrough(Boolean strikeThrough) {
     /**
      * <p>underline.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder underline() {
         return setUnderline(true);
@@ -190,7 +190,7 @@ public FontBuilder underline() {
      * <p>setUnderline.</p>
      *
      * @param underline a {@link java.lang.Boolean} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder setUnderline(Boolean underline) {
         getObject().setUnderline(underline);
@@ -200,7 +200,7 @@ public FontBuilder setUnderline(Boolean underline) {
     /**
      * <p>getFont.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.style.DRFont} object.
      */
     public DRFont getFont() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PaddingBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/PaddingBuilder.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PaddingBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/PaddingBuilder.java
index b38ae82..9a1d368 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PaddingBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/PaddingBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.base.style.DRPadding;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.style.DRPadding;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>PaddingBuilder class.</p>
@@ -50,7 +50,7 @@ protected PaddingBuilder(int padding) {
      * <p>setTop.</p>
      *
      * @param top a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      */
     public PaddingBuilder setTop(Integer top) {
         getObject().setTop(top);
@@ -61,7 +61,7 @@ public PaddingBuilder setTop(Integer top) {
      * <p>setLeft.</p>
      *
      * @param left a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      */
     public PaddingBuilder setLeft(Integer left) {
         getObject().setLeft(left);
@@ -72,7 +72,7 @@ public PaddingBuilder setLeft(Integer left) {
      * <p>setBottom.</p>
      *
      * @param bottom a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      */
     public PaddingBuilder setBottom(Integer bottom) {
         getObject().setBottom(bottom);
@@ -83,7 +83,7 @@ public PaddingBuilder setBottom(Integer bottom) {
      * <p>setRight.</p>
      *
      * @param right a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      */
     public PaddingBuilder setRight(Integer right) {
         getObject().setRight(right);
@@ -93,7 +93,7 @@ public PaddingBuilder setRight(Integer right) {
     /**
      * <p>getPadding.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.style.DRPadding} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.style.DRPadding} object.
      */
     public DRPadding getPadding() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PenBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/PenBuilder.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PenBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/PenBuilder.java
index dc2d349..c8ce342 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/PenBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/PenBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.base.style.DRPen;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.report.base.style.DRPen;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.LineStyle;
 
 import java.awt.Color;
 
@@ -44,7 +44,7 @@ protected PenBuilder() {
      * <p>Constructor for PenBuilder.</p>
      *
      * @param lineWidth a {@link java.lang.Float} object.
-     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @param lineStyle a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
      */
     protected PenBuilder(Float lineWidth, LineStyle lineStyle) {
         super(new DRPen(lineWidth, lineStyle));
@@ -54,7 +54,7 @@ protected PenBuilder(Float lineWidth, LineStyle lineStyle) {
      * <p>setLineWidth.</p>
      *
      * @param lineWidth a {@link java.lang.Float} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder setLineWidth(Float lineWidth) {
         getObject().setLineWidth(lineWidth);
@@ -64,8 +64,8 @@ public PenBuilder setLineWidth(Float lineWidth) {
     /**
      * <p>setLineStyle.</p>
      *
-     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param lineStyle a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder setLineStyle(LineStyle lineStyle) {
         getObject().setLineStyle(lineStyle);
@@ -76,7 +76,7 @@ public PenBuilder setLineStyle(LineStyle lineStyle) {
      * <p>setLineColor.</p>
      *
      * @param lineColor a {@link java.awt.Color} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder setLineColor(Color lineColor) {
         getObject().setLineColor(lineColor);
@@ -86,7 +86,7 @@ public PenBuilder setLineColor(Color lineColor) {
     /**
      * <p>getPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.style.DRPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.style.DRPen} object.
      */
     public DRPen getPen() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ReportStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/ReportStyleBuilder.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ReportStyleBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/ReportStyleBuilder.java
index 1a4068d..ff99204 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/ReportStyleBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/ReportStyleBuilder.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 import java.io.Serializable;
 
@@ -32,14 +32,14 @@ public interface ReportStyleBuilder extends Serializable {
     /**
      * <p>getStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getStyle();
 
     /**
      * <p>build.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle build();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/SimpleStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/SimpleStyleBuilder.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/SimpleStyleBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/SimpleStyleBuilder.java
index fb267e2..051b101 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/SimpleStyleBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/SimpleStyleBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.style.DRSimpleStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>SimpleStyleBuilder class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/StyleBuilder.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/StyleBuilder.java
index 0e732df..2480e67 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/StyleBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.base.style.DRStyle;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.style.DRStyle;
+import software.xdev.dynamicreports.report.constant.Constants;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -40,7 +40,7 @@ protected StyleBuilder() {
     /**
      * <p>Constructor for StyleBuilder.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+     * @param style a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
      */
     protected StyleBuilder(DRStyle style) {
         super(style);
@@ -49,8 +49,8 @@ protected StyleBuilder(DRStyle style) {
     /**
      * <p>conditionalStyles.</p>
      *
-     * @param conditionalStyles a {@link net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param conditionalStyles a {@link software.xdev.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder conditionalStyles(ConditionalStyleBuilder... conditionalStyles) {
         return addConditionalStyle(conditionalStyles);
@@ -59,8 +59,8 @@ public StyleBuilder conditionalStyles(ConditionalStyleBuilder... conditionalStyl
     /**
      * <p>addConditionalStyle.</p>
      *
-     * @param conditionalStyles a {@link net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param conditionalStyles a {@link software.xdev.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder addConditionalStyle(ConditionalStyleBuilder... conditionalStyles) {
         Validate.notNull(conditionalStyles, "conditionalStyles must not be null");
@@ -75,7 +75,7 @@ public StyleBuilder addConditionalStyle(ConditionalStyleBuilder... conditionalSt
      * <p>setName.</p>
      *
      * @param name a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder setName(String name) {
         getObject().setName(name);
@@ -85,8 +85,8 @@ public StyleBuilder setName(String name) {
     /**
      * <p>setParentStyle.</p>
      *
-     * @param parentStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param parentStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder setParentStyle(ReportStyleBuilder parentStyle) {
         if (parentStyle != null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/StyleBuilders.java
similarity index 60%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/StyleBuilders.java
index 5347c53..380f9d7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/StyleBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/StyleBuilders.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.constant.LineStyle;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.io.File;
 import java.io.InputStream;
@@ -38,7 +38,7 @@ public class StyleBuilders {
     /**
      * <p>font.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder font() {
         return Styles.font();
@@ -51,7 +51,7 @@ public FontBuilder font() {
      * @param bold     a boolean.
      * @param italic   a boolean.
      * @param fontSize a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder font(String fontName, boolean bold, boolean italic, int fontSize) {
         return Styles.font(fontName, bold, italic, fontSize);
@@ -60,7 +60,7 @@ public FontBuilder font(String fontName, boolean bold, boolean italic, int fontS
     /**
      * <p>fontArial.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder fontArial() {
         return Styles.fontArial();
@@ -69,7 +69,7 @@ public FontBuilder fontArial() {
     /**
      * <p>fontArialBold.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder fontArialBold() {
         return Styles.fontArialBold();
@@ -78,7 +78,7 @@ public FontBuilder fontArialBold() {
     /**
      * <p>fontTimesNewRoman.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder fontTimesNewRoman() {
         return Styles.fontTimesNewRoman();
@@ -87,7 +87,7 @@ public FontBuilder fontTimesNewRoman() {
     /**
      * <p>fontTimesNewRomanBold.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder fontTimesNewRomanBold() {
         return Styles.fontTimesNewRomanBold();
@@ -96,7 +96,7 @@ public FontBuilder fontTimesNewRomanBold() {
     /**
      * <p>fontCourierNew.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder fontCourierNew() {
         return Styles.fontCourierNew();
@@ -105,7 +105,7 @@ public FontBuilder fontCourierNew() {
     /**
      * <p>fontCourierNewBold.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public FontBuilder fontCourierNewBold() {
         return Styles.fontCourierNewBold();
@@ -116,7 +116,7 @@ public FontBuilder fontCourierNewBold() {
     /**
      * <p>pen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder pen() {
         return Styles.pen();
@@ -126,8 +126,8 @@ public PenBuilder pen() {
      * <p>pen.</p>
      *
      * @param lineWidth a {@link java.lang.Float} object.
-     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param lineStyle a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder pen(Float lineWidth, LineStyle lineStyle) {
         return Styles.pen(lineWidth, lineStyle);
@@ -136,7 +136,7 @@ public PenBuilder pen(Float lineWidth, LineStyle lineStyle) {
     /**
      * <p>penThin.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder penThin() {
         return Styles.penThin();
@@ -145,7 +145,7 @@ public PenBuilder penThin() {
     /**
      * <p>pen1Point.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder pen1Point() {
         return Styles.pen1Point();
@@ -154,7 +154,7 @@ public PenBuilder pen1Point() {
     /**
      * <p>pen2Point.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder pen2Point() {
         return Styles.pen2Point();
@@ -163,7 +163,7 @@ public PenBuilder pen2Point() {
     /**
      * <p>penDotted.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder penDotted() {
         return Styles.penDotted();
@@ -172,7 +172,7 @@ public PenBuilder penDotted() {
     /**
      * <p>penDashed.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder penDashed() {
         return Styles.penDashed();
@@ -181,7 +181,7 @@ public PenBuilder penDashed() {
     /**
      * <p>penDouble.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public PenBuilder penDouble() {
         return Styles.penDouble();
@@ -192,7 +192,7 @@ public PenBuilder penDouble() {
     /**
      * <p>border.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      */
     public BorderBuilder border() {
         return Styles.border();
@@ -201,8 +201,8 @@ public BorderBuilder border() {
     /**
      * <p>border.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      */
     public BorderBuilder border(PenBuilder pen) {
         return Styles.border(pen);
@@ -213,7 +213,7 @@ public BorderBuilder border(PenBuilder pen) {
     /**
      * <p>padding.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      */
     public PaddingBuilder padding() {
         return Styles.padding();
@@ -223,7 +223,7 @@ public PaddingBuilder padding() {
      * <p>padding.</p>
      *
      * @param padding a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      */
     public PaddingBuilder padding(int padding) {
         return Styles.padding(padding);
@@ -234,7 +234,7 @@ public PaddingBuilder padding(int padding) {
     /**
      * <p>style.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder style() {
         return Styles.style();
@@ -243,8 +243,8 @@ public StyleBuilder style() {
     /**
      * <p>style.</p>
      *
-     * @param parentStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param parentStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder style(ReportStyleBuilder parentStyle) {
         return Styles.style(parentStyle);
@@ -253,8 +253,8 @@ public StyleBuilder style(ReportStyleBuilder parentStyle) {
     /**
      * <p>style.</p>
      *
-     * @param font a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param font a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder style(FontBuilder font) {
         return Styles.style(font);
@@ -263,8 +263,8 @@ public StyleBuilder style(FontBuilder font) {
     /**
      * <p>style.</p>
      *
-     * @param borderPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param borderPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder style(PenBuilder borderPen) {
         return Styles.style(borderPen);
@@ -274,7 +274,7 @@ public StyleBuilder style(PenBuilder borderPen) {
      * <p>style.</p>
      *
      * @param padding a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder style(Integer padding) {
         return Styles.style(padding);
@@ -283,7 +283,7 @@ public StyleBuilder style(Integer padding) {
     /**
      * <p>simpleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
      */
     public SimpleStyleBuilder simpleStyle() {
         return Styles.simpleStyle();
@@ -293,7 +293,7 @@ public SimpleStyleBuilder simpleStyle() {
      * <p>templateStyle.</p>
      *
      * @param name a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStyleBuilder} object.
      */
     public TemplateStyleBuilder templateStyle(String name) {
         return Styles.templateStyle(name);
@@ -302,8 +302,8 @@ public TemplateStyleBuilder templateStyle(String name) {
     /**
      * <p>conditionalStyle.</p>
      *
-     * @param conditionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
+     * @param conditionExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
      */
     public ConditionalStyleBuilder conditionalStyle(DRIExpression<Boolean> conditionExpression) {
         return Styles.conditionalStyle(conditionExpression);
@@ -312,7 +312,7 @@ public ConditionalStyleBuilder conditionalStyle(DRIExpression<Boolean> condition
     /**
      * <p>templateStyles.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder templateStyles() {
         return Styles.templateStyles();
@@ -322,7 +322,7 @@ public TemplateStylesBuilder templateStyles() {
      * <p>loadStyles.</p>
      *
      * @param inputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder loadStyles(InputStream inputStream) {
         return Styles.loadStyles(inputStream);
@@ -332,7 +332,7 @@ public TemplateStylesBuilder loadStyles(InputStream inputStream) {
      * <p>loadStyles.</p>
      *
      * @param file a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder loadStyles(File file) {
         return Styles.loadStyles(file);
@@ -342,8 +342,8 @@ public TemplateStylesBuilder loadStyles(File file) {
      * <p>loadStyles.</p>
      *
      * @param fileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public TemplateStylesBuilder loadStyles(String fileName) throws DRException {
         return Styles.loadStyles(fileName);
@@ -353,7 +353,7 @@ public TemplateStylesBuilder loadStyles(String fileName) throws DRException {
      * <p>loadStyles.</p>
      *
      * @param url a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder loadStyles(URL url) {
         return Styles.loadStyles(url);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/Styles.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/Styles.java
similarity index 62%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/Styles.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/Styles.java
index 6524266..dc2564e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/Styles.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/Styles.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.constant.FontName;
-import net.sf.dynamicreports.report.constant.LineStyle;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.constant.FontName;
+import software.xdev.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRException;
 import org.apache.commons.lang3.Validate;
 
 import java.io.File;
@@ -40,7 +40,7 @@ public class Styles {
     /**
      * <p>font.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public static FontBuilder font() {
         return new FontBuilder();
@@ -53,7 +53,7 @@ public static FontBuilder font() {
      * @param bold     a boolean.
      * @param italic   a boolean.
      * @param fontSize a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public static FontBuilder font(String fontName, boolean bold, boolean italic, int fontSize) {
         return new FontBuilder(fontName, bold, italic, fontSize);
@@ -62,7 +62,7 @@ public static FontBuilder font(String fontName, boolean bold, boolean italic, in
     /**
      * <p>fontArial.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public static FontBuilder fontArial() {
         return new FontBuilder(FontName.ARIAL, false, false, 10);
@@ -71,7 +71,7 @@ public static FontBuilder fontArial() {
     /**
      * <p>fontArialBold.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public static FontBuilder fontArialBold() {
         return new FontBuilder(FontName.ARIAL, true, false, 10);
@@ -80,7 +80,7 @@ public static FontBuilder fontArialBold() {
     /**
      * <p>fontTimesNewRoman.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public static FontBuilder fontTimesNewRoman() {
         return new FontBuilder(FontName.TIMES_NEW_ROMAN, false, false, 10);
@@ -89,7 +89,7 @@ public static FontBuilder fontTimesNewRoman() {
     /**
      * <p>fontTimesNewRomanBold.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public static FontBuilder fontTimesNewRomanBold() {
         return new FontBuilder(FontName.TIMES_NEW_ROMAN, true, false, 10);
@@ -98,7 +98,7 @@ public static FontBuilder fontTimesNewRomanBold() {
     /**
      * <p>fontCourierNew.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public static FontBuilder fontCourierNew() {
         return new FontBuilder(FontName.COURIER_NEW, false, false, 10);
@@ -107,7 +107,7 @@ public static FontBuilder fontCourierNew() {
     /**
      * <p>fontCourierNewBold.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
      */
     public static FontBuilder fontCourierNewBold() {
         return new FontBuilder(FontName.COURIER_NEW, true, false, 10);
@@ -118,7 +118,7 @@ public static FontBuilder fontCourierNewBold() {
     /**
      * <p>pen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public static PenBuilder pen() {
         return new PenBuilder();
@@ -128,8 +128,8 @@ public static PenBuilder pen() {
      * <p>pen.</p>
      *
      * @param lineWidth a {@link java.lang.Float} object.
-     * @param lineStyle a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @param lineStyle a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public static PenBuilder pen(Float lineWidth, LineStyle lineStyle) {
         return new PenBuilder(lineWidth, lineStyle);
@@ -138,7 +138,7 @@ public static PenBuilder pen(Float lineWidth, LineStyle lineStyle) {
     /**
      * <p>penThin.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public static PenBuilder penThin() {
         return new PenBuilder(0.5f, LineStyle.SOLID);
@@ -147,7 +147,7 @@ public static PenBuilder penThin() {
     /**
      * <p>pen1Point.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public static PenBuilder pen1Point() {
         return new PenBuilder(1f, LineStyle.SOLID);
@@ -156,7 +156,7 @@ public static PenBuilder pen1Point() {
     /**
      * <p>pen2Point.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public static PenBuilder pen2Point() {
         return new PenBuilder(2f, LineStyle.SOLID);
@@ -165,7 +165,7 @@ public static PenBuilder pen2Point() {
     /**
      * <p>penDotted.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public static PenBuilder penDotted() {
         return new PenBuilder(1f, LineStyle.DOTTED);
@@ -174,7 +174,7 @@ public static PenBuilder penDotted() {
     /**
      * <p>penDashed.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public static PenBuilder penDashed() {
         return new PenBuilder(1f, LineStyle.DASHED);
@@ -183,7 +183,7 @@ public static PenBuilder penDashed() {
     /**
      * <p>penDouble.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
      */
     public static PenBuilder penDouble() {
         return new PenBuilder(1f, LineStyle.DOUBLE);
@@ -194,7 +194,7 @@ public static PenBuilder penDouble() {
     /**
      * <p>border.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      */
     public static BorderBuilder border() {
         return new BorderBuilder();
@@ -203,8 +203,8 @@ public static BorderBuilder border() {
     /**
      * <p>border.</p>
      *
-     * @param pen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.BorderBuilder} object.
+     * @param pen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.BorderBuilder} object.
      */
     public static BorderBuilder border(PenBuilder pen) {
         Validate.notNull(pen, "pen must not be null");
@@ -216,7 +216,7 @@ public static BorderBuilder border(PenBuilder pen) {
     /**
      * <p>padding.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      */
     public static PaddingBuilder padding() {
         return new PaddingBuilder();
@@ -226,7 +226,7 @@ public static PaddingBuilder padding() {
      * <p>padding.</p>
      *
      * @param padding a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.PaddingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.PaddingBuilder} object.
      */
     public static PaddingBuilder padding(int padding) {
         return new PaddingBuilder(padding);
@@ -237,7 +237,7 @@ public static PaddingBuilder padding(int padding) {
     /**
      * <p>style.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public static StyleBuilder style() {
         return new StyleBuilder();
@@ -246,8 +246,8 @@ public static StyleBuilder style() {
     /**
      * <p>style.</p>
      *
-     * @param parentStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param parentStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public static StyleBuilder style(ReportStyleBuilder parentStyle) {
         return new StyleBuilder().setParentStyle(parentStyle);
@@ -256,8 +256,8 @@ public static StyleBuilder style(ReportStyleBuilder parentStyle) {
     /**
      * <p>style.</p>
      *
-     * @param font a {@link net.sf.dynamicreports.report.builder.style.FontBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param font a {@link software.xdev.dynamicreports.report.builder.style.FontBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public static StyleBuilder style(FontBuilder font) {
         return new StyleBuilder().setFont(font);
@@ -266,8 +266,8 @@ public static StyleBuilder style(FontBuilder font) {
     /**
      * <p>style.</p>
      *
-     * @param borderPen a {@link net.sf.dynamicreports.report.builder.style.PenBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @param borderPen a {@link software.xdev.dynamicreports.report.builder.style.PenBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public static StyleBuilder style(PenBuilder borderPen) {
         return new StyleBuilder().setBorder(borderPen);
@@ -277,7 +277,7 @@ public static StyleBuilder style(PenBuilder borderPen) {
      * <p>style.</p>
      *
      * @param padding a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public static StyleBuilder style(Integer padding) {
         return new StyleBuilder().setPadding(padding);
@@ -286,7 +286,7 @@ public static StyleBuilder style(Integer padding) {
     /**
      * <p>simpleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.SimpleStyleBuilder} object.
      */
     public static SimpleStyleBuilder simpleStyle() {
         return new SimpleStyleBuilder();
@@ -296,7 +296,7 @@ public static SimpleStyleBuilder simpleStyle() {
      * <p>templateStyle.</p>
      *
      * @param name a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStyleBuilder} object.
      */
     public static TemplateStyleBuilder templateStyle(String name) {
         return new TemplateStyleBuilder(name);
@@ -305,8 +305,8 @@ public static TemplateStyleBuilder templateStyle(String name) {
     /**
      * <p>conditionalStyle.</p>
      *
-     * @param conditionExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
+     * @param conditionExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.ConditionalStyleBuilder} object.
      */
     public static ConditionalStyleBuilder conditionalStyle(DRIExpression<Boolean> conditionExpression) {
         return new ConditionalStyleBuilder(conditionExpression);
@@ -315,7 +315,7 @@ public static ConditionalStyleBuilder conditionalStyle(DRIExpression<Boolean> co
     /**
      * <p>templateStyles.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public static TemplateStylesBuilder templateStyles() {
         return new TemplateStylesBuilder();
@@ -325,7 +325,7 @@ public static TemplateStylesBuilder templateStyles() {
      * <p>loadStyles.</p>
      *
      * @param inputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public static TemplateStylesBuilder loadStyles(InputStream inputStream) {
         return new TemplateStylesBuilder().loadStyles(inputStream);
@@ -335,7 +335,7 @@ public static TemplateStylesBuilder loadStyles(InputStream inputStream) {
      * <p>loadStyles.</p>
      *
      * @param file a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public static TemplateStylesBuilder loadStyles(File file) {
         return new TemplateStylesBuilder().loadStyles(file);
@@ -345,8 +345,8 @@ public static TemplateStylesBuilder loadStyles(File file) {
      * <p>loadStyles.</p>
      *
      * @param fileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public static TemplateStylesBuilder loadStyles(String fileName) throws DRException {
         return new TemplateStylesBuilder().loadStyles(fileName);
@@ -356,7 +356,7 @@ public static TemplateStylesBuilder loadStyles(String fileName) throws DRExcepti
      * <p>loadStyles.</p>
      *
      * @param url a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public static TemplateStylesBuilder loadStyles(URL url) {
         return new TemplateStylesBuilder().loadStyles(url);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStyleBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/TemplateStyleBuilder.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStyleBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/TemplateStyleBuilder.java
index 4da57f9..8ea8799 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStyleBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/TemplateStyleBuilder.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.report.base.style.DRTemplateStyle;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.base.style.DRTemplateStyle;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>TemplateStyleBuilder class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStylesBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/TemplateStylesBuilder.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStylesBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/TemplateStylesBuilder.java
index 89004ae..909da42 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/style/TemplateStylesBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/style/TemplateStylesBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import net.sf.dynamicreports.jasper.base.JasperTemplateStyleLoader;
-import net.sf.dynamicreports.report.base.style.DRStyle;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.base.JasperTemplateStyleLoader;
+import software.xdev.dynamicreports.report.base.style.DRStyle;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.exception.DRException;
 import org.apache.commons.lang3.Validate;
 
 import java.io.File;
@@ -50,7 +50,7 @@ protected TemplateStylesBuilder() {
      * <p>loadStyles.</p>
      *
      * @param inputStream a {@link java.io.InputStream} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder loadStyles(InputStream inputStream) {
         return addStyles(JasperTemplateStyleLoader.loadStyles(inputStream));
@@ -60,7 +60,7 @@ public TemplateStylesBuilder loadStyles(InputStream inputStream) {
      * <p>loadStyles.</p>
      *
      * @param file a {@link java.io.File} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder loadStyles(File file) {
         return addStyles(JasperTemplateStyleLoader.loadStyles(file));
@@ -70,8 +70,8 @@ public TemplateStylesBuilder loadStyles(File file) {
      * <p>loadStyles.</p>
      *
      * @param fileName a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public TemplateStylesBuilder loadStyles(String fileName) throws DRException {
         return addStyles(JasperTemplateStyleLoader.loadStyles(fileName));
@@ -81,7 +81,7 @@ public TemplateStylesBuilder loadStyles(String fileName) throws DRException {
      * <p>loadStyles.</p>
      *
      * @param url a {@link java.net.URL} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder loadStyles(URL url) {
         return addStyles(JasperTemplateStyleLoader.loadStyles(url));
@@ -97,8 +97,8 @@ private TemplateStylesBuilder addStyles(DRStyle[] styles) {
     /**
      * <p>styles.</p>
      *
-     * @param styles a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @param styles a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder styles(StyleBuilder... styles) {
         return addStyle(styles);
@@ -107,8 +107,8 @@ public TemplateStylesBuilder styles(StyleBuilder... styles) {
     /**
      * <p>addStyle.</p>
      *
-     * @param styles a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
+     * @param styles a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder} object.
      */
     public TemplateStylesBuilder addStyle(StyleBuilder... styles) {
         Validate.notNull(styles, "styles must not be null");
@@ -123,7 +123,7 @@ public TemplateStylesBuilder addStyle(StyleBuilder... styles) {
      * <p>getStyle.</p>
      *
      * @param name a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.style.StyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.style.StyleBuilder} object.
      */
     public StyleBuilder getStyle(String name) {
         Validate.notNull(name, "name must not be null");
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java
index b53b828..f892f78 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/AggregationSubtotalBuilder.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.subtotal;
+package software.xdev.dynamicreports.report.builder.subtotal;
 
-import net.sf.dynamicreports.report.base.DRVariable;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.builder.datatype.DataTypes;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.constant.SubtotalPosition;
-import net.sf.dynamicreports.report.definition.DRIField;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.column.DRIValueColumn;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRReportException;
+import software.xdev.dynamicreports.report.base.DRVariable;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.builder.datatype.DataTypes;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.constant.SubtotalPosition;
+import software.xdev.dynamicreports.report.definition.DRIField;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.column.DRIValueColumn;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRReportException;
 
 /**
  * <p>AggregationSubtotalBuilder class.</p>
@@ -49,8 +49,8 @@ public class AggregationSubtotalBuilder<T> extends SubtotalBuilder<AggregationSu
     /**
      * <p>Constructor for AggregationSubtotalBuilder.</p>
      *
-     * @param column      a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
-     * @param calculation a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param column      a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param calculation a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected AggregationSubtotalBuilder(ValueColumnBuilder<?, ?> column, Calculation calculation) {
         this(column.getColumn(), column, calculation);
@@ -61,9 +61,9 @@ protected AggregationSubtotalBuilder(ValueColumnBuilder<?, ?> column, Calculatio
     /**
      * <p>Constructor for AggregationSubtotalBuilder.</p>
      *
-     * @param field        a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
-     * @param calculation  a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param field        a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param calculation  a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected AggregationSubtotalBuilder(FieldBuilder<?> field, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
         this(field.build(), showInColumn, calculation);
@@ -74,9 +74,9 @@ protected AggregationSubtotalBuilder(FieldBuilder<?> field, ColumnBuilder<?, ?>
     /**
      * <p>Constructor for AggregationSubtotalBuilder.</p>
      *
-     * @param expression   a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
-     * @param calculation  a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @param expression   a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param calculation  a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     protected AggregationSubtotalBuilder(DRIExpression<?> expression, ColumnBuilder<?, ?> showInColumn, Calculation calculation) {
         super(showInColumn);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java
index 80077a3..de53f26 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/BaseSubtotalBuilder.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.subtotal;
-
-import net.sf.dynamicreports.report.base.DRSubtotal;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.SubtotalPosition;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+package software.xdev.dynamicreports.report.builder.subtotal;
+
+import software.xdev.dynamicreports.report.base.DRSubtotal;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.HyperLinkBuilder;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.SubtotalPosition;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 import org.apache.commons.lang3.Validate;
 
 /**
@@ -48,7 +48,7 @@ public abstract class BaseSubtotalBuilder<T extends BaseSubtotalBuilder<T, U>, U
     /**
      * <p>Constructor for BaseSubtotalBuilder.</p>
      *
-     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.builder.column.ColumnBuilder} object.
      */
     protected BaseSubtotalBuilder(ColumnBuilder<?, ?> showInColumn) {
         super(new DRSubtotal<U>(showInColumn.build()));
@@ -57,7 +57,7 @@ protected BaseSubtotalBuilder(ColumnBuilder<?, ?> showInColumn) {
     /**
      * <p>Setter for the field <code>valueExpression</code>.</p>
      *
-     * @param valueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param valueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     protected void setValueExpression(DRIExpression<U> valueExpression) {
         this.valueExpression = valueExpression;
@@ -66,7 +66,7 @@ protected void setValueExpression(DRIExpression<U> valueExpression) {
     /**
      * <p>setShowInColumn.</p>
      *
-     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.builder.column.ColumnBuilder} object.
      * @return a T object.
      */
     public T setShowInColumn(ColumnBuilder<?, ?> showInColumn) {
@@ -78,7 +78,7 @@ public T setShowInColumn(ColumnBuilder<?, ?> showInColumn) {
     /**
      * <p>setLabel.</p>
      *
-     * @param labelExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param labelExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setLabel(DRIExpression<?> labelExpression) {
@@ -100,7 +100,7 @@ public T setLabel(String label) {
     /**
      * <p>setLabelStyle.</p>
      *
-     * @param labelStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param labelStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setLabelStyle(ReportStyleBuilder labelStyle) {
@@ -115,7 +115,7 @@ public T setLabelStyle(ReportStyleBuilder labelStyle) {
     /**
      * <p>setLabelPosition.</p>
      *
-     * @param labelPosition a {@link net.sf.dynamicreports.report.constant.Position} object.
+     * @param labelPosition a {@link software.xdev.dynamicreports.report.constant.Position} object.
      * @return a T object.
      */
     public T setLabelPosition(Position labelPosition) {
@@ -129,7 +129,7 @@ public T setLabelPosition(Position labelPosition) {
      * @param width the label component preferred width >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setLabelWidth(Integer width) {
         getObject().setLabelWidth(width);
@@ -142,7 +142,7 @@ public T setLabelWidth(Integer width) {
      * @param width the label component fixed width >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setLabelFixedWidth(Integer width) {
         getObject().setLabelWidth(width);
@@ -156,7 +156,7 @@ public T setLabelFixedWidth(Integer width) {
      * @param width the label component minimum width >= 0
      * @return a T object.
      * @throws java.lang.IllegalArgumentException if <code>width</code> is < 0
-     * @see net.sf.dynamicreports.report.builder.Units
+     * @see software.xdev.dynamicreports.report.builder.Units
      */
     public T setLabelMinWidth(Integer width) {
         getObject().setLabelWidth(width);
@@ -178,7 +178,7 @@ public T setPattern(String pattern) {
     /**
      * <p>setPattern.</p>
      *
-     * @param patternExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param patternExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setPattern(DRIExpression<String> patternExpression) {
@@ -189,7 +189,7 @@ public T setPattern(DRIExpression<String> patternExpression) {
     /**
      * <p>setValueFormatter.</p>
      *
-     * @param valueFormatter a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @param valueFormatter a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      * @return a T object.
      */
     public T setValueFormatter(DRIValueFormatter<?, ? super U> valueFormatter) {
@@ -200,7 +200,7 @@ public T setValueFormatter(DRIValueFormatter<?, ? super U> valueFormatter) {
     /**
      * <p>setDataType.</p>
      *
-     * @param dataType a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @param dataType a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      * @return a T object.
      */
     @SuppressWarnings("rawtypes")
@@ -223,7 +223,7 @@ public T setAnchorName(String anchorName) {
     /**
      * <p>setAnchorName.</p>
      *
-     * @param anchorNameExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param anchorNameExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setAnchorName(DRIExpression<String> anchorNameExpression) {
@@ -245,7 +245,7 @@ public T setBookmarkLevel(Integer bookmarkLevel) {
     /**
      * <p>setHyperLink.</p>
      *
-     * @param hyperLink a {@link net.sf.dynamicreports.report.builder.HyperLinkBuilder} object.
+     * @param hyperLink a {@link software.xdev.dynamicreports.report.builder.HyperLinkBuilder} object.
      * @return a T object.
      */
     public T setHyperLink(HyperLinkBuilder hyperLink) {
@@ -330,7 +330,7 @@ public T setMinHeight(Integer height) {
     /**
      * <p>setStyle.</p>
      *
-     * @param style a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param style a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      * @return a T object.
      */
     public T setStyle(ReportStyleBuilder style) {
@@ -345,7 +345,7 @@ public T setStyle(ReportStyleBuilder style) {
     /**
      * <p>setPrintWhenExpression.</p>
      *
-     * @param printWhenExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param printWhenExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      * @return a T object.
      */
     public T setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
@@ -356,7 +356,7 @@ public T setPrintWhenExpression(DRIExpression<Boolean> printWhenExpression) {
     /**
      * <p>setGroup.</p>
      *
-     * @param group a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @param group a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
      * @return a T object.
      */
     public T setGroup(GroupBuilder<?> group) {
@@ -371,7 +371,7 @@ public T setGroup(GroupBuilder<?> group) {
     /**
      * <p>setPosition.</p>
      *
-     * @param position a {@link net.sf.dynamicreports.report.constant.SubtotalPosition} object.
+     * @param position a {@link software.xdev.dynamicreports.report.constant.SubtotalPosition} object.
      * @return a T object.
      */
     public T setPosition(SubtotalPosition position) {
@@ -389,7 +389,7 @@ protected void configure() {
     /**
      * <p>getSubtotal.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRSubtotal} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRSubtotal} object.
      */
     public DRSubtotal<U> getSubtotal() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java
index b12f543..7593a3c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/CustomSubtotalBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.subtotal;
+package software.xdev.dynamicreports.report.builder.subtotal;
 
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>CustomSubtotalBuilder class.</p>
@@ -34,8 +34,8 @@ public class CustomSubtotalBuilder<T> extends SubtotalBuilder<CustomSubtotalBuil
     /**
      * <p>Constructor for CustomSubtotalBuilder.</p>
      *
-     * @param expression   a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param expression   a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.builder.column.ColumnBuilder} object.
      */
     protected CustomSubtotalBuilder(DRIExpression<T> expression, ColumnBuilder<?, ?> showInColumn) {
         super(showInColumn);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java
similarity index 67%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java
index 5a25926..9efa80b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/PercentageSubtotalBuilder.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.subtotal;
-
-import net.sf.dynamicreports.report.base.DRGroup;
-import net.sf.dynamicreports.report.base.DRVariable;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.builder.datatype.DataTypes;
-import net.sf.dynamicreports.report.builder.expression.PercentageExpression;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.constant.PercentageTotalType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.exception.DRReportException;
+package software.xdev.dynamicreports.report.builder.subtotal;
+
+import software.xdev.dynamicreports.report.base.DRGroup;
+import software.xdev.dynamicreports.report.base.DRVariable;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.builder.datatype.DataTypes;
+import software.xdev.dynamicreports.report.builder.expression.PercentageExpression;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.constant.PercentageTotalType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.exception.DRReportException;
 
 /**
  * <p>PercentageSubtotalBuilder class.</p>
@@ -50,7 +50,7 @@ public class PercentageSubtotalBuilder extends BaseSubtotalBuilder<PercentageSub
     /**
      * <p>Constructor for PercentageSubtotalBuilder.</p>
      *
-     * @param column a {@link net.sf.dynamicreports.report.builder.column.ValueColumnBuilder} object.
+     * @param column a {@link software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder} object.
      */
     protected PercentageSubtotalBuilder(ValueColumnBuilder<?, ? extends Number> column) {
         this(column.build(), column);
@@ -61,8 +61,8 @@ protected PercentageSubtotalBuilder(ValueColumnBuilder<?, ? extends Number> colu
     /**
      * <p>Constructor for PercentageSubtotalBuilder.</p>
      *
-     * @param field        a {@link net.sf.dynamicreports.report.builder.FieldBuilder} object.
-     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param field        a {@link software.xdev.dynamicreports.report.builder.FieldBuilder} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.builder.column.ColumnBuilder} object.
      */
     protected PercentageSubtotalBuilder(FieldBuilder<? extends Number> field, ColumnBuilder<?, ?> showInColumn) {
         this(field.getField(), showInColumn);
@@ -73,8 +73,8 @@ protected PercentageSubtotalBuilder(FieldBuilder<? extends Number> field, Column
     /**
      * <p>Constructor for PercentageSubtotalBuilder.</p>
      *
-     * @param expression   a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param expression   a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.builder.column.ColumnBuilder} object.
      */
     protected PercentageSubtotalBuilder(DRIExpression<? extends Number> expression, ColumnBuilder<?, ?> showInColumn) {
         super(showInColumn);
@@ -84,8 +84,8 @@ protected PercentageSubtotalBuilder(DRIExpression<? extends Number> expression,
     /**
      * <p>Setter for the field <code>totalType</code>.</p>
      *
-     * @param totalType a {@link net.sf.dynamicreports.report.constant.PercentageTotalType} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder} object.
+     * @param totalType a {@link software.xdev.dynamicreports.report.constant.PercentageTotalType} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder} object.
      */
     public PercentageSubtotalBuilder setTotalType(PercentageTotalType totalType) {
         this.totalType = totalType;
@@ -95,8 +95,8 @@ public PercentageSubtotalBuilder setTotalType(PercentageTotalType totalType) {
     /**
      * <p>Setter for the field <code>totalGroup</code>.</p>
      *
-     * @param totalGroup a {@link net.sf.dynamicreports.report.builder.group.GroupBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder} object.
+     * @param totalGroup a {@link software.xdev.dynamicreports.report.builder.group.GroupBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder} object.
      */
     public PercentageSubtotalBuilder setTotalGroup(GroupBuilder<?> totalGroup) {
         if (totalGroup != null) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/SubtotalBuilder.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/SubtotalBuilder.java
index eccfc7b..d327c8e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/SubtotalBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.subtotal;
+package software.xdev.dynamicreports.report.builder.subtotal;
 
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>Abstract SubtotalBuilder class.</p>
@@ -32,7 +32,7 @@ public abstract class SubtotalBuilder<T extends SubtotalBuilder<T, U>, U> extend
     /**
      * <p>Constructor for SubtotalBuilder.</p>
      *
-     * @param showInColumn a {@link net.sf.dynamicreports.report.builder.column.ColumnBuilder} object.
+     * @param showInColumn a {@link software.xdev.dynamicreports.report.builder.column.ColumnBuilder} object.
      */
     protected SubtotalBuilder(ColumnBuilder<?, ?> showInColumn) {
         super(showInColumn);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/SubtotalBuilders.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilders.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/SubtotalBuilders.java
index ae3edff..5b09969 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/SubtotalBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/SubtotalBuilders.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.subtotal;
+package software.xdev.dynamicreports.report.builder.subtotal;
 
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * A set of methods of creating column subtotals
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/Subtotals.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/Subtotals.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/Subtotals.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/Subtotals.java
index d49e0d7..75f1961 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/subtotal/Subtotals.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/subtotal/Subtotals.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.subtotal;
-
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.ValueColumnBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+package software.xdev.dynamicreports.report.builder.subtotal;
+
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.ValueColumnBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 import org.apache.commons.lang3.Validate;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java
index cb4f6fc..a7691a9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizer.java
@@ -15,36 +15,36 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.tableofcontents;
+package software.xdev.dynamicreports.report.builder.tableofcontents;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.hyperLink;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.hyperLink;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.builder.component.ComponentBuilder;
-import net.sf.dynamicreports.report.builder.component.HorizontalListBuilder;
-import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
-import net.sf.dynamicreports.report.builder.component.VerticalListBuilder;
-import net.sf.dynamicreports.report.builder.expression.SystemMessageExpression;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.HyperLinkType;
-import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.HyperLinkBuilder;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.ComponentBuilder;
+import software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder;
+import software.xdev.dynamicreports.report.builder.component.TextFieldBuilder;
+import software.xdev.dynamicreports.report.builder.component.VerticalListBuilder;
+import software.xdev.dynamicreports.report.builder.expression.SystemMessageExpression;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.HyperLinkType;
+import software.xdev.dynamicreports.report.constant.TableOfContentsPosition;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * <p>TableOfContentsCustomizer class.</p>
@@ -148,7 +148,7 @@ public void customize() {
     /**
      * <p>title.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      */
     protected ComponentBuilder<?, ?> title() {
         return cmp.text(new SystemMessageExpression("table_of_contents")).setStyle(titleStyle);
@@ -157,7 +157,7 @@ public void customize() {
     /**
      * <p>detailComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      */
     protected ComponentBuilder<?, ?> detailComponent() {
         final VerticalListBuilder detailComponent = cmp.verticalList();
@@ -174,7 +174,7 @@ public void customize() {
      * <p>headingComponent.</p>
      *
      * @param level a int.
-     * @return a {@link net.sf.dynamicreports.report.builder.component.ComponentBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.component.ComponentBuilder} object.
      */
     protected ComponentBuilder<?, ?> headingComponent(final int level) {
         final HorizontalListBuilder headingComponent = cmp.horizontalList();
@@ -223,7 +223,7 @@ public void customize() {
     /**
      * <p>Setter for the field <code>titleStyle</code>.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      */
     public void setTitleStyle(final ReportStyleBuilder titleStyle) {
         this.titleStyle = titleStyle;
@@ -232,7 +232,7 @@ public void setTitleStyle(final ReportStyleBuilder titleStyle) {
     /**
      * <p>Setter for the field <code>headingStyle</code>.</p>
      *
-     * @param headingStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param headingStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      */
     public void setHeadingStyle(final ReportStyleBuilder headingStyle) {
         this.headingStyle = headingStyle;
@@ -242,7 +242,7 @@ public void setHeadingStyle(final ReportStyleBuilder headingStyle) {
      * <p>Setter for the field <code>headingStyle</code>.</p>
      *
      * @param level        a int.
-     * @param headingStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @param headingStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
      */
     public void setHeadingStyle(final int level, final ReportStyleBuilder headingStyle) {
         this.headingStyles.put(level, headingStyle);
@@ -284,7 +284,7 @@ public TableOfContentsPosition getPosition() {
     /**
      * <p>Setter for the field <code>position</code>.</p>
      *
-     * @param position a {@link net.sf.dynamicreports.report.constant.TableOfContentsPosition} object.
+     * @param position a {@link software.xdev.dynamicreports.report.constant.TableOfContentsPosition} object.
      */
     public void setPosition(final TableOfContentsPosition position) {
         this.position = position;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java
similarity index 64%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java
index ae183ff..1d1ee25 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsCustomizerBuilder.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.tableofcontents;
+package software.xdev.dynamicreports.report.builder.tableofcontents;
 
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.style.ReportStyleBuilder;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.TableOfContentsPosition;
 
 /**
  * <p>TableOfContentsCustomizerBuilder class.</p>
@@ -41,7 +41,7 @@ public TableOfContentsCustomizerBuilder() {
     /**
      * <p>getTableOfContents.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer} object.
      */
     public TableOfContentsCustomizer getTableOfContents() {
         return build();
@@ -50,8 +50,8 @@ public TableOfContentsCustomizer getTableOfContents() {
     /**
      * <p>setTitleStyle.</p>
      *
-     * @param titleStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     * @param titleStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
      */
     public TableOfContentsCustomizerBuilder setTitleStyle(ReportStyleBuilder titleStyle) {
         this.getObject().setTitleStyle(titleStyle);
@@ -61,8 +61,8 @@ public TableOfContentsCustomizerBuilder setTitleStyle(ReportStyleBuilder titleSt
     /**
      * <p>setHeadingStyle.</p>
      *
-     * @param headingStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     * @param headingStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
      */
     public TableOfContentsCustomizerBuilder setHeadingStyle(ReportStyleBuilder headingStyle) {
         this.getObject().setHeadingStyle(headingStyle);
@@ -73,8 +73,8 @@ public TableOfContentsCustomizerBuilder setHeadingStyle(ReportStyleBuilder headi
      * <p>setHeadingStyle.</p>
      *
      * @param level        a int.
-     * @param headingStyle a {@link net.sf.dynamicreports.report.builder.style.ReportStyleBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     * @param headingStyle a {@link software.xdev.dynamicreports.report.builder.style.ReportStyleBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
      */
     public TableOfContentsCustomizerBuilder setHeadingStyle(int level, ReportStyleBuilder headingStyle) {
         this.getObject().setHeadingStyle(level, headingStyle);
@@ -85,7 +85,7 @@ public TableOfContentsCustomizerBuilder setHeadingStyle(int level, ReportStyleBu
      * <p>setTextFixedWidth.</p>
      *
      * @param textFixedWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
      */
     public TableOfContentsCustomizerBuilder setTextFixedWidth(Integer textFixedWidth) {
         this.getObject().setTextFixedWidth(textFixedWidth);
@@ -96,7 +96,7 @@ public TableOfContentsCustomizerBuilder setTextFixedWidth(Integer textFixedWidth
      * <p>setDotsFixedWidth.</p>
      *
      * @param dotsFixedWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
      */
     public TableOfContentsCustomizerBuilder setDotsFixedWidth(Integer dotsFixedWidth) {
         this.getObject().setDotsFixedWidth(dotsFixedWidth);
@@ -107,7 +107,7 @@ public TableOfContentsCustomizerBuilder setDotsFixedWidth(Integer dotsFixedWidth
      * <p>setPageIndexFixedWidth.</p>
      *
      * @param pageIndexFixedWidth a {@link java.lang.Integer} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
      */
     public TableOfContentsCustomizerBuilder setPageIndexFixedWidth(Integer pageIndexFixedWidth) {
         this.getObject().setPageIndexFixedWidth(pageIndexFixedWidth);
@@ -117,8 +117,8 @@ public TableOfContentsCustomizerBuilder setPageIndexFixedWidth(Integer pageIndex
     /**
      * <p>setPosition.</p>
      *
-     * @param position a {@link net.sf.dynamicreports.report.constant.TableOfContentsPosition} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
+     * @param position a {@link software.xdev.dynamicreports.report.constant.TableOfContentsPosition} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder} object.
      */
     public TableOfContentsCustomizerBuilder setPosition(TableOfContentsPosition position) {
         this.getObject().setPosition(position);
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java
index c2480f5..2ae6d51 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/tableofcontents/TableOfContentsHeadingBuilder.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.builder.tableofcontents;
+package software.xdev.dynamicreports.report.builder.tableofcontents;
 
-import net.sf.dynamicreports.report.base.DRTableOfContentsHeading;
-import net.sf.dynamicreports.report.builder.AbstractBuilder;
-import net.sf.dynamicreports.report.builder.expression.Expressions;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.base.DRTableOfContentsHeading;
+import software.xdev.dynamicreports.report.builder.AbstractBuilder;
+import software.xdev.dynamicreports.report.builder.expression.Expressions;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>TableOfContentsHeadingBuilder class.</p>
@@ -42,8 +42,8 @@ public TableOfContentsHeadingBuilder() {
     /**
      * <p>setParentHeading.</p>
      *
-     * @param parentHeading a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @param parentHeading a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
      */
     public TableOfContentsHeadingBuilder setParentHeading(TableOfContentsHeadingBuilder parentHeading) {
         if (parentHeading != null) {
@@ -58,7 +58,7 @@ public TableOfContentsHeadingBuilder setParentHeading(TableOfContentsHeadingBuil
      * <p>setLabel.</p>
      *
      * @param label a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
      */
     public TableOfContentsHeadingBuilder setLabel(String label) {
         this.getObject().setLabelExpression(Expressions.text(label));
@@ -68,8 +68,8 @@ public TableOfContentsHeadingBuilder setLabel(String label) {
     /**
      * <p>setLabel.</p>
      *
-     * @param labelExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @param labelExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
      */
     public TableOfContentsHeadingBuilder setLabel(DRIExpression<String> labelExpression) {
         this.getObject().setLabelExpression(labelExpression);
@@ -80,7 +80,7 @@ public TableOfContentsHeadingBuilder setLabel(DRIExpression<String> labelExpress
      * <p>setCustomValue.</p>
      *
      * @param customValue a {@link java.lang.Object} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
      */
     public TableOfContentsHeadingBuilder setCustomValue(Object customValue) {
         this.getObject().setCustomValueExpression(Expressions.value(customValue));
@@ -90,8 +90,8 @@ public TableOfContentsHeadingBuilder setCustomValue(Object customValue) {
     /**
      * <p>setCustomValue.</p>
      *
-     * @param customValueExpression a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
-     * @return a {@link net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
+     * @param customValueExpression a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder} object.
      */
     public TableOfContentsHeadingBuilder setCustomValue(DRIExpression<?> customValueExpression) {
         this.getObject().setCustomValueExpression(customValueExpression);
@@ -101,7 +101,7 @@ public TableOfContentsHeadingBuilder setCustomValue(DRIExpression<?> customValue
     /**
      * <p>getTableOfContentsHeading.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.base.DRTableOfContentsHeading} object.
+     * @return a {@link software.xdev.dynamicreports.report.base.DRTableOfContentsHeading} object.
      */
     public DRTableOfContentsHeading getTableOfContentsHeading() {
         return build();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponentTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/CustomComponentTransform.java
similarity index 62%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponentTransform.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/CustomComponentTransform.java
index 3d6db5c..47ade89 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponentTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/CustomComponentTransform.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.component;
+package software.xdev.dynamicreports.report.component;
 
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.constant.ResetType;
-import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
-import net.sf.dynamicreports.design.transformation.DesignTransformAccessor;
-import net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.constant.ResetType;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignComponent;
+import software.xdev.dynamicreports.design.transformation.DesignTransformAccessor;
+import software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRComponentElement;
 
 /**
@@ -45,19 +45,19 @@ public interface CustomComponentTransform<T extends DRIComponent, U extends DRID
     /**
      * <p>designComponent.</p>
      *
-     * @param accessor   a {@link net.sf.dynamicreports.design.transformation.DesignTransformAccessor} object.
+     * @param accessor   a {@link software.xdev.dynamicreports.design.transformation.DesignTransformAccessor} object.
      * @param component  a T object.
-     * @param resetType  a {@link net.sf.dynamicreports.design.constant.ResetType} object.
-     * @param resetGroup a {@link net.sf.dynamicreports.design.base.DRDesignGroup} object.
+     * @param resetType  a {@link software.xdev.dynamicreports.design.constant.ResetType} object.
+     * @param resetGroup a {@link software.xdev.dynamicreports.design.base.DRDesignGroup} object.
      * @return a U object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public U designComponent(DesignTransformAccessor accessor, T component, ResetType resetType, DRDesignGroup resetGroup) throws DRException;
 
     /**
      * <p>jasperComponent.</p>
      *
-     * @param accessor  a {@link net.sf.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
+     * @param accessor  a {@link software.xdev.dynamicreports.jasper.transformation.JasperTransformAccessor} object.
      * @param component a U object.
      * @return a {@link net.sf.jasperreports.engine.JRComponentElement} object.
      */
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponents.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/CustomComponents.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponents.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/CustomComponents.java
index 19a7a83..82f948a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/CustomComponents.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/CustomComponents.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.component;
+package software.xdev.dynamicreports.report.component;
 
 import net.sf.jasperreports.extensions.ExtensionsEnvironment;
 
@@ -33,7 +33,7 @@ public class CustomComponents {
      * <p>getComponentTransform.</p>
      *
      * @param component a {@link java.lang.Object} object.
-     * @return a {@link net.sf.dynamicreports.report.component.CustomComponentTransform} object.
+     * @return a {@link software.xdev.dynamicreports.report.component.CustomComponentTransform} object.
      */
     @SuppressWarnings("rawtypes")
     public static CustomComponentTransform<?, ?> getComponentTransform(Object component) {
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRICustomComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/DRICustomComponent.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRICustomComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/DRICustomComponent.java
index 22c5b04..e9ecd32 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRICustomComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/DRICustomComponent.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.component;
+package software.xdev.dynamicreports.report.component;
 
-import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
+import software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent;
 
 /**
  * <p>DRICustomComponent interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRIDesignCustomComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/DRIDesignCustomComponent.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRIDesignCustomComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/DRIDesignCustomComponent.java
index a2f2b75..000c0c9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/component/DRIDesignCustomComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/component/DRIDesignCustomComponent.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.component;
+package software.xdev.dynamicreports.report.component;
 
-import net.sf.dynamicreports.design.definition.component.DRIDesignComponent;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignComponent;
 
 /**
  * <p>DRIDesignCustomComponent interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/AxisPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/AxisPosition.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/AxisPosition.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/AxisPosition.java
index 7d05b66..59d3789 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/AxisPosition.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/AxisPosition.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>AxisPosition class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/BooleanComponentType.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/BooleanComponentType.java
index 93192b3..f2b5182 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BooleanComponentType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/BooleanComponentType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>BooleanComponentType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BreakType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/BreakType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BreakType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/BreakType.java
index 1a3fb45..fc5e4e0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/BreakType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/BreakType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>BreakType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Calculation.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Calculation.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Calculation.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Calculation.java
index d7b791f..09e7b31 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Calculation.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Calculation.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>Calculation class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentDimensionType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ComponentDimensionType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentDimensionType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ComponentDimensionType.java
index 93330ca..450f9d6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentDimensionType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ComponentDimensionType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>ComponentDimensionType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentPositionType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ComponentPositionType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentPositionType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ComponentPositionType.java
index f247fd3..3296109 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ComponentPositionType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ComponentPositionType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>ComponentPositionType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Constants.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Constants.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Constants.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Constants.java
index bd5bd3f..cd1063d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Constants.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Constants.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>Constants interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabPercentageType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/CrosstabPercentageType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabPercentageType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/CrosstabPercentageType.java
index 7a07ce5..1b4be9a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabPercentageType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/CrosstabPercentageType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>CrosstabPercentageType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabTotalPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/CrosstabTotalPosition.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabTotalPosition.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/CrosstabTotalPosition.java
index 97c20d0..8534cac 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/CrosstabTotalPosition.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/CrosstabTotalPosition.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>CrosstabTotalPosition class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Evaluation.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Evaluation.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Evaluation.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Evaluation.java
index eac77f7..710ef63 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Evaluation.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Evaluation.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>Evaluation class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/FontName.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/FontName.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/FontName.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/FontName.java
index feea330..5e0c107 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/FontName.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/FontName.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>FontName class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupFooterPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/GroupFooterPosition.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupFooterPosition.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/GroupFooterPosition.java
index 5972d0a..e49743e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupFooterPosition.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/GroupFooterPosition.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>GroupFooterPosition class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupHeaderLayout.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/GroupHeaderLayout.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupHeaderLayout.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/GroupHeaderLayout.java
index ea6b8cb..97b8dc3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/GroupHeaderLayout.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/GroupHeaderLayout.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>GroupHeaderLayout class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalAlignment.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalAlignment.java
index caff7bb..1537992 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>HorizontalAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalCellComponentAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalCellComponentAlignment.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalCellComponentAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalCellComponentAlignment.java
index 844fce6..db499b5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalCellComponentAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalCellComponentAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>HorizontalCellComponentAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalImageAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalImageAlignment.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalImageAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalImageAlignment.java
index 63c908d..8a3ef49 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalImageAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalImageAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>HorizontalImageAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalTextAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalTextAlignment.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalTextAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalTextAlignment.java
index 7329c2d..41c25eb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HorizontalTextAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalTextAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>HorizontalTextAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkTarget.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HyperLinkTarget.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkTarget.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HyperLinkTarget.java
index 963e700..87410fb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkTarget.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HyperLinkTarget.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>HyperLinkTarget class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HyperLinkType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HyperLinkType.java
index 76a120d..79502ec 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/HyperLinkType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HyperLinkType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>HyperLinkType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageAnchorType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ImageAnchorType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageAnchorType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ImageAnchorType.java
index 8d80bca..5906a9b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageAnchorType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ImageAnchorType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>ImageAnchorType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageScale.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ImageScale.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageScale.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ImageScale.java
index e488507..99fe078 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ImageScale.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ImageScale.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>ImageScale class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Language.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Language.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Language.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Language.java
index 39a2813..82febed 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Language.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Language.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>Language class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineDirection.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineDirection.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineDirection.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineDirection.java
index 2efe0cf..fef826a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineDirection.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineDirection.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>LineDirection class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineSpacing.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineSpacing.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineSpacing.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineSpacing.java
index 7298b23..aaa2cf7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineSpacing.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineSpacing.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>LineSpacing class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineStyle.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineStyle.java
index b50c41a..cc7be46 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/LineStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/LineStyle.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>LineStyle class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ListType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ListType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ListType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ListType.java
index 72b3766..d015572 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ListType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ListType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>ListType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Markup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Markup.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Markup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Markup.java
index 2fbec46..962b991 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Markup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Markup.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>Markup class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/MeterShape.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/MeterShape.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/MeterShape.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/MeterShape.java
index 492c42c..ea03093 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/MeterShape.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/MeterShape.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>MeterShape class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/OrderType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/OrderType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/OrderType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/OrderType.java
index d98f4c5..48f29c5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/OrderType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/OrderType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>OrderType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Orientation.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Orientation.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Orientation.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Orientation.java
index fe39574..574c737 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Orientation.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Orientation.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>Orientation class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageOrientation.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PageOrientation.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageOrientation.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PageOrientation.java
index a2e3764..ed04c5e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageOrientation.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PageOrientation.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>PageOrientation class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PageType.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PageType.java
index 67f3603..75f36ee 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PageType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PageType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>PageType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfEncoding.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfEncoding.java
similarity index 98%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfEncoding.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfEncoding.java
index df8599c..1a16ce4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfEncoding.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfEncoding.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>PdfEncoding class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfPrintScaling.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfPrintScaling.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfPrintScaling.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfPrintScaling.java
index ea69710..66c5feb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfPrintScaling.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfPrintScaling.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>PdfPrintScaling class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfaConformance.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfaConformance.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfaConformance.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfaConformance.java
index 78bb81a..1782769 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PdfaConformance.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PdfaConformance.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>PdfaConformance class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PercentageTotalType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PercentageTotalType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PercentageTotalType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PercentageTotalType.java
index f7e1420..dff90b2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/PercentageTotalType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/PercentageTotalType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>PercentageTotalType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Position.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Position.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Position.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Position.java
index f8edac2..11a7562 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Position.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Position.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>Position class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java
index 4c713de..1f9a6c6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/QrCodeErrorCorrectionLevel.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>QrCodeErrorCorrectionLevel class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QueryLanguage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/QueryLanguage.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QueryLanguage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/QueryLanguage.java
index 02e1e51..e090ed1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/QueryLanguage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/QueryLanguage.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>QueryLanguage class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RectangleAnchor.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/RectangleAnchor.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RectangleAnchor.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/RectangleAnchor.java
index dc31ec2..0f951ff 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RectangleAnchor.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/RectangleAnchor.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>RectangleAnchor class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Rotation.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Rotation.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Rotation.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Rotation.java
index 56f65d7..29cf7a0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/Rotation.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/Rotation.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>Rotation class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RunDirection.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/RunDirection.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RunDirection.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/RunDirection.java
index 0722a0c..a3d6595 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/RunDirection.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/RunDirection.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>RunDirection class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ScaleType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ScaleType.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ScaleType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ScaleType.java
index b2695b7..2ba710f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ScaleType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ScaleType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>ScaleType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SpiderRotation.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SpiderRotation.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SpiderRotation.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SpiderRotation.java
index d0e2eb7..df31b96 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SpiderRotation.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SpiderRotation.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>SpiderRotation class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SplitType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SplitType.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SplitType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SplitType.java
index 74e3188..0752760 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SplitType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SplitType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>SplitType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/StretchType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/StretchType.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/StretchType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/StretchType.java
index 10ff3bd..081ddfc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/StretchType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/StretchType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>StretchType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SubtotalPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SubtotalPosition.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SubtotalPosition.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SubtotalPosition.java
index e054cd3..d8f37dc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SubtotalPosition.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SubtotalPosition.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>SubtotalPosition class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SystemExpression.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SystemExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SystemExpression.java
index 0d64ff2..81477fc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/SystemExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/SystemExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>SystemExpression class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TabStopAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TabStopAlignment.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TabStopAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TabStopAlignment.java
index a6dc2d7..25fc50e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TabStopAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TabStopAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>TabStopAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOfContentsPosition.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TableOfContentsPosition.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOfContentsPosition.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TableOfContentsPosition.java
index d070acf..6710e18 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOfContentsPosition.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TableOfContentsPosition.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>TableOfContentsPosition class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOrder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TableOrder.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOrder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TableOrder.java
index 6946c70..e1ef169 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TableOrder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TableOrder.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>TableOrder class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TextAdjust.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TextAdjust.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TextAdjust.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TextAdjust.java
index fe308fd..1afb66d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TextAdjust.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TextAdjust.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  *
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TimePeriod.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TimePeriod.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TimePeriod.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TimePeriod.java
index c005d4f..f5b92d1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/TimePeriod.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/TimePeriod.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>TimePeriod class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ValueLocation.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ValueLocation.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ValueLocation.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ValueLocation.java
index 2e27d19..2d0d592 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/ValueLocation.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/ValueLocation.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>ValueLocation class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalAlignment.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalAlignment.java
index 8dad2d4..bec96da 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>VerticalAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalCellComponentAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalCellComponentAlignment.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalCellComponentAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalCellComponentAlignment.java
index c33e399..f526068 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalCellComponentAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalCellComponentAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>VerticalCellComponentAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalImageAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalImageAlignment.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalImageAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalImageAlignment.java
index 541b603..3068ddf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalImageAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalImageAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>VerticalImageAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalTextAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalTextAlignment.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalTextAlignment.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalTextAlignment.java
index 1173139..a434276 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/VerticalTextAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalTextAlignment.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>VerticalTextAlignment class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenNoDataType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/WhenNoDataType.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenNoDataType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/WhenNoDataType.java
index 9bd394e..bd5e8c2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenNoDataType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/WhenNoDataType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>WhenNoDataType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenResourceMissingType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/WhenResourceMissingType.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenResourceMissingType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/WhenResourceMissingType.java
index a17520e..b941019 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/constant/WhenResourceMissingType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/WhenResourceMissingType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.constant;
+package software.xdev.dynamicreports.report.constant;
 
 /**
  * <p>WhenResourceMissingType class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/datasource/DRDataSource.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/datasource/DRDataSource.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/datasource/DRDataSource.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/datasource/DRDataSource.java
index 96d7b79..b83feca 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/datasource/DRDataSource.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/datasource/DRDataSource.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.datasource;
+package software.xdev.dynamicreports.report.datasource;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRField;
 import net.sf.jasperreports.engine.JRRewindableDataSource;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Default.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Default.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Default.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Default.java
index dfbc4ae..752ac52 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Default.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Default.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.defaults;
+package software.xdev.dynamicreports.report.defaults;
 
 import java.awt.Color;
 import java.math.BigDecimal;
@@ -23,38 +23,38 @@
 import java.util.Date;
 import java.util.Locale;
 
-import net.sf.dynamicreports.report.base.DRMargin;
-import net.sf.dynamicreports.report.base.datatype.DRDataType;
-import net.sf.dynamicreports.report.base.style.DRFont;
-import net.sf.dynamicreports.report.base.style.DRPadding;
-import net.sf.dynamicreports.report.base.style.DRSimpleStyle;
-import net.sf.dynamicreports.report.base.style.DRStyle;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.Language;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.base.DRMargin;
+import software.xdev.dynamicreports.report.base.datatype.DRDataType;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.base.style.DRPadding;
+import software.xdev.dynamicreports.report.base.style.DRSimpleStyle;
+import software.xdev.dynamicreports.report.base.style.DRStyle;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.constant.CrosstabTotalPosition;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.Language;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.TableOfContentsPosition;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
 
 
 /**
@@ -515,7 +515,7 @@ public boolean isIgnorePagination()
 	/**
 	 * <p>Getter for the field <code>whenNoDataType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
 	 */
 	public WhenNoDataType getWhenNoDataType()
 	{
@@ -525,7 +525,7 @@ public WhenNoDataType getWhenNoDataType()
 	/**
 	 * <p>Getter for the field <code>whenResourceMissingType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
 	 */
 	public WhenResourceMissingType getWhenResourceMissingType()
 	{
@@ -575,7 +575,7 @@ public boolean isFloatColumnFooter()
 	/**
 	 * <p>Getter for the field <code>printOrder</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
 	 */
 	public Orientation getPrintOrder()
 	{
@@ -585,7 +585,7 @@ public Orientation getPrintOrder()
 	/**
 	 * <p>Getter for the field <code>columnDirection</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
 	 */
 	public RunDirection getColumnDirection()
 	{
@@ -625,7 +625,7 @@ public boolean isHighlightDetailOddRows()
 	/**
 	 * <p>Getter for the field <code>detailOddRowStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public DRSimpleStyle getDetailOddRowStyle()
 	{
@@ -645,7 +645,7 @@ public boolean isHighlightDetailEvenRows()
 	/**
 	 * <p>Getter for the field <code>detailEvenRowStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public DRSimpleStyle getDetailEvenRowStyle()
 	{
@@ -655,7 +655,7 @@ public DRSimpleStyle getDetailEvenRowStyle()
 	/**
 	 * <p>Getter for the field <code>textStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getTextStyle()
 	{
@@ -665,7 +665,7 @@ public DRStyle getTextStyle()
 	/**
 	 * <p>Getter for the field <code>columnTitleStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getColumnTitleStyle()
 	{
@@ -675,7 +675,7 @@ public DRStyle getColumnTitleStyle()
 	/**
 	 * <p>Getter for the field <code>columnStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getColumnStyle()
 	{
@@ -685,7 +685,7 @@ public DRStyle getColumnStyle()
 	/**
 	 * <p>Getter for the field <code>groupTitleStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getGroupTitleStyle()
 	{
@@ -695,7 +695,7 @@ public DRStyle getGroupTitleStyle()
 	/**
 	 * <p>Getter for the field <code>groupStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getGroupStyle()
 	{
@@ -705,7 +705,7 @@ public DRStyle getGroupStyle()
 	/**
 	 * <p>Getter for the field <code>subtotalStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getSubtotalStyle()
 	{
@@ -715,7 +715,7 @@ public DRStyle getSubtotalStyle()
 	/**
 	 * <p>Getter for the field <code>imageStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getImageStyle()
 	{
@@ -745,7 +745,7 @@ public int getPageHeight()
 	/**
 	 * <p>Getter for the field <code>pageOrientation</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
 	 */
 	public PageOrientation getPageOrientation()
 	{
@@ -755,7 +755,7 @@ public PageOrientation getPageOrientation()
 	/**
 	 * <p>Getter for the field <code>pageMargin</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.DRMargin} object.
 	 */
 	public DRMargin getPageMargin()
 	{
@@ -765,7 +765,7 @@ public DRMargin getPageMargin()
 	/**
 	 * <p>Getter for the field <code>subreportPageMargin</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.DRMargin} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.DRMargin} object.
 	 */
 	public DRMargin getSubreportPageMargin()
 	{
@@ -855,7 +855,7 @@ public boolean isPrintWhenDetailOverflows()
 	/**
 	 * <p>Getter for the field <code>groupHeaderLayout</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.GroupHeaderLayout} object.
 	 */
 	public GroupHeaderLayout getGroupHeaderLayout()
 	{
@@ -945,7 +945,7 @@ public Integer getGroupMinHeightToStartNewPage()
 	/**
 	 * <p>Getter for the field <code>groupFooterPosition</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
 	 */
 	public GroupFooterPosition getGroupFooterPosition()
 	{
@@ -985,7 +985,7 @@ public boolean isGroupByDataType()
 	/**
 	 * <p>Getter for the field <code>subtotalLabelPosition</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.Position} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.Position} object.
 	 */
 	public Position getSubtotalLabelPosition()
 	{
@@ -1005,7 +1005,7 @@ public boolean isTableOfContents()
 	/**
 	 * <p>Getter for the field <code>tableOfContentsCustomizer</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
 	 */
 	public DRITableOfContentsCustomizer getTableOfContentsCustomizer()
 	{
@@ -1025,7 +1025,7 @@ public boolean isAddGroupToTableOfContents()
 	/**
 	 * <p>Getter for the field <code>tableOfContentsPosition</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.TableOfContentsPosition} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.TableOfContentsPosition} object.
 	 */
 	public TableOfContentsPosition getTableOfContentsPosition()
 	{
@@ -1067,7 +1067,7 @@ public boolean isTextFieldStretchWithOverflow()
 	/**
 	 * <p>getTextFieldTextAdjust.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
 	 */
 	public TextAdjust getTextFieldTextAdjust()
 	{
@@ -1297,7 +1297,7 @@ public int getListgap()
 	/**
 	 * <p>Getter for the field <code>horizontalCellComponentAlignment</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
 	 */
 	public HorizontalCellComponentAlignment getHorizontalCellComponentAlignment()
 	{
@@ -1307,7 +1307,7 @@ public HorizontalCellComponentAlignment getHorizontalCellComponentAlignment()
 	/**
 	 * <p>Getter for the field <code>verticalCellComponentAlignment</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
 	 */
 	public VerticalCellComponentAlignment getVerticalCellComponentAlignment()
 	{
@@ -1377,7 +1377,7 @@ public int getCrosstabHeight()
 	/**
 	 * <p>Getter for the field <code>crosstabColumnGroupTotalPosition</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
 	 */
 	public CrosstabTotalPosition getCrosstabColumnGroupTotalPosition()
 	{
@@ -1387,7 +1387,7 @@ public CrosstabTotalPosition getCrosstabColumnGroupTotalPosition()
 	/**
 	 * <p>Getter for the field <code>crosstabRowGroupTotalPosition</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
 	 */
 	public CrosstabTotalPosition getCrosstabRowGroupTotalPosition()
 	{
@@ -1447,7 +1447,7 @@ public int getCrosstabCellMaxWidth()
 	/**
 	 * <p>Getter for the field <code>crosstabOddRowStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public DRSimpleStyle getCrosstabOddRowStyle()
 	{
@@ -1457,7 +1457,7 @@ public DRSimpleStyle getCrosstabOddRowStyle()
 	/**
 	 * <p>Getter for the field <code>crosstabEvenRowStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRSimpleStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRSimpleStyle} object.
 	 */
 	public DRSimpleStyle getCrosstabEvenRowStyle()
 	{
@@ -1487,7 +1487,7 @@ public boolean isCrosstabHighlightEvenRows()
 	/**
 	 * <p>Getter for the field <code>crosstabGroupStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getCrosstabGroupStyle()
 	{
@@ -1497,7 +1497,7 @@ public DRStyle getCrosstabGroupStyle()
 	/**
 	 * <p>Getter for the field <code>crosstabGroupTotalStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getCrosstabGroupTotalStyle()
 	{
@@ -1507,7 +1507,7 @@ public DRStyle getCrosstabGroupTotalStyle()
 	/**
 	 * <p>Getter for the field <code>crosstabGrandTotalStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getCrosstabGrandTotalStyle()
 	{
@@ -1517,7 +1517,7 @@ public DRStyle getCrosstabGrandTotalStyle()
 	/**
 	 * <p>Getter for the field <code>crosstabCellStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getCrosstabCellStyle()
 	{
@@ -1527,7 +1527,7 @@ public DRStyle getCrosstabCellStyle()
 	/**
 	 * <p>Getter for the field <code>crosstabMeasureTitleStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRStyle} object.
 	 */
 	public DRStyle getCrosstabMeasureTitleStyle()
 	{
@@ -1537,7 +1537,7 @@ public DRStyle getCrosstabMeasureTitleStyle()
 	/**
 	 * <p>Getter for the field <code>crosstabPercentageType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
 	 */
 	public CrosstabPercentageType getCrosstabPercentageType()
 	{
@@ -1547,7 +1547,7 @@ public CrosstabPercentageType getCrosstabPercentageType()
 	/**
 	 * <p>Getter for the field <code>booleanComponentType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.BooleanComponentType} object.
 	 */
 	public BooleanComponentType getBooleanComponentType()
 	{
@@ -1587,7 +1587,7 @@ public int getBooleanImageHeight()
 	/**
 	 * <p>Getter for the field <code>booleanColumnStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIStyle} object.
 	 */
 	public DRIStyle getBooleanColumnStyle()
 	{
@@ -1597,7 +1597,7 @@ public DRIStyle getBooleanColumnStyle()
 	/**
 	 * <p>Getter for the field <code>booleanHorizontalImageAlignment</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
 	 */
 	public HorizontalImageAlignment getBooleanHorizontalImageAlignment()
 	{
@@ -1607,7 +1607,7 @@ public HorizontalImageAlignment getBooleanHorizontalImageAlignment()
 	/**
 	 * <p>Getter for the field <code>defaultSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getDefaultSplitType()
 	{
@@ -1617,7 +1617,7 @@ public SplitType getDefaultSplitType()
 	/**
 	 * <p>Getter for the field <code>titleSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getTitleSplitType()
 	{
@@ -1627,7 +1627,7 @@ public SplitType getTitleSplitType()
 	/**
 	 * <p>Getter for the field <code>pageHeaderSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getPageHeaderSplitType()
 	{
@@ -1637,7 +1637,7 @@ public SplitType getPageHeaderSplitType()
 	/**
 	 * <p>Getter for the field <code>pageFooterSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getPageFooterSplitType()
 	{
@@ -1647,7 +1647,7 @@ public SplitType getPageFooterSplitType()
 	/**
 	 * <p>Getter for the field <code>columnHeaderSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getColumnHeaderSplitType()
 	{
@@ -1657,7 +1657,7 @@ public SplitType getColumnHeaderSplitType()
 	/**
 	 * <p>Getter for the field <code>columnFooterSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getColumnFooterSplitType()
 	{
@@ -1667,7 +1667,7 @@ public SplitType getColumnFooterSplitType()
 	/**
 	 * <p>Getter for the field <code>groupHeaderSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getGroupHeaderSplitType()
 	{
@@ -1677,7 +1677,7 @@ public SplitType getGroupHeaderSplitType()
 	/**
 	 * <p>Getter for the field <code>groupFooterSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getGroupFooterSplitType()
 	{
@@ -1687,7 +1687,7 @@ public SplitType getGroupFooterSplitType()
 	/**
 	 * <p>Getter for the field <code>detailHeaderSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getDetailHeaderSplitType()
 	{
@@ -1697,7 +1697,7 @@ public SplitType getDetailHeaderSplitType()
 	/**
 	 * <p>Getter for the field <code>detailSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getDetailSplitType()
 	{
@@ -1707,7 +1707,7 @@ public SplitType getDetailSplitType()
 	/**
 	 * <p>Getter for the field <code>detailFooterSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getDetailFooterSplitType()
 	{
@@ -1717,7 +1717,7 @@ public SplitType getDetailFooterSplitType()
 	/**
 	 * <p>Getter for the field <code>lastPageFooterSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getLastPageFooterSplitType()
 	{
@@ -1727,7 +1727,7 @@ public SplitType getLastPageFooterSplitType()
 	/**
 	 * <p>Getter for the field <code>summarySplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getSummarySplitType()
 	{
@@ -1737,7 +1737,7 @@ public SplitType getSummarySplitType()
 	/**
 	 * <p>Getter for the field <code>noDataSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getNoDataSplitType()
 	{
@@ -1747,7 +1747,7 @@ public SplitType getNoDataSplitType()
 	/**
 	 * <p>Getter for the field <code>backgroundSplitType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
 	 */
 	public SplitType getBackgroundSplitType()
 	{
@@ -1757,7 +1757,7 @@ public SplitType getBackgroundSplitType()
 	/**
 	 * <p>Getter for the field <code>bandStyle</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.style.DRIStyle} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIStyle} object.
 	 */
 	public DRIStyle getBandStyle()
 	{
@@ -1767,7 +1767,7 @@ public DRIStyle getBandStyle()
 	/**
 	 * <p>Getter for the field <code>bandBackgroundComponent</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+	 * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
 	 */
 	public DRIComponent getBandBackgroundComponent()
 	{
@@ -1777,7 +1777,7 @@ public DRIComponent getBandBackgroundComponent()
 	/**
 	 * <p>Getter for the field <code>font</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.style.DRFont} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.style.DRFont} object.
 	 */
 	public DRFont getFont()
 	{
@@ -1787,7 +1787,7 @@ public DRFont getFont()
 	/**
 	 * <p>Getter for the field <code>bigDecimalType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, BigDecimal> getBigDecimalType()
 	{
@@ -1797,7 +1797,7 @@ public DRDataType<Number, BigDecimal> getBigDecimalType()
 	/**
 	 * <p>Getter for the field <code>bigIntegerType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, BigInteger> getBigIntegerType()
 	{
@@ -1807,7 +1807,7 @@ public DRDataType<Number, BigInteger> getBigIntegerType()
 	/**
 	 * <p>Getter for the field <code>byteType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, Byte> getByteType()
 	{
@@ -1817,7 +1817,7 @@ public DRDataType<Number, Byte> getByteType()
 	/**
 	 * <p>Getter for the field <code>doubleType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, Double> getDoubleType()
 	{
@@ -1827,7 +1827,7 @@ public DRDataType<Number, Double> getDoubleType()
 	/**
 	 * <p>Getter for the field <code>floatType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, Float> getFloatType()
 	{
@@ -1837,7 +1837,7 @@ public DRDataType<Number, Float> getFloatType()
 	/**
 	 * <p>Getter for the field <code>integerType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, Integer> getIntegerType()
 	{
@@ -1847,7 +1847,7 @@ public DRDataType<Number, Integer> getIntegerType()
 	/**
 	 * <p>Getter for the field <code>longType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, Long> getLongType()
 	{
@@ -1857,7 +1857,7 @@ public DRDataType<Number, Long> getLongType()
 	/**
 	 * <p>Getter for the field <code>shortType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, Short> getShortType()
 	{
@@ -1867,7 +1867,7 @@ public DRDataType<Number, Short> getShortType()
 	/**
 	 * <p>Getter for the field <code>dateType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateType()
 	{
@@ -1877,7 +1877,7 @@ public DRDataType<Date, Date> getDateType()
 	/**
 	 * <p>Getter for the field <code>dateYearToMonthType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateYearToMonthType()
 	{
@@ -1887,7 +1887,7 @@ public DRDataType<Date, Date> getDateYearToMonthType()
 	/**
 	 * <p>Getter for the field <code>dateYearToHourType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateYearToHourType()
 	{
@@ -1897,7 +1897,7 @@ public DRDataType<Date, Date> getDateYearToHourType()
 	/**
 	 * <p>Getter for the field <code>dateYearToMinuteType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateYearToMinuteType()
 	{
@@ -1907,7 +1907,7 @@ public DRDataType<Date, Date> getDateYearToMinuteType()
 	/**
 	 * <p>Getter for the field <code>dateYearToSecondType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateYearToSecondType()
 	{
@@ -1917,7 +1917,7 @@ public DRDataType<Date, Date> getDateYearToSecondType()
 	/**
 	 * <p>Getter for the field <code>dateYearToFractionType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateYearToFractionType()
 	{
@@ -1927,7 +1927,7 @@ public DRDataType<Date, Date> getDateYearToFractionType()
 	/**
 	 * <p>Getter for the field <code>dateYearType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateYearType()
 	{
@@ -1937,7 +1937,7 @@ public DRDataType<Date, Date> getDateYearType()
 	/**
 	 * <p>Getter for the field <code>dateMonthType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateMonthType()
 	{
@@ -1947,7 +1947,7 @@ public DRDataType<Date, Date> getDateMonthType()
 	/**
 	 * <p>Getter for the field <code>dateDayType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getDateDayType()
 	{
@@ -1957,7 +1957,7 @@ public DRDataType<Date, Date> getDateDayType()
 	/**
 	 * <p>Getter for the field <code>timeHourToMinuteType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getTimeHourToMinuteType()
 	{
@@ -1967,7 +1967,7 @@ public DRDataType<Date, Date> getTimeHourToMinuteType()
 	/**
 	 * <p>Getter for the field <code>timeHourToSecondType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getTimeHourToSecondType()
 	{
@@ -1977,7 +1977,7 @@ public DRDataType<Date, Date> getTimeHourToSecondType()
 	/**
 	 * <p>Getter for the field <code>timeHourToFractionType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Date, Date> getTimeHourToFractionType()
 	{
@@ -1987,7 +1987,7 @@ public DRDataType<Date, Date> getTimeHourToFractionType()
 	/**
 	 * <p>Getter for the field <code>percentageType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Number, Double> getPercentageType()
 	{
@@ -1997,7 +1997,7 @@ public DRDataType<Number, Double> getPercentageType()
 	/**
 	 * <p>Getter for the field <code>booleanType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Boolean, Boolean> getBooleanType()
 	{
@@ -2007,7 +2007,7 @@ public DRDataType<Boolean, Boolean> getBooleanType()
 	/**
 	 * <p>Getter for the field <code>characterType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<Character, Character> getCharacterType()
 	{
@@ -2017,7 +2017,7 @@ public DRDataType<Character, Character> getCharacterType()
 	/**
 	 * <p>Getter for the field <code>stringType</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.base.datatype.DRDataType} object.
+	 * @return a {@link software.xdev.dynamicreports.report.base.datatype.DRDataType} object.
 	 */
 	public DRDataType<String, String> getStringType()
 	{
@@ -2027,7 +2027,7 @@ public DRDataType<String, String> getStringType()
 	/**
 	 * <p>Getter for the field <code>pageXofYHorizontalTextAlignment</code>.</p>
 	 *
-	 * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+	 * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
 	 */
 	public HorizontalTextAlignment getPageXofYHorizontalTextAlignment()
 	{
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/DefaultBinder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/DefaultBinder.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/DefaultBinder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/DefaultBinder.java
index ea9bd16..92a459c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/DefaultBinder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/DefaultBinder.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.defaults;
+package software.xdev.dynamicreports.report.defaults;
 
-import net.sf.dynamicreports.report.base.datatype.DRDataType;
-import net.sf.dynamicreports.report.base.style.DRFont;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.xml.XmlDataType;
-import net.sf.dynamicreports.report.defaults.xml.XmlDynamicReports;
-import net.sf.dynamicreports.report.defaults.xml.XmlFont;
-import net.sf.dynamicreports.report.exception.DRReportException;
+import software.xdev.dynamicreports.report.base.datatype.DRDataType;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.xml.XmlDataType;
+import software.xdev.dynamicreports.report.defaults.xml.XmlDynamicReports;
+import software.xdev.dynamicreports.report.defaults.xml.XmlFont;
+import software.xdev.dynamicreports.report.exception.DRReportException;
 
 /**
  * <p>DefaultBinder class.</p>
@@ -36,8 +36,8 @@ public class DefaultBinder {
     /**
      * <p>bind.</p>
      *
-     * @param xmlDynamicReports a {@link net.sf.dynamicreports.report.defaults.xml.XmlDynamicReports} object.
-     * @return a {@link net.sf.dynamicreports.report.defaults.Default} object.
+     * @param xmlDynamicReports a {@link software.xdev.dynamicreports.report.defaults.xml.XmlDynamicReports} object.
+     * @return a {@link software.xdev.dynamicreports.report.defaults.Default} object.
      */
     public static Default bind(XmlDynamicReports xmlDynamicReports) {
         Default defaults = new Default();
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Defaults.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Defaults.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java
index 9cbcc72..0f07c29 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/defaults/Defaults.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.defaults;
+package software.xdev.dynamicreports.report.defaults;
 
 import java.io.InputStream;
 
@@ -28,7 +28,7 @@
 import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Unmarshaller;
-import net.sf.dynamicreports.report.defaults.xml.XmlDynamicReports;
+import software.xdev.dynamicreports.report.defaults.xml.XmlDynamicReports;
 
 /**
  * <p>Defaults class.</p>
@@ -79,7 +79,7 @@ private static XmlDynamicReports load() {
     /**
      * <p>Getter for the field <code>defaults</code>.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.defaults.Default} object.
+     * @return a {@link software.xdev.dynamicreports.report.defaults.Default} object.
      */
     public static Default getDefaults() {
         return defaults;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIBand.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIBand.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIBand.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIBand.java
index 499c4d2..fa95f8c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIBand.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIBand.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.definition.component.DRIList;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.definition.component.DRIList;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.io.Serializable;
 
@@ -34,21 +34,21 @@ public interface DRIBand extends Serializable {
     /**
      * <p>getSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getSplitType();
 
     /**
      * <p>getList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIList} object.
      */
     public DRIList getList();
 
     /**
      * <p>getPrintWhenExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Boolean> getPrintWhenExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICrosstabValue.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRICrosstabValue.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICrosstabValue.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRICrosstabValue.java
index 0aab90b..30dc7e7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICrosstabValue.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRICrosstabValue.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 /**
  * <p>DRICrosstabValue interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICustomValues.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRICustomValues.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICustomValues.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRICustomValues.java
index db40c77..dd0beed 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRICustomValues.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRICustomValues.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIDataset.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIDataset.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIDataset.java
index 501999c..84539bc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIDataset.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIDataset.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.io.Serializable;
 import java.sql.Connection;
@@ -55,28 +55,28 @@ public interface DRIDataset extends Serializable {
     /**
      * <p>getQuery.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIQuery} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIQuery} object.
      */
     public DRIQuery getQuery();
 
     /**
      * <p>getConnectionExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Connection> getConnectionExpression();
 
     /**
      * <p>getDataSourceExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getDataSourceExpression();
 
     /**
      * <p>getFilterExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Boolean> getFilterExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIField.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIField.java
index 826057f..069f052 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIField.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIField interface.</p>
@@ -31,7 +31,7 @@ public interface DRIField<T> extends DRIExpression<T>, DRIValue<T> {
     /**
      * <p>getDataType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     public DRIDataType<? super T, T> getDataType();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIGroup.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIGroup.java
index 06c24e4..7537916 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIGroup.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 import java.io.Serializable;
 
@@ -43,21 +43,21 @@ public interface DRIGroup extends Serializable {
     /**
      * <p>getValueField.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
      */
     public DRITextField<?> getValueField();
 
     /**
      * <p>getTitleExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getTitleExpression();
 
     /**
      * <p>getTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getTitleStyle();
 
@@ -71,7 +71,7 @@ public interface DRIGroup extends Serializable {
     /**
      * <p>getHeaderLayout.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.GroupHeaderLayout} object.
      */
     public GroupHeaderLayout getHeaderLayout();
 
@@ -106,7 +106,7 @@ public interface DRIGroup extends Serializable {
     /**
      * <p>getPrintSubtotalsWhenExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Boolean> getPrintSubtotalsWhenExpression();
 
@@ -155,7 +155,7 @@ public interface DRIGroup extends Serializable {
     /**
      * <p>getFooterPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
      */
     public GroupFooterPosition getFooterPosition();
 
@@ -176,14 +176,14 @@ public interface DRIGroup extends Serializable {
     /**
      * <p>getHeaderBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getHeaderBand();
 
     /**
      * <p>getFooterBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getFooterBand();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIHyperLink.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIHyperLink.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIHyperLink.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIHyperLink.java
index feafda3..d9495d0 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIHyperLink.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIHyperLink.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.io.Serializable;
 
@@ -32,28 +32,28 @@ public interface DRIHyperLink extends Serializable {
     /**
      * <p>getAnchorExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<String> getAnchorExpression();
 
     /**
      * <p>getPageExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Integer> getPageExpression();
 
     /**
      * <p>getReferenceExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<String> getReferenceExpression();
 
     /**
      * <p>getTooltipExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<String> getTooltipExpression();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIMargin.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIMargin.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIMargin.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIMargin.java
index 903de30..a57faa5 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIMargin.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIMargin.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIPage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIPage.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIPage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIPage.java
index 2945774..257d5ee 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIPage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIPage.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
 
 import java.io.Serializable;
 
@@ -46,14 +46,14 @@ public interface DRIPage extends Serializable {
     /**
      * <p>getOrientation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
      */
     public PageOrientation getOrientation();
 
     /**
      * <p>getMargin.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIMargin} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIMargin} object.
      */
     public DRIMargin getMargin();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIParameter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIParameter.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIParameter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIParameter.java
index 0e5cf4b..85c8a67 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIParameter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIParameter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIQuery.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIQuery.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIQuery.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIQuery.java
index 115966b..2eeccd6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIQuery.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIQuery.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIReport.java
similarity index 68%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIReport.java
index cbc70f6..c6a8c32 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIReport.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 import java.io.Serializable;
 import java.util.List;
@@ -24,18 +24,18 @@
 import java.util.Properties;
 import java.util.ResourceBundle;
 
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.column.DRIColumn;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGrid;
-import net.sf.dynamicreports.report.definition.style.DRIConditionalStyle;
-import net.sf.dynamicreports.report.definition.style.DRIFont;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.column.DRIColumn;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGrid;
+import software.xdev.dynamicreports.report.definition.style.DRIConditionalStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIFont;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRISimpleStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
 
 /**
  * <p>DRIReport interface.</p>
@@ -48,7 +48,7 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getTemplate.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIReportTemplate} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIReportTemplate} object.
      */
     public DRIReportTemplate getTemplate();
 
@@ -62,7 +62,7 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getTemplateDesign.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRITemplateDesign} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRITemplateDesign} object.
      */
     public DRITemplateDesign<?> getTemplateDesign();
 
@@ -181,14 +181,14 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getQuery.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIQuery} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIQuery} object.
      */
     public DRIQuery getQuery();
 
     /**
      * <p>getPage.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIPage} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIPage} object.
      */
     public DRIPage getPage();
 
@@ -202,14 +202,14 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getWhenNoDataType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
      */
     public WhenNoDataType getWhenNoDataType();
 
     /**
      * <p>getWhenResourceMissingType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
      */
     public WhenResourceMissingType getWhenResourceMissingType();
 
@@ -244,14 +244,14 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getPrintOrder.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
      */
     public Orientation getPrintOrder();
 
     /**
      * <p>getColumnDirection.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public RunDirection getColumnDirection();
 
@@ -272,56 +272,56 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getDefaultFont.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIFont} object.
      */
     public DRIFont getDefaultFont();
 
     /**
      * <p>getTextStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getTextStyle();
 
     /**
      * <p>getColumnTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getColumnTitleStyle();
 
     /**
      * <p>getColumnStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getColumnStyle();
 
     /**
      * <p>getGroupTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGroupTitleStyle();
 
     /**
      * <p>getGroupStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGroupStyle();
 
     /**
      * <p>getSubtotalStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getSubtotalStyle();
 
     /**
      * <p>getImageStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getImageStyle();
 
@@ -335,7 +335,7 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getDetailOddRowStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
      */
     public DRISimpleStyle getDetailOddRowStyle();
 
@@ -349,7 +349,7 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getDetailEvenRowStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
      */
     public DRISimpleStyle getDetailEvenRowStyle();
 
@@ -363,7 +363,7 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getColumnGrid.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGrid} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGrid} object.
      */
     public DRIColumnGrid getColumnGrid();
 
@@ -377,98 +377,98 @@ public interface DRIReport extends Serializable {
     /**
      * <p>getTableOfContentsCustomizer.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
      */
     public DRITableOfContentsCustomizer getTableOfContentsCustomizer();
 
     /**
      * <p>getFilterExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Boolean> getFilterExpression();
 
     /**
      * <p>getTitleBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getTitleBand();
 
     /**
      * <p>getPageHeaderBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getPageHeaderBand();
 
     /**
      * <p>getPageFooterBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getPageFooterBand();
 
     /**
      * <p>getColumnHeaderBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getColumnHeaderBand();
 
     /**
      * <p>getColumnFooterBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getColumnFooterBand();
 
     /**
      * <p>getDetailBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getDetailBand();
 
     /**
      * <p>getDetailHeaderBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getDetailHeaderBand();
 
     /**
      * <p>getDetailFooterBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getDetailFooterBand();
 
     /**
      * <p>getLastPageFooterBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getLastPageFooterBand();
 
     /**
      * <p>getSummaryBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getSummaryBand();
 
     /**
      * <p>getNoDataBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getNoDataBand();
 
     /**
      * <p>getBackgroundBand.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIBand} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIBand} object.
      */
     public DRIBand getBackgroundBand();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReportTemplate.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIReportTemplate.java
similarity index 66%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReportTemplate.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIReportTemplate.java
index 3bf77c3..e867229 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIReportTemplate.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIReportTemplate.java
@@ -15,27 +15,27 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Locale;
 
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.style.DRIFont;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
-import net.sf.dynamicreports.report.definition.style.DRIStyle;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.style.DRIFont;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRISimpleStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIStyle;
 
 /**
  * <p>DRIReportTemplate interface.</p>
@@ -83,14 +83,14 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getWhenNoDataType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
      */
     public WhenNoDataType getWhenNoDataType();
 
     /**
      * <p>getWhenResourceMissingType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
      */
     public WhenResourceMissingType getWhenResourceMissingType();
 
@@ -125,14 +125,14 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getPrintOrder.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Orientation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Orientation} object.
      */
     public Orientation getPrintOrder();
 
     /**
      * <p>getColumnDirection.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public RunDirection getColumnDirection();
 
@@ -160,7 +160,7 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getDetailOddRowStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
      */
     public DRISimpleStyle getDetailOddRowStyle();
 
@@ -174,63 +174,63 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getDetailEvenRowStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
      */
     public DRISimpleStyle getDetailEvenRowStyle();
 
     /**
      * <p>getDefaultFont.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIFont} object.
      */
     public DRIFont getDefaultFont();
 
     /**
      * <p>getTextStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getTextStyle();
 
     /**
      * <p>getColumnTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getColumnTitleStyle();
 
     /**
      * <p>getColumnStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getColumnStyle();
 
     /**
      * <p>getGroupTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGroupTitleStyle();
 
     /**
      * <p>getGroupStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGroupStyle();
 
     /**
      * <p>getSubtotalStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getSubtotalStyle();
 
     /**
      * <p>getImageStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getImageStyle();
 
@@ -251,14 +251,14 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getPageOrientation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
      */
     public PageOrientation getPageOrientation();
 
     /**
      * <p>getPageMargin.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIMargin} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIMargin} object.
      */
     public DRIMargin getPageMargin();
 
@@ -300,7 +300,7 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getGroupHeaderLayout.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.GroupHeaderLayout} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.GroupHeaderLayout} object.
      */
     public GroupHeaderLayout getGroupHeaderLayout();
 
@@ -356,7 +356,7 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getGroupFooterPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.GroupFooterPosition} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.GroupFooterPosition} object.
      */
     public GroupFooterPosition getGroupFooterPosition();
 
@@ -377,7 +377,7 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getSubtotalLabelPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Position} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Position} object.
      */
     public Position getSubtotalLabelPosition();
 
@@ -391,7 +391,7 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getTableOfContentsCustomizer.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsCustomizer} object.
      */
     public DRITableOfContentsCustomizer getTableOfContentsCustomizer();
 
@@ -475,7 +475,7 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getCrosstabOddRowStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
      */
     public DRISimpleStyle getCrosstabOddRowStyle();
 
@@ -489,49 +489,49 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getCrosstabEvenRowStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
      */
     public DRISimpleStyle getCrosstabEvenRowStyle();
 
     /**
      * <p>getCrosstabGroupStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getCrosstabGroupStyle();
 
     /**
      * <p>getCrosstabGroupTotalStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getCrosstabGroupTotalStyle();
 
     /**
      * <p>getCrosstabGrandTotalStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getCrosstabGrandTotalStyle();
 
     /**
      * <p>getCrosstabCellStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getCrosstabCellStyle();
 
     /**
      * <p>getCrosstabMeasureTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getCrosstabMeasureTitleStyle();
 
     /**
      * <p>getBooleanComponentType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.BooleanComponentType} object.
      */
     public BooleanComponentType getBooleanComponentType();
 
@@ -559,308 +559,308 @@ public interface DRIReportTemplate extends Serializable {
     /**
      * <p>getBooleanColumnStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getBooleanColumnStyle();
 
     /**
      * <p>getDefaultSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getDefaultSplitType();
 
     /**
      * <p>getTitleSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getTitleSplitType();
 
     /**
      * <p>getPageHeaderSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getPageHeaderSplitType();
 
     /**
      * <p>getPageFooterSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getPageFooterSplitType();
 
     /**
      * <p>getColumnHeaderSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getColumnHeaderSplitType();
 
     /**
      * <p>getColumnFooterSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getColumnFooterSplitType();
 
     /**
      * <p>getGroupHeaderSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getGroupHeaderSplitType();
 
     /**
      * <p>getGroupFooterSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getGroupFooterSplitType();
 
     /**
      * <p>getDetailHeaderSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getDetailHeaderSplitType();
 
     /**
      * <p>getDetailSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getDetailSplitType();
 
     /**
      * <p>getDetailFooterSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getDetailFooterSplitType();
 
     /**
      * <p>getLastPageFooterSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getLastPageFooterSplitType();
 
     /**
      * <p>getSummarySplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getSummarySplitType();
 
     /**
      * <p>getNoDataSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getNoDataSplitType();
 
     /**
      * <p>getBackgroundSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getBackgroundSplitType();
 
     /**
      * <p>getTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getTitleStyle();
 
     /**
      * <p>getPageHeaderStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getPageHeaderStyle();
 
     /**
      * <p>getPageFooterStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getPageFooterStyle();
 
     /**
      * <p>getColumnHeaderStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getColumnHeaderStyle();
 
     /**
      * <p>getColumnFooterStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getColumnFooterStyle();
 
     /**
      * <p>getGroupHeaderStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGroupHeaderStyle();
 
     /**
      * <p>getGroupFooterStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGroupFooterStyle();
 
     /**
      * <p>getDetailHeaderStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getDetailHeaderStyle();
 
     /**
      * <p>getDetailStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getDetailStyle();
 
     /**
      * <p>getDetailFooterStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getDetailFooterStyle();
 
     /**
      * <p>getLastPageFooterStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getLastPageFooterStyle();
 
     /**
      * <p>getSummaryStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getSummaryStyle();
 
     /**
      * <p>getNoDataStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getNoDataStyle();
 
     /**
      * <p>getBackgroundStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getBackgroundStyle();
 
     /**
      * <p>getTitleBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getTitleBackgroundComponent();
 
     /**
      * <p>getPageHeaderBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getPageHeaderBackgroundComponent();
 
     /**
      * <p>getPageFooterBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getPageFooterBackgroundComponent();
 
     /**
      * <p>getColumnHeaderBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getColumnHeaderBackgroundComponent();
 
     /**
      * <p>getColumnFooterBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getColumnFooterBackgroundComponent();
 
     /**
      * <p>getGroupHeaderBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getGroupHeaderBackgroundComponent();
 
     /**
      * <p>getGroupFooterBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getGroupFooterBackgroundComponent();
 
     /**
      * <p>getDetailHeaderBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getDetailHeaderBackgroundComponent();
 
     /**
      * <p>getDetailBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getDetailBackgroundComponent();
 
     /**
      * <p>getDetailFooterBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getDetailFooterBackgroundComponent();
 
     /**
      * <p>getLastPageFooterBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getLastPageFooterBackgroundComponent();
 
     /**
      * <p>getSummaryBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getSummaryBackgroundComponent();
 
     /**
      * <p>getNoDataBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getNoDataBackgroundComponent();
 
     /**
      * <p>getBackgroundBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getBackgroundBackgroundComponent();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIScriptlet.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIScriptlet.java
similarity index 68%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIScriptlet.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIScriptlet.java
index 004987b..8685549 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIScriptlet.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIScriptlet.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 /**
  * <p>DRIScriptlet interface.</p>
@@ -35,42 +35,42 @@ public interface DRIScriptlet {
     /**
      * Called before the report is initialized.
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void beforeReportInit(ReportParameters reportParameters);
 
     /**
      * Called after the report is initialized.
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void afterReportInit(ReportParameters reportParameters);
 
     /**
      * Called before each page is initialized.
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void beforePageInit(ReportParameters reportParameters);
 
     /**
      * Called after each page is initialized.
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void afterPageInit(ReportParameters reportParameters);
 
     /**
      * Called before each column is initialized.
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void beforeColumnInit(ReportParameters reportParameters);
 
     /**
      * Called after each column is initialized.
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void afterColumnInit(ReportParameters reportParameters);
 
@@ -78,7 +78,7 @@ public interface DRIScriptlet {
      * Called before a group is initialized.
      *
      * @param groupName        the group name
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void beforeGroupInit(String groupName, ReportParameters reportParameters);
 
@@ -86,21 +86,21 @@ public interface DRIScriptlet {
      * Called after a group is initialized.
      *
      * @param groupName        the group name
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void afterGroupInit(String groupName, ReportParameters reportParameters);
 
     /**
      * Called before evaluating each detail.
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void beforeDetailEval(ReportParameters reportParameters);
 
     /**
      * Called after evaluating each detail.
      *
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public void afterDetailEval(ReportParameters reportParameters);
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISort.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRISort.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISort.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRISort.java
index dd5d98e..dda410a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISort.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRISort.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.io.Serializable;
 
@@ -33,14 +33,14 @@ public interface DRISort extends Serializable {
     /**
      * <p>getExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getExpression();
 
     /**
      * <p>getOrderType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      */
     public OrderType getOrderType();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISubtotal.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRISubtotal.java
similarity index 58%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISubtotal.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRISubtotal.java
index 05dd3d4..d0f463f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRISubtotal.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRISubtotal.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.constant.SubtotalPosition;
-import net.sf.dynamicreports.report.definition.column.DRIColumn;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.constant.SubtotalPosition;
+import software.xdev.dynamicreports.report.definition.column.DRIColumn;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRISubtotal interface.</p>
@@ -36,35 +36,35 @@ public interface DRISubtotal<T> extends DRIExpression<T>, DRIValue<T> {
     /**
      * <p>getShowInColumn.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.column.DRIColumn} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.column.DRIColumn} object.
      */
     public DRIColumn<?> getShowInColumn();
 
     /**
      * <p>getValueField.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRITextField} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRITextField} object.
      */
     public DRITextField<T> getValueField();
 
     /**
      * <p>getLabelExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getLabelExpression();
 
     /**
      * <p>getLabelStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getLabelStyle();
 
     /**
      * <p>getLabelPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Position} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Position} object.
      */
     public Position getLabelPosition();
 
@@ -78,21 +78,21 @@ public interface DRISubtotal<T> extends DRIExpression<T>, DRIValue<T> {
     /**
      * <p>getLabelWidthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public ComponentDimensionType getLabelWidthType();
 
     /**
      * <p>getPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SubtotalPosition} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SubtotalPosition} object.
      */
     public SubtotalPosition getPosition();
 
     /**
      * <p>getGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     public DRIGroup getGroup();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsCustomizer.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITableOfContentsCustomizer.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsCustomizer.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITableOfContentsCustomizer.java
index b6902f9..f9e842b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsCustomizer.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITableOfContentsCustomizer.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.constant.TableOfContentsPosition;
 
 import java.io.Serializable;
 import java.util.List;
@@ -35,7 +35,7 @@ public interface DRITableOfContentsCustomizer extends Serializable {
     /**
      * <p>setReport.</p>
      *
-     * @param report a {@link net.sf.dynamicreports.report.builder.ReportBuilder} object.
+     * @param report a {@link software.xdev.dynamicreports.report.builder.ReportBuilder} object.
      */
     public void setReport(ReportBuilder<?> report);
 
@@ -68,7 +68,7 @@ public interface DRITableOfContentsCustomizer extends Serializable {
     /**
      * <p>getPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TableOfContentsPosition} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TableOfContentsPosition} object.
      */
     public TableOfContentsPosition getPosition();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsHeading.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITableOfContentsHeading.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsHeading.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITableOfContentsHeading.java
index e2423ec..0d04e1e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITableOfContentsHeading.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITableOfContentsHeading.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.io.Serializable;
 
@@ -32,21 +32,21 @@ public interface DRITableOfContentsHeading extends Serializable {
     /**
      * <p>getParentHeading.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsHeading} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsHeading} object.
      */
     public DRITableOfContentsHeading getParentHeading();
 
     /**
      * <p>getLabelExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<String> getLabelExpression();
 
     /**
      * <p>getCustomValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getCustomValueExpression();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITemplateDesign.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITemplateDesign.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITemplateDesign.java
index 29f574a..1caf347 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRITemplateDesign.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRITemplateDesign.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.io.Serializable;
 import java.util.List;
@@ -72,14 +72,14 @@ public interface DRITemplateDesign<T> extends Serializable {
     /**
      * <p>getWhenNoDataType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenNoDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenNoDataType} object.
      */
     public WhenNoDataType getWhenNoDataType();
 
     /**
      * <p>getWhenResourceMissingType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.WhenResourceMissingType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.WhenResourceMissingType} object.
      */
     public WhenResourceMissingType getWhenResourceMissingType();
 
@@ -128,14 +128,14 @@ public interface DRITemplateDesign<T> extends Serializable {
     /**
      * <p>getPageOrientation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.PageOrientation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.PageOrientation} object.
      */
     public PageOrientation getPageOrientation();
 
     /**
      * <p>getPageMargin.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIMargin} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIMargin} object.
      */
     public DRIMargin getPageMargin();
 
@@ -227,7 +227,7 @@ public interface DRITemplateDesign<T> extends Serializable {
      * <p>getDesign.</p>
      *
      * @return a T object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public T getDesign() throws DRException;
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIValue.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIValue.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIValue.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIValue.java
index bbf16c4..db9fe50 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIValue.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIValue.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 /**
  * <p>DRIValue interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIVariable.java
similarity index 66%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIVariable.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIVariable.java
index 16f321a..95a1a5c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/DRIVariable.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/DRIVariable.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIVariable interface.</p>
@@ -32,35 +32,35 @@ public interface DRIVariable<T> extends DRIExpression<T>, DRIValue<T> {
     /**
      * <p>getCalculation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public Calculation getCalculation();
 
     /**
      * <p>getResetType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
      */
     public Evaluation getResetType();
 
     /**
      * <p>getResetGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     public DRIGroup getResetGroup();
 
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getValueExpression();
 
     /**
      * <p>getInitialValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getInitialValueExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/ReportParameters.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/ReportParameters.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/ReportParameters.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/ReportParameters.java
index b32a42c..9bd7fa2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/ReportParameters.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/ReportParameters.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition;
+package software.xdev.dynamicreports.report.definition;
 
 import java.sql.Connection;
 import java.util.Locale;
@@ -44,7 +44,7 @@ public interface ReportParameters {
     /**
      * <p>getValue.</p>
      *
-     * @param value a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
+     * @param value a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
      * @param <T>   a T object.
      * @return a T object.
      */
@@ -145,7 +145,7 @@ public interface ReportParameters {
      * <p>getScriptlet.</p>
      *
      * @param name a {@link java.lang.String} object.
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIScriptlet} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIScriptlet} object.
      */
     public DRIScriptlet getScriptlet(String name);
 
@@ -169,7 +169,7 @@ public interface ReportParameters {
     /**
      * <p>getMasterParameters.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      */
     public ReportParameters getMasterParameters();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIBooleanColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIBooleanColumn.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIBooleanColumn.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIBooleanColumn.java
index 8cf197c..15918bb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIBooleanColumn.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIBooleanColumn.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.column;
+package software.xdev.dynamicreports.report.definition.column;
 
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.component.DRIBooleanField;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.component.DRIBooleanField;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIBooleanColumn interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIColumn.java
similarity index 69%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIColumn.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIColumn.java
index eba7b3e..20ee2b3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIColumn.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIColumn.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.column;
+package software.xdev.dynamicreports.report.definition.column;
 
 import java.util.List;
 
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.component.DRIComponent;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.component.DRIComponent;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRIColumn interface.</p>
@@ -45,14 +45,14 @@ public interface DRIColumn<T extends DRIComponent> extends DRIColumnGridComponen
     /**
      * <p>getTitleExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<?> getTitleExpression();
 
     /**
      * <p>getTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     DRIReportStyle getTitleStyle();
 
@@ -66,7 +66,7 @@ public interface DRIColumn<T extends DRIComponent> extends DRIColumnGridComponen
     /**
      * <p>getTitleHeightType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     ComponentDimensionType getTitleHeightType();
 
@@ -103,7 +103,7 @@ public interface DRIColumn<T extends DRIComponent> extends DRIColumnGridComponen
     /**
      * <p>getTitleTextAdjust.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     TextAdjust getTitleTextAdjust();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIValueColumn.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIValueColumn.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIValueColumn.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIValueColumn.java
index 980b867..3178ac7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/column/DRIValueColumn.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/column/DRIValueColumn.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.column;
+package software.xdev.dynamicreports.report.definition.column;
 
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.component.DRITextField;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.component.DRITextField;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIValueColumn interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBooleanField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIBooleanField.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBooleanField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIBooleanField.java
index 4adbbe9..4517627 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBooleanField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIBooleanField.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIBooleanField interface.</p>
@@ -33,14 +33,14 @@ public interface DRIBooleanField extends DRIHyperLinkComponent {
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Boolean> getValueExpression();
 
     /**
      * <p>getComponentType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.BooleanComponentType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.BooleanComponentType} object.
      */
     public BooleanComponentType getComponentType();
 
@@ -68,14 +68,14 @@ public interface DRIBooleanField extends DRIHyperLinkComponent {
     /**
      * <p>getHorizontalImageAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public HorizontalImageAlignment getHorizontalImageAlignment();
 
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public HorizontalTextAlignment getHorizontalTextAlignment();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBreak.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIBreak.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBreak.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIBreak.java
index 9f0a452..037081a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIBreak.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIBreak.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.BreakType;
+import software.xdev.dynamicreports.report.constant.BreakType;
 
 /**
  * <p>DRIBreak interface.</p>
@@ -30,7 +30,7 @@ public interface DRIBreak extends DRIComponent {
     /**
      * <p>getType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.BreakType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.BreakType} object.
      */
     public BreakType getType();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIComponent.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIComponent.java
index 4ad35f9..0fa0a40 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIComponent.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.definition.DRITableOfContentsHeading;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.DRITableOfContentsHeading;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 import java.io.Serializable;
 import java.util.List;
@@ -36,14 +36,14 @@ public interface DRIComponent extends Serializable {
     /**
      * <p>getStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getStyle();
 
     /**
      * <p>getPrintWhenExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Boolean> getPrintWhenExpression();
 
@@ -64,7 +64,7 @@ public interface DRIComponent extends Serializable {
     /**
      * <p>getTableOfContentsHeading.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRITableOfContentsHeading} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRITableOfContentsHeading} object.
      */
     public DRITableOfContentsHeading getTableOfContentsHeading();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRICurrentDate.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRICurrentDate.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRICurrentDate.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRICurrentDate.java
index 3ec5339..458cc7d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRICurrentDate.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRICurrentDate.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
 /**
  * <p>DRICurrentDate interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIDimensionComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIDimensionComponent.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIDimensionComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIDimensionComponent.java
index 45dcb89..7d163e4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIDimensionComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIDimensionComponent.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.StretchType;
-import net.sf.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
 
 /**
  * <p>DRIDimensionComponent interface.</p>
@@ -47,28 +47,28 @@ public interface DRIDimensionComponent extends DRIComponent {
     /**
      * <p>getWidthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public ComponentDimensionType getWidthType();
 
     /**
      * <p>getHeightType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public ComponentDimensionType getHeightType();
 
     /**
      * <p>getPositionType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentPositionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentPositionType} object.
      */
     public ComponentPositionType getPositionType();
 
     /**
      * <p>getStretchType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.StretchType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.StretchType} object.
      */
     public StretchType getStretchType();
 
@@ -89,7 +89,7 @@ public interface DRIDimensionComponent extends DRIComponent {
     /**
      * <p>getPrintWhenGroupChanges.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     public DRIGroup getPrintWhenGroupChanges();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIEllipse.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIEllipse.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIEllipse.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIEllipse.java
index ffff5bb..b71bc93 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIEllipse.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIEllipse.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.definition.style.DRIPen;
+import software.xdev.dynamicreports.report.definition.style.DRIPen;
 
 /**
  * <p>DRIEllipse interface.</p>
@@ -30,7 +30,7 @@ public interface DRIEllipse extends DRIDimensionComponent {
     /**
      * <p>getPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
      */
     public DRIPen getPen();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFiller.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIFiller.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFiller.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIFiller.java
index e2f3424..37fed08 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFiller.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIFiller.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
 /**
  * <p>DRIFiller interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFormatField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIFormatField.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFormatField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIFormatField.java
index 9e8826f..5e1c3ff 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIFormatField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIFormatField.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIFormatField interface.</p>
@@ -31,14 +31,14 @@ public interface DRIFormatField extends DRIHyperLinkComponent {
     /**
      * <p>getFormatExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<String> getFormatExpression();
 
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public HorizontalTextAlignment getHorizontalTextAlignment();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIGenericElement.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIGenericElement.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIGenericElement.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIGenericElement.java
index c800b50..052cded 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIGenericElement.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIGenericElement.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.definition.expression.DRIParameterExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIParameterExpression;
 
 import java.util.List;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIHyperLinkComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIHyperLinkComponent.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIHyperLinkComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIHyperLinkComponent.java
index bd66222..2f4c0d1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIHyperLinkComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIHyperLinkComponent.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.definition.DRIHyperLink;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.DRIHyperLink;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIHyperLinkComponent interface.</p>
@@ -31,7 +31,7 @@ public interface DRIHyperLinkComponent extends DRIDimensionComponent {
     /**
      * <p>getAnchorNameExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<String> getAnchorNameExpression();
 
@@ -45,7 +45,7 @@ public interface DRIHyperLinkComponent extends DRIDimensionComponent {
     /**
      * <p>getHyperLink.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIHyperLink} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIHyperLink} object.
      */
     public DRIHyperLink getHyperLink();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIImage.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIImage.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIImage.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIImage.java
index aeac11f..cf4adc1 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIImage.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIImage.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIImage interface.</p>
@@ -32,14 +32,14 @@ public interface DRIImage extends DRIHyperLinkComponent {
     /**
      * <p>getImageExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getImageExpression();
 
     /**
      * <p>getImageScale.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      */
     public ImageScale getImageScale();
 
@@ -60,7 +60,7 @@ public interface DRIImage extends DRIHyperLinkComponent {
     /**
      * <p>getHorizontalImageAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public HorizontalImageAlignment getHorizontalImageAlignment();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRILine.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRILine.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRILine.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRILine.java
index a402f9d..c7b8eba 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRILine.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRILine.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.LineDirection;
-import net.sf.dynamicreports.report.definition.style.DRIPen;
+import software.xdev.dynamicreports.report.constant.LineDirection;
+import software.xdev.dynamicreports.report.definition.style.DRIPen;
 
 /**
  * <p>DRILine interface.</p>
@@ -31,14 +31,14 @@ public interface DRILine extends DRIDimensionComponent {
     /**
      * <p>getDirection.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.LineDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.LineDirection} object.
      */
     public LineDirection getDirection();
 
     /**
      * <p>getPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
      */
     public DRIPen getPen();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIList.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIList.java
index a6f9f29..d953d56 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIList.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.ListType;
 
 import java.util.List;
 
@@ -39,7 +39,7 @@ public interface DRIList extends DRIDimensionComponent {
     /**
      * <p>getType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public ListType getType();
 
@@ -53,7 +53,7 @@ public interface DRIList extends DRIDimensionComponent {
     /**
      * <p>getBackgroundComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getBackgroundComponent();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIListCell.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIListCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIListCell.java
index 8a7fc46..1affe43 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIListCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIListCell.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 
 import java.io.Serializable;
 
@@ -33,21 +33,21 @@ public interface DRIListCell extends Serializable {
     /**
      * <p>getHorizontalAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
      */
     public HorizontalCellComponentAlignment getHorizontalAlignment();
 
     /**
      * <p>getVerticalAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
      */
     public VerticalCellComponentAlignment getVerticalAlignment();
 
     /**
      * <p>getComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getComponent();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMap.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIMap.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMap.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIMap.java
index 8932423..37ac4e3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMap.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIMap.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIMap interface.</p>
@@ -30,21 +30,21 @@ public interface DRIMap extends DRIDimensionComponent {
     /**
      * <p>getLatitudeExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Float> getLatitudeExpression();
 
     /**
      * <p>getLongitudeExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Float> getLongitudeExpression();
 
     /**
      * <p>getZoomExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Integer> getZoomExpression();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMultiPageList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIMultiPageList.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMultiPageList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIMultiPageList.java
index 58460e7..ee8d526 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIMultiPageList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIMultiPageList.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.SplitType;
 
 import java.util.List;
 
@@ -39,7 +39,7 @@ public interface DRIMultiPageList extends DRIDimensionComponent {
     /**
      * <p>getSplitType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.SplitType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.SplitType} object.
      */
     public SplitType getSplitType();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageNumber.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIPageNumber.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageNumber.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIPageNumber.java
index 0576577..da7d2ea 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageNumber.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIPageNumber.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
 /**
  * <p>DRIPageNumber interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageXofY.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIPageXofY.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageXofY.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIPageXofY.java
index f6f54af..a8740cb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIPageXofY.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIPageXofY.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
 
 /**
  * <p>DRIPageXofY interface.</p>
@@ -37,7 +37,7 @@ public interface DRIPageXofY extends DRIFormatField {
     /**
      * <p>getPageXWidthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public ComponentDimensionType getPageXWidthType();
 
@@ -51,7 +51,7 @@ public interface DRIPageXofY extends DRIFormatField {
     /**
      * <p>getPageYWidthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     public ComponentDimensionType getPageYWidthType();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIRectangle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIRectangle.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIRectangle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIRectangle.java
index 914484e..47242aa 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIRectangle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIRectangle.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.definition.style.DRIPen;
+import software.xdev.dynamicreports.report.definition.style.DRIPen;
 
 /**
  * <p>DRIRectangle interface.</p>
@@ -37,7 +37,7 @@ public interface DRIRectangle extends DRIDimensionComponent {
     /**
      * <p>getPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
      */
     public DRIPen getPen();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRISubreport.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRISubreport.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRISubreport.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRISubreport.java
index befa6a8..a388cd2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRISubreport.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRISubreport.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 import java.sql.Connection;
 import java.util.Map;
@@ -33,28 +33,28 @@ public interface DRISubreport extends DRIDimensionComponent {
     /**
      * <p>getReportExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getReportExpression();
 
     /**
      * <p>getParametersExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Map<String, Object>> getParametersExpression();
 
     /**
      * <p>getConnectionExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Connection> getConnectionExpression();
 
     /**
      * <p>getDataSourceExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getDataSourceExpression();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITextField.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRITextField.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITextField.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRITextField.java
index 824157e..8bb365b 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITextField.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRITextField.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.DRIGroup;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.DRIGroup;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
 
 /**
  * <p>DRITextField interface.</p>
@@ -37,7 +37,7 @@ public interface DRITextField<T> extends DRIHyperLinkComponent {
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<T> getValueExpression();
 
@@ -51,28 +51,28 @@ public interface DRITextField<T> extends DRIHyperLinkComponent {
     /**
      * <p>getPatternExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<String> getPatternExpression();
 
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     HorizontalTextAlignment getHorizontalTextAlignment();
 
     /**
      * <p>getValueFormatter.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      */
     DRIValueFormatter<?, ? super T> getValueFormatter();
 
     /**
      * <p>getDataType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     DRIDataType<? super T, T> getDataType();
 
@@ -93,21 +93,21 @@ public interface DRITextField<T> extends DRIHyperLinkComponent {
     /**
      * <p>getEvaluationTime.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Evaluation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Evaluation} object.
      */
     Evaluation getEvaluationTime();
 
     /**
      * <p>getEvaluationGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIGroup} object.
      */
     DRIGroup getEvaluationGroup();
 
     /**
      * <p>getMarkup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      */
     Markup getMarkup();
 
@@ -130,7 +130,7 @@ public interface DRITextField<T> extends DRIHyperLinkComponent {
     /**
      * <p>getTextAdjust.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     TextAdjust getTextAdjust();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITotalPages.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRITotalPages.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITotalPages.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRITotalPages.java
index 0bdaf22..74052bd 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRITotalPages.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRITotalPages.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
 /**
  * <p>DRITotalPages interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIXyList.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIXyList.java
index 725a007..33636db 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIXyList.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
 import java.util.List;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIXyListCell.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyListCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIXyListCell.java
index cac33f7..ec5ae9c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/component/DRIXyListCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/component/DRIXyListCell.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.component;
+package software.xdev.dynamicreports.report.definition.component;
 
 import java.io.Serializable;
 
@@ -44,7 +44,7 @@ public interface DRIXyListCell extends Serializable {
     /**
      * <p>getComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIComponent} object.
      */
     public DRIComponent getComponent();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstab.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstab.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstab.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstab.java
index 901e8fc..d3dce26 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstab.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstab.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.definition.component.DRIDimensionComponent;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
-import net.sf.dynamicreports.report.definition.style.DRISimpleStyle;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.definition.component.DRIDimensionComponent;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRISimpleStyle;
 
 import java.util.List;
 
@@ -35,7 +35,7 @@ public interface DRICrosstab extends DRIDimensionComponent {
     /**
      * <p>getDataset.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabDataset} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabDataset} object.
      */
     public DRICrosstabDataset getDataset();
 
@@ -70,7 +70,7 @@ public interface DRICrosstab extends DRIDimensionComponent {
     /**
      * <p>getRunDirection.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.RunDirection} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.RunDirection} object.
      */
     public RunDirection getRunDirection();
 
@@ -98,7 +98,7 @@ public interface DRICrosstab extends DRIDimensionComponent {
     /**
      * <p>getOddRowStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
      */
     public DRISimpleStyle getOddRowStyle();
 
@@ -112,56 +112,56 @@ public interface DRICrosstab extends DRIDimensionComponent {
     /**
      * <p>getEvenRowStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRISimpleStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRISimpleStyle} object.
      */
     public DRISimpleStyle getEvenRowStyle();
 
     /**
      * <p>getGroupStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGroupStyle();
 
     /**
      * <p>getGroupTotalStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGroupTotalStyle();
 
     /**
      * <p>getGrandTotalStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getGrandTotalStyle();
 
     /**
      * <p>getCellStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getCellStyle();
 
     /**
      * <p>getMeasureTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getMeasureTitleStyle();
 
     /**
      * <p>getWhenNoDataCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellContent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabCellContent} object.
      */
     public DRICrosstabCellContent getWhenNoDataCell();
 
     /**
      * <p>getHeaderCell.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabCellContent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabCellContent} object.
      */
     public DRICrosstabCellContent getHeaderCell();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java
index 2e0c0bd..9c9f7b9 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabCellContent.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
-import net.sf.dynamicreports.report.definition.component.DRIList;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.component.DRIList;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 import java.io.Serializable;
 
@@ -33,14 +33,14 @@ public interface DRICrosstabCellContent extends Serializable {
     /**
      * <p>getList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.component.DRIList} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.component.DRIList} object.
      */
     public DRIList getList();
 
     /**
      * <p>getStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getStyle();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java
index f72452d..3a465bb 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabCellStyle.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 import java.io.Serializable;
 
@@ -32,21 +32,21 @@ public interface DRICrosstabCellStyle extends Serializable {
     /**
      * <p>getRowGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabRowGroup} object.
      */
     public DRICrosstabRowGroup<?> getRowGroup();
 
     /**
      * <p>getColumnGroup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.crosstab.DRICrosstabColumnGroup} object.
      */
     public DRICrosstabColumnGroup<?> getColumnGroup();
 
     /**
      * <p>getStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getStyle();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java
index 4763279..de74bd6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabColumnGroup.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
 /**
  * <p>DRICrosstabColumnGroup interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java
index 6363de3..2b7f3e3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabDataset.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
-import net.sf.dynamicreports.report.definition.DRIDataset;
+import software.xdev.dynamicreports.report.definition.DRIDataset;
 
 import java.io.Serializable;
 
@@ -32,7 +32,7 @@ public interface DRICrosstabDataset extends Serializable {
     /**
      * <p>getSubDataset.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIDataset} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIDataset} object.
      */
     public DRIDataset getSubDataset();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java
similarity index 61%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java
index a226fc3..6c53873 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabGroup.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
 import java.util.Comparator;
 import java.util.List;
 
-import net.sf.dynamicreports.report.constant.CrosstabTotalPosition;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.DRIHyperLink;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.constant.CrosstabTotalPosition;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.DRIHyperLink;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRISystemExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRICrosstabGroup interface.</p>
@@ -53,14 +53,14 @@ public interface DRICrosstabGroup<T> extends DRISystemExpression<T> {
     /**
      * <p>getHeaderHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     HorizontalTextAlignment getHeaderHorizontalTextAlignment();
 
     /**
      * <p>getHeaderValueFormatter.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      */
     DRIValueFormatter<?, ? super T> getHeaderValueFormatter();
 
@@ -76,21 +76,21 @@ public interface DRICrosstabGroup<T> extends DRISystemExpression<T> {
     /**
      * <p>getHeaderTextAdjust.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     TextAdjust getHeaderTextAdjust();
 
     /**
      * <p>getHeaderHyperLink.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIHyperLink} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIHyperLink} object.
      */
     DRIHyperLink getHeaderHyperLink();
 
     /**
      * <p>getHeaderStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     DRIReportStyle getHeaderStyle();
 
@@ -111,14 +111,14 @@ public interface DRICrosstabGroup<T> extends DRISystemExpression<T> {
     /**
      * <p>getTotalPosition.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.CrosstabTotalPosition} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabTotalPosition} object.
      */
     CrosstabTotalPosition getTotalPosition();
 
     /**
      * <p>getTotalHeaderExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<?> getTotalHeaderExpression();
 
@@ -133,14 +133,14 @@ public interface DRICrosstabGroup<T> extends DRISystemExpression<T> {
     /**
      * <p>getTotalHeaderTextAdjust.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     TextAdjust getTotalHeaderTextAdjust();
 
     /**
      * <p>getTotalHeaderStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     DRIReportStyle getTotalHeaderStyle();
 
@@ -154,35 +154,35 @@ public interface DRICrosstabGroup<T> extends DRISystemExpression<T> {
     /**
      * <p>getExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<T> getExpression();
 
     /**
      * <p>getDataType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     DRIDataType<? super T, T> getDataType();
 
     /**
      * <p>getOrderByExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<? extends Comparable<?>> getOrderByExpression();
 
     /**
      * <p>getOrderType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.OrderType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.OrderType} object.
      */
     OrderType getOrderType();
 
     /**
      * <p>getComparatorExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<? extends Comparator<?>> getComparatorExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java
similarity index 63%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java
index 490cbbe..ac6a829 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabMeasure.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
 import java.io.Serializable;
 import java.util.List;
 
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.DRIHyperLink;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.DRIHyperLink;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRICrosstabMeasure interface.</p>
@@ -47,14 +47,14 @@ public interface DRICrosstabMeasure<T> extends Serializable {
     /**
      * <p>getDataType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.datatype.DRIDataType} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.datatype.DRIDataType} object.
      */
     DRIDataType<? super T, T> getDataType();
 
     /**
      * <p>getExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<?> getExpression();
 
@@ -68,14 +68,14 @@ public interface DRICrosstabMeasure<T> extends Serializable {
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     HorizontalTextAlignment getHorizontalTextAlignment();
 
     /**
      * <p>getValueFormatter.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      */
     DRIValueFormatter<?, ? super T> getValueFormatter();
 
@@ -90,14 +90,14 @@ public interface DRICrosstabMeasure<T> extends Serializable {
     /**
      * <p>getTextAdjust.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     TextAdjust getTextAdjust();
 
     /**
      * <p>getHyperLink.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.DRIHyperLink} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.DRIHyperLink} object.
      */
     DRIHyperLink getHyperLink();
 
@@ -118,14 +118,14 @@ public interface DRICrosstabMeasure<T> extends Serializable {
     /**
      * <p>getTitleExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<?> getTitleExpression();
 
     /**
      * <p>getTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     DRIReportStyle getTitleStyle();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java
index 526e729..c1773ba 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabRowGroup.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
 /**
  * <p>DRICrosstabRowGroup interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java
index 5868b30..0f9ba40 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/crosstab/DRICrosstabVariable.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.crosstab;
+package software.xdev.dynamicreports.report.definition.crosstab;
 
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRISystemExpression;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRISystemExpression;
 
 /**
  * <p>DRICrosstabVariable interface.</p>
@@ -38,21 +38,21 @@ public interface DRICrosstabVariable<T> extends DRISystemExpression<T>, DRIValue
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getValueExpression();
 
     /**
      * <p>getCalculation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Calculation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Calculation} object.
      */
     public Calculation getCalculation();
 
     /**
      * <p>getPercentageType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.CrosstabPercentageType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.CrosstabPercentageType} object.
      */
     public CrosstabPercentageType getPercentageType();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/datatype/DRIDataType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/datatype/DRIDataType.java
similarity index 65%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/datatype/DRIDataType.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/datatype/DRIDataType.java
index 495a3a5..a87378c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/datatype/DRIDataType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/datatype/DRIDataType.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.datatype;
+package software.xdev.dynamicreports.report.definition.datatype;
 
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 import java.io.Serializable;
 import java.util.Locale;
@@ -44,14 +44,14 @@ public interface DRIDataType<U, T extends U> extends Serializable {
     /**
      * <p>getValueFormatter.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIValueFormatter} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter} object.
      */
     public DRIValueFormatter<?, ? extends U> getValueFormatter();
 
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public HorizontalTextAlignment getHorizontalTextAlignment();
 
@@ -67,8 +67,8 @@ public interface DRIDataType<U, T extends U> extends Serializable {
     /**
      * <p>valueToString.</p>
      *
-     * @param value            a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param value            a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      * @return a {@link java.lang.String} object.
      */
     public String valueToString(DRIValue<? extends U> value, ReportParameters reportParameters);
@@ -77,7 +77,7 @@ public interface DRIDataType<U, T extends U> extends Serializable {
      * <p>valueToString.</p>
      *
      * @param name             a {@link java.lang.String} object.
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      * @return a {@link java.lang.String} object.
      */
     public String valueToString(String name, ReportParameters reportParameters);
@@ -88,17 +88,17 @@ public interface DRIDataType<U, T extends U> extends Serializable {
      * @param value  a {@link java.lang.String} object.
      * @param locale a {@link java.util.Locale} object.
      * @return a T object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public T stringToValue(String value, Locale locale) throws DRException;
 
     /**
      * <p>stringToValue.</p>
      *
-     * @param value            a {@link net.sf.dynamicreports.report.definition.DRIValue} object.
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param value            a {@link software.xdev.dynamicreports.report.definition.DRIValue} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      * @return a T object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public T stringToValue(DRIValue<String> value, ReportParameters reportParameters) throws DRException;
 
@@ -106,9 +106,9 @@ public interface DRIDataType<U, T extends U> extends Serializable {
      * <p>stringToValue.</p>
      *
      * @param name             a {@link java.lang.String} object.
-     * @param reportParameters a {@link net.sf.dynamicreports.report.definition.ReportParameters} object.
+     * @param reportParameters a {@link software.xdev.dynamicreports.report.definition.ReportParameters} object.
      * @return a T object.
-     * @throws net.sf.dynamicreports.report.exception.DRException if any.
+     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
     public T stringToValue(String name, ReportParameters reportParameters) throws DRException;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIComplexExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIComplexExpression.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIComplexExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIComplexExpression.java
index 37d142d..ab7e3cf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIComplexExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIComplexExpression.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.expression;
+package software.xdev.dynamicreports.report.definition.expression;
 
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.util.List;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIExpression.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIExpression.java
index f91d3f2..f7fac71 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.expression;
+package software.xdev.dynamicreports.report.definition.expression;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIJasperExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIJasperExpression.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIJasperExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIJasperExpression.java
index 9f3ad68..943b4b4 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIJasperExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIJasperExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.expression;
+package software.xdev.dynamicreports.report.definition.expression;
 
 /**
  * This expression allows declaring an expression in a Jasper native syntax. Knowledge of the jasper syntax is also required for proper use.
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIParameterExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIParameterExpression.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIParameterExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIParameterExpression.java
index bd1a100..b92f43a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIParameterExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIParameterExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.expression;
+package software.xdev.dynamicreports.report.definition.expression;
 
 import java.io.Serializable;
 
@@ -37,7 +37,7 @@ public interface DRIParameterExpression extends Serializable {
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<?> getValueExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIPropertyExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIPropertyExpression.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIPropertyExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIPropertyExpression.java
index a95d7c1..a020933 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIPropertyExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIPropertyExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.expression;
+package software.xdev.dynamicreports.report.definition.expression;
 
 import java.io.Serializable;
 
@@ -37,7 +37,7 @@ public interface DRIPropertyExpression extends Serializable {
     /**
      * <p>getValueExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<String> getValueExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISimpleExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRISimpleExpression.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISimpleExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRISimpleExpression.java
index 83a76a6..9c14299 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISimpleExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRISimpleExpression.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.expression;
+package software.xdev.dynamicreports.report.definition.expression;
 
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 /**
  * The basic and the simplest implementation of an expression.
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISystemExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRISystemExpression.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISystemExpression.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRISystemExpression.java
index 2b2afe2..9b51e19 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRISystemExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRISystemExpression.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.expression;
+package software.xdev.dynamicreports.report.definition.expression;
 
 /**
  * <p>DRISystemExpression interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIValueFormatter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIValueFormatter.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIValueFormatter.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIValueFormatter.java
index dacfdd2..ee75e22 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/expression/DRIValueFormatter.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/expression/DRIValueFormatter.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.expression;
+package software.xdev.dynamicreports.report.definition.expression;
 
-import net.sf.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGrid.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGrid.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGrid.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGrid.java
index 4681fff..c86db89 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGrid.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGrid.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.grid;
+package software.xdev.dynamicreports.report.definition.grid;
 
 import java.io.Serializable;
 
@@ -30,7 +30,7 @@ public interface DRIColumnGrid extends Serializable {
     /**
      * <p>getList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridList} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridList} object.
      */
     public DRIColumnGridList getList();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridComponent.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridComponent.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridComponent.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridComponent.java
index ca22fcf..eb12d70 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridComponent.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridComponent.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.grid;
+package software.xdev.dynamicreports.report.definition.grid;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridList.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridList.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridList.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridList.java
index 4b218a6..5dba50c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridList.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridList.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.grid;
+package software.xdev.dynamicreports.report.definition.grid;
 
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.ListType;
 
 import java.util.List;
 
@@ -39,7 +39,7 @@ public interface DRIColumnGridList extends DRIColumnGridComponent {
     /**
      * <p>getType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ListType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ListType} object.
      */
     public ListType getType();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridListCell.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridListCell.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridListCell.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridListCell.java
index 45e7044..5009041 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnGridListCell.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnGridListCell.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.grid;
+package software.xdev.dynamicreports.report.definition.grid;
 
-import net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment;
-import net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment;
 
 import java.io.Serializable;
 
@@ -33,21 +33,21 @@ public interface DRIColumnGridListCell extends Serializable {
     /**
      * <p>getHorizontalAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalCellComponentAlignment} object.
      */
     public HorizontalCellComponentAlignment getHorizontalAlignment();
 
     /**
      * <p>getVerticalAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.VerticalCellComponentAlignment} object.
      */
     public VerticalCellComponentAlignment getVerticalAlignment();
 
     /**
      * <p>getComponent.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridComponent} object.
      */
     public DRIColumnGridComponent getComponent();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java
similarity index 70%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java
index a9ff833..f839c7c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/grid/DRIColumnTitleGroup.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.grid;
+package software.xdev.dynamicreports.report.definition.grid;
 
 import java.util.List;
 
-import net.sf.dynamicreports.report.constant.ComponentDimensionType;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.report.definition.expression.DRIPropertyExpression;
-import net.sf.dynamicreports.report.definition.style.DRIReportStyle;
+import software.xdev.dynamicreports.report.constant.ComponentDimensionType;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIPropertyExpression;
+import software.xdev.dynamicreports.report.definition.style.DRIReportStyle;
 
 /**
  * <p>DRIColumnTitleGroup interface.</p>
@@ -36,21 +36,21 @@ public interface DRIColumnTitleGroup extends DRIColumnGridComponent {
     /**
      * <p>getList.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.grid.DRIColumnGridList} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.grid.DRIColumnGridList} object.
      */
     DRIColumnGridList getList();
 
     /**
      * <p>getTitleExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     DRIExpression<?> getTitleExpression();
 
     /**
      * <p>getTitleStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     DRIReportStyle getTitleStyle();
 
@@ -64,7 +64,7 @@ public interface DRIColumnTitleGroup extends DRIColumnGridComponent {
     /**
      * <p>getTitleWidthType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     ComponentDimensionType getTitleWidthType();
 
@@ -85,7 +85,7 @@ public interface DRIColumnTitleGroup extends DRIColumnGridComponent {
     /**
      * <p>getTitleHeightType.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ComponentDimensionType} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ComponentDimensionType} object.
      */
     ComponentDimensionType getTitleHeightType();
 
@@ -108,7 +108,7 @@ public interface DRIColumnTitleGroup extends DRIColumnGridComponent {
     /**
      * <p>getTitleTextAdjust.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TextAdjust} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TextAdjust} object.
      */
     TextAdjust getTitleTextAdjust();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBaseStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIBaseStyle.java
similarity index 61%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBaseStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIBaseStyle.java
index 97da44d..9d1d41e 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBaseStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIBaseStyle.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.constant.Rotation;
-import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
-import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.constant.Rotation;
+import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
 
 import java.awt.Color;
 import java.io.Serializable;
@@ -60,63 +60,63 @@ public interface DRIBaseStyle extends Serializable {
     /**
      * <p>getImageScale.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.ImageScale} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.ImageScale} object.
      */
     public ImageScale getImageScale();
 
     /**
      * <p>getHorizontalImageAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalImageAlignment} object.
      */
     public HorizontalImageAlignment getHorizontalImageAlignment();
 
     /**
      * <p>getVerticalImageAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.VerticalImageAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.VerticalImageAlignment} object.
      */
     public VerticalImageAlignment getVerticalImageAlignment();
 
     /**
      * <p>getHorizontalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.HorizontalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.HorizontalTextAlignment} object.
      */
     public HorizontalTextAlignment getHorizontalTextAlignment();
 
     /**
      * <p>getVerticalTextAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.VerticalTextAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.VerticalTextAlignment} object.
      */
     public VerticalTextAlignment getVerticalTextAlignment();
 
     /**
      * <p>getBorder.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIBorder} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIBorder} object.
      */
     public DRIBorder getBorder();
 
     /**
      * <p>getPadding.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPadding} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPadding} object.
      */
     public DRIPadding getPadding();
 
     /**
      * <p>getFont.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIFont} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIFont} object.
      */
     public DRIFont getFont();
 
     /**
      * <p>getRotation.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Rotation} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Rotation} object.
      */
     public Rotation getRotation();
 
@@ -130,21 +130,21 @@ public interface DRIBaseStyle extends Serializable {
     /**
      * <p>getMarkup.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.Markup} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.Markup} object.
      */
     public Markup getMarkup();
 
     /**
      * <p>getParagraph.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIParagraph} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIParagraph} object.
      */
     public DRIParagraph getParagraph();
 
     /**
      * <p>getLinePen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
      */
     public DRIPen getLinePen();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBorder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIBorder.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBorder.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIBorder.java
index 3fce8b8..8f1a5ca 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIBorder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIBorder.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
 import java.io.Serializable;
 
@@ -30,28 +30,28 @@ public interface DRIBorder extends Serializable {
     /**
      * <p>getTopPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
      */
     public DRIPen getTopPen();
 
     /**
      * <p>getLeftPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
      */
     public DRIPen getLeftPen();
 
     /**
      * <p>getBottomPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
      */
     public DRIPen getBottomPen();
 
     /**
      * <p>getRightPen.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIPen} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIPen} object.
      */
     public DRIPen getRightPen();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIConditionalStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIConditionalStyle.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIConditionalStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIConditionalStyle.java
index 242a9bf..4c20934 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIConditionalStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIConditionalStyle.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
 
 /**
  * <p>DRIConditionalStyle interface.</p>
@@ -30,7 +30,7 @@ public interface DRIConditionalStyle extends DRIBaseStyle {
     /**
      * <p>getConditionExpression.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.expression.DRIExpression} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
     public DRIExpression<Boolean> getConditionExpression();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIFont.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIFont.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIFont.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIFont.java
index f60ca2c..8a7ad86 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIFont.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIFont.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPadding.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIPadding.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPadding.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIPadding.java
index efa3423..f754ebe 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPadding.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIPadding.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIParagraph.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIParagraph.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIParagraph.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIParagraph.java
index 7287e10..5a9423d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIParagraph.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIParagraph.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
-import net.sf.dynamicreports.report.constant.LineSpacing;
+import software.xdev.dynamicreports.report.constant.LineSpacing;
 
 import java.io.Serializable;
 import java.util.List;
@@ -33,7 +33,7 @@ public interface DRIParagraph extends Serializable {
     /**
      * <p>getLineSpacing.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.LineSpacing} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.LineSpacing} object.
      */
     public LineSpacing getLineSpacing();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPen.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIPen.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPen.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIPen.java
index a891854..0abc9bf 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIPen.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIPen.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
-import net.sf.dynamicreports.report.constant.LineStyle;
+import software.xdev.dynamicreports.report.constant.LineStyle;
 
 import java.awt.Color;
 import java.io.Serializable;
@@ -40,7 +40,7 @@ public interface DRIPen extends Serializable {
     /**
      * <p>getLineStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.LineStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.LineStyle} object.
      */
     public LineStyle getLineStyle();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIReportStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIReportStyle.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIReportStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIReportStyle.java
index d608cb7..e1bc3e7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIReportStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIReportStyle.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
 import java.io.Serializable;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRISimpleStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRISimpleStyle.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRISimpleStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRISimpleStyle.java
index e436830..d49ce8a 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRISimpleStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRISimpleStyle.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
 /**
  * <p>DRISimpleStyle interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIStyle.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIStyle.java
index 9f8357f..f07bbbc 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRIStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRIStyle.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
 import java.util.List;
 
@@ -37,7 +37,7 @@ public interface DRIStyle extends DRIBaseStyle, DRIReportStyle {
     /**
      * <p>getParentStyle.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.definition.style.DRIReportStyle} object.
+     * @return a {@link software.xdev.dynamicreports.report.definition.style.DRIReportStyle} object.
      */
     public DRIReportStyle getParentStyle();
 
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITabStop.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRITabStop.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITabStop.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRITabStop.java
index 3e88e03..66bbdbd 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITabStop.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRITabStop.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
-import net.sf.dynamicreports.report.constant.TabStopAlignment;
+import software.xdev.dynamicreports.report.constant.TabStopAlignment;
 
 import java.io.Serializable;
 
@@ -39,7 +39,7 @@ public interface DRITabStop extends Serializable {
     /**
      * <p>getAlignment.</p>
      *
-     * @return a {@link net.sf.dynamicreports.report.constant.TabStopAlignment} object.
+     * @return a {@link software.xdev.dynamicreports.report.constant.TabStopAlignment} object.
      */
     public TabStopAlignment getAlignment();
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITemplateStyle.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRITemplateStyle.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITemplateStyle.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRITemplateStyle.java
index ffe1618..6222604 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/definition/style/DRITemplateStyle.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/definition/style/DRITemplateStyle.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.definition.style;
+package software.xdev.dynamicreports.report.definition.style;
 
 /**
  * <p>DRITemplateStyle interface.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRException.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/exception/DRException.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRException.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/exception/DRException.java
index 9972430..f4c6d73 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRException.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/exception/DRException.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.exception;
+package software.xdev.dynamicreports.report.exception;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRException class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRReportException.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/exception/DRReportException.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRReportException.java
rename to dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/exception/DRReportException.java
index d200bc8..7264df7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/net/sf/dynamicreports/report/exception/DRReportException.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/exception/DRReportException.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.report.exception;
+package software.xdev.dynamicreports.report.exception;
 
-import net.sf.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.constant.Constants;
 
 /**
  * <p>DRReportException class.</p>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/jasperreports_extension.properties b/dynamicreports-core-for-grid-exporter/src/main/resources/jasperreports_extension.properties
index 57fe439..f869f8c 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/resources/jasperreports_extension.properties
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/jasperreports_extension.properties
@@ -1,2 +1,2 @@
-net.sf.jasperreports.extension.registry.factory.system.font.families=net.sf.dynamicreports.jasper.base.JasperSystemFontExtensionsRegistryFactory
-net.sf.jasperreports.extension.system.font.families.drfonts=fonts.xml
\ No newline at end of file
+net.sf.jasperreports.extension.registry.factory.system.font.families=software.xdev.dynamicreports.jasper.base.JasperSystemFontExtensionsRegistryFactory
+net.sf.jasperreports.extension.system.font.families.drfonts=fonts.xml
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xjb b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/defaults/schema/dynamicreports.xjb
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xjb
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/defaults/schema/dynamicreports.xjb
index f88b620..9d87d0f 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xjb
+++ b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/defaults/schema/dynamicreports.xjb
@@ -5,7 +5,7 @@
 
     <bindings schemaLocation="dynamicreports.xsd" node="/xsd:schema">
         <schemaBindings>
-            <package name="net.sf.dynamicreports.report.defaults.xml"/>
+            <package name="software.xdev.dynamicreports.report.defaults.xml"/>
             <nameXmlTransform>
                 <typeName prefix="Xml"/>
             </nameXmlTransform>
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xsd b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/defaults/schema/dynamicreports.xsd
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/defaults/schema/dynamicreports.xsd
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/defaults/schema/dynamicreports.xsd
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_green.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/ball_green.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_green.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/ball_green.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_red.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/ball_red.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/ball_red.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/ball_red.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean1_false.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_false.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean1_false.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean1_true.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean1_true.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean1_true.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean2_false.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_false.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean2_false.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean2_true.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean2_true.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean2_true.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean3_false.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_false.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean3_false.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean3_true.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean3_true.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean3_true.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean4_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean4_false.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/boolean4_false.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/boolean4_false.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox1_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/checkbox1_true.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox1_true.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/checkbox1_true.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox2_true.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/checkbox2_true.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox2_true.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/checkbox2_true.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox_false.svg b/dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/checkbox_false.svg
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/main/resources/net/sf/dynamicreports/report/images/checkbox_false.svg
rename to dynamicreports-core-for-grid-exporter/src/main/resources/software/xdev/dynamicreports/report/images/checkbox_false.svg
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/jasper/base/JasperCustomValuesTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/jasper/base/JasperCustomValuesTest.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/jasper/base/JasperCustomValuesTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/jasper/base/JasperCustomValuesTest.java
index d859c52..74f9b48 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/jasper/base/JasperCustomValuesTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/jasper/base/JasperCustomValuesTest.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.jasper.base;
+package software.xdev.dynamicreports.jasper.base;
 
-import static net.sf.dynamicreports.jasper.base.JasperScriptletManager.USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY;
+import static software.xdev.dynamicreports.jasper.base.JasperScriptletManager.USE_THREAD_SAFE_SCRIPLET_MANAGER_PROPERTY_KEY;
 
 import java.util.Properties;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/ReportUtilsTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/report/ReportUtilsTest.java
similarity index 98%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/ReportUtilsTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/report/ReportUtilsTest.java
index a7aa047..15c710f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/ReportUtilsTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/report/ReportUtilsTest.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sf.dynamicreports.report;
+package software.xdev.dynamicreports.report;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/builder/style/StyleBuildersTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/report/builder/style/StyleBuildersTest.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/builder/style/StyleBuildersTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/report/builder/style/StyleBuildersTest.java
index ea51fac..0e47206 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/report/builder/style/StyleBuildersTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/report/builder/style/StyleBuildersTest.java
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sf.dynamicreports.report.builder.style;
+package software.xdev.dynamicreports.report.builder.style;
 
-import static net.sf.dynamicreports.report.constant.FontName.ARIAL;
-import static net.sf.dynamicreports.report.constant.FontName.COURIER_NEW;
-import static net.sf.dynamicreports.report.constant.FontName.TIMES_NEW_ROMAN;
+import static software.xdev.dynamicreports.report.constant.FontName.ARIAL;
+import static software.xdev.dynamicreports.report.constant.FontName.COURIER_NEW;
+import static software.xdev.dynamicreports.report.constant.FontName.TIMES_NEW_ROMAN;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/ConditionsTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/ConditionsTest.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/ConditionsTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/ConditionsTest.java
index b149f03..d12030c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/ConditionsTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/ConditionsTest.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.base;
+package software.xdev.dynamicreports.test.base;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cnd;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cnd;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
 
 import java.sql.Connection;
 import java.util.Locale;
@@ -26,11 +26,11 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.definition.DRIScriptlet;
-import net.sf.dynamicreports.report.definition.DRIValue;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRISimpleExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.definition.DRIScriptlet;
+import software.xdev.dynamicreports.report.definition.DRIValue;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRISimpleExpression;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DataTypeTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DataTypeTest.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DataTypeTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DataTypeTest.java
index 419d0ed..b25a0eb 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DataTypeTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DataTypeTest.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.base;
+package software.xdev.dynamicreports.test.base;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -29,10 +29,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.report.builder.datatype.BigDecimalType;
-import net.sf.dynamicreports.report.builder.datatype.StringType;
-import net.sf.dynamicreports.report.definition.datatype.DRIDataType;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.builder.datatype.BigDecimalType;
+import software.xdev.dynamicreports.report.builder.datatype.StringType;
+import software.xdev.dynamicreports.report.definition.datatype.DRIDataType;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DefaultsTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DefaultsTest.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DefaultsTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DefaultsTest.java
index a67386f..582cba4 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/base/DefaultsTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DefaultsTest.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.base;
+package software.xdev.dynamicreports.test.base;
 
 import java.io.InputStream;
 
@@ -28,12 +28,12 @@
 import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Unmarshaller;
-import net.sf.dynamicreports.report.base.datatype.DRDataType;
-import net.sf.dynamicreports.report.base.style.DRFont;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.defaults.Default;
-import net.sf.dynamicreports.report.defaults.DefaultBinder;
-import net.sf.dynamicreports.report.defaults.xml.XmlDynamicReports;
+import software.xdev.dynamicreports.report.base.datatype.DRDataType;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.defaults.Default;
+import software.xdev.dynamicreports.report.defaults.DefaultBinder;
+import software.xdev.dynamicreports.report.defaults.xml.XmlDynamicReports;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/bugs/Bug_2997586_Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/bugs/Bug_2997586_Test.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/bugs/Bug_2997586_Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/bugs/Bug_2997586_Test.java
index 6cbfde8..6842b4c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/bugs/Bug_2997586_Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/bugs/Bug_2997586_Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.bugs;
+package software.xdev.dynamicreports.test.bugs;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
+import software.xdev.dynamicreports.report.builder.component.TextFieldBuilder;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/AbstractBandTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/AbstractBandTest.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/AbstractBandTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/AbstractBandTest.java
index 735c80c..178a465 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/AbstractBandTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/AbstractBandTest.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design;
+package software.xdev.dynamicreports.test.design;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.DRDesignReport;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.DRDesignReport;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/DesignReportBuilder.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignReportBuilder.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/DesignReportBuilder.java
index 6ea3b42..80e8423 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/DesignReportBuilder.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design;
+package software.xdev.dynamicreports.test.design;
 
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.definition.DRITemplateDesign;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignTestTemplateDesign.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/DesignTestTemplateDesign.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignTestTemplateDesign.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/DesignTestTemplateDesign.java
index 4d3699e..733d0f5 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/DesignTestTemplateDesign.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/DesignTestTemplateDesign.java
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design;
+package software.xdev.dynamicreports.test.design;
 
-import net.sf.dynamicreports.report.base.AbstractTemplateDesign;
+import software.xdev.dynamicreports.report.base.AbstractTemplateDesign;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/ColumnPosition1Test.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/ColumnPosition1Test.java
index f14fe10..d853940 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/ColumnPosition1Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.position;
+package software.xdev.dynamicreports.test.design.position;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.test.design.AbstractBandTest;
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.test.design.AbstractBandTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/ColumnPosition2Test.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/ColumnPosition2Test.java
index 79aa028..0bd4c05 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/ColumnPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/ColumnPosition2Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.position;
+package software.xdev.dynamicreports.test.design.position;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.ListType;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/HorizontalListPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/HorizontalListPositionTest.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/HorizontalListPositionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/HorizontalListPositionTest.java
index 90d671a..38ff1bc 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/HorizontalListPositionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/HorizontalListPositionTest.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.position;
+package software.xdev.dynamicreports.test.design.position;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.test.design.AbstractBandTest;
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.test.design.AbstractBandTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/SubtotalPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/SubtotalPositionTest.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/SubtotalPositionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/SubtotalPositionTest.java
index 12f9c90..ecb668b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/SubtotalPositionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/SubtotalPositionTest.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.position;
+package software.xdev.dynamicreports.test.design.position;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.test.design.AbstractBandTest;
-
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.test.design.AbstractBandTest;
+
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/VerticalListPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/VerticalListPositionTest.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/VerticalListPositionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/VerticalListPositionTest.java
index 5671dd2..8e78a5d 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/position/VerticalListPositionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/position/VerticalListPositionTest.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.position;
+package software.xdev.dynamicreports.test.design.position;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.design.base.DRDesignBand;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.test.design.AbstractBandTest;
+import software.xdev.dynamicreports.design.base.DRDesignBand;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.test.design.AbstractBandTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/BandBackgroundTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/BandBackgroundTest.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/BandBackgroundTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/BandBackgroundTest.java
index 27e476f..342c12c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/BandBackgroundTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/BandBackgroundTest.java
@@ -15,30 +15,30 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.report;
+package software.xdev.dynamicreports.test.design.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
 
 import java.util.ArrayList;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.base.DRDesignReport;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignRectangle;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.design.DesignReportBuilder;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.base.DRDesignReport;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignRectangle;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.builder.ReportTemplateBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.design.DesignReportBuilder;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ExceptionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/ExceptionTest.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ExceptionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/ExceptionTest.java
index 5a8849f..7a110fa 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ExceptionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/ExceptionTest.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.report;
+package software.xdev.dynamicreports.test.design.report;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.design.base.DRDesignReport;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.design.DesignReportBuilder;
+import software.xdev.dynamicreports.design.base.DRDesignReport;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.design.DesignReportBuilder;
 import org.junit.jupiter.api.Test;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.variable;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.variable;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ReportTemplateTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/ReportTemplateTest.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ReportTemplateTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/ReportTemplateTest.java
index 8e1c024..039663e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/ReportTemplateTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/ReportTemplateTest.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.report;
+package software.xdev.dynamicreports.test.design.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -33,29 +33,29 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.design.base.DRDesignGroup;
-import net.sf.dynamicreports.design.base.DRDesignReport;
-import net.sf.dynamicreports.design.base.component.DRDesignComponent;
-import net.sf.dynamicreports.design.base.component.DRDesignImage;
-import net.sf.dynamicreports.design.base.component.DRDesignList;
-import net.sf.dynamicreports.design.base.component.DRDesignTextField;
-import net.sf.dynamicreports.design.base.crosstab.DRDesignCrosstab;
-import net.sf.dynamicreports.design.definition.component.DRIDesignList;
-import net.sf.dynamicreports.design.definition.style.DRIDesignStyle;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.constant.Language;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.design.DesignReportBuilder;
+import software.xdev.dynamicreports.design.base.DRDesignGroup;
+import software.xdev.dynamicreports.design.base.DRDesignReport;
+import software.xdev.dynamicreports.design.base.component.DRDesignComponent;
+import software.xdev.dynamicreports.design.base.component.DRDesignImage;
+import software.xdev.dynamicreports.design.base.component.DRDesignList;
+import software.xdev.dynamicreports.design.base.component.DRDesignTextField;
+import software.xdev.dynamicreports.design.base.crosstab.DRDesignCrosstab;
+import software.xdev.dynamicreports.design.definition.component.DRIDesignList;
+import software.xdev.dynamicreports.design.definition.style.DRIDesignStyle;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.constant.Language;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.design.DesignReportBuilder;
 
 
 class ReportTemplateTest
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/TemplateDesignTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/TemplateDesignTest.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/TemplateDesignTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/TemplateDesignTest.java
index d2aaba2..bf5d44a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/design/report/TemplateDesignTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/design/report/TemplateDesignTest.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.design.report;
+package software.xdev.dynamicreports.test.design.report;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.design.base.DRDesignReport;
-import net.sf.dynamicreports.report.base.AbstractTemplateDesign;
-import net.sf.dynamicreports.report.base.DRMargin;
-import net.sf.dynamicreports.report.builder.MarginBuilder;
-import net.sf.dynamicreports.report.builder.ReportBuilder;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.definition.DRIMargin;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.design.DesignReportBuilder;
+import software.xdev.dynamicreports.design.base.DRDesignReport;
+import software.xdev.dynamicreports.report.base.AbstractTemplateDesign;
+import software.xdev.dynamicreports.report.base.DRMargin;
+import software.xdev.dynamicreports.report.builder.MarginBuilder;
+import software.xdev.dynamicreports.report.builder.ReportBuilder;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.definition.DRIMargin;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.design.DesignReportBuilder;
 import org.junit.jupiter.api.Test;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java
index e6d540e..0962c9e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabPositionTest.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper;
+package software.xdev.dynamicreports.test.jasper;
 
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java
index 16d3fce..18ac313 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabStyleTest.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper;
+package software.xdev.dynamicreports.test.jasper;
 
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
 import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java
index 70c1777..5fed3d1 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperCrosstabValueTest.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper;
+package software.xdev.dynamicreports.test.jasper;
 
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperPositionTest.java
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperPositionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperPositionTest.java
index 99cb799..a71f563 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperPositionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperPositionTest.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper;
+package software.xdev.dynamicreports.test.jasper;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.SubtotalBuilder;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.SubtotalBuilder;
 import net.sf.jasperreports.engine.JRPrintElement;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperStyleTest.java
similarity index 98%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperStyleTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperStyleTest.java
index 38b497d..3fc0fc7 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperStyleTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperStyleTest.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper;
+package software.xdev.dynamicreports.test.jasper;
 
 import java.awt.Color;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.SubtotalBuilder;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.SubtotalBuilder;
 import net.sf.jasperreports.engine.JRImageAlignment;
 import net.sf.jasperreports.engine.JRStyle;
 import net.sf.jasperreports.engine.JRTextAlignment;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperTest.java
similarity index 96%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperTest.java
index 082e59a..c664e75 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperTest.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper;
+package software.xdev.dynamicreports.test.jasper;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,9 +34,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRPrintElement;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperValueTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperValueTest.java
similarity index 97%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperValueTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperValueTest.java
index 579756c..30fcef4 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/AbstractJasperValueTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperValueTest.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper;
+package software.xdev.dynamicreports.test.jasper;
 
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.BaseSubtotalBuilder;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.BaseSubtotalBuilder;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JRPrintElement;
 import net.sf.jasperreports.engine.JRPrintText;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/JasperTestUtils.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/JasperTestUtils.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/JasperTestUtils.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/JasperTestUtils.java
index fa1066d..1276029 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/JasperTestUtils.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/JasperTestUtils.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper;
+package software.xdev.dynamicreports.test.jasper;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.report.base.DRSubtotal;
-import net.sf.dynamicreports.report.builder.column.ColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.group.GroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.BaseSubtotalBuilder;
+import software.xdev.dynamicreports.report.base.DRSubtotal;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.BaseSubtotalBuilder;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumn1Test.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumn1Test.java
index 07f85fc..488eb1f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumn1Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 import java.io.Serializable;
 import java.util.Locale;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRPrintImage;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumn2Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumn2Test.java
index 915d137..a15a7bc 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumn2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumn2Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
 
 import java.io.Serializable;
 import java.util.Locale;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRPrintImage;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java
index 47b948d..a022be6 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition1Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java
index 0d929e5..372b5cf 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition2Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java
index 08219f3..e63f981 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition3Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.BooleanComponentType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.BooleanComponentType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java
index 7d69b3b..f073709 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition4Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java
index 3ee9962..206e5b1 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/BooleanColumnPosition5Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column1Test.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column1Test.java
index ec5b05d..e1b9066 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column1Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
@@ -32,8 +32,8 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column2Test.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column2Test.java
index e14673b..c2adbff 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column2Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column3Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column3Test.java
index 6302297..f4d2601 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column3Test.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.datatype.DoubleType;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.definition.expression.DRIValueFormatter;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.datatype.DoubleType;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.definition.expression.DRIValueFormatter;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
@@ -34,8 +34,8 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column4Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column4Test.java
index 162c7a7..83fb58c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/Column4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/Column4Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnGridTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnGridTest.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnGridTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnGridTest.java
index b9b2fc2..30b6be5 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnGridTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnGridTest.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnPosition1Test.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnPosition1Test.java
index 7044b2d..ca6346c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnPosition1Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnPosition2Test.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnPosition2Test.java
index cc02f59..276e70b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnPosition2Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java
index 082d12e..a3d1da3 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup1Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java
index 5951ad2..54bfb1f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup2Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.constant.JasperProperty;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.constant.JasperProperty;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java
index bef9331..a8d6667 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroup3Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.constant.JasperProperty;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.constant.JasperProperty;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java
index 637a945..03ec980 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition1Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java
index 52f6341..9477483 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition2Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java
index eadf186..1f66e71 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition3Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java
index d261cd0..134b830 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition4Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java
index e8812ad..ef7b89e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition5Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.grid.ColumnTitleGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java
index 925aa5e..acdd88e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ColumnTitleGroupPosition6Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java
index 7c001fd..e183dea 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ComponentColumnPositionTest.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.ComponentColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+package software.xdev.dynamicreports.test.jasper.column;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.ComponentColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/EmptyColumnTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/EmptyColumnTest.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/EmptyColumnTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/EmptyColumnTest.java
index 709d868..e3167ae 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/EmptyColumnTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/EmptyColumnTest.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ExpressionColumnTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ExpressionColumnTest.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ExpressionColumnTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ExpressionColumnTest.java
index 863deb4..3135a3e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/ExpressionColumnTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/ExpressionColumnTest.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/PercentageColumnTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/PercentageColumnTest.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/PercentageColumnTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/PercentageColumnTest.java
index cafd389..4c951df 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/column/PercentageColumnTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/column/PercentageColumnTest.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.column;
+package software.xdev.dynamicreports.test.jasper.column;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.builder.column.PercentageColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.builder.column.PercentageColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
@@ -31,8 +31,8 @@
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/BreakTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/BreakTest.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/BreakTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/BreakTest.java
index 315a2be..c810782 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/BreakTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/BreakTest.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.constant.Constants;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.constant.Constants;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component1Test.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component1Test.java
index 4a2c6d6..5c4c32c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component1Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component2Test.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component2Test.java
index 85594b1..6ad9f1c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component2Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.LineDirection;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.LineDirection;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRPrintLine;
 import net.sf.jasperreports.engine.JRPrintRectangle;
 import net.sf.jasperreports.engine.type.LineDirectionEnum;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component3Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component3Test.java
index bb43f31..967b90e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Component3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Component3Test.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
-import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
-import net.sf.dynamicreports.report.constant.ComponentPositionType;
-import net.sf.dynamicreports.report.constant.StretchType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.TextFieldBuilder;
+import software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder;
+import software.xdev.dynamicreports.report.constant.ComponentPositionType;
+import software.xdev.dynamicreports.report.constant.StretchType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRElement;
 import net.sf.jasperreports.engine.JREmptyDataSource;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ComponentStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ComponentStyleTest.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ComponentStyleTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ComponentStyleTest.java
index bd28655..037ab01 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ComponentStyleTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ComponentStyleTest.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRPen;
 import net.sf.jasperreports.engine.JRPrintEllipse;
 import net.sf.jasperreports.engine.JRPrintLine;
@@ -29,8 +29,8 @@
 
 import java.awt.Color;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Image1Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Image1Test.java
index 4080cfe..2dd725a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Image1Test.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
@@ -31,10 +31,10 @@
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.ImageScale;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.ImageScale;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperTest;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRPrintImage;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Image2Test.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Image2Test.java
index 06a34a2..0789a22 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/Image2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/Image2Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 import java.util.Arrays;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.component.ImageBuilder;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.test.jasper.AbstractJasperTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.ImageBuilder;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperTest;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List1Test.java
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List1Test.java
index 317d849..5113feb 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List1Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List2Test.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List2Test.java
index 088008f..0c10d98 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List2Test.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.component.VerticalListBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.VerticalListBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List3Test.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List3Test.java
index cc0cf7f..81eb35b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/List3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/List3Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.component.HorizontalListBuilder;
-import net.sf.dynamicreports.report.builder.component.VerticalListBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.HorizontalListBuilder;
+import software.xdev.dynamicreports.report.builder.component.VerticalListBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java
index d4bd711..b510710 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListBackgroundComponentTest.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
 
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.RectangleBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.ReportTemplateBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.RectangleBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRPrintElement;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java
index 936e552..8392f8a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListComponentGroupTypeTest.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListFixedComponents1Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListFixedComponents1Test.java
index 63e2a4d..6e85101 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListFixedComponents1Test.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListFixedComponents2Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListFixedComponents2Test.java
index 7bda1ad..552cad2 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListFixedComponents2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListFixedComponents2Test.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListGapTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListGapTest.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListGapTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListGapTest.java
index 8a0a05e..6f2b144 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/ListGapTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/ListGapTest.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList1Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList1Test.java
index 7232c9e..b7d48b1 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList1Test.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.MultiPageListBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList2Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList2Test.java
index 481d774..a386b9f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList2Test.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.MultiPageListBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList3Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList3Test.java
index 3e23fcd..741114a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList3Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.MultiPageListBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList4Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList4Test.java
index db61e6c..f184ecd 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/MultiPageList4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/MultiPageList4Test.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.MultiPageListBuilder;
-import net.sf.dynamicreports.report.constant.SplitType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.MultiPageListBuilder;
+import software.xdev.dynamicreports.report.constant.SplitType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRPrintElement;
 import net.sf.jasperreports.engine.JRPrintText;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber1Test.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber1Test.java
index 2917fb9..a1c4c0a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber1Test.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber2Test.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber2Test.java
index f2d75e4..d6f479b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber2Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber3Test.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber3Test.java
index cd0b979..c3d2896 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber3Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.component;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber4Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber4Test.java
index 728cb04..0e5575d 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber4Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber5Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber5Test.java
index bab4438..8028999 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber5Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber6Test.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber6Test.java
index aaeb86d..5d126ee 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumber6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumber6Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.report.exception.DRException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumberPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumberPositionTest.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumberPositionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumberPositionTest.java
index 85a1446..eda3996 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/PageNumberPositionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/PageNumberPositionTest.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.component.PageXofYBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.PageXofYBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField1Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField1Test.java
index 9389952..5f3dd63 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField1Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField2Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField2Test.java
index a8af552..a68ca04 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField2Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField3Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField3Test.java
index dea43f2..efb700d 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField3Test.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.constant.JasperProperty;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.constant.JasperProperty;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField4Test.java
similarity index 67%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField4Test.java
index 646e730..d3380fa 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField4Test.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.VariableBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.VariableBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
-import static net.sf.dynamicreports.report.builder.DynamicReports.variable;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.variable;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField5Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField5Test.java
index 789391c..4b5fc38 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField5Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField6Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField6Test.java
index bd53b6f..03ae521 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField6Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField7Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField7Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField7Test.java
index 125cb64..939a062 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/TextField7Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/TextField7Test.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.constant.JasperProperty;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.constant.JasperProperty;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/VerticalListTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/VerticalListTest.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/VerticalListTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/VerticalListTest.java
index 6772f81..2f29e68 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/VerticalListTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/VerticalListTest.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/XyListTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/XyListTest.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/XyListTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/XyListTest.java
index 2ee4162..58d0fd3 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/component/XyListTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/component/XyListTest.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.component;
+package software.xdev.dynamicreports.test.jasper.component;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.component.XyListBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.XyListBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab1Test.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab1Test.java
index 9a7a1d4..f21133f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab1Test.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+package software.xdev.dynamicreports.test.jasper.crosstab;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab2Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab2Test.java
index cfae9f1..f31bee3 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab2Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+package software.xdev.dynamicreports.test.jasper.crosstab;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab3Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab3Test.java
index d5d8582..eb8a113 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab3Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+package software.xdev.dynamicreports.test.jasper.crosstab;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab4Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab4Test.java
index b52be32..14a247a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab4Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
-import net.sf.dynamicreports.test.jasper.JasperTestUtils;
+package software.xdev.dynamicreports.test.jasper.crosstab;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import software.xdev.dynamicreports.test.jasper.JasperTestUtils;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab5Test.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab5Test.java
index 251a1f1..ed036dd 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab5Test.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -29,19 +29,19 @@
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.CrosstabPercentageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.CrosstabPercentageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab6Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab6Test.java
index 9a04c00..bab3890 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab6Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.constant.JasperProperty;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.constant.JasperProperty;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab7Test.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab7Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab7Test.java
index 66c9264..3acbb9d 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/Crosstab7Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/Crosstab7Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.constant.JasperProperty;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.TextAdjust;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.constant.JasperProperty;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.TextAdjust;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java
index 65b1e94..8153f97 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition10Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java
index 2143370..8f22e2c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition1Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java
index 14493fe..429037b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition2Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java
index 520c45b..5568b06 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition3Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java
index 55e4f8a..66d7b3d 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition4Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java
index 95ee1d0..8f4ce9a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition5Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+package software.xdev.dynamicreports.test.jasper.crosstab;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java
index 6a15039..6a862b1 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition6Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java
index 297fb85..eda90fb 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition7Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java
index 1150312..73bbc2c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition8Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java
index a97b270..1ef0839 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabPosition9Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java
index 9a08f40..ab8c231 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle1Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java
index 76303ca..21f8aae 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle2Test.java
@@ -15,29 +15,29 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java
index b0cfcbc..8ebdd26 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle3Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
 
 import java.awt.Color;
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java
index c8e7fd6..cfccca7 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle4Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java
index 86dee2d..9385668 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle5Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java
index 3c9da0b..c5555c1 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabStyle6Test.java
@@ -15,28 +15,28 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.ConditionalStyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabTest.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabTest.java
index a118dfa..ba05544 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabTest.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.test.jasper.AbstractJasperTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperTest;
 import net.sf.jasperreports.crosstabs.base.JRBaseCrosstab;
 import net.sf.jasperreports.crosstabs.type.CrosstabColumnPositionEnum;
 import net.sf.jasperreports.crosstabs.type.CrosstabRowPositionEnum;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java
index fb002f1..fe646b7 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/CrosstabWhenNoDataTest.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
-
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabPositionTest;
+
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java
index efdbfec..ba53354 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/ExpressionCrosstabTest.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+package software.xdev.dynamicreports.test.jasper.crosstab;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java
index 88fbdf3..2e69fe0 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/GroupExpressionCrosstabTest.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+package software.xdev.dynamicreports.test.jasper.crosstab;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
@@ -36,8 +36,8 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java
index 768542e..977a3dd 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/HyperLinkCrosstabTest.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.hyperLink;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.hyperLink;
 
 import java.io.Serializable;
 import java.util.List;
@@ -26,18 +26,18 @@
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
-import net.sf.dynamicreports.test.jasper.JasperTestUtils;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.AbstractCrosstabGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import software.xdev.dynamicreports.test.jasper.JasperTestUtils;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRPrintElement;
 import net.sf.jasperreports.engine.JRPrintText;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java
index ebdfff5..6135955 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/crosstab/OrderCrosstabTest.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.crosstab;
+package software.xdev.dynamicreports.test.jasper.crosstab;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.OrderType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.OrderType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java
index 89bf245..ab61853 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset1Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.dataset;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+package software.xdev.dynamicreports.test.jasper.dataset;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java
index ad75990..57781a7 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset2Test.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.dataset;
+package software.xdev.dynamicreports.test.jasper.dataset;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java
index d371e6e..436e0db 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDataset3Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.dataset;
+package software.xdev.dynamicreports.test.jasper.dataset;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabVariableBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java
index c7427ba..f52168d 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/dataset/CrosstabDatasetStyleTest.java
@@ -15,29 +15,29 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.dataset;
+package software.xdev.dynamicreports.test.jasper.dataset;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseReportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/DatabaseReportTest.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseReportTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/DatabaseReportTest.java
index f912661..7c52305 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseReportTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/DatabaseReportTest.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.datasource;
+package software.xdev.dynamicreports.test.jasper.datasource;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -29,8 +29,8 @@
 import java.sql.Statement;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java
index 18a036c..752329f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/DatabaseSubreportTest.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.datasource;
+package software.xdev.dynamicreports.test.jasper.datasource;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -34,12 +34,12 @@
 import java.util.List;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/FilterTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/FilterTest.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/FilterTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/FilterTest.java
index ead9968..d080d65 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/FilterTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/FilterTest.java
@@ -15,28 +15,28 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.datasource;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.DatasetBuilder;
-import net.sf.dynamicreports.report.builder.DynamicReports;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
-import net.sf.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
+package software.xdev.dynamicreports.test.jasper.datasource;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.DatasetBuilder;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabMeasureBuilder;
+import software.xdev.dynamicreports.report.builder.crosstab.CrosstabRowGroupBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperCrosstabValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.ctab;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.ctab;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/SubDatasourceTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/SubDatasourceTest.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/SubDatasourceTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/SubDatasourceTest.java
index 8c03337..0fd435c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/SubDatasourceTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/SubDatasourceTest.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.datasource;
+package software.xdev.dynamicreports.test.jasper.datasource;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/XmlReportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/XmlReportTest.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/XmlReportTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/XmlReportTest.java
index 2367ccb..fedd9f0 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/datasource/XmlReportTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/datasource/XmlReportTest.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.datasource;
+package software.xdev.dynamicreports.test.jasper.datasource;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.QueryLanguage;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.QueryLanguage;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.data.JRXmlDataSource;
 import net.sf.jasperreports.engine.query.JRXPathQueryExecuterFactory;
@@ -29,11 +29,11 @@
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/CustomGroupTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/CustomGroupTest.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/CustomGroupTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/CustomGroupTest.java
index ae8db22..8e38a8e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/CustomGroupTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/CustomGroupTest.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
+package software.xdev.dynamicreports.test.jasper.group;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/DataTypeGroupTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/DataTypeGroupTest.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/DataTypeGroupTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/DataTypeGroupTest.java
index ebe6bae..8b6a36c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/DataTypeGroupTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/DataTypeGroupTest.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
+package software.xdev.dynamicreports.test.jasper.group;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Date;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group1Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group1Test.java
index d89f866..869d1c6 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group1Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
+package software.xdev.dynamicreports.test.jasper.group;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group2Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group2Test.java
index a8e1709..d15eab2 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group2Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.group;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group3Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group3Test.java
index d6e1460..ab34b8a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/Group3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/Group3Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
+package software.xdev.dynamicreports.test.jasper.group;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition1Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition1Test.java
index fe09832..65c1362 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition1Test.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
+package software.xdev.dynamicreports.test.jasper.group;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition2Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition2Test.java
index 24dee71..50a1f66 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition2Test.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
+package software.xdev.dynamicreports.test.jasper.group;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition3Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition3Test.java
index d9de2bb..005c2ab 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/GroupPosition3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/GroupPosition3Test.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
+package software.xdev.dynamicreports.test.jasper.group;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.GroupFooterPosition;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.GroupFooterPosition;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRGroup;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/PercentageGroup1Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/PercentageGroup1Test.java
index 7f09652..94a9f38 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/PercentageGroup1Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
+package software.xdev.dynamicreports.test.jasper.group;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.PercentageColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.PercentageTotalType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.PercentageColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.PercentageTotalType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/PercentageGroup2Test.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/PercentageGroup2Test.java
index 17b8783..ac187d7 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/group/PercentageGroup2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/group/PercentageGroup2Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.group;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.PercentageColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.PercentageTotalType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.group;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.PercentageColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.PercentageTotalType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/BandTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/BandTest.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/BandTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/BandTest.java
index 9f01441..2273fc6 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/BandTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/BandTest.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+package software.xdev.dynamicreports.test.jasper.report;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnGridTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ColumnGridTest.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnGridTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ColumnGridTest.java
index 5daddb5..6e09980 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnGridTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ColumnGridTest.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+package software.xdev.dynamicreports.test.jasper.report;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnsPerPageTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ColumnsPerPageTest.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnsPerPageTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ColumnsPerPageTest.java
index 677a6b9..4eb519a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ColumnsPerPageTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ColumnsPerPageTest.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.ListType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+package software.xdev.dynamicreports.test.jasper.report;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.ListType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java
index 5958621..e20a16c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport1Test.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 import java.io.ByteArrayOutputStream;
 
@@ -27,9 +27,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java
index d384b3a..1062109 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport2Test.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 import java.io.ByteArrayOutputStream;
 
@@ -28,10 +28,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java
index 9197187..e6c6fec 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport3Test.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 import java.io.ByteArrayOutputStream;
 
@@ -27,10 +27,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.jasper.base.reporthandler.JasperPrintListFileHandler;
-import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.base.reporthandler.JasperPrintListFileHandler;
+import software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.fill.JRSwapFileVirtualizer;
 import net.sf.jasperreports.engine.util.JRSwapFile;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java
index 8494d65..3e007a0 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport4Test.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 import java.io.ByteArrayOutputStream;
 
@@ -27,10 +27,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.jasper.base.reporthandler.JasperPrintListHandler;
-import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.base.reporthandler.JasperPrintListHandler;
+import software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java
index 0296b1e..62e67b7 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ConcatenatedReport5Test.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 import java.io.ByteArrayOutputStream;
 
@@ -27,10 +27,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRField;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/CustomFontTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/CustomFontTest.java
similarity index 71%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/CustomFontTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/CustomFontTest.java
index 801bcfe..161a39c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/CustomFontTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/CustomFontTest.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/DetailBand1Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/DetailBand1Test.java
index 64b171f..fbc4016 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/DetailBand1Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/DetailBand2Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/DetailBand2Test.java
index 46333e2..97b1501 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/DetailBand2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/DetailBand2Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExportTest.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExportTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExportTest.java
index ee6bef2..5d1d469 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExportTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExportTest.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.concatenatedReport;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.concatenatedReport;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 import java.io.ByteArrayOutputStream;
 
@@ -27,11 +27,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.jasper.constant.ImageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.jasper.constant.ImageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExpressionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExpressionTest.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExpressionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExpressionTest.java
index 2a2fbd7..a042ec2 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ExpressionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExpressionTest.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/FieldDataTypeTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/FieldDataTypeTest.java
similarity index 91%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/FieldDataTypeTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/FieldDataTypeTest.java
index c5f31b9..fa68820 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/FieldDataTypeTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/FieldDataTypeTest.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.FieldBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.report;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.FieldBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
@@ -30,10 +30,10 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/HyperLinkTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/HyperLinkTest.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/HyperLinkTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/HyperLinkTest.java
index 37cff23..ea95d73 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/HyperLinkTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/HyperLinkTest.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.hyperLink;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.hyperLink;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.HyperLinkBuilder;
-import net.sf.dynamicreports.report.constant.HyperLinkTarget;
-import net.sf.dynamicreports.report.constant.HyperLinkType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.HyperLinkBuilder;
+import software.xdev.dynamicreports.report.constant.HyperLinkTarget;
+import software.xdev.dynamicreports.report.constant.HyperLinkType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRPrintText;
 import net.sf.jasperreports.engine.type.HyperlinkTargetEnum;
 import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePageWidthTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/IgnorePageWidthTest.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePageWidthTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/IgnorePageWidthTest.java
index f8787f4..86a2528 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePageWidthTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/IgnorePageWidthTest.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePaginationTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/IgnorePaginationTest.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePaginationTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/IgnorePaginationTest.java
index a4170a7..de4cacd 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/IgnorePaginationTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/IgnorePaginationTest.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.type.OrientationEnum;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/JasperExpressionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/JasperExpressionTest.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/JasperExpressionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/JasperExpressionTest.java
index 01911a9..c9d9c16 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/JasperExpressionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/JasperExpressionTest.java
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Serializable;
@@ -26,11 +26,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
@@ -69,7 +69,7 @@ public void test()
 			final ByteArrayOutputStream bos = new ByteArrayOutputStream();
             this.getReportBuilder().toJrXml(bos);
 			final String jrxml = bos.toString();
-			Assertions.assertFalse(StringUtils.contains(jrxml, "net.sf.dynamicreports"));
+			Assertions.assertFalse(StringUtils.contains(jrxml, "software.xdev.dynamicreports"));
 		}
 		catch(final DRException e)
 		{
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ListDataTypeTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ListDataTypeTest.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ListDataTypeTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ListDataTypeTest.java
index a14e129..83f02e5 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ListDataTypeTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ListDataTypeTest.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/MarkupTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/MarkupTest.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/MarkupTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/MarkupTest.java
index 68b6f82..bf59453 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/MarkupTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/MarkupTest.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Markup;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Markup;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDataSectionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/NoDataSectionTest.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDataSectionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/NoDataSectionTest.java
index 9a6e719..b47b348 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDataSectionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/NoDataSectionTest.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDetailSectionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/NoDetailSectionTest.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDetailSectionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/NoDetailSectionTest.java
index 950a179..6f05260 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/NoDetailSectionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/NoDetailSectionTest.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ParametersTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ParametersTest.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ParametersTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ParametersTest.java
index cbde64c..112fb75 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ParametersTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ParametersTest.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
 
@@ -30,7 +30,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java
index ee63642..8dcde1b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/PrintWhenExpressionTest.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report1Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report1Test.java
index 8effbb7..8d3fb3b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report1Test.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.parameter;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.parameter;
 
 import java.math.BigDecimal;
 import java.util.ListResourceBundle;
@@ -28,15 +28,15 @@
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.AbstractScriptlet;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.constant.WhenResourceMissingType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.AbstractScriptlet;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.constant.WhenResourceMissingType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JasperPrint;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report2Test.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report2Test.java
index bbe4fcc..bf9081e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report2Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report3Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report3Test.java
index 4faa3a2..520127a 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report3Test.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JasperPrint;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report4Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report4Test.java
index 5aebfcc..89354a4 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report4Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.Language;
-import net.sf.dynamicreports.report.constant.Orientation;
-import net.sf.dynamicreports.report.constant.RunDirection;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.Language;
+import software.xdev.dynamicreports.report.constant.Orientation;
+import software.xdev.dynamicreports.report.constant.RunDirection;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report5Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report5Test.java
index 608273d..bfdb793 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/Report5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/Report5Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.JRParameter;
@@ -33,9 +33,9 @@
 import java.util.Locale;
 import java.util.Map;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground1Test.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground1Test.java
index 60b534f..cf42194 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground1Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground2Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground2Test.java
index 8572f63..5b476f6 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground2Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground3Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground3Test.java
index 272ce9d..5bd673c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ReportBackground3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ReportBackground3Test.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/TitleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/TitleTest.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/TitleTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/TitleTest.java
index ee70ccc..0594f34 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/TitleTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/TitleTest.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.hyperLink;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.hyperLink;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRPrintText;
 import net.sf.jasperreports.engine.type.HyperlinkTypeEnum;
@@ -41,7 +41,7 @@ class TitleTest extends AbstractJasperValueTest
 	@Override
 	protected void configureReport(final JasperReportBuilder rb)
 	{
-		rb.setResourceBundle("net.sf.dynamicreports.test.jasper.report.test")
+		rb.setResourceBundle("software.xdev.dynamicreports.test.jasper.report.test")
 			.columns(col.column("Column1", "field1", Integer.class))
 			.title(cmp.text("title 1").setHyperLink(hyperLink("link").setTooltip("tooltip")),
 				cmp.text("title 2"),
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ValueTypeNamesTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ValueTypeNamesTest.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ValueTypeNamesTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ValueTypeNamesTest.java
index 02cbc79..f9b9f44 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/ValueTypeNamesTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ValueTypeNamesTest.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.parameter;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.parameter;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.io.Serializable;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VariableTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/VariableTest.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VariableTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/VariableTest.java
index b81bc6e..433a9f8 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VariableTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/VariableTest.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.VariableBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.VariableBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.variable;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.variable;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VirtualizerTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/VirtualizerTest.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VirtualizerTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/VirtualizerTest.java
index 3b9338a..0b972c1 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/report/VirtualizerTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/VirtualizerTest.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.report;
+package software.xdev.dynamicreports.test.jasper.report;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.fill.JRFileVirtualizer;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle1Test.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle1Test.java
index 3efb1a5..ce1f032 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle1Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+package software.xdev.dynamicreports.test.jasper.style;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.awt.Color;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle2Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle2Test.java
index e827316..4896390 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle2Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.ReportTemplateBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.awt.Color;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle3Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle3Test.java
index 1d4af1f..f3a6c32 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/BandStyle3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/BandStyle3Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.awt.Color;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/DefaultFontTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/DefaultFontTest.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/DefaultFontTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/DefaultFontTest.java
index ef0934c..7933d34 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/DefaultFontTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/DefaultFontTest.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.awt.Color;
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.FontBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.FontBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style1Test.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style1Test.java
index 4902083..393a298 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style1Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style2Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style2Test.java
index 2be6810..5418e60 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style2Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style3Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style3Test.java
index d74a9bf..52e07b8 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style3Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.awt.Color;
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style4Test.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style4Test.java
index 8bd8bed..a05758e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style4Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.awt.Color;
 import java.io.Serializable;
 import java.util.Date;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style5Test.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style5Test.java
index ce65514..2b6f06e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style5Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style6Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style6Test.java
index eacf440..c11b658 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style6Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cnd;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cnd;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.awt.Color;
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.ConditionalStyleBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.ConditionalStyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style7Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style7Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style7Test.java
index 4df05ea..397fb68 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style7Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style7Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.io.Serializable;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.constant.LineSpacing;
-import net.sf.dynamicreports.report.constant.TabStopAlignment;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.constant.LineSpacing;
+import software.xdev.dynamicreports.report.constant.TabStopAlignment;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRStyle;
 import net.sf.jasperreports.engine.TabStop;
 import net.sf.jasperreports.engine.type.LineSpacingEnum;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style8Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style8Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style8Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style8Test.java
index ef5b251..9ae09a3 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style8Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style8Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.BooleanColumnBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.HorizontalImageAlignment;
-import net.sf.dynamicreports.report.constant.VerticalImageAlignment;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.BooleanColumnBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.HorizontalImageAlignment;
+import software.xdev.dynamicreports.report.constant.VerticalImageAlignment;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.HorizontalImageAlignEnum;
 import net.sf.jasperreports.engine.type.HorizontalTextAlignEnum;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style9Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style9Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style9Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style9Test.java
index 3e5755c..a32f99c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/Style9Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/Style9Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRStyle;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/StyleNamesTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/StyleNamesTest.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/StyleNamesTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/StyleNamesTest.java
index 3254090..0dbd524 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/StyleNamesTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/StyleNamesTest.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.Charset;
@@ -27,10 +27,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.style.TemplateStyleBuilder;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.style.TemplateStyleBuilder;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRStyle;
 import net.sf.jasperreports.engine.design.JasperDesign;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle1Test.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle1Test.java
index 688293b..e49854b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle1Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle2Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle2Test.java
index eeb6708..ef8aec5 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle2Test.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.ReportTemplateBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle3Test.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle3Test.java
index 3bc0b0f..6ba7f37 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle3Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 import java.awt.Color;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle4Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle4Test.java
index 2c71a52..77aff63 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle4Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.ReportTemplateBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle5Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle5Test.java
index 3f8732f..099b17e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle5Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.style.TemplateStylesBuilder;
-import net.sf.dynamicreports.report.constant.WhenNoDataType;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
-import net.sf.dynamicreports.test.jasper.templatedesign.TemplateDesign1Test;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.style.TemplateStylesBuilder;
+import software.xdev.dynamicreports.report.constant.WhenNoDataType;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.test.jasper.templatedesign.TemplateDesign1Test;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 
@@ -31,7 +31,7 @@
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle6Test.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle6Test.java
index 52ff1f3..ae3620b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/style/TemplateStyle6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/style/TemplateStyle6Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.style;
+package software.xdev.dynamicreports.test.jasper.style;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
 
 import java.io.Serializable;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.ReportTemplateBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java
index f79af8e..cf16b41 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/JasperSubreport2Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
+package software.xdev.dynamicreports.test.jasper.subreport;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.JRException;
@@ -33,7 +33,7 @@
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/JasperSubreportTest.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreportTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/JasperSubreportTest.java
index 279f46d..4d450a0 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/JasperSubreportTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/JasperSubreportTest.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
+package software.xdev.dynamicreports.test.jasper.subreport;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.component.Components;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.component.Components;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.JRException;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport2Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport2Test.java
index 663f18f..87096a4 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport2Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.subreport;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport3Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport3Test.java
index fd9524c..a92a588 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport3Test.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.subreport;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport4Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport4Test.java
index 9fa3ab8..e1f6a17 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport4Test.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
+package software.xdev.dynamicreports.test.jasper.subreport;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperCompileManager;
 import net.sf.jasperreports.engine.JasperReport;
@@ -30,9 +30,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport5Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport5Test.java
index 963ab01..1458052 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport5Test.java
@@ -15,26 +15,26 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.Components;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.subreport;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.Components;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.List;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport6Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport6Test.java
index 5d58fba..8163ea2 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/Subreport6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/Subreport6Test.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.component.Components;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.subreport;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.component.Components;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportPositionTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/SubreportPositionTest.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportPositionTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/SubreportPositionTest.java
index a983bb6..18d755c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportPositionTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/SubreportPositionTest.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.component.Components;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+package software.xdev.dynamicreports.test.jasper.subreport;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.component.Components;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/SubreportTest.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/SubreportTest.java
index aae5a79..cf14d8f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subreport/SubreportTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subreport/SubreportTest.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subreport;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.component.Components;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.subreport;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.component.Components;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.parameter;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.parameter;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java
index c3cd3e2..d04036c 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal1Test.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.VariableBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.builder.expression.PercentageExpression;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.constant.Evaluation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.subtotal;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.VariableBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.builder.expression.PercentageExpression;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.constant.Evaluation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
@@ -38,9 +38,9 @@
 import java.util.List;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.variable;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.variable;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java
index d584d2e..ed9623f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupCustomSubtotal2Test.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.expression.AbstractComplexExpression;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.expression.AbstractComplexExpression;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.CustomSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java
index 8390b8a..12d4150 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupSubtotal1Test.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java
index 6dfede9..86cd185 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/GroupSubtotal2Test.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java
index 0a46c3f..b299674 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/PercentageSubtotalTest.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.PercentageSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/Subtotal1Test.java
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/Subtotal1Test.java
index 94e54b9..ce0bd34 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/Subtotal1Test.java
@@ -15,25 +15,25 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Locale;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.base.expression.AbstractValueFormatter;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/Subtotal2Test.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/Subtotal2Test.java
index 1310abd..b43e781 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/Subtotal2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/Subtotal2Test.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
@@ -29,9 +29,9 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java
similarity index 73%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java
index c878378..055c3a9 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition1Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Calculation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+package software.xdev.dynamicreports.test.jasper.subtotal;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Calculation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java
index 0a16741..7e083c9 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition2Test.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.VerticalTextAlignment;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.VerticalTextAlignment;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grid;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grid;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java
index b182544..e759e3b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition3Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.GroupHeaderLayout;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.GroupHeaderLayout;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java
index 7c83f08..048162f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition4Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java
similarity index 85%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java
index 931ded4..54dba71 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/subtotal/SubtotalPosition5Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.subtotal;
+package software.xdev.dynamicreports.test.jasper.subtotal;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.constant.Position;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.constant.Position;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java
similarity index 89%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java
index 3aa1714..a40a275 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents1Test.java
@@ -15,27 +15,27 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRPrintText;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java
similarity index 92%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java
index dea0715..052308f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents2Test.java
@@ -15,24 +15,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.exp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.exp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.TextFieldBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRPrintText;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java
index 92423d8..49a2cec 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents3Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Assertions;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.component.TextFieldBuilder;
-import net.sf.dynamicreports.report.definition.expression.DRIExpression;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.component.TextFieldBuilder;
+import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.JRPrintText;
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java
index dfb788e..654415b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents4Test.java
@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.DRICustomValues;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocHeading;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.DRICustomValues;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
@@ -32,9 +32,9 @@
 import java.util.List;
 import java.util.Map;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java
similarity index 75%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java
index 79be29a..b53df27 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents5Test.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java
index 0f91c33..885a775 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents6Test.java
@@ -15,28 +15,28 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
-
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.component.DRTextField;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.CustomGroupBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
+
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.component.DRTextField;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.CustomGroupBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizer;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.field;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.field;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java
index bdfcee4..405a2f0 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents7Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java
similarity index 76%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java
index 2b38ef2..0ad9a61 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents8Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.base.expression.AbstractSimpleExpression;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.definition.ReportParameters;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.base.expression.AbstractSimpleExpression;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.definition.ReportParameters;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java
index bb6f1e6..104c8b1 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContents9Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.util.Locale;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java
similarity index 87%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java
index 5297389..354d80f 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition1Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.group.ColumnGroupBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.ColumnGroupBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.grp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.grp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java
similarity index 82%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java
index 65ebcb9..57fefd4 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition2Test.java
@@ -15,18 +15,18 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java
similarity index 78%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java
index b507191..c383e1b 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition3Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java
similarity index 72%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java
index 58e4e97..4de4866 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition4Test.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.ReportTemplateBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
-import net.sf.dynamicreports.report.constant.TableOfContentsPosition;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.ReportTemplateBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import software.xdev.dynamicreports.report.constant.TableOfContentsPosition;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
-import static net.sf.dynamicreports.report.builder.DynamicReports.template;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.template;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java
similarity index 86%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java
index 3ceeea8..83a7eb8 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsPosition5Test.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsHeadingBuilder;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.tableOfContentsHeading;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java
similarity index 77%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java
index 27cf196..34bab68 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/tableofcontents/TableOfContentsStyleTest.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.tableofcontents;
+package software.xdev.dynamicreports.test.jasper.tableofcontents;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.stl;
-import static net.sf.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.stl;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.tableOfContentsCustomizer;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 import java.awt.Color;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.style.StyleBuilder;
-import net.sf.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
-import net.sf.dynamicreports.report.constant.HorizontalTextAlignment;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.test.jasper.AbstractJasperStyleTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.style.StyleBuilder;
+import software.xdev.dynamicreports.report.builder.tableofcontents.TableOfContentsCustomizerBuilder;
+import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperStyleTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 /**
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java
similarity index 74%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java
index 736f794..aef7f50 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/ReportScriptlet.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.constant.PageType;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.constant.PageType;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRDefaultScriptlet;
 import net.sf.jasperreports.engine.JRScriptletException;
@@ -29,11 +29,11 @@
 
 import java.util.Map;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
-import static net.sf.dynamicreports.report.builder.DynamicReports.type;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.type;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java
similarity index 81%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java
index dafd972..1ae0dd4 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign1Test.java
@@ -15,23 +15,23 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
 import org.junit.jupiter.api.Assertions;
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.AggregationSubtotalBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JasperPrint;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.sbt;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.sbt;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java
index ba9b875..728bea4 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign2Test.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.builder.component.SubreportBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.builder.component.SubreportBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java
index 9c48314..3fd1ef6 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign3Test.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java
index 46f26f1..077e1f6 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign4Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java
index c547045..edc71a8 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesign5Test.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.constant.PageOrientation;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperValueTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.constant.PageOrientation;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperValueTest;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 
 import java.io.InputStream;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java
similarity index 84%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java
index 60d61d8..5e8c516 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition1Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java
similarity index 79%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java
index 4977bcb..7464927 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition2Test.java
@@ -15,19 +15,19 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java
similarity index 83%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java
index a3ab251..096a3e2 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition3Test.java
@@ -15,20 +15,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java
similarity index 80%
rename from dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java
rename to dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java
index d3ead30..353e868 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/net/sf/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/templatedesign/TemplateDesignPosition4Test.java
@@ -15,22 +15,22 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.sf.dynamicreports.test.jasper.templatedesign;
+package software.xdev.dynamicreports.test.jasper.templatedesign;
 
-import net.sf.dynamicreports.jasper.builder.JasperReportBuilder;
-import net.sf.dynamicreports.report.builder.column.TextColumnBuilder;
-import net.sf.dynamicreports.report.datasource.DRDataSource;
-import net.sf.dynamicreports.report.exception.DRException;
-import net.sf.dynamicreports.test.jasper.AbstractJasperPositionTest;
+import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
+import software.xdev.dynamicreports.report.builder.column.TextColumnBuilder;
+import software.xdev.dynamicreports.report.datasource.DRDataSource;
+import software.xdev.dynamicreports.report.exception.DRException;
+import software.xdev.dynamicreports.test.jasper.AbstractJasperPositionTest;
 import net.sf.jasperreports.engine.JRDataSource;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
-import static net.sf.dynamicreports.report.builder.DynamicReports.cmp;
-import static net.sf.dynamicreports.report.builder.DynamicReports.col;
-import static net.sf.dynamicreports.report.builder.DynamicReports.margin;
-import static net.sf.dynamicreports.report.builder.DynamicReports.report;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.cmp;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.col;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.margin;
+import static software.xdev.dynamicreports.report.builder.DynamicReports.report;
 
 /**
  * @author Ricardo Mariaca
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/base/dynamicreports-defaults.xml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/base/dynamicreports-defaults.xml
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/base/dynamicreports-defaults.xml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/base/dynamicreports-defaults.xml
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Bold.ttf b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/Arimo-Bold.ttf
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Bold.ttf
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/Arimo-Bold.ttf
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Italic.ttf b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/Arimo-Italic.ttf
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Italic.ttf
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/Arimo-Italic.ttf
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-License.txt b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/Arimo-License.txt
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-License.txt
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/Arimo-License.txt
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Regular.ttf b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/Arimo-Regular.ttf
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/Arimo-Regular.ttf
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/Arimo-Regular.ttf
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-License.txt b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/FreeUniversal-License.txt
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-License.txt
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/FreeUniversal-License.txt
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-Regular.ttf b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/FreeUniversal-Regular.ttf
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/fonts/FreeUniversal-Regular.ttf
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/fonts/FreeUniversal-Regular.ttf
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/component/dynamicreports.png b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/component/dynamicreports.png
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/component/dynamicreports.png
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/component/dynamicreports.png
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/datasource/data.xml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/datasource/data.xml
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/datasource/data.xml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/datasource/data.xml
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/report/test.properties b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/report/test.properties
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/report/test.properties
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/report/test.properties
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate1.jrtx b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/style/StyleTemplate1.jrtx
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate1.jrtx
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/style/StyleTemplate1.jrtx
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate2.jrtx b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/style/StyleTemplate2.jrtx
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/style/StyleTemplate2.jrtx
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/style/StyleTemplate2.jrtx
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/detailsubreport.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/detailsubreport.jrxml
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/detailsubreport.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/detailsubreport.jrxml
index bba9783..9c6bc63 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/detailsubreport.jrxml
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/detailsubreport.jrxml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
               xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
-              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="software.xdev.dynamicreports.jasper.base.JasperScriptlet">
     <style name="style_2_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
         <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
     </style>
-    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="software.xdev.dynamicreports.report.definition.ReportParameters"/>
     <title>
         <band height="16">
             <textField isStretchWithOverflow="true" isBlankWhenNull="true">
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport1.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport1.jrxml
similarity index 90%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport1.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport1.jrxml
index d0d4e19..0ebe330 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport1.jrxml
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport1.jrxml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
               xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
-              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="software.xdev.dynamicreports.jasper.base.JasperScriptlet">
     <style name="style_22_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
         <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
     </style>
-    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="software.xdev.dynamicreports.report.definition.ReportParameters"/>
     <field name="column1" class="java.lang.String"/>
     <title>
         <band height="16">
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport2.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport2.jrxml
similarity index 93%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport2.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport2.jrxml
index 18b8fd3..47b2acc 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport2.jrxml
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport2.jrxml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
               xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
-              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="software.xdev.dynamicreports.jasper.base.JasperScriptlet">
     <style name="style_27_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
         <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
     </style>
-    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="software.xdev.dynamicreports.report.definition.ReportParameters"/>
     <field name="column1" class="java.lang.String"/>
     <field name="column2" class="java.lang.String"/>
     <title>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport3.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport3.jrxml
similarity index 95%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport3.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport3.jrxml
index e59aeb5..36a9300 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport3.jrxml
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport3.jrxml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
               xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
-              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="software.xdev.dynamicreports.jasper.base.JasperScriptlet">
     <style name="style_33_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
         <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
     </style>
-    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="software.xdev.dynamicreports.report.definition.ReportParameters"/>
     <field name="column1" class="java.lang.String"/>
     <field name="column2" class="java.lang.String"/>
     <field name="column3" class="java.lang.String"/>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport4.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport4.jrxml
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport4.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport4.jrxml
index 948d0ea..2a2cd4e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/subreport4.jrxml
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/subreport4.jrxml
@@ -5,7 +5,7 @@
     <style name="style_22_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
         <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
     </style>
-    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="software.xdev.dynamicreports.report.definition.ReportParameters"/>
     <parameter name="parameter3" class="java.lang.String"/>
     <parameter name="parameter5" class="java.lang.String"/>
     <summary>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/titlesubreport.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/titlesubreport.jrxml
similarity index 88%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/titlesubreport.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/titlesubreport.jrxml
index 06d3276..03385c4 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/subreport/titlesubreport.jrxml
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/subreport/titlesubreport.jrxml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
               xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Report" pageWidth="595" pageHeight="842"
-              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="net.sf.dynamicreports.jasper.base.JasperScriptlet">
+              columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" scriptletClass="software.xdev.dynamicreports.jasper.base.JasperScriptlet">
     <style name="style_21_" isDefault="false" forecolor="#000000" isBlankWhenNull="true" fontSize="10" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false">
         <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"/>
     </style>
-    <parameter name="MASTER_REPORT_PARAMETERS" class="net.sf.dynamicreports.report.definition.ReportParameters"/>
+    <parameter name="MASTER_REPORT_PARAMETERS" class="software.xdev.dynamicreports.report.definition.ReportParameters"/>
     <field name="field1" class="java.lang.String"/>
     <columnHeader>
         <band height="16">
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign1.jrxml
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign2.jrxml
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign3.jrxml
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml
similarity index 94%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml
index e541950..a85be06 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign4.jrxml
@@ -2,7 +2,7 @@
 <jasperReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jasperreports.sourceforge.net/jasperreports"
               xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templatedesign4" pageWidth="595" pageHeight="842"
               whenNoDataType="AllSectionsNoDetail" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10"
-              scriptletClass="net.sf.dynamicreports.test.jasper.templatedesign.ReportScriptlet">
+              scriptletClass="software.xdev.dynamicreports.test.jasper.templatedesign.ReportScriptlet">
     <property name="ireport.zoom" value="1.5"/>
     <property name="ireport.x" value="0"/>
     <property name="ireport.y" value="0"/>
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign5.jrxml
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml b/dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml
similarity index 100%
rename from dynamicreports-core-for-grid-exporter/src/test/resources/net/sf/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml
rename to dynamicreports-core-for-grid-exporter/src/test/resources/software/xdev/dynamicreports/test/jasper/templatedesign/templatedesign6.jrxml

From 9b92f29cda7a406900beb1ebe6e5c2e5d378b47f Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 13:13:37 +0200
Subject: [PATCH 09/21] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fa0914..b79c369 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Initial release of the fork
 
 ## Differences to [dynamicreports/dynamicreports-core](https://github.com/dynamicreports/dynamicreports/tree/f7d73961462f3f13cbc27c91df90d4cc3ccc669e/dynamicreports-core)
+* Renamed ``net.sf.dynamicreports`` to ``software.xdev.dynamicreports`` to prevent conflicts with existing installations
 * Changed from ``javax`` to ``jakarta``
   * Added ``jakarta.xml.bind-api``
   * Replaced ``maven-jaxb2-plugin`` with ``jaxb40-maven-plugin``

From 301d1cfd6f69cddecb4adfb202d3593885c3a5c6 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 13:27:46 +0200
Subject: [PATCH 10/21] Fix tests

---
 .../src/test/resources/customfonts.xml                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/customfonts.xml b/dynamicreports-core-for-grid-exporter/src/test/resources/customfonts.xml
index 1ccb9b0..3a04e7e 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/customfonts.xml
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/customfonts.xml
@@ -3,15 +3,15 @@
 <fontFamilies>
 
   <fontFamily name="Arimo">
-    <normal>net/sf/dynamicreports/test/fonts/Arimo-Regular.ttf</normal>
-    <bold>net/sf/dynamicreports/test/fonts/Arimo-Bold.ttf</bold>
-    <italic>net/sf/dynamicreports/test/fonts/Arimo-Italic.ttf</italic>
+    <normal>software/xdev/dynamicreports/test/fonts/Arimo-Regular.ttf</normal>
+    <bold>software/xdev/dynamicreports/test/fonts/Arimo-Bold.ttf</bold>
+    <italic>software/xdev/dynamicreports/test/fonts/Arimo-Italic.ttf</italic>
     <pdfEncoding>Identity-H</pdfEncoding>
     <pdfEmbedded>true</pdfEmbedded>
   </fontFamily>
 
   <fontFamily name="FreeUniversal">
-    <normal>net/sf/dynamicreports/test/fonts/FreeUniversal-Regular.ttf</normal>
+    <normal>software/xdev/dynamicreports/test/fonts/FreeUniversal-Regular.ttf</normal>
   </fontFamily>
 
 </fontFamilies>

From b71ed621c157c57d28d29a0e214f802283d993b7 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 14:00:43 +0200
Subject: [PATCH 11/21] Fix Javadoc + Track generated files in Git

---
 dynamicreports-core-for-grid-exporter/pom.xml |  11 +-
 .../report/defaults/xml/ObjectFactory.java    |  79 ++
 .../report/defaults/xml/XmlDataType.java      |  85 ++
 .../defaults/xml/XmlDynamicReports.java       | 735 ++++++++++++++++++
 .../report/defaults/xml/XmlFont.java          | 166 ++++
 .../defaults/xml/XmlHorizontalAlignment.java  |  41 +
 .../report/builder/datatype/BooleanType.java  |   8 +-
 .../report/constant/HorizontalAlignment.java  |   1 +
 .../report/constant/StretchType.java          |  14 +-
 .../report/constant/VerticalAlignment.java    |   1 +
 10 files changed, 1131 insertions(+), 10 deletions(-)
 create mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/ObjectFactory.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java

diff --git a/dynamicreports-core-for-grid-exporter/pom.xml b/dynamicreports-core-for-grid-exporter/pom.xml
index 688062f..2416622 100644
--- a/dynamicreports-core-for-grid-exporter/pom.xml
+++ b/dynamicreports-core-for-grid-exporter/pom.xml
@@ -202,6 +202,15 @@
 				<artifactId>jaxb40-maven-plugin</artifactId>
 				<version>0.16.1</version>
 				<configuration>
+					<!-- We have no m2e or Eclipse IDE so ignore the warnings -->
+					<!-- Alternative is to use the maven clean plugin inside that directory -->
+					<forceRegenerate>true</forceRegenerate>
+					<!-- We want reproducible files! -->
+					<noFileHeader>true</noFileHeader>
+					<!-- Episode file contains current timestamps and localized messages so disable it -->
+					<episode>false</episode>
+					<!-- Generate into a persistent directory so that changes are noticeable -->
+					<generateDirectory>src/gen/jaxb</generateDirectory>
 					<schemaIncludes>
 						<schemaInclude>**/dynamicreports.xsd</schemaInclude>
 					</schemaIncludes>
@@ -234,7 +243,7 @@
 						</goals>
 						<configuration>
 							<sources>
-								<source>${basedir}/target/generated-sources/xjc</source>
+								<source>${basedir}/src/gen/jaxb</source>
 							</sources>
 						</configuration>
 					</execution>
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/ObjectFactory.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/ObjectFactory.java
new file mode 100644
index 0000000..a81615c
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/ObjectFactory.java
@@ -0,0 +1,79 @@
+
+package software.xdev.dynamicreports.report.defaults.xml;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the software.xdev.dynamicreports.report.defaults.xml package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _DynamicReports_QNAME = new QName("", "DynamicReports");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: software.xdev.dynamicreports.report.defaults.xml
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link XmlDynamicReports }
+     * 
+     * @return
+     *     the new instance of {@link XmlDynamicReports }
+     */
+    public XmlDynamicReports createXmlDynamicReports() {
+        return new XmlDynamicReports();
+    }
+
+    /**
+     * Create an instance of {@link XmlFont }
+     * 
+     * @return
+     *     the new instance of {@link XmlFont }
+     */
+    public XmlFont createXmlFont() {
+        return new XmlFont();
+    }
+
+    /**
+     * Create an instance of {@link XmlDataType }
+     * 
+     * @return
+     *     the new instance of {@link XmlDataType }
+     */
+    public XmlDataType createXmlDataType() {
+        return new XmlDataType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link XmlDynamicReports }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link XmlDynamicReports }{@code >}
+     */
+    @XmlElementDecl(namespace = "", name = "DynamicReports")
+    public JAXBElement<XmlDynamicReports> createDynamicReports(XmlDynamicReports value) {
+        return new JAXBElement<>(_DynamicReports_QNAME, XmlDynamicReports.class, null, value);
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
new file mode 100644
index 0000000..19e18a8
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
@@ -0,0 +1,85 @@
+
+package software.xdev.dynamicreports.report.defaults.xml;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java-Klasse für DataType complex type.
+ * 
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ * 
+ * <pre>{@code
+ * <complexType name="DataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="pattern" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="horizontalAlignment" type="{}HorizontalAlignment" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DataType")
+public class XmlDataType {
+
+    @XmlAttribute(name = "pattern")
+    protected String pattern;
+    @XmlAttribute(name = "horizontalAlignment")
+    protected XmlHorizontalAlignment horizontalAlignment;
+
+    /**
+     * Ruft den Wert der pattern-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPattern() {
+        return pattern;
+    }
+
+    /**
+     * Legt den Wert der pattern-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPattern(String value) {
+        this.pattern = value;
+    }
+
+    /**
+     * Ruft den Wert der horizontalAlignment-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlHorizontalAlignment }
+     *     
+     */
+    public XmlHorizontalAlignment getHorizontalAlignment() {
+        return horizontalAlignment;
+    }
+
+    /**
+     * Legt den Wert der horizontalAlignment-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlHorizontalAlignment }
+     *     
+     */
+    public void setHorizontalAlignment(XmlHorizontalAlignment value) {
+        this.horizontalAlignment = value;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
new file mode 100644
index 0000000..efd0345
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
@@ -0,0 +1,735 @@
+
+package software.xdev.dynamicreports.report.defaults.xml;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java-Klasse für DynamicReports complex type.
+ * 
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ * 
+ * <pre>{@code
+ * <complexType name="DynamicReports">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="font" type="{}Font" minOccurs="0"/>
+ *         <element name="bigDecimalType" type="{}DataType" minOccurs="0"/>
+ *         <element name="bigIntegerType" type="{}DataType" minOccurs="0"/>
+ *         <element name="byteType" type="{}DataType" minOccurs="0"/>
+ *         <element name="doubleType" type="{}DataType" minOccurs="0"/>
+ *         <element name="floatType" type="{}DataType" minOccurs="0"/>
+ *         <element name="integerType" type="{}DataType" minOccurs="0"/>
+ *         <element name="longType" type="{}DataType" minOccurs="0"/>
+ *         <element name="shortType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateYearToMonthType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateYearToHourType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateYearToMinuteType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateYearToSecondType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateYearToFractionType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateYearType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateMonthType" type="{}DataType" minOccurs="0"/>
+ *         <element name="dateDayType" type="{}DataType" minOccurs="0"/>
+ *         <element name="timeHourToMinuteType" type="{}DataType" minOccurs="0"/>
+ *         <element name="timeHourToSecondType" type="{}DataType" minOccurs="0"/>
+ *         <element name="timeHourToFractionType" type="{}DataType" minOccurs="0"/>
+ *         <element name="percentageType" type="{}DataType" minOccurs="0"/>
+ *         <element name="booleanType" type="{}DataType" minOccurs="0"/>
+ *         <element name="characterType" type="{}DataType" minOccurs="0"/>
+ *         <element name="stringType" type="{}DataType" minOccurs="0"/>
+ *         <element name="loadSystemFonts" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DynamicReports", propOrder = {
+    "font",
+    "bigDecimalType",
+    "bigIntegerType",
+    "byteType",
+    "doubleType",
+    "floatType",
+    "integerType",
+    "longType",
+    "shortType",
+    "dateType",
+    "dateYearToMonthType",
+    "dateYearToHourType",
+    "dateYearToMinuteType",
+    "dateYearToSecondType",
+    "dateYearToFractionType",
+    "dateYearType",
+    "dateMonthType",
+    "dateDayType",
+    "timeHourToMinuteType",
+    "timeHourToSecondType",
+    "timeHourToFractionType",
+    "percentageType",
+    "booleanType",
+    "characterType",
+    "stringType",
+    "loadSystemFonts"
+})
+public class XmlDynamicReports {
+
+    protected XmlFont font;
+    protected XmlDataType bigDecimalType;
+    protected XmlDataType bigIntegerType;
+    protected XmlDataType byteType;
+    protected XmlDataType doubleType;
+    protected XmlDataType floatType;
+    protected XmlDataType integerType;
+    protected XmlDataType longType;
+    protected XmlDataType shortType;
+    protected XmlDataType dateType;
+    protected XmlDataType dateYearToMonthType;
+    protected XmlDataType dateYearToHourType;
+    protected XmlDataType dateYearToMinuteType;
+    protected XmlDataType dateYearToSecondType;
+    protected XmlDataType dateYearToFractionType;
+    protected XmlDataType dateYearType;
+    protected XmlDataType dateMonthType;
+    protected XmlDataType dateDayType;
+    protected XmlDataType timeHourToMinuteType;
+    protected XmlDataType timeHourToSecondType;
+    protected XmlDataType timeHourToFractionType;
+    protected XmlDataType percentageType;
+    protected XmlDataType booleanType;
+    protected XmlDataType characterType;
+    protected XmlDataType stringType;
+    protected Boolean loadSystemFonts;
+
+    /**
+     * Ruft den Wert der font-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlFont }
+     *     
+     */
+    public XmlFont getFont() {
+        return font;
+    }
+
+    /**
+     * Legt den Wert der font-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlFont }
+     *     
+     */
+    public void setFont(XmlFont value) {
+        this.font = value;
+    }
+
+    /**
+     * Ruft den Wert der bigDecimalType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getBigDecimalType() {
+        return bigDecimalType;
+    }
+
+    /**
+     * Legt den Wert der bigDecimalType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setBigDecimalType(XmlDataType value) {
+        this.bigDecimalType = value;
+    }
+
+    /**
+     * Ruft den Wert der bigIntegerType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getBigIntegerType() {
+        return bigIntegerType;
+    }
+
+    /**
+     * Legt den Wert der bigIntegerType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setBigIntegerType(XmlDataType value) {
+        this.bigIntegerType = value;
+    }
+
+    /**
+     * Ruft den Wert der byteType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getByteType() {
+        return byteType;
+    }
+
+    /**
+     * Legt den Wert der byteType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setByteType(XmlDataType value) {
+        this.byteType = value;
+    }
+
+    /**
+     * Ruft den Wert der doubleType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDoubleType() {
+        return doubleType;
+    }
+
+    /**
+     * Legt den Wert der doubleType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDoubleType(XmlDataType value) {
+        this.doubleType = value;
+    }
+
+    /**
+     * Ruft den Wert der floatType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getFloatType() {
+        return floatType;
+    }
+
+    /**
+     * Legt den Wert der floatType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setFloatType(XmlDataType value) {
+        this.floatType = value;
+    }
+
+    /**
+     * Ruft den Wert der integerType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getIntegerType() {
+        return integerType;
+    }
+
+    /**
+     * Legt den Wert der integerType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setIntegerType(XmlDataType value) {
+        this.integerType = value;
+    }
+
+    /**
+     * Ruft den Wert der longType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getLongType() {
+        return longType;
+    }
+
+    /**
+     * Legt den Wert der longType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setLongType(XmlDataType value) {
+        this.longType = value;
+    }
+
+    /**
+     * Ruft den Wert der shortType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getShortType() {
+        return shortType;
+    }
+
+    /**
+     * Legt den Wert der shortType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setShortType(XmlDataType value) {
+        this.shortType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateType() {
+        return dateType;
+    }
+
+    /**
+     * Legt den Wert der dateType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateType(XmlDataType value) {
+        this.dateType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateYearToMonthType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateYearToMonthType() {
+        return dateYearToMonthType;
+    }
+
+    /**
+     * Legt den Wert der dateYearToMonthType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateYearToMonthType(XmlDataType value) {
+        this.dateYearToMonthType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateYearToHourType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateYearToHourType() {
+        return dateYearToHourType;
+    }
+
+    /**
+     * Legt den Wert der dateYearToHourType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateYearToHourType(XmlDataType value) {
+        this.dateYearToHourType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateYearToMinuteType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateYearToMinuteType() {
+        return dateYearToMinuteType;
+    }
+
+    /**
+     * Legt den Wert der dateYearToMinuteType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateYearToMinuteType(XmlDataType value) {
+        this.dateYearToMinuteType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateYearToSecondType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateYearToSecondType() {
+        return dateYearToSecondType;
+    }
+
+    /**
+     * Legt den Wert der dateYearToSecondType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateYearToSecondType(XmlDataType value) {
+        this.dateYearToSecondType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateYearToFractionType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateYearToFractionType() {
+        return dateYearToFractionType;
+    }
+
+    /**
+     * Legt den Wert der dateYearToFractionType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateYearToFractionType(XmlDataType value) {
+        this.dateYearToFractionType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateYearType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateYearType() {
+        return dateYearType;
+    }
+
+    /**
+     * Legt den Wert der dateYearType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateYearType(XmlDataType value) {
+        this.dateYearType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateMonthType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateMonthType() {
+        return dateMonthType;
+    }
+
+    /**
+     * Legt den Wert der dateMonthType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateMonthType(XmlDataType value) {
+        this.dateMonthType = value;
+    }
+
+    /**
+     * Ruft den Wert der dateDayType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getDateDayType() {
+        return dateDayType;
+    }
+
+    /**
+     * Legt den Wert der dateDayType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setDateDayType(XmlDataType value) {
+        this.dateDayType = value;
+    }
+
+    /**
+     * Ruft den Wert der timeHourToMinuteType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getTimeHourToMinuteType() {
+        return timeHourToMinuteType;
+    }
+
+    /**
+     * Legt den Wert der timeHourToMinuteType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setTimeHourToMinuteType(XmlDataType value) {
+        this.timeHourToMinuteType = value;
+    }
+
+    /**
+     * Ruft den Wert der timeHourToSecondType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getTimeHourToSecondType() {
+        return timeHourToSecondType;
+    }
+
+    /**
+     * Legt den Wert der timeHourToSecondType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setTimeHourToSecondType(XmlDataType value) {
+        this.timeHourToSecondType = value;
+    }
+
+    /**
+     * Ruft den Wert der timeHourToFractionType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getTimeHourToFractionType() {
+        return timeHourToFractionType;
+    }
+
+    /**
+     * Legt den Wert der timeHourToFractionType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setTimeHourToFractionType(XmlDataType value) {
+        this.timeHourToFractionType = value;
+    }
+
+    /**
+     * Ruft den Wert der percentageType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getPercentageType() {
+        return percentageType;
+    }
+
+    /**
+     * Legt den Wert der percentageType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setPercentageType(XmlDataType value) {
+        this.percentageType = value;
+    }
+
+    /**
+     * Ruft den Wert der booleanType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getBooleanType() {
+        return booleanType;
+    }
+
+    /**
+     * Legt den Wert der booleanType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setBooleanType(XmlDataType value) {
+        this.booleanType = value;
+    }
+
+    /**
+     * Ruft den Wert der characterType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getCharacterType() {
+        return characterType;
+    }
+
+    /**
+     * Legt den Wert der characterType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setCharacterType(XmlDataType value) {
+        this.characterType = value;
+    }
+
+    /**
+     * Ruft den Wert der stringType-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public XmlDataType getStringType() {
+        return stringType;
+    }
+
+    /**
+     * Legt den Wert der stringType-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlDataType }
+     *     
+     */
+    public void setStringType(XmlDataType value) {
+        this.stringType = value;
+    }
+
+    /**
+     * Ruft den Wert der loadSystemFonts-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isLoadSystemFonts() {
+        return loadSystemFonts;
+    }
+
+    /**
+     * Legt den Wert der loadSystemFonts-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setLoadSystemFonts(Boolean value) {
+        this.loadSystemFonts = value;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
new file mode 100644
index 0000000..c702ad9
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
@@ -0,0 +1,166 @@
+
+package software.xdev.dynamicreports.report.defaults.xml;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java-Klasse für Font complex type.
+ * 
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ * 
+ * <pre>{@code
+ * <complexType name="Font">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       <attribute name="pdfFontName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="pdfEncoding" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="pdfEmbedded" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Font")
+public class XmlFont {
+
+    @XmlAttribute(name = "fontName")
+    protected String fontName;
+    @XmlAttribute(name = "fontSize")
+    protected Integer fontSize;
+    @XmlAttribute(name = "pdfFontName")
+    protected String pdfFontName;
+    @XmlAttribute(name = "pdfEncoding")
+    protected String pdfEncoding;
+    @XmlAttribute(name = "pdfEmbedded")
+    protected Boolean pdfEmbedded;
+
+    /**
+     * Ruft den Wert der fontName-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFontName() {
+        return fontName;
+    }
+
+    /**
+     * Legt den Wert der fontName-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFontName(String value) {
+        this.fontName = value;
+    }
+
+    /**
+     * Ruft den Wert der fontSize-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public Integer getFontSize() {
+        return fontSize;
+    }
+
+    /**
+     * Legt den Wert der fontSize-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setFontSize(Integer value) {
+        this.fontSize = value;
+    }
+
+    /**
+     * Ruft den Wert der pdfFontName-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPdfFontName() {
+        return pdfFontName;
+    }
+
+    /**
+     * Legt den Wert der pdfFontName-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPdfFontName(String value) {
+        this.pdfFontName = value;
+    }
+
+    /**
+     * Ruft den Wert der pdfEncoding-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPdfEncoding() {
+        return pdfEncoding;
+    }
+
+    /**
+     * Legt den Wert der pdfEncoding-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPdfEncoding(String value) {
+        this.pdfEncoding = value;
+    }
+
+    /**
+     * Ruft den Wert der pdfEmbedded-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isPdfEmbedded() {
+        return pdfEmbedded;
+    }
+
+    /**
+     * Legt den Wert der pdfEmbedded-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setPdfEmbedded(Boolean value) {
+        this.pdfEmbedded = value;
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java
new file mode 100644
index 0000000..a016cf7
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java
@@ -0,0 +1,41 @@
+
+package software.xdev.dynamicreports.report.defaults.xml;
+
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java-Klasse für HorizontalAlignment.
+ * 
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ * <pre>{@code
+ * <simpleType name="HorizontalAlignment">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="LEFT"/>
+ *     <enumeration value="CENTER"/>
+ *     <enumeration value="RIGHT"/>
+ *     <enumeration value="JUSTIFIED"/>
+ *   </restriction>
+ * </simpleType>
+ * }</pre>
+ * 
+ */
+@XmlType(name = "HorizontalAlignment")
+@XmlEnum
+public enum XmlHorizontalAlignment {
+
+    LEFT,
+    CENTER,
+    RIGHT,
+    JUSTIFIED;
+
+    public String value() {
+        return name();
+    }
+
+    public static XmlHorizontalAlignment fromValue(String v) {
+        return valueOf(v);
+    }
+
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BooleanType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BooleanType.java
index d9e0c71..ecf7476 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BooleanType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BooleanType.java
@@ -17,14 +17,14 @@
  */
 package software.xdev.dynamicreports.report.builder.datatype;
 
+import java.util.Locale;
+
 import software.xdev.dynamicreports.report.base.datatype.AbstractDataType;
 import software.xdev.dynamicreports.report.constant.Constants;
 import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
 import software.xdev.dynamicreports.report.defaults.Defaults;
 import software.xdev.dynamicreports.report.exception.DRException;
 
-import java.util.Locale;
-
 /**
  * <p>BooleanType class.</p>
  *
@@ -48,7 +48,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
 
     /** {@inheritDoc} */
     @Override
-    public Boolean stringToValue(String value, Locale locale) throws DRException {
-        return new Boolean(value);
+    public Boolean stringToValue(final String value, final Locale locale) throws DRException {
+        return Boolean.parseBoolean(value);
     }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalAlignment.java
index 1537992..4b333d8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/HorizontalAlignment.java
@@ -24,6 +24,7 @@
  * 
  * @deprecated use HorizontalTextAligment for texts or HorizontalImageAligment for images instead
  */
+@Deprecated
 public enum HorizontalAlignment {
     LEFT, CENTER, RIGHT, JUSTIFIED
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/StretchType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/StretchType.java
index 081ddfc..23d87ed 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/StretchType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/StretchType.java
@@ -21,14 +21,18 @@
  * <p>StretchType class.</p>
  *
  * @author Ricardo Mariaca
- * 
  */
-public enum StretchType {
-    NO_STRETCH, /**
+public enum StretchType
+{
+    NO_STRETCH,
+    /**
      * @deprecated use ELEMENT_GROUP_HEIGHT instead
      */
-    RELATIVE_TO_TALLEST_OBJECT, /**
+    @Deprecated
+    RELATIVE_TO_TALLEST_OBJECT,
+    /**
      * @deprecated use CONTAINER_HEIGHT instead
      */
-    RELATIVE_TO_BAND_HEIGHT, ELEMENT_GROUP_HEIGHT, ELEMENT_GROUP_BOTTOM, CONTAINER_HEIGHT, CONTAINER_BOTTOM;
+    @Deprecated
+    RELATIVE_TO_BAND_HEIGHT, ELEMENT_GROUP_HEIGHT, ELEMENT_GROUP_BOTTOM, CONTAINER_HEIGHT, CONTAINER_BOTTOM
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalAlignment.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalAlignment.java
index bec96da..c9d19d7 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/constant/VerticalAlignment.java
@@ -24,6 +24,7 @@
  * 
  * @deprecated use VerticalTextAligment for texts or VerticalImageAligment for images instead
  */
+@Deprecated
 public enum VerticalAlignment {
     TOP, MIDDLE, BOTTOM, JUSTIFIED
 }

From 3fb9d4b33f0c6cfa35071d6d5fadaa008b761416 Mon Sep 17 00:00:00 2001
From: Alex B <45384811+AB-xdev@users.noreply.github.com>
Date: Tue, 6 Jun 2023 14:08:23 +0200
Subject: [PATCH 12/21] Build executable jar in demo

---
 standard-maven-template-demo/pom.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml
index f2df5ec..018a999 100644
--- a/standard-maven-template-demo/pom.xml
+++ b/standard-maven-template-demo/pom.xml
@@ -49,6 +49,34 @@
 					</compilerArgs>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.6.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>${mainClass}</mainClass>
+						</manifest>
+						<manifestEntries>
+							<Multi-Release>true</Multi-Release>
+						</manifestEntries>
+					</archive>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id> <!-- this is used for inheritance merges -->
+						<phase>package</phase> <!-- bind to the packaging phase -->
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

From dff7475fb6754809dad84a41c6444c1d0adba482 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 14:08:35 +0200
Subject: [PATCH 13/21] Create demo

---
 .../main/java/software/xdev/Application.java  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 dynamicreports-core-for-grid-exporter-demo/src/main/java/software/xdev/Application.java

diff --git a/dynamicreports-core-for-grid-exporter-demo/src/main/java/software/xdev/Application.java b/dynamicreports-core-for-grid-exporter-demo/src/main/java/software/xdev/Application.java
new file mode 100644
index 0000000..33242b5
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter-demo/src/main/java/software/xdev/Application.java
@@ -0,0 +1,32 @@
+package software.xdev;
+
+import java.util.stream.Stream;
+
+import software.xdev.dynamicreports.jasper.builder.export.Exporters;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilders;
+import software.xdev.dynamicreports.report.exception.DRException;
+
+
+public class Application
+{
+	@SuppressWarnings("java:S106") // Just a simple demo
+	public static void main(final String[] args) throws DRException
+	{
+		DynamicReports.report()
+			.setDataSource(Stream.of("a", "b", "c")
+				.map(DummyDTO::new)
+				.toList())
+			.columns(new ColumnBuilders()
+				.column("value", String.class))
+			.export(Exporters.csvExporter(System.out));
+	}
+	
+	public record DummyDTO(String value)
+	{
+		public String getValue()
+		{
+			return this.value();
+		}
+	}
+}

From 4bf44164ab96beafa944d620f0020ddd34cac46b Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 14:15:59 +0200
Subject: [PATCH 14/21] Fix noteworthy sonar problems

---
 .../builder/datatype/BigDecimalType.java      |  8 +--
 .../expression/CalculationExpression.java     | 59 ++++++++++++-------
 .../test/jasper/AbstractJasperStyleTest.java  |  8 +--
 3 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigDecimalType.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigDecimalType.java
index ed5d474..5a174e3 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigDecimalType.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/datatype/BigDecimalType.java
@@ -17,12 +17,12 @@
  */
 package software.xdev.dynamicreports.report.builder.datatype;
 
+import java.math.BigDecimal;
+
 import software.xdev.dynamicreports.report.constant.Constants;
 import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
 import software.xdev.dynamicreports.report.defaults.Defaults;
 
-import java.math.BigDecimal;
-
 /**
  * <p>BigDecimalType class.</p>
  *
@@ -46,7 +46,7 @@ public HorizontalTextAlignment getHorizontalTextAlignment() {
 
     /** {@inheritDoc} */
     @Override
-    protected BigDecimal numberToValue(Number number) {
-        return new BigDecimal(number.doubleValue());
+    protected BigDecimal numberToValue(final Number number) {
+        return BigDecimal.valueOf(number.doubleValue());
     }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CalculationExpression.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CalculationExpression.java
index 6fbbbcf..d311834 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CalculationExpression.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/builder/expression/CalculationExpression.java
@@ -17,54 +17,69 @@
  */
 package software.xdev.dynamicreports.report.builder.expression;
 
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.apache.commons.lang3.Validate;
+
 import software.xdev.dynamicreports.report.constant.Constants;
 import software.xdev.dynamicreports.report.definition.ReportParameters;
 import software.xdev.dynamicreports.report.definition.expression.DRIExpression;
-import org.apache.commons.lang3.Validate;
 
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * @author Ricardo Mariaca
  */
-abstract class CalculationExpression extends AbstractComplexExpression<BigDecimal> {
+abstract class CalculationExpression extends AbstractComplexExpression<BigDecimal>
+{
     private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
-
-    @SafeVarargs
+    
     /**
      * <p>Constructor for CalculationExpression.</p>
      *
      * @param expressions a {@link software.xdev.dynamicreports.report.definition.expression.DRIExpression} object.
      */
-    protected CalculationExpression(DRIExpression<? extends Number>... expressions) {
+    @SafeVarargs
+    protected CalculationExpression(final DRIExpression<? extends Number>... expressions)
+    {
         Validate.notNull(expressions, "expressions must not be null");
         Validate.noNullElements(expressions, "expressions must not contains null expression");
-        for (DRIExpression<? extends Number> expression : expressions) {
-            addExpression(expression);
+        for(final DRIExpression<? extends Number> expression : expressions)
+        {
+            this.addExpression(expression);
         }
     }
-
-    /** {@inheritDoc} */
+    
+    /**
+     * {@inheritDoc}
+     */
     @Override
-    public BigDecimal evaluate(List<?> values, ReportParameters reportParameters) {
+    public BigDecimal evaluate(final List<?> values, final ReportParameters reportParameters)
+    {
         BigDecimal result = null;
-        for (Object value : values) {
-            BigDecimal bigDecimalValue;
-            if (value instanceof BigDecimal) {
-                bigDecimalValue = (BigDecimal) value;
-            } else {
-                bigDecimalValue = new BigDecimal(((Number) value).doubleValue());
+        for(final Object value : values)
+        {
+            final BigDecimal bigDecimalValue;
+            if(value instanceof final BigDecimal bd)
+            {
+                bigDecimalValue = bd;
+            }
+            else
+            {
+                bigDecimalValue = BigDecimal.valueOf(((Number)value).doubleValue());
             }
-            if (result == null) {
+            if(result == null)
+            {
                 result = bigDecimalValue;
-            } else {
-                result = calculate(result, bigDecimalValue);
+            }
+            else
+            {
+                result = this.calculate(result, bigDecimalValue);
             }
         }
         return result;
     }
-
+    
     /**
      * <p>calculate.</p>
      *
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperStyleTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperStyleTest.java
index 3fc0fc7..a964caf 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperStyleTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/AbstractJasperStyleTest.java
@@ -21,9 +21,6 @@
 
 import org.junit.jupiter.api.Assertions;
 
-import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
-import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
-import software.xdev.dynamicreports.report.builder.subtotal.SubtotalBuilder;
 import net.sf.jasperreports.engine.JRImageAlignment;
 import net.sf.jasperreports.engine.JRStyle;
 import net.sf.jasperreports.engine.JRTextAlignment;
@@ -33,6 +30,9 @@
 import net.sf.jasperreports.engine.type.LineStyleEnum;
 import net.sf.jasperreports.engine.type.VerticalImageAlignEnum;
 import net.sf.jasperreports.engine.type.VerticalTextAlignEnum;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilder;
+import software.xdev.dynamicreports.report.builder.group.GroupBuilder;
+import software.xdev.dynamicreports.report.builder.subtotal.SubtotalBuilder;
 
 
 /**
@@ -144,7 +144,7 @@ protected void verticalAlignmentTest(
 		if(verticalAlignment == null)
 		{
 			Assertions.assertEquals(
-				VerticalTextAlignEnum.TOP,
+				VerticalImageAlignEnum.TOP,
 				element.getVerticalImageAlign());
 		}
 		Assertions.assertEquals(verticalAlignment, element.getVerticalImageAlign());

From fea40dcf3d335019e0da8c40a340e176999b3752 Mon Sep 17 00:00:00 2001
From: Alex B <45384811+AB-xdev@users.noreply.github.com>
Date: Tue, 6 Jun 2023 14:20:12 +0200
Subject: [PATCH 15/21] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0d57401..89c493e 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_dynamicreports-core-for-grid-exporter&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_dynamicreports-core-for-grid-exporter)
 
 # dynamicreports-core-for-grid-exporter
-
+This is a fork of [dynamicreports-core](https://github.com/dynamicreports/dynamicreports) and specially designed for [XDEV's Vaadin Grid Exporer](https://github.com/xdev-software/vaadin-grid-exporter).
 
 ## Installation
 [Installation guide for the latest release](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/releases/latest#Installation)

From 3338c0526eea92b07f351695235a9a0f6dc8eb84 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 14:27:49 +0200
Subject: [PATCH 16/21] ENGLISH

---
 dynamicreports-core-for-grid-exporter/pom.xml |   2 +
 .../report/defaults/xml/XmlDataType.java      |  12 +-
 .../defaults/xml/XmlDynamicReports.java       | 108 +++++++++---------
 .../report/defaults/xml/XmlFont.java          |  24 ++--
 .../defaults/xml/XmlHorizontalAlignment.java  |   4 +-
 5 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/dynamicreports-core-for-grid-exporter/pom.xml b/dynamicreports-core-for-grid-exporter/pom.xml
index 2416622..5000a39 100644
--- a/dynamicreports-core-for-grid-exporter/pom.xml
+++ b/dynamicreports-core-for-grid-exporter/pom.xml
@@ -209,6 +209,8 @@
 					<noFileHeader>true</noFileHeader>
 					<!-- Episode file contains current timestamps and localized messages so disable it -->
 					<episode>false</episode>
+					<!-- Reproducible locale = World Standard = English -->
+					<locale>en</locale>
 					<!-- Generate into a persistent directory so that changes are noticeable -->
 					<generateDirectory>src/gen/jaxb</generateDirectory>
 					<schemaIncludes>
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
index 19e18a8..5b8d360 100644
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
@@ -8,9 +8,9 @@
 
 
 /**
- * <p>Java-Klasse für DataType complex type.
+ * <p>Java class for DataType complex type.
  * 
- * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>{@code
  * <complexType name="DataType">
@@ -35,7 +35,7 @@ public class XmlDataType {
     protected XmlHorizontalAlignment horizontalAlignment;
 
     /**
-     * Ruft den Wert der pattern-Eigenschaft ab.
+     * Gets the value of the pattern property.
      * 
      * @return
      *     possible object is
@@ -47,7 +47,7 @@ public String getPattern() {
     }
 
     /**
-     * Legt den Wert der pattern-Eigenschaft fest.
+     * Sets the value of the pattern property.
      * 
      * @param value
      *     allowed object is
@@ -59,7 +59,7 @@ public void setPattern(String value) {
     }
 
     /**
-     * Ruft den Wert der horizontalAlignment-Eigenschaft ab.
+     * Gets the value of the horizontalAlignment property.
      * 
      * @return
      *     possible object is
@@ -71,7 +71,7 @@ public XmlHorizontalAlignment getHorizontalAlignment() {
     }
 
     /**
-     * Legt den Wert der horizontalAlignment-Eigenschaft fest.
+     * Sets the value of the horizontalAlignment property.
      * 
      * @param value
      *     allowed object is
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
index efd0345..812d64f 100644
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
@@ -7,9 +7,9 @@
 
 
 /**
- * <p>Java-Klasse für DynamicReports complex type.
+ * <p>Java class for DynamicReports complex type.
  * 
- * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>{@code
  * <complexType name="DynamicReports">
@@ -109,7 +109,7 @@ public class XmlDynamicReports {
     protected Boolean loadSystemFonts;
 
     /**
-     * Ruft den Wert der font-Eigenschaft ab.
+     * Gets the value of the font property.
      * 
      * @return
      *     possible object is
@@ -121,7 +121,7 @@ public XmlFont getFont() {
     }
 
     /**
-     * Legt den Wert der font-Eigenschaft fest.
+     * Sets the value of the font property.
      * 
      * @param value
      *     allowed object is
@@ -133,7 +133,7 @@ public void setFont(XmlFont value) {
     }
 
     /**
-     * Ruft den Wert der bigDecimalType-Eigenschaft ab.
+     * Gets the value of the bigDecimalType property.
      * 
      * @return
      *     possible object is
@@ -145,7 +145,7 @@ public XmlDataType getBigDecimalType() {
     }
 
     /**
-     * Legt den Wert der bigDecimalType-Eigenschaft fest.
+     * Sets the value of the bigDecimalType property.
      * 
      * @param value
      *     allowed object is
@@ -157,7 +157,7 @@ public void setBigDecimalType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der bigIntegerType-Eigenschaft ab.
+     * Gets the value of the bigIntegerType property.
      * 
      * @return
      *     possible object is
@@ -169,7 +169,7 @@ public XmlDataType getBigIntegerType() {
     }
 
     /**
-     * Legt den Wert der bigIntegerType-Eigenschaft fest.
+     * Sets the value of the bigIntegerType property.
      * 
      * @param value
      *     allowed object is
@@ -181,7 +181,7 @@ public void setBigIntegerType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der byteType-Eigenschaft ab.
+     * Gets the value of the byteType property.
      * 
      * @return
      *     possible object is
@@ -193,7 +193,7 @@ public XmlDataType getByteType() {
     }
 
     /**
-     * Legt den Wert der byteType-Eigenschaft fest.
+     * Sets the value of the byteType property.
      * 
      * @param value
      *     allowed object is
@@ -205,7 +205,7 @@ public void setByteType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der doubleType-Eigenschaft ab.
+     * Gets the value of the doubleType property.
      * 
      * @return
      *     possible object is
@@ -217,7 +217,7 @@ public XmlDataType getDoubleType() {
     }
 
     /**
-     * Legt den Wert der doubleType-Eigenschaft fest.
+     * Sets the value of the doubleType property.
      * 
      * @param value
      *     allowed object is
@@ -229,7 +229,7 @@ public void setDoubleType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der floatType-Eigenschaft ab.
+     * Gets the value of the floatType property.
      * 
      * @return
      *     possible object is
@@ -241,7 +241,7 @@ public XmlDataType getFloatType() {
     }
 
     /**
-     * Legt den Wert der floatType-Eigenschaft fest.
+     * Sets the value of the floatType property.
      * 
      * @param value
      *     allowed object is
@@ -253,7 +253,7 @@ public void setFloatType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der integerType-Eigenschaft ab.
+     * Gets the value of the integerType property.
      * 
      * @return
      *     possible object is
@@ -265,7 +265,7 @@ public XmlDataType getIntegerType() {
     }
 
     /**
-     * Legt den Wert der integerType-Eigenschaft fest.
+     * Sets the value of the integerType property.
      * 
      * @param value
      *     allowed object is
@@ -277,7 +277,7 @@ public void setIntegerType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der longType-Eigenschaft ab.
+     * Gets the value of the longType property.
      * 
      * @return
      *     possible object is
@@ -289,7 +289,7 @@ public XmlDataType getLongType() {
     }
 
     /**
-     * Legt den Wert der longType-Eigenschaft fest.
+     * Sets the value of the longType property.
      * 
      * @param value
      *     allowed object is
@@ -301,7 +301,7 @@ public void setLongType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der shortType-Eigenschaft ab.
+     * Gets the value of the shortType property.
      * 
      * @return
      *     possible object is
@@ -313,7 +313,7 @@ public XmlDataType getShortType() {
     }
 
     /**
-     * Legt den Wert der shortType-Eigenschaft fest.
+     * Sets the value of the shortType property.
      * 
      * @param value
      *     allowed object is
@@ -325,7 +325,7 @@ public void setShortType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateType-Eigenschaft ab.
+     * Gets the value of the dateType property.
      * 
      * @return
      *     possible object is
@@ -337,7 +337,7 @@ public XmlDataType getDateType() {
     }
 
     /**
-     * Legt den Wert der dateType-Eigenschaft fest.
+     * Sets the value of the dateType property.
      * 
      * @param value
      *     allowed object is
@@ -349,7 +349,7 @@ public void setDateType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateYearToMonthType-Eigenschaft ab.
+     * Gets the value of the dateYearToMonthType property.
      * 
      * @return
      *     possible object is
@@ -361,7 +361,7 @@ public XmlDataType getDateYearToMonthType() {
     }
 
     /**
-     * Legt den Wert der dateYearToMonthType-Eigenschaft fest.
+     * Sets the value of the dateYearToMonthType property.
      * 
      * @param value
      *     allowed object is
@@ -373,7 +373,7 @@ public void setDateYearToMonthType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateYearToHourType-Eigenschaft ab.
+     * Gets the value of the dateYearToHourType property.
      * 
      * @return
      *     possible object is
@@ -385,7 +385,7 @@ public XmlDataType getDateYearToHourType() {
     }
 
     /**
-     * Legt den Wert der dateYearToHourType-Eigenschaft fest.
+     * Sets the value of the dateYearToHourType property.
      * 
      * @param value
      *     allowed object is
@@ -397,7 +397,7 @@ public void setDateYearToHourType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateYearToMinuteType-Eigenschaft ab.
+     * Gets the value of the dateYearToMinuteType property.
      * 
      * @return
      *     possible object is
@@ -409,7 +409,7 @@ public XmlDataType getDateYearToMinuteType() {
     }
 
     /**
-     * Legt den Wert der dateYearToMinuteType-Eigenschaft fest.
+     * Sets the value of the dateYearToMinuteType property.
      * 
      * @param value
      *     allowed object is
@@ -421,7 +421,7 @@ public void setDateYearToMinuteType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateYearToSecondType-Eigenschaft ab.
+     * Gets the value of the dateYearToSecondType property.
      * 
      * @return
      *     possible object is
@@ -433,7 +433,7 @@ public XmlDataType getDateYearToSecondType() {
     }
 
     /**
-     * Legt den Wert der dateYearToSecondType-Eigenschaft fest.
+     * Sets the value of the dateYearToSecondType property.
      * 
      * @param value
      *     allowed object is
@@ -445,7 +445,7 @@ public void setDateYearToSecondType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateYearToFractionType-Eigenschaft ab.
+     * Gets the value of the dateYearToFractionType property.
      * 
      * @return
      *     possible object is
@@ -457,7 +457,7 @@ public XmlDataType getDateYearToFractionType() {
     }
 
     /**
-     * Legt den Wert der dateYearToFractionType-Eigenschaft fest.
+     * Sets the value of the dateYearToFractionType property.
      * 
      * @param value
      *     allowed object is
@@ -469,7 +469,7 @@ public void setDateYearToFractionType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateYearType-Eigenschaft ab.
+     * Gets the value of the dateYearType property.
      * 
      * @return
      *     possible object is
@@ -481,7 +481,7 @@ public XmlDataType getDateYearType() {
     }
 
     /**
-     * Legt den Wert der dateYearType-Eigenschaft fest.
+     * Sets the value of the dateYearType property.
      * 
      * @param value
      *     allowed object is
@@ -493,7 +493,7 @@ public void setDateYearType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateMonthType-Eigenschaft ab.
+     * Gets the value of the dateMonthType property.
      * 
      * @return
      *     possible object is
@@ -505,7 +505,7 @@ public XmlDataType getDateMonthType() {
     }
 
     /**
-     * Legt den Wert der dateMonthType-Eigenschaft fest.
+     * Sets the value of the dateMonthType property.
      * 
      * @param value
      *     allowed object is
@@ -517,7 +517,7 @@ public void setDateMonthType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der dateDayType-Eigenschaft ab.
+     * Gets the value of the dateDayType property.
      * 
      * @return
      *     possible object is
@@ -529,7 +529,7 @@ public XmlDataType getDateDayType() {
     }
 
     /**
-     * Legt den Wert der dateDayType-Eigenschaft fest.
+     * Sets the value of the dateDayType property.
      * 
      * @param value
      *     allowed object is
@@ -541,7 +541,7 @@ public void setDateDayType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der timeHourToMinuteType-Eigenschaft ab.
+     * Gets the value of the timeHourToMinuteType property.
      * 
      * @return
      *     possible object is
@@ -553,7 +553,7 @@ public XmlDataType getTimeHourToMinuteType() {
     }
 
     /**
-     * Legt den Wert der timeHourToMinuteType-Eigenschaft fest.
+     * Sets the value of the timeHourToMinuteType property.
      * 
      * @param value
      *     allowed object is
@@ -565,7 +565,7 @@ public void setTimeHourToMinuteType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der timeHourToSecondType-Eigenschaft ab.
+     * Gets the value of the timeHourToSecondType property.
      * 
      * @return
      *     possible object is
@@ -577,7 +577,7 @@ public XmlDataType getTimeHourToSecondType() {
     }
 
     /**
-     * Legt den Wert der timeHourToSecondType-Eigenschaft fest.
+     * Sets the value of the timeHourToSecondType property.
      * 
      * @param value
      *     allowed object is
@@ -589,7 +589,7 @@ public void setTimeHourToSecondType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der timeHourToFractionType-Eigenschaft ab.
+     * Gets the value of the timeHourToFractionType property.
      * 
      * @return
      *     possible object is
@@ -601,7 +601,7 @@ public XmlDataType getTimeHourToFractionType() {
     }
 
     /**
-     * Legt den Wert der timeHourToFractionType-Eigenschaft fest.
+     * Sets the value of the timeHourToFractionType property.
      * 
      * @param value
      *     allowed object is
@@ -613,7 +613,7 @@ public void setTimeHourToFractionType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der percentageType-Eigenschaft ab.
+     * Gets the value of the percentageType property.
      * 
      * @return
      *     possible object is
@@ -625,7 +625,7 @@ public XmlDataType getPercentageType() {
     }
 
     /**
-     * Legt den Wert der percentageType-Eigenschaft fest.
+     * Sets the value of the percentageType property.
      * 
      * @param value
      *     allowed object is
@@ -637,7 +637,7 @@ public void setPercentageType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der booleanType-Eigenschaft ab.
+     * Gets the value of the booleanType property.
      * 
      * @return
      *     possible object is
@@ -649,7 +649,7 @@ public XmlDataType getBooleanType() {
     }
 
     /**
-     * Legt den Wert der booleanType-Eigenschaft fest.
+     * Sets the value of the booleanType property.
      * 
      * @param value
      *     allowed object is
@@ -661,7 +661,7 @@ public void setBooleanType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der characterType-Eigenschaft ab.
+     * Gets the value of the characterType property.
      * 
      * @return
      *     possible object is
@@ -673,7 +673,7 @@ public XmlDataType getCharacterType() {
     }
 
     /**
-     * Legt den Wert der characterType-Eigenschaft fest.
+     * Sets the value of the characterType property.
      * 
      * @param value
      *     allowed object is
@@ -685,7 +685,7 @@ public void setCharacterType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der stringType-Eigenschaft ab.
+     * Gets the value of the stringType property.
      * 
      * @return
      *     possible object is
@@ -697,7 +697,7 @@ public XmlDataType getStringType() {
     }
 
     /**
-     * Legt den Wert der stringType-Eigenschaft fest.
+     * Sets the value of the stringType property.
      * 
      * @param value
      *     allowed object is
@@ -709,7 +709,7 @@ public void setStringType(XmlDataType value) {
     }
 
     /**
-     * Ruft den Wert der loadSystemFonts-Eigenschaft ab.
+     * Gets the value of the loadSystemFonts property.
      * 
      * @return
      *     possible object is
@@ -721,7 +721,7 @@ public Boolean isLoadSystemFonts() {
     }
 
     /**
-     * Legt den Wert der loadSystemFonts-Eigenschaft fest.
+     * Sets the value of the loadSystemFonts property.
      * 
      * @param value
      *     allowed object is
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
index c702ad9..dfbbeb7 100644
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
@@ -8,9 +8,9 @@
 
 
 /**
- * <p>Java-Klasse für Font complex type.
+ * <p>Java class for Font complex type.
  * 
- * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>{@code
  * <complexType name="Font">
@@ -44,7 +44,7 @@ public class XmlFont {
     protected Boolean pdfEmbedded;
 
     /**
-     * Ruft den Wert der fontName-Eigenschaft ab.
+     * Gets the value of the fontName property.
      * 
      * @return
      *     possible object is
@@ -56,7 +56,7 @@ public String getFontName() {
     }
 
     /**
-     * Legt den Wert der fontName-Eigenschaft fest.
+     * Sets the value of the fontName property.
      * 
      * @param value
      *     allowed object is
@@ -68,7 +68,7 @@ public void setFontName(String value) {
     }
 
     /**
-     * Ruft den Wert der fontSize-Eigenschaft ab.
+     * Gets the value of the fontSize property.
      * 
      * @return
      *     possible object is
@@ -80,7 +80,7 @@ public Integer getFontSize() {
     }
 
     /**
-     * Legt den Wert der fontSize-Eigenschaft fest.
+     * Sets the value of the fontSize property.
      * 
      * @param value
      *     allowed object is
@@ -92,7 +92,7 @@ public void setFontSize(Integer value) {
     }
 
     /**
-     * Ruft den Wert der pdfFontName-Eigenschaft ab.
+     * Gets the value of the pdfFontName property.
      * 
      * @return
      *     possible object is
@@ -104,7 +104,7 @@ public String getPdfFontName() {
     }
 
     /**
-     * Legt den Wert der pdfFontName-Eigenschaft fest.
+     * Sets the value of the pdfFontName property.
      * 
      * @param value
      *     allowed object is
@@ -116,7 +116,7 @@ public void setPdfFontName(String value) {
     }
 
     /**
-     * Ruft den Wert der pdfEncoding-Eigenschaft ab.
+     * Gets the value of the pdfEncoding property.
      * 
      * @return
      *     possible object is
@@ -128,7 +128,7 @@ public String getPdfEncoding() {
     }
 
     /**
-     * Legt den Wert der pdfEncoding-Eigenschaft fest.
+     * Sets the value of the pdfEncoding property.
      * 
      * @param value
      *     allowed object is
@@ -140,7 +140,7 @@ public void setPdfEncoding(String value) {
     }
 
     /**
-     * Ruft den Wert der pdfEmbedded-Eigenschaft ab.
+     * Gets the value of the pdfEmbedded property.
      * 
      * @return
      *     possible object is
@@ -152,7 +152,7 @@ public Boolean isPdfEmbedded() {
     }
 
     /**
-     * Legt den Wert der pdfEmbedded-Eigenschaft fest.
+     * Sets the value of the pdfEmbedded property.
      * 
      * @param value
      *     allowed object is
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java
index a016cf7..6eea527 100644
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java
+++ b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java
@@ -6,9 +6,9 @@
 
 
 /**
- * <p>Java-Klasse für HorizontalAlignment.
+ * <p>Java class for HorizontalAlignment.
  * 
- * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
+ * <p>The following schema fragment specifies the expected content contained within this class.
  * <pre>{@code
  * <simpleType name="HorizontalAlignment">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">

From a3de4c490b079c686fa2122747d99130a474ecf5 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 14:41:05 +0200
Subject: [PATCH 17/21] Update JasperConcatenatedReportBuilder.java

---
 .../JasperConcatenatedReportBuilder.java      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
index f413eef..d2e745d 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
@@ -31,6 +31,15 @@
 
 import org.apache.commons.lang3.Validate;
 
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
+import net.sf.jasperreports.export.Exporter;
+import net.sf.jasperreports.export.ExporterInput;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleGraphics2DExporterConfiguration;
+import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
+import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
 import software.xdev.dynamicreports.jasper.base.export.AbstractJasperExporter;
 import software.xdev.dynamicreports.jasper.base.reporthandler.JasperReportBuilderHandler;
 import software.xdev.dynamicreports.jasper.builder.export.AbstractJasperExporterBuilder;
@@ -50,15 +59,6 @@
 import software.xdev.dynamicreports.jasper.transformation.ExporterTransform;
 import software.xdev.dynamicreports.report.constant.Constants;
 import software.xdev.dynamicreports.report.exception.DRException;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
-import net.sf.jasperreports.export.Exporter;
-import net.sf.jasperreports.export.ExporterInput;
-import net.sf.jasperreports.export.SimpleExporterInput;
-import net.sf.jasperreports.export.SimpleGraphics2DExporterConfiguration;
-import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
-import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
 
 /**
  * This report builder allows concatenating several separated reports into one single document. Each report starts on a new page with its own page dimension.
@@ -119,6 +119,7 @@ public JasperConcatenatedReportBuilder toPng(final OutputStream outputStream) th
      * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
      * @throws software.xdev.dynamicreports.report.exception.DRException if any.
      */
+    @SuppressWarnings("java:S2184") // FP: int - int != float?
     public JasperConcatenatedReportBuilder toPng(final OutputStream outputStream, final float zoom) throws DRException {
         Validate.notNull(outputStream, "outputStream must not be null");
         Validate.isTrue(zoom > 0, "zoom must be > 0");

From c217d27cb361cef278c70ae7fdd912dbe3bfea5c Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 16:41:53 +0200
Subject: [PATCH 18/21] Drop XML dependencies

---
 CHANGELOG.md                                  |   3 +
 dynamicreports-core-for-grid-exporter/pom.xml |  71 --
 .../report/defaults/xml/ObjectFactory.java    |  79 --
 .../report/defaults/xml/XmlDataType.java      |  85 --
 .../defaults/xml/XmlDynamicReports.java       | 735 ------------------
 .../report/defaults/xml/XmlFont.java          | 166 ----
 .../defaults/xml/XmlHorizontalAlignment.java  |  41 -
 .../report/defaults/Default.java              | 323 ++++----
 .../report/defaults/DefaultBinder.java        | 119 ---
 .../report/defaults/Defaults.java             |  79 +-
 .../xdev/dynamicreports/TestDefault.java      |  29 +
 .../test/base/DefaultsTest.java               | 124 ---
 ...dev.dynamicreports.report.defaults.Default |   1 +
 .../resources/dynamicreports-defaults.xml     |   4 -
 14 files changed, 209 insertions(+), 1650 deletions(-)
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/ObjectFactory.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/DefaultBinder.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/TestDefault.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DefaultsTest.java
 create mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/META-INF/services/software.xdev.dynamicreports.report.defaults.Default
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-defaults.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b79c369..b214112 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ Initial release of the fork
   * Added ``jakarta.xml.bind-api``
   * Replaced ``maven-jaxb2-plugin`` with ``jaxb40-maven-plugin``
 * Dependency shedding
+  * Removed default-XML subsystem; can be supplied manually to the builder or using Java Service Loading
+    * ``jakarta.xml.bind:jakarta.xml.bind-api``
+    * ``org.glassfish.jaxb:jaxb-runtime``
   * Removed barcode subsystem
     * Barbecue
     * ``net.sf.barcode4j:barcode4j``
diff --git a/dynamicreports-core-for-grid-exporter/pom.xml b/dynamicreports-core-for-grid-exporter/pom.xml
index 5000a39..829ed58 100644
--- a/dynamicreports-core-for-grid-exporter/pom.xml
+++ b/dynamicreports-core-for-grid-exporter/pom.xml
@@ -85,19 +85,6 @@
 	</distributionManagement>
 
 	<dependencies>
-		<!-- XML API -->
-		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.0</version>
-		</dependency>
-		<!-- ...and default implementation -->
-		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
-			<artifactId>jaxb-runtime</artifactId>
-			<version>4.0.2</version>
-		</dependency>
-
 		<!-- Used for reports -->
 		<dependency>
 			<groupId>net.sf.jasperreports</groupId>
@@ -194,64 +181,6 @@
 				</executions>
 			</plugin>
 
-			<!-- Original plugin can't handle Jakarta - as of June 2023 -->
-			<!-- https://github.com/highsource/maven-jaxb2-plugin/issues/253 -->
-			<!-- Switched to fork -->
-			<plugin>
-				<groupId>com.helger.maven</groupId>
-				<artifactId>jaxb40-maven-plugin</artifactId>
-				<version>0.16.1</version>
-				<configuration>
-					<!-- We have no m2e or Eclipse IDE so ignore the warnings -->
-					<!-- Alternative is to use the maven clean plugin inside that directory -->
-					<forceRegenerate>true</forceRegenerate>
-					<!-- We want reproducible files! -->
-					<noFileHeader>true</noFileHeader>
-					<!-- Episode file contains current timestamps and localized messages so disable it -->
-					<episode>false</episode>
-					<!-- Reproducible locale = World Standard = English -->
-					<locale>en</locale>
-					<!-- Generate into a persistent directory so that changes are noticeable -->
-					<generateDirectory>src/gen/jaxb</generateDirectory>
-					<schemaIncludes>
-						<schemaInclude>**/dynamicreports.xsd</schemaInclude>
-					</schemaIncludes>
-					<bindingIncludes>
-						<bindingInclude>**/dynamicreports.xjb</bindingInclude>
-					</bindingIncludes>
-					<removeOldOutput>true</removeOldOutput>
-				</configuration>
-				<executions>
-					<execution>
-						<id>jaxb</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.4.0</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${basedir}/src/gen/jaxb</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.0.0-M9</version>
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/ObjectFactory.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/ObjectFactory.java
deleted file mode 100644
index a81615c..0000000
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/ObjectFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-
-package software.xdev.dynamicreports.report.defaults.xml;
-
-import javax.xml.namespace.QName;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.annotation.XmlElementDecl;
-import jakarta.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the software.xdev.dynamicreports.report.defaults.xml package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _DynamicReports_QNAME = new QName("", "DynamicReports");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: software.xdev.dynamicreports.report.defaults.xml
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link XmlDynamicReports }
-     * 
-     * @return
-     *     the new instance of {@link XmlDynamicReports }
-     */
-    public XmlDynamicReports createXmlDynamicReports() {
-        return new XmlDynamicReports();
-    }
-
-    /**
-     * Create an instance of {@link XmlFont }
-     * 
-     * @return
-     *     the new instance of {@link XmlFont }
-     */
-    public XmlFont createXmlFont() {
-        return new XmlFont();
-    }
-
-    /**
-     * Create an instance of {@link XmlDataType }
-     * 
-     * @return
-     *     the new instance of {@link XmlDataType }
-     */
-    public XmlDataType createXmlDataType() {
-        return new XmlDataType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XmlDynamicReports }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link XmlDynamicReports }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "DynamicReports")
-    public JAXBElement<XmlDynamicReports> createDynamicReports(XmlDynamicReports value) {
-        return new JAXBElement<>(_DynamicReports_QNAME, XmlDynamicReports.class, null, value);
-    }
-
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
deleted file mode 100644
index 5b8d360..0000000
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDataType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-
-package software.xdev.dynamicreports.report.defaults.xml;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for DataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>{@code
- * <complexType name="DataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="pattern" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="horizontalAlignment" type="{}HorizontalAlignment" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DataType")
-public class XmlDataType {
-
-    @XmlAttribute(name = "pattern")
-    protected String pattern;
-    @XmlAttribute(name = "horizontalAlignment")
-    protected XmlHorizontalAlignment horizontalAlignment;
-
-    /**
-     * Gets the value of the pattern property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPattern() {
-        return pattern;
-    }
-
-    /**
-     * Sets the value of the pattern property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPattern(String value) {
-        this.pattern = value;
-    }
-
-    /**
-     * Gets the value of the horizontalAlignment property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlHorizontalAlignment }
-     *     
-     */
-    public XmlHorizontalAlignment getHorizontalAlignment() {
-        return horizontalAlignment;
-    }
-
-    /**
-     * Sets the value of the horizontalAlignment property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlHorizontalAlignment }
-     *     
-     */
-    public void setHorizontalAlignment(XmlHorizontalAlignment value) {
-        this.horizontalAlignment = value;
-    }
-
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
deleted file mode 100644
index 812d64f..0000000
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlDynamicReports.java
+++ /dev/null
@@ -1,735 +0,0 @@
-
-package software.xdev.dynamicreports.report.defaults.xml;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for DynamicReports complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>{@code
- * <complexType name="DynamicReports">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="font" type="{}Font" minOccurs="0"/>
- *         <element name="bigDecimalType" type="{}DataType" minOccurs="0"/>
- *         <element name="bigIntegerType" type="{}DataType" minOccurs="0"/>
- *         <element name="byteType" type="{}DataType" minOccurs="0"/>
- *         <element name="doubleType" type="{}DataType" minOccurs="0"/>
- *         <element name="floatType" type="{}DataType" minOccurs="0"/>
- *         <element name="integerType" type="{}DataType" minOccurs="0"/>
- *         <element name="longType" type="{}DataType" minOccurs="0"/>
- *         <element name="shortType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateYearToMonthType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateYearToHourType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateYearToMinuteType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateYearToSecondType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateYearToFractionType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateYearType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateMonthType" type="{}DataType" minOccurs="0"/>
- *         <element name="dateDayType" type="{}DataType" minOccurs="0"/>
- *         <element name="timeHourToMinuteType" type="{}DataType" minOccurs="0"/>
- *         <element name="timeHourToSecondType" type="{}DataType" minOccurs="0"/>
- *         <element name="timeHourToFractionType" type="{}DataType" minOccurs="0"/>
- *         <element name="percentageType" type="{}DataType" minOccurs="0"/>
- *         <element name="booleanType" type="{}DataType" minOccurs="0"/>
- *         <element name="characterType" type="{}DataType" minOccurs="0"/>
- *         <element name="stringType" type="{}DataType" minOccurs="0"/>
- *         <element name="loadSystemFonts" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DynamicReports", propOrder = {
-    "font",
-    "bigDecimalType",
-    "bigIntegerType",
-    "byteType",
-    "doubleType",
-    "floatType",
-    "integerType",
-    "longType",
-    "shortType",
-    "dateType",
-    "dateYearToMonthType",
-    "dateYearToHourType",
-    "dateYearToMinuteType",
-    "dateYearToSecondType",
-    "dateYearToFractionType",
-    "dateYearType",
-    "dateMonthType",
-    "dateDayType",
-    "timeHourToMinuteType",
-    "timeHourToSecondType",
-    "timeHourToFractionType",
-    "percentageType",
-    "booleanType",
-    "characterType",
-    "stringType",
-    "loadSystemFonts"
-})
-public class XmlDynamicReports {
-
-    protected XmlFont font;
-    protected XmlDataType bigDecimalType;
-    protected XmlDataType bigIntegerType;
-    protected XmlDataType byteType;
-    protected XmlDataType doubleType;
-    protected XmlDataType floatType;
-    protected XmlDataType integerType;
-    protected XmlDataType longType;
-    protected XmlDataType shortType;
-    protected XmlDataType dateType;
-    protected XmlDataType dateYearToMonthType;
-    protected XmlDataType dateYearToHourType;
-    protected XmlDataType dateYearToMinuteType;
-    protected XmlDataType dateYearToSecondType;
-    protected XmlDataType dateYearToFractionType;
-    protected XmlDataType dateYearType;
-    protected XmlDataType dateMonthType;
-    protected XmlDataType dateDayType;
-    protected XmlDataType timeHourToMinuteType;
-    protected XmlDataType timeHourToSecondType;
-    protected XmlDataType timeHourToFractionType;
-    protected XmlDataType percentageType;
-    protected XmlDataType booleanType;
-    protected XmlDataType characterType;
-    protected XmlDataType stringType;
-    protected Boolean loadSystemFonts;
-
-    /**
-     * Gets the value of the font property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlFont }
-     *     
-     */
-    public XmlFont getFont() {
-        return font;
-    }
-
-    /**
-     * Sets the value of the font property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlFont }
-     *     
-     */
-    public void setFont(XmlFont value) {
-        this.font = value;
-    }
-
-    /**
-     * Gets the value of the bigDecimalType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getBigDecimalType() {
-        return bigDecimalType;
-    }
-
-    /**
-     * Sets the value of the bigDecimalType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setBigDecimalType(XmlDataType value) {
-        this.bigDecimalType = value;
-    }
-
-    /**
-     * Gets the value of the bigIntegerType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getBigIntegerType() {
-        return bigIntegerType;
-    }
-
-    /**
-     * Sets the value of the bigIntegerType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setBigIntegerType(XmlDataType value) {
-        this.bigIntegerType = value;
-    }
-
-    /**
-     * Gets the value of the byteType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getByteType() {
-        return byteType;
-    }
-
-    /**
-     * Sets the value of the byteType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setByteType(XmlDataType value) {
-        this.byteType = value;
-    }
-
-    /**
-     * Gets the value of the doubleType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDoubleType() {
-        return doubleType;
-    }
-
-    /**
-     * Sets the value of the doubleType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDoubleType(XmlDataType value) {
-        this.doubleType = value;
-    }
-
-    /**
-     * Gets the value of the floatType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getFloatType() {
-        return floatType;
-    }
-
-    /**
-     * Sets the value of the floatType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setFloatType(XmlDataType value) {
-        this.floatType = value;
-    }
-
-    /**
-     * Gets the value of the integerType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getIntegerType() {
-        return integerType;
-    }
-
-    /**
-     * Sets the value of the integerType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setIntegerType(XmlDataType value) {
-        this.integerType = value;
-    }
-
-    /**
-     * Gets the value of the longType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getLongType() {
-        return longType;
-    }
-
-    /**
-     * Sets the value of the longType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setLongType(XmlDataType value) {
-        this.longType = value;
-    }
-
-    /**
-     * Gets the value of the shortType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getShortType() {
-        return shortType;
-    }
-
-    /**
-     * Sets the value of the shortType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setShortType(XmlDataType value) {
-        this.shortType = value;
-    }
-
-    /**
-     * Gets the value of the dateType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateType() {
-        return dateType;
-    }
-
-    /**
-     * Sets the value of the dateType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateType(XmlDataType value) {
-        this.dateType = value;
-    }
-
-    /**
-     * Gets the value of the dateYearToMonthType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateYearToMonthType() {
-        return dateYearToMonthType;
-    }
-
-    /**
-     * Sets the value of the dateYearToMonthType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateYearToMonthType(XmlDataType value) {
-        this.dateYearToMonthType = value;
-    }
-
-    /**
-     * Gets the value of the dateYearToHourType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateYearToHourType() {
-        return dateYearToHourType;
-    }
-
-    /**
-     * Sets the value of the dateYearToHourType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateYearToHourType(XmlDataType value) {
-        this.dateYearToHourType = value;
-    }
-
-    /**
-     * Gets the value of the dateYearToMinuteType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateYearToMinuteType() {
-        return dateYearToMinuteType;
-    }
-
-    /**
-     * Sets the value of the dateYearToMinuteType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateYearToMinuteType(XmlDataType value) {
-        this.dateYearToMinuteType = value;
-    }
-
-    /**
-     * Gets the value of the dateYearToSecondType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateYearToSecondType() {
-        return dateYearToSecondType;
-    }
-
-    /**
-     * Sets the value of the dateYearToSecondType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateYearToSecondType(XmlDataType value) {
-        this.dateYearToSecondType = value;
-    }
-
-    /**
-     * Gets the value of the dateYearToFractionType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateYearToFractionType() {
-        return dateYearToFractionType;
-    }
-
-    /**
-     * Sets the value of the dateYearToFractionType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateYearToFractionType(XmlDataType value) {
-        this.dateYearToFractionType = value;
-    }
-
-    /**
-     * Gets the value of the dateYearType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateYearType() {
-        return dateYearType;
-    }
-
-    /**
-     * Sets the value of the dateYearType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateYearType(XmlDataType value) {
-        this.dateYearType = value;
-    }
-
-    /**
-     * Gets the value of the dateMonthType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateMonthType() {
-        return dateMonthType;
-    }
-
-    /**
-     * Sets the value of the dateMonthType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateMonthType(XmlDataType value) {
-        this.dateMonthType = value;
-    }
-
-    /**
-     * Gets the value of the dateDayType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getDateDayType() {
-        return dateDayType;
-    }
-
-    /**
-     * Sets the value of the dateDayType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setDateDayType(XmlDataType value) {
-        this.dateDayType = value;
-    }
-
-    /**
-     * Gets the value of the timeHourToMinuteType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getTimeHourToMinuteType() {
-        return timeHourToMinuteType;
-    }
-
-    /**
-     * Sets the value of the timeHourToMinuteType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setTimeHourToMinuteType(XmlDataType value) {
-        this.timeHourToMinuteType = value;
-    }
-
-    /**
-     * Gets the value of the timeHourToSecondType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getTimeHourToSecondType() {
-        return timeHourToSecondType;
-    }
-
-    /**
-     * Sets the value of the timeHourToSecondType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setTimeHourToSecondType(XmlDataType value) {
-        this.timeHourToSecondType = value;
-    }
-
-    /**
-     * Gets the value of the timeHourToFractionType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getTimeHourToFractionType() {
-        return timeHourToFractionType;
-    }
-
-    /**
-     * Sets the value of the timeHourToFractionType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setTimeHourToFractionType(XmlDataType value) {
-        this.timeHourToFractionType = value;
-    }
-
-    /**
-     * Gets the value of the percentageType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getPercentageType() {
-        return percentageType;
-    }
-
-    /**
-     * Sets the value of the percentageType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setPercentageType(XmlDataType value) {
-        this.percentageType = value;
-    }
-
-    /**
-     * Gets the value of the booleanType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getBooleanType() {
-        return booleanType;
-    }
-
-    /**
-     * Sets the value of the booleanType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setBooleanType(XmlDataType value) {
-        this.booleanType = value;
-    }
-
-    /**
-     * Gets the value of the characterType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getCharacterType() {
-        return characterType;
-    }
-
-    /**
-     * Sets the value of the characterType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setCharacterType(XmlDataType value) {
-        this.characterType = value;
-    }
-
-    /**
-     * Gets the value of the stringType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public XmlDataType getStringType() {
-        return stringType;
-    }
-
-    /**
-     * Sets the value of the stringType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XmlDataType }
-     *     
-     */
-    public void setStringType(XmlDataType value) {
-        this.stringType = value;
-    }
-
-    /**
-     * Gets the value of the loadSystemFonts property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isLoadSystemFonts() {
-        return loadSystemFonts;
-    }
-
-    /**
-     * Sets the value of the loadSystemFonts property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setLoadSystemFonts(Boolean value) {
-        this.loadSystemFonts = value;
-    }
-
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
deleted file mode 100644
index dfbbeb7..0000000
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlFont.java
+++ /dev/null
@@ -1,166 +0,0 @@
-
-package software.xdev.dynamicreports.report.defaults.xml;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Font complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>{@code
- * <complexType name="Font">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       <attribute name="pdfFontName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="pdfEncoding" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="pdfEmbedded" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Font")
-public class XmlFont {
-
-    @XmlAttribute(name = "fontName")
-    protected String fontName;
-    @XmlAttribute(name = "fontSize")
-    protected Integer fontSize;
-    @XmlAttribute(name = "pdfFontName")
-    protected String pdfFontName;
-    @XmlAttribute(name = "pdfEncoding")
-    protected String pdfEncoding;
-    @XmlAttribute(name = "pdfEmbedded")
-    protected Boolean pdfEmbedded;
-
-    /**
-     * Gets the value of the fontName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFontName() {
-        return fontName;
-    }
-
-    /**
-     * Sets the value of the fontName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFontName(String value) {
-        this.fontName = value;
-    }
-
-    /**
-     * Gets the value of the fontSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getFontSize() {
-        return fontSize;
-    }
-
-    /**
-     * Sets the value of the fontSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setFontSize(Integer value) {
-        this.fontSize = value;
-    }
-
-    /**
-     * Gets the value of the pdfFontName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPdfFontName() {
-        return pdfFontName;
-    }
-
-    /**
-     * Sets the value of the pdfFontName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPdfFontName(String value) {
-        this.pdfFontName = value;
-    }
-
-    /**
-     * Gets the value of the pdfEncoding property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPdfEncoding() {
-        return pdfEncoding;
-    }
-
-    /**
-     * Sets the value of the pdfEncoding property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPdfEncoding(String value) {
-        this.pdfEncoding = value;
-    }
-
-    /**
-     * Gets the value of the pdfEmbedded property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isPdfEmbedded() {
-        return pdfEmbedded;
-    }
-
-    /**
-     * Sets the value of the pdfEmbedded property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setPdfEmbedded(Boolean value) {
-        this.pdfEmbedded = value;
-    }
-
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java b/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java
deleted file mode 100644
index 6eea527..0000000
--- a/dynamicreports-core-for-grid-exporter/src/gen/jaxb/software/xdev/dynamicreports/report/defaults/xml/XmlHorizontalAlignment.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-package software.xdev.dynamicreports.report.defaults.xml;
-
-import jakarta.xml.bind.annotation.XmlEnum;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for HorizontalAlignment.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <pre>{@code
- * <simpleType name="HorizontalAlignment">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="LEFT"/>
- *     <enumeration value="CENTER"/>
- *     <enumeration value="RIGHT"/>
- *     <enumeration value="JUSTIFIED"/>
- *   </restriction>
- * </simpleType>
- * }</pre>
- * 
- */
-@XmlType(name = "HorizontalAlignment")
-@XmlEnum
-public enum XmlHorizontalAlignment {
-
-    LEFT,
-    CENTER,
-    RIGHT,
-    JUSTIFIED;
-
-    public String value() {
-        return name();
-    }
-
-    public static XmlHorizontalAlignment fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Default.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Default.java
index 752ac52..820d7e2 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Default.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Default.java
@@ -64,202 +64,201 @@
  */
 public class Default
 {
-	private String reportName;
-	private Locale locale;
-	private boolean showColumnTitle;
-	private boolean showColumnValues;
-	private boolean ignorePagination;
-	private WhenNoDataType whenNoDataType;
-	private WhenResourceMissingType whenResourceMissingType;
-	private boolean titleOnANewPage;
-	private boolean summaryOnANewPage;
-	private boolean summaryWithPageHeaderAndFooter;
-	private boolean floatColumnFooter;
-	private Orientation printOrder;
-	private RunDirection columnDirection;
-	private String language;
-	private boolean useFieldNameAsDescription;
+	protected String reportName;
+	protected Locale locale;
+	protected boolean showColumnTitle;
+	protected boolean showColumnValues;
+	protected boolean ignorePagination;
+	protected WhenNoDataType whenNoDataType;
+	protected WhenResourceMissingType whenResourceMissingType;
+	protected boolean titleOnANewPage;
+	protected boolean summaryOnANewPage;
+	protected boolean summaryWithPageHeaderAndFooter;
+	protected boolean floatColumnFooter;
+	protected Orientation printOrder;
+	protected RunDirection columnDirection;
+	protected String language;
+	protected boolean useFieldNameAsDescription;
 	// style
-	private boolean highlightDetailOddRows;
-	private DRSimpleStyle detailOddRowStyle;
-	private boolean highlightDetailEvenRows;
-	private DRSimpleStyle detailEvenRowStyle;
-	private DRStyle textStyle;
-	private DRStyle columnTitleStyle;
-	private DRStyle columnStyle;
-	private DRStyle groupTitleStyle;
-	private DRStyle groupStyle;
-	private DRStyle subtotalStyle;
-	private DRStyle imageStyle;
+	protected boolean highlightDetailOddRows;
+	protected DRSimpleStyle detailOddRowStyle;
+	protected boolean highlightDetailEvenRows;
+	protected DRSimpleStyle detailEvenRowStyle;
+	protected DRStyle textStyle;
+	protected DRStyle columnTitleStyle;
+	protected DRStyle columnStyle;
+	protected DRStyle groupTitleStyle;
+	protected DRStyle groupStyle;
+	protected DRStyle subtotalStyle;
+	protected DRStyle imageStyle;
 	// page
-	private int pageWidth;
-	private int pageHeight;
-	private PageOrientation pageOrientation;
-	private DRMargin pageMargin;
-	private DRMargin subreportPageMargin;
-	private int pageColumnsPerPage;
-	private int pageColumnSpace;
-	private boolean ignorePageWidth;
+	protected int pageWidth;
+	protected int pageHeight;
+	protected PageOrientation pageOrientation;
+	protected DRMargin pageMargin;
+	protected DRMargin subreportPageMargin;
+	protected int pageColumnsPerPage;
+	protected int pageColumnSpace;
+	protected boolean ignorePageWidth;
 	// column
-	private boolean columnPrintRepeatedDetailValues;
-	private int columnWidth;
+	protected boolean columnPrintRepeatedDetailValues;
+	protected int columnWidth;
 	// component
-	private boolean removeLineWhenBlank;
-	private boolean printInFirstWholeBand;
-	private boolean printWhenDetailOverflows;
+	protected boolean removeLineWhenBlank;
+	protected boolean printInFirstWholeBand;
+	protected boolean printWhenDetailOverflows;
 	// group
-	private GroupHeaderLayout groupHeaderLayout;
-	private boolean groupHideColumn;
-	private boolean groupShowColumnHeaderAndFooter;
-	private int groupPadding;
-	private boolean groupStartInNewPage;
-	private boolean groupStartInNewColumn;
-	private boolean groupReprintHeaderOnEachPage;
-	private boolean groupResetPageNumber;
-	private Integer groupMinHeightToStartNewPage;
-	private GroupFooterPosition groupFooterPosition;
-	private boolean groupKeepTogether;
-	private boolean groupHeaderWithSubtotal;
-	private boolean groupByDataType;
+	protected GroupHeaderLayout groupHeaderLayout;
+	protected boolean groupHideColumn;
+	protected boolean groupShowColumnHeaderAndFooter;
+	protected int groupPadding;
+	protected boolean groupStartInNewPage;
+	protected boolean groupStartInNewColumn;
+	protected boolean groupReprintHeaderOnEachPage;
+	protected boolean groupResetPageNumber;
+	protected Integer groupMinHeightToStartNewPage;
+	protected GroupFooterPosition groupFooterPosition;
+	protected boolean groupKeepTogether;
+	protected boolean groupHeaderWithSubtotal;
+	protected boolean groupByDataType;
 	// subtotal
-	private Position subtotalLabelPosition;
+	protected Position subtotalLabelPosition;
 	// table of contents
-	private boolean tableOfContents;
-	private DRITableOfContentsCustomizer tableOfContentsCustomizer;
-	private boolean addGroupToTableOfContents;
-	private TableOfContentsPosition tableOfContentsPosition;
+	protected boolean tableOfContents;
+	protected DRITableOfContentsCustomizer tableOfContentsCustomizer;
+	protected boolean addGroupToTableOfContents;
+	protected TableOfContentsPosition tableOfContentsPosition;
 	// text field
-	private int textFieldWidth;
-	private boolean textFieldPrintRepeatedValues;
-	private boolean textFieldStretchWithOverflow;
-	private TextAdjust textFieldTextAdjust;
+	protected int textFieldWidth;
+	protected boolean textFieldPrintRepeatedValues;
+	protected boolean textFieldStretchWithOverflow;
 	// image
-	private int imageWidth;
-	private int imageHeight;
+	protected int imageWidth;
+	protected int imageHeight;
 	// filler
-	private int fillerWidth;
-	private int fillerHeight;
+	protected int fillerWidth;
+	protected int fillerHeight;
 	// line
-	private int lineWidth;
-	private int lineHeight;
+	protected int lineWidth;
+	protected int lineHeight;
 	// ellipse
-	private int ellipseWidth;
-	private int ellipseHeight;
+	protected int ellipseWidth;
+	protected int ellipseHeight;
 	// rectangle
-	private Integer rectangleRadius;
-	private int rectangleWidth;
-	private int rectangleHeight;
+	protected Integer rectangleRadius;
+	protected int rectangleWidth;
+	protected int rectangleHeight;
 	// map
-	private int mapWidth;
-	private int mapHeight;
+	protected int mapWidth;
+	protected int mapHeight;
 	// custom component
-	private int customComponentWidth;
-	private int customComponentHeight;
+	protected int customComponentWidth;
+	protected int customComponentHeight;
 	// break
-	private int breakWidth;
-	private int breakHeight;
+	protected int breakWidth;
+	protected int breakHeight;
 	// generic element
-	private int genericElementWidth;
-	private int genericElementHeight;
+	protected int genericElementWidth;
+	protected int genericElementHeight;
 	// list
-	private Integer listWidth;
-	private Integer listHeight;
-	private int listgap;
-	private HorizontalCellComponentAlignment horizontalCellComponentAlignment;
-	private VerticalCellComponentAlignment verticalCellComponentAlignment;
+	protected Integer listWidth;
+	protected Integer listHeight;
+	protected int listgap;
+	protected HorizontalCellComponentAlignment horizontalCellComponentAlignment;
+	protected VerticalCellComponentAlignment verticalCellComponentAlignment;
 	// multi page list
-	private int multiPageListWidth;
-	private int multiPageListHeight;
+	protected int multiPageListWidth;
+	protected int multiPageListHeight;
 	// subreport
-	private int subreportWidth;
-	private int subreportHeight;
+	protected int subreportWidth;
+	protected int subreportHeight;
 	// crosstab
-	private int crosstabWidth;
-	private int crosstabHeight;
-	private CrosstabTotalPosition crosstabColumnGroupTotalPosition;
-	private CrosstabTotalPosition crosstabRowGroupTotalPosition;
-	private boolean crosstabColumnGroupShowTotal;
-	private boolean crosstabRowGroupShowTotal;
-	private int crosstabColumnGroupTotalHeaderMaxWidth;
-	private int crosstabRowGroupHeaderMaxWidth;
-	private int crosstabCellMaxWidth;
-	private boolean crosstabHighlightOddRows;
-	private DRSimpleStyle crosstabOddRowStyle;
-	private boolean crosstabHighlightEvenRows;
-	private DRSimpleStyle crosstabEvenRowStyle;
-	private DRStyle crosstabGroupStyle;
-	private DRStyle crosstabGroupTotalStyle;
-	private DRStyle crosstabGrandTotalStyle;
-	private DRStyle crosstabCellStyle;
-	private DRStyle crosstabMeasureTitleStyle;
-	private CrosstabPercentageType crosstabPercentageType;
+	protected int crosstabWidth;
+	protected int crosstabHeight;
+	protected CrosstabTotalPosition crosstabColumnGroupTotalPosition;
+	protected CrosstabTotalPosition crosstabRowGroupTotalPosition;
+	protected boolean crosstabColumnGroupShowTotal;
+	protected boolean crosstabRowGroupShowTotal;
+	protected int crosstabColumnGroupTotalHeaderMaxWidth;
+	protected int crosstabRowGroupHeaderMaxWidth;
+	protected int crosstabCellMaxWidth;
+	protected boolean crosstabHighlightOddRows;
+	protected DRSimpleStyle crosstabOddRowStyle;
+	protected boolean crosstabHighlightEvenRows;
+	protected DRSimpleStyle crosstabEvenRowStyle;
+	protected DRStyle crosstabGroupStyle;
+	protected DRStyle crosstabGroupTotalStyle;
+	protected DRStyle crosstabGrandTotalStyle;
+	protected DRStyle crosstabCellStyle;
+	protected DRStyle crosstabMeasureTitleStyle;
+	protected CrosstabPercentageType crosstabPercentageType;
 	// boolean
-	private BooleanComponentType booleanComponentType;
-	private boolean booleanEmptyWhenNullValue;
-	private int booleanImageWidth;
-	private int booleanImageHeight;
-	private DRStyle booleanColumnStyle;
-	private HorizontalImageAlignment booleanHorizontalImageAlignment;
+	protected BooleanComponentType booleanComponentType;
+	protected boolean booleanEmptyWhenNullValue;
+	protected int booleanImageWidth;
+	protected int booleanImageHeight;
+	protected DRStyle booleanColumnStyle;
+	protected HorizontalImageAlignment booleanHorizontalImageAlignment;
 	// split
-	private SplitType defaultSplitType;
-	private SplitType titleSplitType;
-	private SplitType pageHeaderSplitType;
-	private SplitType pageFooterSplitType;
-	private SplitType columnHeaderSplitType;
-	private SplitType columnFooterSplitType;
-	private SplitType groupHeaderSplitType;
-	private SplitType groupFooterSplitType;
-	private SplitType detailHeaderSplitType;
-	private SplitType detailSplitType;
-	private SplitType detailFooterSplitType;
-	private SplitType lastPageFooterSplitType;
-	private SplitType summarySplitType;
-	private SplitType noDataSplitType;
-	private SplitType backgroundSplitType;
+	protected SplitType defaultSplitType;
+	protected SplitType titleSplitType;
+	protected SplitType pageHeaderSplitType;
+	protected SplitType pageFooterSplitType;
+	protected SplitType columnHeaderSplitType;
+	protected SplitType columnFooterSplitType;
+	protected SplitType groupHeaderSplitType;
+	protected SplitType groupFooterSplitType;
+	protected SplitType detailHeaderSplitType;
+	protected SplitType detailSplitType;
+	protected SplitType detailFooterSplitType;
+	protected SplitType lastPageFooterSplitType;
+	protected SplitType summarySplitType;
+	protected SplitType noDataSplitType;
+	protected SplitType backgroundSplitType;
 	// band style
-	private DRIStyle bandStyle;
+	protected DRIStyle bandStyle;
 	// band background component
-	private DRIComponent bandBackgroundComponent;
+	protected DRIComponent bandBackgroundComponent;
 	// font
-	private DRFont font;
+	protected DRFont font;
 	// datatype
-	private DRDataType<Number, BigDecimal> bigDecimalType;
-	private DRDataType<Number, BigInteger> bigIntegerType;
-	private DRDataType<Number, Byte> byteType;
-	private DRDataType<Number, Double> doubleType;
-	private DRDataType<Number, Float> floatType;
-	private DRDataType<Number, Integer> integerType;
-	private DRDataType<Number, Long> longType;
-	private DRDataType<Number, Short> shortType;
-	private DRDataType<Date, Date> dateType;
-	private DRDataType<Date, Date> dateYearToMonthType;
-	private DRDataType<Date, Date> dateYearToHourType;
-	private DRDataType<Date, Date> dateYearToMinuteType;
-	private DRDataType<Date, Date> dateYearToSecondType;
-	private DRDataType<Date, Date> dateYearToFractionType;
-	private DRDataType<Date, Date> dateYearType;
-	private DRDataType<Date, Date> dateMonthType;
-	private DRDataType<Date, Date> dateDayType;
-	private DRDataType<Date, Date> timeHourToMinuteType;
-	private DRDataType<Date, Date> timeHourToSecondType;
-	private DRDataType<Date, Date> timeHourToFractionType;
-	private DRDataType<Number, Double> percentageType;
-	private DRDataType<Boolean, Boolean> booleanType;
-	private DRDataType<Character, Character> characterType;
-	private DRDataType<String, String> stringType;
-	private HorizontalTextAlignment pageXofYHorizontalTextAlignment;
+	protected DRDataType<Number, BigDecimal> bigDecimalType;
+	protected DRDataType<Number, BigInteger> bigIntegerType;
+	protected DRDataType<Number, Byte> byteType;
+	protected DRDataType<Number, Double> doubleType;
+	protected DRDataType<Number, Float> floatType;
+	protected DRDataType<Number, Integer> integerType;
+	protected DRDataType<Number, Long> longType;
+	protected DRDataType<Number, Short> shortType;
+	protected DRDataType<Date, Date> dateType;
+	protected DRDataType<Date, Date> dateYearToMonthType;
+	protected DRDataType<Date, Date> dateYearToHourType;
+	protected DRDataType<Date, Date> dateYearToMinuteType;
+	protected DRDataType<Date, Date> dateYearToSecondType;
+	protected DRDataType<Date, Date> dateYearToFractionType;
+	protected DRDataType<Date, Date> dateYearType;
+	protected DRDataType<Date, Date> dateMonthType;
+	protected DRDataType<Date, Date> dateDayType;
+	protected DRDataType<Date, Date> timeHourToMinuteType;
+	protected DRDataType<Date, Date> timeHourToSecondType;
+	protected DRDataType<Date, Date> timeHourToFractionType;
+	protected DRDataType<Number, Double> percentageType;
+	protected DRDataType<Boolean, Boolean> booleanType;
+	protected DRDataType<Character, Character> characterType;
+	protected DRDataType<String, String> stringType;
+	protected HorizontalTextAlignment pageXofYHorizontalTextAlignment;
 	// system fonts
-	private boolean loadSystemFonts;
+	protected boolean loadSystemFonts;
 	
 	/**
 	 * <p>Constructor for Default.</p>
 	 */
 	public Default()
 	{
-        this.init();
+		this.init();
 	}
 	
-	private void init()
+	protected void init()
 	{
 		this.reportName = "Report";
 		this.locale = Locale.getDefault();
@@ -336,7 +335,6 @@ private void init()
 		this.textFieldWidth = 100;
 		this.textFieldPrintRepeatedValues = true;
 		this.textFieldStretchWithOverflow = true;
-		this.textFieldTextAdjust = TextAdjust.STRETCH_HEIGHT;
 		
 		this.imageWidth = 100;
 		this.imageHeight = 100;
@@ -366,9 +364,6 @@ private void init()
 		this.genericElementWidth = 100;
 		this.genericElementHeight = 100;
 		
-		this.genericElementWidth = 100;
-		this.genericElementHeight = 100;
-		
 		this.listWidth = null;
 		this.listHeight = null;
 		this.listgap = 0;
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/DefaultBinder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/DefaultBinder.java
deleted file mode 100644
index 92a459c..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/DefaultBinder.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package software.xdev.dynamicreports.report.defaults;
-
-import software.xdev.dynamicreports.report.base.datatype.DRDataType;
-import software.xdev.dynamicreports.report.base.style.DRFont;
-import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
-import software.xdev.dynamicreports.report.defaults.xml.XmlDataType;
-import software.xdev.dynamicreports.report.defaults.xml.XmlDynamicReports;
-import software.xdev.dynamicreports.report.defaults.xml.XmlFont;
-import software.xdev.dynamicreports.report.exception.DRReportException;
-
-/**
- * <p>DefaultBinder class.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public class DefaultBinder {
-
-    /**
-     * <p>bind.</p>
-     *
-     * @param xmlDynamicReports a {@link software.xdev.dynamicreports.report.defaults.xml.XmlDynamicReports} object.
-     * @return a {@link software.xdev.dynamicreports.report.defaults.Default} object.
-     */
-    public static Default bind(XmlDynamicReports xmlDynamicReports) {
-        Default defaults = new Default();
-        if (xmlDynamicReports != null) {
-            // font
-            bind(defaults.getFont(), xmlDynamicReports.getFont());
-            // data type
-            bind(defaults.getBigDecimalType(), xmlDynamicReports.getBigDecimalType());
-            bind(defaults.getBigIntegerType(), xmlDynamicReports.getBigIntegerType());
-            bind(defaults.getByteType(), xmlDynamicReports.getByteType());
-            bind(defaults.getDoubleType(), xmlDynamicReports.getDoubleType());
-            bind(defaults.getFloatType(), xmlDynamicReports.getFloatType());
-            bind(defaults.getIntegerType(), xmlDynamicReports.getIntegerType());
-            bind(defaults.getLongType(), xmlDynamicReports.getLongType());
-            bind(defaults.getShortType(), xmlDynamicReports.getShortType());
-            bind(defaults.getDateType(), xmlDynamicReports.getDateType());
-            bind(defaults.getDateYearToMonthType(), xmlDynamicReports.getDateYearToMonthType());
-            bind(defaults.getDateYearToHourType(), xmlDynamicReports.getDateYearToHourType());
-            bind(defaults.getDateYearToMinuteType(), xmlDynamicReports.getDateYearToMinuteType());
-            bind(defaults.getDateYearToSecondType(), xmlDynamicReports.getDateYearToSecondType());
-            bind(defaults.getDateYearToFractionType(), xmlDynamicReports.getDateYearToFractionType());
-            bind(defaults.getDateYearType(), xmlDynamicReports.getDateYearType());
-            bind(defaults.getDateMonthType(), xmlDynamicReports.getDateMonthType());
-            bind(defaults.getDateDayType(), xmlDynamicReports.getDateDayType());
-            bind(defaults.getTimeHourToMinuteType(), xmlDynamicReports.getTimeHourToMinuteType());
-            bind(defaults.getTimeHourToSecondType(), xmlDynamicReports.getTimeHourToSecondType());
-            bind(defaults.getTimeHourToFractionType(), xmlDynamicReports.getTimeHourToFractionType());
-            bind(defaults.getPercentageType(), xmlDynamicReports.getPercentageType());
-            bind(defaults.getBooleanType(), xmlDynamicReports.getBooleanType());
-            bind(defaults.getCharacterType(), xmlDynamicReports.getCharacterType());
-            bind(defaults.getStringType(), xmlDynamicReports.getStringType());
-
-            if (xmlDynamicReports.isLoadSystemFonts() != null) {
-                defaults.setLoadSystemFonts(xmlDynamicReports.isLoadSystemFonts());
-            }
-        }
-        return defaults;
-    }
-
-    private static void bind(DRDataType<?, ?> dataType, XmlDataType xmlDataType) {
-        if (xmlDataType == null) {
-            return;
-        }
-
-        if (xmlDataType.getPattern() != null) {
-            dataType.setPattern(xmlDataType.getPattern());
-        }
-        if (xmlDataType.getHorizontalAlignment() != null) {
-            HorizontalTextAlignment alignment = HorizontalTextAlignment.valueOf(xmlDataType.getHorizontalAlignment().name());
-            if (alignment == null) {
-                throw new DRReportException("Horizontal text alignment " + xmlDataType.getHorizontalAlignment().name() + " not supported");
-            }
-            dataType.setHorizontalTextAlignment(alignment);
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private static void bind(DRFont font, XmlFont xmlFont) {
-        if (xmlFont == null) {
-            return;
-        }
-
-        if (xmlFont.getFontName() != null) {
-            font.setFontName(xmlFont.getFontName());
-        }
-        if (xmlFont.getFontSize() != null) {
-            font.setFontSize(xmlFont.getFontSize());
-        }
-        if (xmlFont.getPdfFontName() != null) {
-            font.setPdfFontName(xmlFont.getPdfFontName());
-        }
-        if (xmlFont.getPdfEncoding() != null) {
-            font.setPdfEncoding(xmlFont.getPdfEncoding());
-        }
-        if (xmlFont.isPdfEmbedded() != null) {
-            font.setPdfEmbedded(xmlFont.isPdfEmbedded());
-        }
-    }
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java
index 0f07c29..d2e1f87 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java
@@ -17,71 +17,26 @@
  */
 package software.xdev.dynamicreports.report.defaults;
 
-import java.io.InputStream;
+import java.util.ServiceLoader;
 
-import javax.xml.transform.stream.StreamSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
-import software.xdev.dynamicreports.report.defaults.xml.XmlDynamicReports;
-
-/**
- * <p>Defaults class.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public class Defaults {
-    private static final Log log = LogFactory.getLog(Defaults.class);
-
-    private static final Default defaults;
-
-    static {
-        defaults = DefaultBinder.bind(load());
+public final class Defaults
+{
+    private static Default instance = ServiceLoader.load(Default.class)
+        .findFirst()
+        .orElseGet(Default::new);
+    
+    private Defaults()
+    {
     }
-
-    private static XmlDynamicReports load() {
-        final String resource = "dynamicreports-defaults.xml";
-        InputStream is = null;
-
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        if (classLoader != null) {
-            is = classLoader.getResourceAsStream(resource);
-        }
-        if (is == null) {
-            classLoader = Defaults.class.getClassLoader();
-            if (classLoader != null) {
-                is = classLoader.getResourceAsStream(resource);
-            }
-            if (is == null) {
-                is = Defaults.class.getResourceAsStream("/" + resource);
-            }
-        }
-        if (is == null) {
-            return null;
-        }
-
-        try {
-            final Unmarshaller unmarshaller = JAXBContext.newInstance(XmlDynamicReports.class).createUnmarshaller();
-            final JAXBElement<XmlDynamicReports> root = unmarshaller.unmarshal(new StreamSource(is), XmlDynamicReports.class);
-            return root.getValue();
-        } catch (final JAXBException e) {
-            log.error("Could not load dynamic reports defaults", e);
-            return null;
-        }
+    
+    public static Default getDefaults()
+    {
+        return instance;
     }
-
-    /**
-     * <p>Getter for the field <code>defaults</code>.</p>
-     *
-     * @return a {@link software.xdev.dynamicreports.report.defaults.Default} object.
-     */
-    public static Default getDefaults() {
-        return defaults;
+    
+    public static void setDefault(final Default d)
+    {
+        instance = d;
     }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/TestDefault.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/TestDefault.java
new file mode 100644
index 0000000..99ed16a
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/TestDefault.java
@@ -0,0 +1,29 @@
+/*
+ * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package software.xdev.dynamicreports;
+
+import software.xdev.dynamicreports.report.defaults.Default;
+
+
+public class TestDefault extends Default
+{
+	public TestDefault()
+	{
+		this.getFont().setFontName("Arimo");
+	}
+}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DefaultsTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DefaultsTest.java
deleted file mode 100644
index 582cba4..0000000
--- a/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/base/DefaultsTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package software.xdev.dynamicreports.test.base;
-
-import java.io.InputStream;
-
-import javax.xml.transform.stream.StreamSource;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
-import software.xdev.dynamicreports.report.base.datatype.DRDataType;
-import software.xdev.dynamicreports.report.base.style.DRFont;
-import software.xdev.dynamicreports.report.constant.HorizontalTextAlignment;
-import software.xdev.dynamicreports.report.defaults.Default;
-import software.xdev.dynamicreports.report.defaults.DefaultBinder;
-import software.xdev.dynamicreports.report.defaults.xml.XmlDynamicReports;
-
-
-/**
- * Defaults tests.
- *
- * @author Ricardo Mariaca
- */
-class DefaultsTest
-{
-	private Default load()
-	{
-		final InputStream is = DefaultsTest.class.getResourceAsStream("dynamicreports-defaults.xml");
-		try
-		{
-			final Unmarshaller unmarshaller =
-				JAXBContext.newInstance(XmlDynamicReports.class).createUnmarshaller();
-			final JAXBElement<XmlDynamicReports> root =
-				unmarshaller.unmarshal(new StreamSource(is), XmlDynamicReports.class);
-			return DefaultBinder.bind(root.getValue());
-		}
-		catch(final JAXBException e)
-		{
-			e.printStackTrace();
-			Assertions.fail(e.getMessage());
-		}
-		return null;
-	}
-	
-	@Test
-	void test()
-	{
-		DefaultBinder.bind(null);
-		final Default defaults = this.load();
-		
-		final DRFont font = defaults.getFont();
-		Assertions.assertEquals("Arimo", font.getFontName());
-		Assertions.assertEquals(15, font.getFontSize());
-		Assertions.assertEquals("Arimo", font.getPdfFontName());
-		Assertions.assertEquals("Identity-H", font.getPdfEncoding());
-		Assertions.assertTrue(font.getPdfEmbedded());
-		
-		this.testDataType("BigDecimal", defaults.getBigDecimalType(), "#,###.00#",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("BigInteger", defaults.getBigIntegerType(), "#,###", HorizontalTextAlignment.LEFT);
-		this.testDataType("Byte", defaults.getByteType(), "#,###", HorizontalTextAlignment.LEFT);
-		this.testDataType("Double", defaults.getDoubleType(), "#,###.#", HorizontalTextAlignment.LEFT);
-		this.testDataType("Float", defaults.getFloatType(), "#,###.#", HorizontalTextAlignment.LEFT);
-		this.testDataType("Integer", defaults.getIntegerType(), "#,###", HorizontalTextAlignment.LEFT);
-		this.testDataType("Long", defaults.getLongType(), "#,###", HorizontalTextAlignment.LEFT);
-		this.testDataType("Short", defaults.getShortType(), "#,###", HorizontalTextAlignment.LEFT);
-		this.testDataType("Date", defaults.getDateType(), "MM.dd.yyyy", HorizontalTextAlignment.LEFT);
-		this.testDataType("DateYearToMonth", defaults.getDateYearToMonthType(), "MM.yyyy",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("DateYearToHour", defaults.getDateYearToHourType(), "MM.dd.yyyy h a",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("DateYearToMinute", defaults.getDateYearToMinuteType(), "MM.dd.yyyy h:mm a",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("DateYearToSecond", defaults.getDateYearToSecondType(), "MM.dd.yyyy h:mm:ss a",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("DateYearToFraction", defaults.getDateYearToFractionType(),
-			"MM.dd.yyyy h:mm:ss,SSS a", HorizontalTextAlignment.LEFT);
-		this.testDataType("DateYear", defaults.getDateYearType(), "yy", HorizontalTextAlignment.LEFT);
-		this.testDataType("DateMonth", defaults.getDateMonthType(), "MM", HorizontalTextAlignment.LEFT);
-		this.testDataType("DateDay", defaults.getDateDayType(), "d", HorizontalTextAlignment.LEFT);
-		this.testDataType("TimeHourToMinute", defaults.getTimeHourToMinuteType(), "hh:mm a",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("TimeHourToSecond", defaults.getTimeHourToSecondType(), "hh:mm:ss a",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("TimeHourToFraction", defaults.getTimeHourToFractionType(), "hh:mm:ss,SSS a",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("Percentage", defaults.getPercentageType(), "#,###.00%",
-			HorizontalTextAlignment.LEFT);
-		this.testDataType("Boolean", defaults.getBooleanType(), null, HorizontalTextAlignment.RIGHT);
-		this.testDataType("Character", defaults.getCharacterType(), null, HorizontalTextAlignment.RIGHT);
-		this.testDataType("String", defaults.getStringType(), null, HorizontalTextAlignment.RIGHT);
-	}
-	
-	private void testDataType(
-		final String name, final DRDataType<?, ?> dataType, final String pattern,
-		final HorizontalTextAlignment horizontalTextAlignment)
-	{
-		Assertions.assertEquals(pattern, dataType.getPattern(), name + " pattern");
-		Assertions.assertEquals(
-			horizontalTextAlignment,
-			dataType.getHorizontalTextAlignment(),
-			name + " horizontal alignment");
-	}
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/META-INF/services/software.xdev.dynamicreports.report.defaults.Default b/dynamicreports-core-for-grid-exporter/src/test/resources/META-INF/services/software.xdev.dynamicreports.report.defaults.Default
new file mode 100644
index 0000000..959fe04
--- /dev/null
+++ b/dynamicreports-core-for-grid-exporter/src/test/resources/META-INF/services/software.xdev.dynamicreports.report.defaults.Default
@@ -0,0 +1 @@
+software.xdev.dynamicreports.TestDefault
diff --git a/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-defaults.xml b/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-defaults.xml
deleted file mode 100644
index 8abb69a..0000000
--- a/dynamicreports-core-for-grid-exporter/src/test/resources/dynamicreports-defaults.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DynamicReports>
-    <font fontName="Arimo"/>
-</DynamicReports>

From 6204bc04e753f5a62b6dd6d7ae5fb7758edd6386 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Tue, 6 Jun 2023 16:48:49 +0200
Subject: [PATCH 19/21] Throw away useless exports

---
 CHANGELOG.md                                  |   5 +-
 .../base/export/JasperImageExporter.java      |  83 --------
 .../jasper/base/export/JasperXmlExporter.java |  48 -----
 .../JasperConcatenatedReportBuilder.java      |  25 ---
 .../jasper/builder/JasperReportBuilder.java   | 194 ++----------------
 .../builder/export/ExporterBuilders.java      |  86 --------
 .../jasper/builder/export/Exporters.java      |  86 --------
 .../export/JasperImageExporterBuilder.java    |  84 --------
 .../export/JasperXmlExporterBuilder.java      |  49 -----
 .../export/JasperIImageExporter.java          |  50 -----
 .../definition/export/JasperIXmlExporter.java |  34 ---
 .../transformation/ExporterTransform.java     | 108 ++--------
 .../test/jasper/report/ExportTest.java        |   6 +-
 13 files changed, 39 insertions(+), 819 deletions(-)
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperImageExporter.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXmlExporter.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIImageExporter.java
 delete mode 100644 dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXmlExporter.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b214112..e732783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,6 @@ Initial release of the fork
 
 ## Differences to [dynamicreports/dynamicreports-core](https://github.com/dynamicreports/dynamicreports/tree/f7d73961462f3f13cbc27c91df90d4cc3ccc669e/dynamicreports-core)
 * Renamed ``net.sf.dynamicreports`` to ``software.xdev.dynamicreports`` to prevent conflicts with existing installations
-* Changed from ``javax`` to ``jakarta``
-  * Added ``jakarta.xml.bind-api``
-  * Replaced ``maven-jaxb2-plugin`` with ``jaxb40-maven-plugin``
 * Dependency shedding
   * Removed default-XML subsystem; can be supplied manually to the builder or using Java Service Loading
     * ``jakarta.xml.bind:jakarta.xml.bind-api``
@@ -21,5 +18,7 @@ Initial release of the fork
   * Dropped support for ``XLS`` as the required dependency was never shipped
     * ``XLSX`` still works as expected
   * Removed ``org.apache.commons:commons-text`` as it was only used on a single unused line of code
+* Removed XML subsystem as XML exports were never producing valid XML
+* Removed half implemented Image subsystem as it is unused
 * Update dependencies to lastest versions
 * Fixed compile errors
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperImageExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperImageExporter.java
deleted file mode 100644
index 615d716..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperImageExporter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package software.xdev.dynamicreports.jasper.base.export;
-
-import software.xdev.dynamicreports.jasper.constant.ImageType;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIImageExporter;
-import software.xdev.dynamicreports.report.constant.Constants;
-import org.apache.commons.lang3.Validate;
-
-/**
- * <p>JasperImageExporter class.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public class JasperImageExporter extends AbstractJasperExporter implements JasperIImageExporter {
-    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
-
-    private Integer pageGap;
-    private ImageType imageType;
-    private Float zoomRatio;
-
-    /** {@inheritDoc} */
-    @Override
-    public Integer getPageGap() {
-        return pageGap;
-    }
-
-    /**
-     * <p>Setter for the field <code>pageGap</code>.</p>
-     *
-     * @param pageGap a {@link java.lang.Integer} object.
-     */
-    public void setPageGap(Integer pageGap) {
-        this.pageGap = pageGap;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ImageType getImageType() {
-        return imageType;
-    }
-
-    /**
-     * <p>Setter for the field <code>imageType</code>.</p>
-     *
-     * @param imageType a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     */
-    public void setImageType(ImageType imageType) {
-        Validate.notNull(imageType, "imageType must not be null");
-        this.imageType = imageType;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Float getZoomRatio() {
-        return zoomRatio;
-    }
-
-    /**
-     * <p>Setter for the field <code>zoomRatio</code>.</p>
-     *
-     * @param zoomRatio a {@link java.lang.Float} object.
-     */
-    public void setZoomRatio(Float zoomRatio) {
-        this.zoomRatio = zoomRatio;
-    }
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXmlExporter.java
deleted file mode 100644
index ee7df0f..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/base/export/JasperXmlExporter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package software.xdev.dynamicreports.jasper.base.export;
-
-import software.xdev.dynamicreports.jasper.definition.export.JasperIXmlExporter;
-import software.xdev.dynamicreports.report.constant.Constants;
-
-/**
- * <p>JasperXmlExporter class.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public class JasperXmlExporter extends AbstractJasperExporter implements JasperIXmlExporter {
-    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
-
-    private Boolean embeddingImages;
-
-    /** {@inheritDoc} */
-    @Override
-    public Boolean getEmbeddingImages() {
-        return embeddingImages;
-    }
-
-    /**
-     * <p>Setter for the field <code>embeddingImages</code>.</p>
-     *
-     * @param embeddingImages a {@link java.lang.Boolean} object.
-     */
-    public void setEmbeddingImages(Boolean embeddingImages) {
-        this.embeddingImages = embeddingImages;
-    }
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
index d2e745d..ddc5632 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperConcatenatedReportBuilder.java
@@ -54,7 +54,6 @@
 import software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
-import software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
 import software.xdev.dynamicreports.jasper.definition.JasperReportHandler;
 import software.xdev.dynamicreports.jasper.transformation.ExporterTransform;
 import software.xdev.dynamicreports.report.constant.Constants;
@@ -416,30 +415,6 @@ public JasperConcatenatedReportBuilder toXlsx(final JasperXlsxExporterBuilder xl
         return this.export(xlsxExporterBuilder);
     }
 
-    // xml
-
-    /**
-     * <p>toXml.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperConcatenatedReportBuilder toXml(final OutputStream outputStream) throws DRException {
-        return this.toXml(Exporters.xmlExporter(outputStream));
-    }
-
-    /**
-     * <p>toXml.</p>
-     *
-     * @param xmlExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder} object.
-     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperConcatenatedReportBuilder toXml(final JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
-        return this.export(xmlExporterBuilder);
-    }
-
     // pptx
 
     /**
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperReportBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperReportBuilder.java
index 155aa26..c9f24c8 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperReportBuilder.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/JasperReportBuilder.java
@@ -17,12 +17,7 @@
  */
 package software.xdev.dynamicreports.jasper.builder;
 
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.awt.image.RenderedImage;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
@@ -32,15 +27,31 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.imageio.ImageIO;
-
 import org.apache.commons.lang3.Validate;
 
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JRResultSetDataSource;
+import net.sf.jasperreports.engine.JRRewindableDataSource;
+import net.sf.jasperreports.engine.JRVirtualizer;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperFillManager;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperPrintManager;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+import net.sf.jasperreports.engine.design.JasperDesign;
+import net.sf.jasperreports.engine.xml.JRXmlWriter;
+import net.sf.jasperreports.export.Exporter;
+import net.sf.jasperreports.export.ExporterInput;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.view.JasperDesignViewer;
+import net.sf.jasperreports.view.JasperViewer;
 import software.xdev.dynamicreports.design.base.DRDesignReport;
 import software.xdev.dynamicreports.design.definition.DRIDesignReport;
 import software.xdev.dynamicreports.jasper.base.JasperReportDesign;
 import software.xdev.dynamicreports.jasper.base.export.AbstractJasperExporter;
-import software.xdev.dynamicreports.jasper.base.export.JasperImageExporter;
 import software.xdev.dynamicreports.jasper.base.tableofcontents.JasperTocReport;
 import software.xdev.dynamicreports.jasper.base.templatedesign.JasperEmptyTemplateDesign;
 import software.xdev.dynamicreports.jasper.base.templatedesign.JasperTemplateDesign;
@@ -49,7 +60,6 @@
 import software.xdev.dynamicreports.jasper.builder.export.JasperCsvExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperDocxExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperHtmlExporterBuilder;
-import software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperOdsExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperOdtExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperPdfExporterBuilder;
@@ -57,9 +67,6 @@
 import software.xdev.dynamicreports.jasper.builder.export.JasperRtfExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperTextExporterBuilder;
 import software.xdev.dynamicreports.jasper.builder.export.JasperXlsxExporterBuilder;
-import software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder;
-import software.xdev.dynamicreports.jasper.constant.ImageType;
-import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
 import software.xdev.dynamicreports.jasper.transformation.ExporterTransform;
 import software.xdev.dynamicreports.jasper.transformation.JasperTransform;
 import software.xdev.dynamicreports.report.builder.DynamicReports;
@@ -69,29 +76,6 @@
 import software.xdev.dynamicreports.report.constant.QueryLanguage;
 import software.xdev.dynamicreports.report.definition.DRITemplateDesign;
 import software.xdev.dynamicreports.report.exception.DRException;
-import net.sf.jasperreports.engine.JRDataSource;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRParameter;
-import net.sf.jasperreports.engine.JRResultSetDataSource;
-import net.sf.jasperreports.engine.JRRewindableDataSource;
-import net.sf.jasperreports.engine.JRVirtualizer;
-import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperPrintManager;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-import net.sf.jasperreports.engine.design.JasperDesign;
-import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
-import net.sf.jasperreports.engine.xml.JRXmlWriter;
-import net.sf.jasperreports.export.Exporter;
-import net.sf.jasperreports.export.ExporterInput;
-import net.sf.jasperreports.export.SimpleExporterInput;
-import net.sf.jasperreports.export.SimpleGraphics2DExporterConfiguration;
-import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
-import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
-import net.sf.jasperreports.view.JasperDesignViewer;
-import net.sf.jasperreports.view.JasperViewer;
 
 /**
  * The most used report builder for creating reports. It allows constructing and customizing the whole report content. A report consists of bands, columns, subtotals, groups, and other parts. Each
@@ -470,122 +454,6 @@ public JasperReportBuilder setVirtualizer(final JRVirtualizer virtualizer) {
         return this;
     }
 
-    /**
-     * <p>toImage.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @param imageType    a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperReportBuilder toImage(final OutputStream outputStream, final ImageType imageType) throws DRException {
-        return this.toImage(Exporters.imageExporter(outputStream, imageType));
-    }
-
-    /**
-     * <p>toImage.</p>
-     *
-     * @param imageExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperReportBuilder toImage(final JasperImageExporterBuilder imageExporterBuilder) throws DRException {
-        Validate.notNull(imageExporterBuilder, "imageExporterBuilder must not be null");
-
-        final JasperImageExporter imageExporter = imageExporterBuilder.build();
-
-        final JasperPrint jasperPrint = this.toJasperPrint();
-        Integer fromPage = null;
-        Integer toPage = null;
-        float zoom = 1;
-        final String imageType = imageExporter.getImageType().name().toLowerCase();
-        int offsetX = 0;
-        int offsetY = 0;
-        int pageGap = 0;
-
-        if (imageExporter.getZoomRatio() != null) {
-            zoom = imageExporter.getZoomRatio();
-        }
-        if (imageExporter.getOffsetX() != null) {
-            offsetX = imageExporter.getOffsetX();
-        }
-        if (imageExporter.getOffsetY() != null) {
-            offsetY = imageExporter.getOffsetY();
-        }
-        if (imageExporter.getPageGap() != null) {
-            pageGap = imageExporter.getPageGap();
-        }
-
-        if (imageExporter.getPageIndex() != null && imageExporter.getPageIndex() >= 0) {
-            fromPage = imageExporter.getPageIndex();
-            toPage = imageExporter.getPageIndex() + 1;
-        } else {
-            if (imageExporter.getStartPageIndex() != null) {
-                fromPage = imageExporter.getStartPageIndex();
-            }
-            if (imageExporter.getEndPageIndex() != null) {
-                toPage = imageExporter.getEndPageIndex();
-            }
-        }
-        if (fromPage == null) {
-            fromPage = 0;
-        }
-        if (toPage == null) {
-            toPage = jasperPrint.getPages().size();
-        }
-
-        final int pages = toPage - fromPage;
-
-        final int pageWidth = (int) (jasperPrint.getPageWidth() * zoom);
-        final int pageHeight = (int) (jasperPrint.getPageHeight() * zoom);
-        final int width = pageWidth * pages + pages - 1 + offsetX * 2;
-        final int height = (int) (jasperPrint.getPageHeight() * zoom) + offsetY * 2;
-        final Image image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-
-        int offset = offsetX;
-        for (int i = 0; i < pages; i++) {
-            try {
-                final SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
-                final SimpleGraphics2DExporterOutput exporterOutput = new SimpleGraphics2DExporterOutput();
-                final Image pageImage = new BufferedImage(pageWidth, pageHeight, BufferedImage.TYPE_INT_RGB);
-                exporterOutput.setGraphics2D((Graphics2D) pageImage.getGraphics());
-                final SimpleGraphics2DReportConfiguration reportExportConfiguration = new SimpleGraphics2DReportConfiguration();
-                reportExportConfiguration.setPageIndex(fromPage);
-                reportExportConfiguration.setZoomRatio(zoom);
-                final SimpleGraphics2DExporterConfiguration exporterConfiguration = new SimpleGraphics2DExporterConfiguration();
-
-                final JRGraphics2DExporter jrExporter = new JRGraphics2DExporter();
-                jrExporter.setExporterInput(exporterInput);
-                jrExporter.setExporterOutput(exporterOutput);
-                jrExporter.setConfiguration(reportExportConfiguration);
-                jrExporter.setConfiguration(exporterConfiguration);
-
-                jrExporter.exportReport();
-                ((Graphics2D) image.getGraphics()).drawImage(pageImage, offset, offsetY, null);
-                fromPage++;
-                offset += pageWidth + pageGap;
-            } catch (final JRException e) {
-                throw new DRException(e);
-            }
-        }
-        try {
-            if (imageExporter.getOutputStream() != null) {
-                ImageIO.write((RenderedImage) image, imageType, imageExporter.getOutputStream());
-            } else if (imageExporter.getOutputFileName() != null) {
-                ImageIO.write((RenderedImage) image, imageType, new File(imageExporter.getOutputFileName()));
-            } else if (imageExporter.getOutputFile() != null) {
-                ImageIO.write((RenderedImage) image, imageType, imageExporter.getOutputFile());
-            } else {
-                throw new JasperDesignException("ImageExporter output not supported");
-            }
-        } catch (final IOException e) {
-            throw new DRException(e);
-        }
-        return this;
-    }
-
-    // image
-
     /**
      * <p>toCsv.</p>
      *
@@ -802,30 +670,6 @@ public JasperReportBuilder toXlsx(final JasperXlsxExporterBuilder xlsxExporterBu
 
     // xlsx
 
-    /**
-     * <p>toXml.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperReportBuilder toXml(final OutputStream outputStream) throws DRException {
-        return this.toXml(Exporters.xmlExporter(outputStream));
-    }
-
-    /**
-     * <p>toXml.</p>
-     *
-     * @param xmlExporterBuilder a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.JasperReportBuilder} object.
-     * @throws software.xdev.dynamicreports.report.exception.DRException if any.
-     */
-    public JasperReportBuilder toXml(final JasperXmlExporterBuilder xmlExporterBuilder) throws DRException {
-        return this.export(xmlExporterBuilder);
-    }
-
-    // xml
-
     /**
      * <p>toPptx.</p>
      *
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/ExporterBuilders.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/ExporterBuilders.java
index 2662aa9..afd07a6 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/ExporterBuilders.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/ExporterBuilders.java
@@ -21,8 +21,6 @@
 import java.io.OutputStream;
 import java.io.Writer;
 
-import software.xdev.dynamicreports.jasper.constant.ImageType;
-
 
 /**
  * A set of methods of creating exporters
@@ -446,52 +444,6 @@ public JasperXlsxExporterBuilder xlsxExporter(final String outputFileName)
         return Exporters.xlsxExporter(outputFileName);
     }
     
-    // xml
-    
-    /**
-     * <p>xmlExporter.</p>
-     *
-     * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public JasperXmlExporterBuilder xmlExporter(final Writer outputWriter)
-    {
-        return Exporters.xmlExporter(outputWriter);
-    }
-    
-    /**
-     * <p>xmlExporter.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public JasperXmlExporterBuilder xmlExporter(final OutputStream outputStream)
-    {
-        return Exporters.xmlExporter(outputStream);
-    }
-    
-    /**
-     * <p>xmlExporter.</p>
-     *
-     * @param outputFile a {@link java.io.File} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public JasperXmlExporterBuilder xmlExporter(final File outputFile)
-    {
-        return Exporters.xmlExporter(outputFile);
-    }
-    
-    /**
-     * <p>xmlExporter.</p>
-     *
-     * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public JasperXmlExporterBuilder xmlExporter(final String outputFileName)
-    {
-        return Exporters.xmlExporter(outputFileName);
-    }
-    
     // pptx
     
     /**
@@ -537,42 +489,4 @@ public JasperPptxExporterBuilder pptxExporter(final String outputFileName)
     {
         return Exporters.pptxExporter(outputFileName);
     }
-    
-    // image
-    
-    /**
-     * <p>imageExporter.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @param imageType    a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public JasperImageExporterBuilder imageExporter(final OutputStream outputStream, final ImageType imageType)
-    {
-        return Exporters.imageExporter(outputStream, imageType);
-    }
-    
-    /**
-     * <p>imageExporter.</p>
-     *
-     * @param outputFile a {@link java.io.File} object.
-     * @param imageType  a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public JasperImageExporterBuilder imageExporter(final File outputFile, final ImageType imageType)
-    {
-        return Exporters.imageExporter(outputFile, imageType);
-    }
-    
-    /**
-     * <p>imageExporter.</p>
-     *
-     * @param outputFileName a {@link java.lang.String} object.
-     * @param imageType      a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public JasperImageExporterBuilder imageExporter(final String outputFileName, final ImageType imageType)
-    {
-        return Exporters.imageExporter(outputFileName, imageType);
-    }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/Exporters.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/Exporters.java
index b2ee9d2..6d66d06 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/Exporters.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/Exporters.java
@@ -21,8 +21,6 @@
 import java.io.OutputStream;
 import java.io.Writer;
 
-import software.xdev.dynamicreports.jasper.constant.ImageType;
-
 
 /**
  * A set of methods of creating exporters
@@ -446,52 +444,6 @@ public static JasperXlsxExporterBuilder xlsxExporter(final String outputFileName
         return new JasperXlsxExporterBuilder().setOutputFileName(outputFileName);
     }
     
-    // xml
-    
-    /**
-     * <p>xmlExporter.</p>
-     *
-     * @param outputWriter a {@link java.io.Writer} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public static JasperXmlExporterBuilder xmlExporter(final Writer outputWriter)
-    {
-        return new JasperXmlExporterBuilder().setOutputWriter(outputWriter);
-    }
-    
-    /**
-     * <p>xmlExporter.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public static JasperXmlExporterBuilder xmlExporter(final OutputStream outputStream)
-    {
-        return new JasperXmlExporterBuilder().setOutputStream(outputStream);
-    }
-    
-    /**
-     * <p>xmlExporter.</p>
-     *
-     * @param outputFile a {@link java.io.File} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public static JasperXmlExporterBuilder xmlExporter(final File outputFile)
-    {
-        return new JasperXmlExporterBuilder().setOutputFile(outputFile);
-    }
-    
-    /**
-     * <p>xmlExporter.</p>
-     *
-     * @param outputFileName a {@link java.lang.String} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public static JasperXmlExporterBuilder xmlExporter(final String outputFileName)
-    {
-        return new JasperXmlExporterBuilder().setOutputFileName(outputFileName);
-    }
-    
     // pptx
     
     /**
@@ -537,42 +489,4 @@ public static JasperPptxExporterBuilder pptxExporter(final String outputFileName
     {
         return new JasperPptxExporterBuilder().setOutputFileName(outputFileName);
     }
-    
-    // image
-    
-    /**
-     * <p>imageExporter.</p>
-     *
-     * @param outputStream a {@link java.io.OutputStream} object.
-     * @param imageType    a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public static JasperImageExporterBuilder imageExporter(final OutputStream outputStream, final ImageType imageType)
-    {
-        return new JasperImageExporterBuilder().setOutputStream(outputStream).setImageType(imageType);
-    }
-    
-    /**
-     * <p>imageExporter.</p>
-     *
-     * @param outputFile a {@link java.io.File} object.
-     * @param imageType  a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public static JasperImageExporterBuilder imageExporter(final File outputFile, final ImageType imageType)
-    {
-        return new JasperImageExporterBuilder().setOutputFile(outputFile).setImageType(imageType);
-    }
-    
-    /**
-     * <p>imageExporter.</p>
-     *
-     * @param outputFileName a {@link java.lang.String} object.
-     * @param imageType      a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public static JasperImageExporterBuilder imageExporter(final String outputFileName, final ImageType imageType)
-    {
-        return new JasperImageExporterBuilder().setOutputFileName(outputFileName).setImageType(imageType);
-    }
 }
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
deleted file mode 100644
index c334728..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperImageExporterBuilder.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package software.xdev.dynamicreports.jasper.builder.export;
-
-import software.xdev.dynamicreports.jasper.base.export.JasperImageExporter;
-import software.xdev.dynamicreports.jasper.constant.ImageType;
-import software.xdev.dynamicreports.report.constant.Constants;
-
-/**
- * <p>JasperImageExporterBuilder class.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public class JasperImageExporterBuilder extends AbstractJasperExporterBuilder<JasperImageExporterBuilder, JasperImageExporter> {
-    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
-
-    /**
-     * <p>Constructor for JasperImageExporterBuilder.</p>
-     */
-    protected JasperImageExporterBuilder() {
-        super(new JasperImageExporter());
-    }
-
-    /**
-     * <p>setPageGap.</p>
-     *
-     * @param pageGap a {@link java.lang.Integer} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public JasperImageExporterBuilder setPageGap(Integer pageGap) {
-        this.getObject().setPageGap(pageGap);
-        return this;
-    }
-
-    /**
-     * <p>setImageType.</p>
-     *
-     * @param imageType a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public JasperImageExporterBuilder setImageType(ImageType imageType) {
-        this.getObject().setImageType(imageType);
-        return this;
-    }
-
-    /**
-     * <p>setZoom.</p>
-     *
-     * @param zoom a {@link java.lang.Float} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     * @deprecated To be removed. Use setZoomRatio instead.
-     */
-    @Deprecated
-    public JasperImageExporterBuilder setZoom(Float zoom) {
-        return setZoomRatio(zoom);
-    }
-
-    /**
-     * <p>setZoomRatio.</p>
-     *
-     * @param zoom a {@link java.lang.Float} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperImageExporterBuilder} object.
-     */
-    public JasperImageExporterBuilder setZoomRatio(Float zoom) {
-        this.getObject().setZoomRatio(zoom);
-        return this;
-    }
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
deleted file mode 100644
index f9170fa..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/builder/export/JasperXmlExporterBuilder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package software.xdev.dynamicreports.jasper.builder.export;
-
-import software.xdev.dynamicreports.jasper.base.export.JasperXmlExporter;
-import software.xdev.dynamicreports.report.constant.Constants;
-
-/**
- * <p>JasperXmlExporterBuilder class.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public class JasperXmlExporterBuilder extends AbstractJasperExporterBuilder<JasperXmlExporterBuilder, JasperXmlExporter> {
-    private static final long serialVersionUID = Constants.SERIAL_VERSION_UID;
-
-    /**
-     * <p>Constructor for JasperXmlExporterBuilder.</p>
-     */
-    protected JasperXmlExporterBuilder() {
-        super(new JasperXmlExporter());
-    }
-
-    /**
-     * <p>setEmbeddingImages.</p>
-     *
-     * @param embeddingImages a {@link java.lang.Boolean} object.
-     * @return a {@link software.xdev.dynamicreports.jasper.builder.export.JasperXmlExporterBuilder} object.
-     */
-    public JasperXmlExporterBuilder setEmbeddingImages(Boolean embeddingImages) {
-        this.getObject().setEmbeddingImages(embeddingImages);
-        return this;
-    }
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIImageExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIImageExporter.java
deleted file mode 100644
index 53db30b..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIImageExporter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package software.xdev.dynamicreports.jasper.definition.export;
-
-import software.xdev.dynamicreports.jasper.constant.ImageType;
-
-/**
- * <p>JasperIImageExporter interface.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public interface JasperIImageExporter extends JasperIExporter {
-
-    /**
-     * <p>getPageGap.</p>
-     *
-     * @return a {@link java.lang.Integer} object.
-     */
-    public Integer getPageGap();
-
-    /**
-     * <p>getImageType.</p>
-     *
-     * @return a {@link software.xdev.dynamicreports.jasper.constant.ImageType} object.
-     */
-    public ImageType getImageType();
-
-    /**
-     * <p>getZoomRatio.</p>
-     *
-     * @return a {@link java.lang.Float} object.
-     */
-    public Float getZoomRatio();
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXmlExporter.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
deleted file mode 100644
index 4d554c9..0000000
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/definition/export/JasperIXmlExporter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * dynamicreports-core-for-grid-exporter - dynamicreports-core-for-grid-exporter
- * Copyright © 2023 XDEV Software (https://xdev.software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package software.xdev.dynamicreports.jasper.definition.export;
-
-/**
- * <p>JasperIXmlExporter interface.</p>
- *
- * @author Ricardo Mariaca
- * 
- */
-public interface JasperIXmlExporter extends JasperIExporter {
-
-    /**
-     * <p>getEmbeddingImages.</p>
-     *
-     * @return a {@link java.lang.Boolean} object.
-     */
-    public Boolean getEmbeddingImages();
-}
diff --git a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ExporterTransform.java b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ExporterTransform.java
index 135fa7f..fcbaa76 100644
--- a/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ExporterTransform.java
+++ b/dynamicreports-core-for-grid-exporter/src/main/java/software/xdev/dynamicreports/jasper/transformation/ExporterTransform.java
@@ -19,24 +19,6 @@
 
 import java.io.File;
 
-import software.xdev.dynamicreports.design.transformation.StyleResolver;
-import software.xdev.dynamicreports.jasper.definition.export.JasperICsvExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIDocxExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIExcelExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIHtmlExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIOdsExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIOdtExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIPdfExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIPptxExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIRtfExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperITextExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
-import software.xdev.dynamicreports.jasper.definition.export.JasperIXmlExporter;
-import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
-import software.xdev.dynamicreports.report.base.style.DRFont;
-import software.xdev.dynamicreports.report.defaults.Defaults;
-import software.xdev.dynamicreports.report.exception.DRException;
 import net.sf.jasperreports.engine.export.FileHtmlResourceHandler;
 import net.sf.jasperreports.engine.export.HtmlExporter;
 import net.sf.jasperreports.engine.export.HtmlResourceHandler;
@@ -44,7 +26,6 @@
 import net.sf.jasperreports.engine.export.JRPdfExporter;
 import net.sf.jasperreports.engine.export.JRRtfExporter;
 import net.sf.jasperreports.engine.export.JRTextExporter;
-import net.sf.jasperreports.engine.export.JRXmlExporter;
 import net.sf.jasperreports.engine.export.oasis.JROdsExporter;
 import net.sf.jasperreports.engine.export.oasis.JROdtExporter;
 import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
@@ -57,7 +38,6 @@
 import net.sf.jasperreports.export.SimpleCsvReportConfiguration;
 import net.sf.jasperreports.export.SimpleDocxExporterConfiguration;
 import net.sf.jasperreports.export.SimpleDocxReportConfiguration;
-import net.sf.jasperreports.export.SimpleExporterConfiguration;
 import net.sf.jasperreports.export.SimpleHtmlExporterConfiguration;
 import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
 import net.sf.jasperreports.export.SimpleHtmlReportConfiguration;
@@ -78,8 +58,24 @@
 import net.sf.jasperreports.export.SimpleWriterExporterOutput;
 import net.sf.jasperreports.export.SimpleXlsxExporterConfiguration;
 import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
-import net.sf.jasperreports.export.SimpleXmlExporterOutput;
 import net.sf.jasperreports.web.util.WebHtmlResourceHandler;
+import software.xdev.dynamicreports.design.transformation.StyleResolver;
+import software.xdev.dynamicreports.jasper.definition.export.JasperICsvExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIDocxExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIExcelExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIHtmlExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIOdsExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIOdtExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIPdfExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIPptxExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIRtfExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperITextExporter;
+import software.xdev.dynamicreports.jasper.definition.export.JasperIXlsxExporter;
+import software.xdev.dynamicreports.jasper.exception.JasperDesignException;
+import software.xdev.dynamicreports.report.base.style.DRFont;
+import software.xdev.dynamicreports.report.defaults.Defaults;
+import software.xdev.dynamicreports.report.exception.DRException;
 
 
 /**
@@ -147,10 +143,6 @@ else if(this.jasperExporter instanceof JasperITextExporter)
         {
             jrExporter = this.text((JasperITextExporter)this.jasperExporter);
         }
-        else if(this.jasperExporter instanceof JasperIXmlExporter)
-        {
-            jrExporter = this.xml((JasperIXmlExporter)this.jasperExporter);
-        }
         else if(this.jasperExporter instanceof JasperIPptxExporter)
         {
             jrExporter = this.pptx((JasperIPptxExporter)this.jasperExporter);
@@ -276,54 +268,6 @@ private SimpleHtmlExporterOutput simpleHtmlExporterOutput(final JasperIExporter
         return null;
     }
     
-    private SimpleXmlExporterOutput simpleXmlExporterOutput(final JasperIXmlExporter jasperExporter)
-    {
-        if(jasperExporter.getOutputWriter() != null)
-        {
-            return new SimpleXmlExporterOutput(jasperExporter.getOutputWriter());
-        }
-        if(jasperExporter.getOutputStream() != null)
-        {
-            if(jasperExporter.getCharacterEncoding() != null)
-            {
-                return new SimpleXmlExporterOutput(
-                    jasperExporter.getOutputStream(),
-                    jasperExporter.getCharacterEncoding());
-            }
-            else
-            {
-                return new SimpleXmlExporterOutput(jasperExporter.getOutputStream());
-            }
-        }
-        if(jasperExporter.getOutputFile() != null)
-        {
-            if(jasperExporter.getCharacterEncoding() != null)
-            {
-                return new SimpleXmlExporterOutput(
-                    jasperExporter.getOutputFile(),
-                    jasperExporter.getCharacterEncoding());
-            }
-            else
-            {
-                return new SimpleXmlExporterOutput(jasperExporter.getOutputFile());
-            }
-        }
-        if(jasperExporter.getOutputFileName() != null)
-        {
-            if(jasperExporter.getCharacterEncoding() != null)
-            {
-                return new SimpleXmlExporterOutput(
-                    jasperExporter.getOutputFileName(),
-                    jasperExporter.getCharacterEncoding());
-            }
-            else
-            {
-                return new SimpleXmlExporterOutput(jasperExporter.getOutputFileName());
-            }
-        }
-        return null;
-    }
-    
     private void reportExportConfiguration(
         final SimpleReportExportConfiguration reportExportConfiguration,
         final JasperIExporter jasperExporter)
@@ -350,24 +294,6 @@ private void reportExportConfiguration(
         }
     }
     
-    private JRXmlExporter xml(final JasperIXmlExporter jasperExporter)
-    {
-        final SimpleXmlExporterOutput exporterOutput = this.simpleXmlExporterOutput(jasperExporter);
-        if(jasperExporter.getEmbeddingImages() != null)
-        {
-            exporterOutput.setEmbeddingImages(jasperExporter.getEmbeddingImages());
-        }
-        final SimpleReportExportConfiguration reportExportConfiguration = new SimpleReportExportConfiguration();
-        this.reportExportConfiguration(reportExportConfiguration, jasperExporter);
-        final SimpleExporterConfiguration exporterConfiguration = new SimpleExporterConfiguration();
-        
-        final JRXmlExporter jrExporter = new JRXmlExporter();
-        jrExporter.setExporterOutput(exporterOutput);
-        jrExporter.setConfiguration(reportExportConfiguration);
-        jrExporter.setConfiguration(exporterConfiguration);
-        return jrExporter;
-    }
-    
     private JRPptxExporter pptx(final JasperIPptxExporter jasperExporter)
     {
         final SimpleOutputStreamExporterOutput exporterOutput = this.simpleOutputStreamExporterOutput(jasperExporter);
diff --git a/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExportTest.java b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExportTest.java
index 5d1d469..31c0002 100644
--- a/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExportTest.java
+++ b/dynamicreports-core-for-grid-exporter/src/test/java/software/xdev/dynamicreports/test/jasper/report/ExportTest.java
@@ -27,12 +27,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import net.sf.jasperreports.engine.JRDataSource;
 import software.xdev.dynamicreports.jasper.builder.JasperConcatenatedReportBuilder;
 import software.xdev.dynamicreports.jasper.builder.JasperReportBuilder;
-import software.xdev.dynamicreports.jasper.constant.ImageType;
 import software.xdev.dynamicreports.report.datasource.DRDataSource;
 import software.xdev.dynamicreports.report.exception.DRException;
-import net.sf.jasperreports.engine.JRDataSource;
 
 
 /**
@@ -60,7 +59,6 @@ void exportTest()
 		try
 		{
 			this.report.toJrXml(new ByteArrayOutputStream());
-			this.report.toImage(new ByteArrayOutputStream(), ImageType.PNG);
 			this.report.toCsv(new ByteArrayOutputStream());
 			this.report.toDocx(new ByteArrayOutputStream());
 			this.report.toHtml(new ByteArrayOutputStream());
@@ -70,7 +68,6 @@ void exportTest()
 			this.report.toRtf(new ByteArrayOutputStream());
 			this.report.toText(new ByteArrayOutputStream());
 			this.report.toXlsx(new ByteArrayOutputStream());
-			this.report.toXml(new ByteArrayOutputStream());
 			this.report.toPptx(new ByteArrayOutputStream());
 		}
 		catch(final DRException e)
@@ -95,7 +92,6 @@ void concatenatedExportTest()
 			this.concatenatedReport.toRtf(new ByteArrayOutputStream());
 			this.concatenatedReport.toText(new ByteArrayOutputStream());
 			this.concatenatedReport.toXlsx(new ByteArrayOutputStream());
-			this.concatenatedReport.toXml(new ByteArrayOutputStream());
 			this.concatenatedReport.toPptx(new ByteArrayOutputStream());
 		}
 		catch(final DRException e)

From 437e2e4e9219b9af956d9b2469d340ed92b7d360 Mon Sep 17 00:00:00 2001
From: Alex B <45384811+AB-xdev@users.noreply.github.com>
Date: Tue, 6 Jun 2023 17:01:50 +0200
Subject: [PATCH 20/21] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e732783..00c54c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,13 @@ Initial release of the fork
 ## Differences to [dynamicreports/dynamicreports-core](https://github.com/dynamicreports/dynamicreports/tree/f7d73961462f3f13cbc27c91df90d4cc3ccc669e/dynamicreports-core)
 * Renamed ``net.sf.dynamicreports`` to ``software.xdev.dynamicreports`` to prevent conflicts with existing installations
 * Dependency shedding
-  * Removed default-XML subsystem; can be supplied manually to the builder or using Java Service Loading
+  * Removed [``Defaults``](./src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java)-XML subsystem; can be supplied manually to the builder or using [Java Service Loading](https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html)
     * ``jakarta.xml.bind:jakarta.xml.bind-api``
     * ``org.glassfish.jaxb:jaxb-runtime``
   * Removed barcode subsystem
-    * Barbecue
     * ``net.sf.barcode4j:barcode4j``
     * ``com.google.zxing:core``
+    * ``net.sourceforge.barbecue:barbecue``
   * Removed charts subsystem
   * Removed boolean to image subsystem
     * ``org.apache.xmlgraphics:batik-bridge``
@@ -19,6 +19,6 @@ Initial release of the fork
     * ``XLSX`` still works as expected
   * Removed ``org.apache.commons:commons-text`` as it was only used on a single unused line of code
 * Removed XML subsystem as XML exports were never producing valid XML
-* Removed half implemented Image subsystem as it is unused
-* Update dependencies to lastest versions
+* Removed half-way implemented Image subsystem as it is unused
+* Updated dependencies to lastest versions
 * Fixed compile errors

From 5407bc729d2bd02b0ef258eebd7fdf140ba54ccf Mon Sep 17 00:00:00 2001
From: Alex B <45384811+AB-xdev@users.noreply.github.com>
Date: Tue, 6 Jun 2023 17:03:39 +0200
Subject: [PATCH 21/21] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 89c493e..8696c22 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@
 # dynamicreports-core-for-grid-exporter
 This is a fork of [dynamicreports-core](https://github.com/dynamicreports/dynamicreports) and specially designed for [XDEV's Vaadin Grid Exporer](https://github.com/xdev-software/vaadin-grid-exporter).
 
+Differences from the original project are roughly descibed in the [changelog](./CHANGELOG.md).
+
 ## Installation
 [Installation guide for the latest release](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/releases/latest#Installation)