Better handling queue