Refactored data holder from map to function.