Improve KQ saving process to remove cb nigthmare

Improved using async, make the code easier to read.