MapAsync methods added, another code cleanup in the way.