Add async
Add comment counting