Jarv/xqueue support