Better handling of async stuff