Adapt validation