Additon of Queue and other changes