unit-veelo, queue refactor