decoupled module form fields from core