Fix map interface