Add option to disable async