Add async extension
Remove comments