Refactored Field Creators. Bugfixes.