diff --git a/src/java-jpa-entity.js b/src/java-jpa-entity.js
index d80de10..4d102bb 100644
--- a/src/java-jpa-entity.js
+++ b/src/java-jpa-entity.js
@@ -15,7 +15,7 @@ module.exports = {
             entity.name = `${utils.pascalcase(model.name)}Record`
             entity.package = `${namespace}.${suffix}`;
             entity.dir = model.package.replace(/\./g, '/')
-            entity.fields = model.fields.map(field => {
+            entity.fields = entity.fields.map(field => {
 
                 let field_attr = field.attributes.find(attr => attr.name == 'jpa_sql')
                 field_attr = field_attr || {}
@@ -43,16 +43,16 @@ module.exports = {
             })
 
             let imports = []
-            for(let field of model.fields) {
+            for(let field of entity.fields) {
                 imports = [ ...imports, ...field.type.imports ]
             }
             entity.imports = [ ...new Set(imports) ]
             entity.implements = model.implements || []
-            if(model.implements.length) {
-                model['implements'][ model['implements'].length - 1 ].last = true
+            if(entity.implements.length) {
+                entity['implements'][ model['implements'].length - 1 ].last = true
             }
             
-            entity.table = jpa.table || model.plural
+            entity.table = jpa.table || entity.plural
             entity.indexes = jpa.indexes