Changed queue to Queue and updated to v.2.3.7