Updated quest generator, and handler