diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/BasicSupportInfo.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/support/BasicSupportInfo.java
similarity index 65%
rename from wizard-server/src/main/java/org/cobbzilla/wizard/server/config/BasicSupportInfo.java
rename to wizard-common/src/main/java/org/cobbzilla/wizard/model/support/BasicSupportInfo.java
index 6714bdd..8750a05 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/BasicSupportInfo.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/support/BasicSupportInfo.java
@@ -1,15 +1,19 @@
-package org.cobbzilla.wizard.server.config;
+package org.cobbzilla.wizard.model.support;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.cobbzilla.wizard.model.entityconfig.EntityFieldType;
+import org.cobbzilla.wizard.model.entityconfig.annotations.ECField;
 
 import static org.cobbzilla.util.daemon.ZillaRuntime.empty;
 
 public class BasicSupportInfo {
 
+    @ECField(type=EntityFieldType.email)
     @Getter @Setter private String email;
     public boolean getHasEmail () { return !empty(email); }
 
+    @ECField(type=EntityFieldType.http_url)
     @Getter @Setter private String site;
     public boolean getHasSite () { return !empty(site); }
 
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/SupportInfo.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java
similarity index 81%
rename from wizard-server/src/main/java/org/cobbzilla/wizard/server/config/SupportInfo.java
rename to wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java
index 9985aaf..ffb1585 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/SupportInfo.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java
@@ -1,12 +1,14 @@
-package org.cobbzilla.wizard.server.config;
+package org.cobbzilla.wizard.model.support;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.HashMap;
 import java.util.Map;
 
+@Schema
 public class SupportInfo extends BasicSupportInfo {
 
     @JsonIgnore @Getter @Setter private Map<String, BasicSupportInfo> locale = new HashMap<>();
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java
index cd770c3..4a2eb73 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java
@@ -16,6 +16,7 @@ import org.cobbzilla.wizard.filters.ApiRateLimit;
 import org.cobbzilla.wizard.log.LogRelayAppenderConfig;
 import org.cobbzilla.wizard.model.Identifiable;
 import org.cobbzilla.wizard.model.IdentifiableBase;
+import org.cobbzilla.wizard.model.support.SupportInfo;
 import org.cobbzilla.wizard.resources.ParentResource;
 import org.cobbzilla.wizard.server.RestServer;
 import org.cobbzilla.wizard.util.SpringUtil;