Enhance fields structure
Merge origin/master