refactor model, add field id to hash, create tenant_field_types method