Added support for async mapping functions