Add Queue and fix paying users