Add sentinel support