Expand map interface, add some docs.