Correctly populate fields Map if needed