Added sentinel support