DRAFT: Improve client request queue