Changed the way we get Queue from Client