add map example, some renaming