Improvements for async MDN handling