Refactoring field out to map