[WIP] Improve queue factory and queue options