Feature/add sentinel