Fields support
Clean up for distribution