Add validateContext to allow validation per specific context