Refactored to use map