Restructured encounter validation