Adding registration field wrapper support.
Fix the fields defnition.