Add watch option to bqueue and gqueue