Make user waitq more generic