Refactor to use map-syntax