Improved the async of the framework