diff --git a/forward_engineering/alterScript/alterScriptHelpers/alterForeignKeyHelper.js b/forward_engineering/alterScript/alterScriptHelpers/alterForeignKeyHelper.js
index d201455..e78894d 100644
--- a/forward_engineering/alterScript/alterScriptHelpers/alterForeignKeyHelper.js
+++ b/forward_engineering/alterScript/alterScriptHelpers/alterForeignKeyHelper.js
@@ -25,19 +25,27 @@ const getAddSingleForeignKeyStatementDto = relationship => {
 	const relationshipName = getRelationshipName(relationship);
 	const ddlProvider = require('../../ddlProvider/ddlProvider')();
 
-	return ddlProvider.createForeignKey({
-		name: relationshipName,
-		foreignKey: compMod.child.collection.fkFields,
-		primaryKey: compMod.parent.collection.fkFields,
-		customProperties: compMod.customProperties?.new,
-		foreignTable: compMod.child.collection.name,
-		foreignSchemaName: compMod.child.bucket.name,
-		foreignTableActivated: compMod.child.collection.isActivated,
-		primaryTable: compMod.parent.collection.name,
-		primarySchemaName: compMod.parent.bucket.name,
-		primaryTableActivated: compMod.parent.collection.isActivated,
-		isActivated: Boolean(relationship.role?.compMod?.isActivated?.new),
-	});
+	const schemaData = {
+		schemaName: compMod.child.bucket.name,
+	};
+
+	return ddlProvider.createForeignKey(
+		{
+			name: relationshipName,
+			foreignKey: compMod.child.collection.fkFields,
+			primaryKey: compMod.parent.collection.fkFields,
+			customProperties: compMod.customProperties?.new,
+			foreignTable: compMod.child.collection.name,
+			foreignSchemaName: compMod.child.bucket.name,
+			foreignTableActivated: compMod.child.collection.isActivated,
+			primaryTable: compMod.parent.collection.name,
+			primarySchemaName: compMod.parent.bucket.name,
+			primaryTableActivated: compMod.parent.collection.isActivated,
+			isActivated: Boolean(relationship.role?.compMod?.isActivated?.new),
+		},
+		{},
+		schemaData,
+	);
 };
 
 const canRelationshipBeAdded = relationship => {
diff --git a/forward_engineering/ddlProvider/ddlHelpers/key/constraintsHelper.js b/forward_engineering/ddlProvider/ddlHelpers/key/constraintsHelper.js
index 4c8ef4e..27dbeb1 100644
--- a/forward_engineering/ddlProvider/ddlHelpers/key/constraintsHelper.js
+++ b/forward_engineering/ddlProvider/ddlHelpers/key/constraintsHelper.js
@@ -45,8 +45,11 @@ const alterPkConstraint = (tableName, isParentActivated, keyData) => {
 };
 
 const dropPK = tableName => {
-	const templatesConfig = { tableName };
-	return assignTemplates(templates.dropPK, templatesConfig);
+	const templateData = { tableName };
+	return assignTemplates({
+		templates: templates.dropPK,
+		templateData,
+	});
 };
 
 const alterUkConstraint = (tableName, isParentActivated, keyData) => {
@@ -69,11 +72,14 @@ const alterUkConstraint = (tableName, isParentActivated, keyData) => {
  * @param constraintName {string}
  * */
 const dropUkConstraint = (tableName, constraintName) => {
-	const templatesConfig = {
+	const templateData = {
 		tableName,
 		constraintName,
 	};
-	return assignTemplates(templates.dropUkConstraint, templatesConfig);
+	return assignTemplates({
+		template: templates.dropUkConstraint,
+		templateData,
+	});
 };
 
 module.exports = {