added queueService + couple new methods