map: use explicit types in api