Add async method (for application use)
[Demo] Clean up code & use async to wrap await calls.