1.7.0: Should be able to decide async or not