Adding sentinel support