Simplified validation and peg lookup