Feature/between context validator