Add multi sentinel support