diff --git a/Application.cfc b/Application.cfc
index 74cf4fa..b6a486c 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -1,37 +1,144 @@
-<cfcomponent displayname="Application" output="true">
+<cfcomponent
+    displayname="Application"
+    output="true"
+    hint="Handle the application.">
+	
 
-    <cfset this.Name = "contractor"/>
-    <cfset this.applicationTimeout = createTimeSpan(0, 0, 3, 0)/>
-    <cfset this.sessionmanagement = true/>
-    <cfset this.datasource = "baza"/>
-    <cfset this.restEnabled = true/>
-    <cfset this.restSettings = {skipCFCWithError: true}/>
+    <!--- Set up the application. --->
+    <cfset this.Name = "contractor" />
+	<cfset this.applicationTimeout = createTimeSpan( 0, 0, 3, 0 ) />
+  	<cfset this.sessionmanagement="Yes"/>
+  	<cfset this.clientmanagement="No"/>
+  	<cfset this.sessiontimeout=CreateTimeSpan(0, 0, 120, 0)/>
+  	<cfset this.setclientcookies="No"/>
+  
+	<cfset this.datasource = "baza"/><!--- default datasource name --->
+	<cfset getDS(this.datasource,"pg")/><!--- datasource name, environment variable prefix without "_" --->
+		
+    <!--- Define the page request properties. --->
+    <cfsetting
+        requesttimeout="20"
+        showdebugoutput="false"
+        enablecfoutputonly="false"
+     />
 
-    <cfset sys = createObject("java", "java.lang.System")/>
+    <cffunction
+        name="OnApplicationStart"
+        access="public"
+        returntype="boolean"
+        output="false"
+        hint="Fires when the application is first created.">
 
-    <cfset dbHost = "postgresqlk8s-master.418f9960-2eb7-4429-b2ec-ac64319d7268.svc.cluster.local"/>
-    <cfset dbPort = "5432"/>
-    <cfset dbName = "baza"/>
-
-    <cfset dbUser = sys.getenv("DB_USER")/>
-    <cfif isNull(dbUser) OR NOT len(dbUser)><cfset dbUser = "super"/></cfif>
-
-    <cfset dbPass = sys.getenv("DB_PASS")/>
-    <cfif isNull(dbPass) OR NOT len(dbPass)><cfset dbPass = "hoHdkA23yxlD9oMUlZ1bIbNyc6DE2mNJmyHMNkEpVD1F4suQs7O2lyN4t0qITyzt"/></cfif>
-
-    <cfset this.datasources["baza"] = {
-        class: "org.postgresql.Driver",
-        bundleName: "org.postgresql.jdbc",
-        bundleVersion: "42.6.0",
-        connectionString: "jdbc:postgresql://#dbHost#:#dbPort#/#dbName#",
-        username: dbUser,
-        password: dbPass
-    }/>
-
-    <cffunction name="onRequestStart" access="public" returntype="boolean">
-        <cfargument name="targetPage" type="string" required="true"/>
-        <cfif structKeyExists(url, "reload")><cfset applicationStop()/></cfif>
-        <cfreturn true/>
+        <cfreturn true />
     </cffunction>
 
+
+    <cffunction
+        name="OnRequest"
+        access="public"
+        returntype="void"
+        output="true"
+        hint="Fires after pre page processing is complete.">
+		
+        <cfargument name="template" type="string" required="true"/>
+		
+		<cfset request.startTickCount=getTickCount()/>
+        
+		<cfset setEncoding("FORM", "UTF-8")>
+		<cfset setEncoding("URL", "UTF-8")>
+	
+		<!--- global settings --->
+		<cfset request.APP_VERSION="0.00.000"/><!---2024-10-13 15:26:10--->		
+		<cflock scope="application" type="readonly" timeout=3>
+			<cfset request.DS=this.datasource/>
+			<cfset request.APP_NAME=this.Name/>
+		</cflock>		
+
+		<cfset local = {} />
+
+        <cfset local.basePath = getDirectoryFromPath(
+            getCurrentTemplatePath()
+            ) />
+
+        <cfset local.targetPath = getDirectoryFromPath(
+            expandPath( arguments.template )
+            ) />
+
+        <cfset local.requestDepth = (
+            listLen( local.targetPath, "\/" ) -
+            listLen( local.basePath, "\/" )
+            ) />
+
+        <cfset request.webRoot = repeatString(
+            "../",
+            local.requestDepth
+            ) />
+
+        <!---
+            While we wouldn't normally do this for every page
+            request (it would normally be cached in the
+            application initialization), I'm going to calculate
+            the site URL based on the web root.
+        --->
+        <cfset request.siteUrl = (
+			IIF(
+				(CGI.server_port_secure <!--- CGI.https EQ "On" does not work with apache+tomcat and nginx+tomcat --->),
+				DE( "https://" ),
+				DE( "http://" )
+				) &
+            cgi.http_host &
+            reReplace(
+                getDirectoryFromPath( arguments.template ),                "([^\\/]+[\\/]){#local.requestDepth#}$",
+                "",
+                "one"
+                )
+            ) />
+
+		<cfset request.thisPage=Replace(ReplaceNoCase(expandPath(ARGUMENTS.template), local.basePath, ""), "\", "/")/>		
+		
+		<cfcookie name="CFID" value="#session.CFID#">
+		<cfcookie name="CFTOKEN" value="#session.CFTOKEN#">
+		
+		<cfinclude template="#ARGUMENTS.template#"/>
+
+        <cfreturn />
+    </cffunction>
+	
+	<cffunction
+        name="getDS"
+        access="private"
+        returntype="void"
+        output="false"
+        hint="Configure data source from environment variables. Convention: data source name is an environment varialble prefix">
+		
+		<cfargument name="dsname" type="string" required="true"/>
+		<cfargument name="prefix" type="string" default=#dsname#/>
+		
+		<cfset system = createObject("java", "java.lang.System")/>
+		<cfset var ds={}/>
+		
+		<cfloop list="class,connectionString,database,driver,host,port,type,url,username,password,bundleName,bundleVersion,connectionLimit,liveTimeout,validate" item="field">
+			<cfset var value=system.getEnv("#arguments.prefix#_#field#")/>
+			<cfif isDefined("value") AND len(value)>
+				<cfset structInsert(ds,field,value)/>
+			</cfif>			
+		</cfloop>		
+		
+		<cfset THIS.datasources[dsname] = ds> 
+        <cfreturn />
+    </cffunction>
+
+
+    <cffunction
+        name="OnRequestEnd"
+        access="public"
+        returntype="void"
+        output="true"
+        hint="Fires after the page processing is complete.">
+		<!--- Attention! Before CF9, OnrequestEnd is not executed in case of redirect. That is why we use session.save_login --->
+
+        <cfreturn />
+    </cffunction>
+
+
 </cfcomponent>