Dropped adding a map, stupid api