Improved the asynchronous behavior and UI