Added sentinel support (draft)