diff --git a/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraints.groovy b/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraints.groovy
index d14c9b1..dff45d5 100644
--- a/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraints.groovy
+++ b/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraints.groovy
@@ -1,5 +1,28 @@
+/*
+ * Copyright 2023-, Stellenbosch University, South Africa
+ * Copyright 2024, Evaluacion y Desarrollo de Negocios, Spain
+ *
+ * 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.
+ */
+
 package nextflow.nomad.models
 
+/**
+ * Nomad Job Constraint Spec
+ *
+ * @author Jorge Aguilera <jagedn@gmail.com>
+ */
+
 class JobConstraints {
 
     List<JobConstraintsNode> nodeSpecs = []
diff --git a/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraintsAttr.groovy b/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraintsAttr.groovy
index 4cd7655..5b0c1eb 100644
--- a/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraintsAttr.groovy
+++ b/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraintsAttr.groovy
@@ -1,5 +1,29 @@
+/*
+ * Copyright 2023-, Stellenbosch University, South Africa
+ * Copyright 2024, Evaluacion y Desarrollo de Negocios, Spain
+ *
+ * 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.
+ */
+
+
 package nextflow.nomad.models
 
+/**
+ * Nomad Job Constraint Spec
+ *
+ * @author Jorge Aguilera <jagedn@gmail.com>
+ */
+
 class JobConstraintsAttr {
 
     private String arch = null
diff --git a/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraintsNode.groovy b/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraintsNode.groovy
index c689931..f02f4fa 100644
--- a/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraintsNode.groovy
+++ b/plugins/nf-nomad/src/main/nextflow/nomad/models/JobConstraintsNode.groovy
@@ -1,5 +1,29 @@
+/*
+ * Copyright 2023-, Stellenbosch University, South Africa
+ * Copyright 2024, Evaluacion y Desarrollo de Negocios, Spain
+ *
+ * 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.
+ */
+
+
 package nextflow.nomad.models
 
+/**
+ * Nomad Job Constraint Spec
+ *
+ * @author Jorge Aguilera <jagedn@gmail.com>
+ */
+
 class JobConstraintsNode {
 
     private String id = null
diff --git a/plugins/nf-nomad/src/test/nextflow/nomad/executor/NomadServiceJobConstraints.groovy b/plugins/nf-nomad/src/test/nextflow/nomad/models/JobConstraintsSpec.groovy
similarity index 98%
rename from plugins/nf-nomad/src/test/nextflow/nomad/executor/NomadServiceJobConstraints.groovy
rename to plugins/nf-nomad/src/test/nextflow/nomad/models/JobConstraintsSpec.groovy
index 0fb162a..1e57c6c 100644
--- a/plugins/nf-nomad/src/test/nextflow/nomad/executor/NomadServiceJobConstraints.groovy
+++ b/plugins/nf-nomad/src/test/nextflow/nomad/models/JobConstraintsSpec.groovy
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nextflow.nomad.executor
+
+package nextflow.nomad.models
 
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import nextflow.executor.Executor
 import nextflow.nomad.config.NomadConfig
+import nextflow.nomad.executor.NomadService
 import nextflow.processor.TaskBean
 import nextflow.processor.TaskConfig
 import nextflow.processor.TaskProcessor
@@ -39,7 +41,7 @@ import java.nio.file.Path
  *
  * @author : Jorge Aguilera <jagedn@gmail.com>
  */
-class NomadServiceJobConstraints extends Specification{
+class JobConstraintsSpec extends Specification{
 
     MockWebServer mockWebServer