Get rid of redundant add map method