Clean
Add custom field
Update readme and example for custom field