Some small refactoring
Add MapField