refactor context service, use context validator