Switched to using partial in map. Thanks to Erik Assum for the suggestion.