MAP: Use explicit address/prefix types in API