improved utility classes and upgraded dependency in pom.xml file