Add proper returns in Queue class
Enable currently required services