Add map method and refactor