Queue updates, common_utils.h added