Refactored validator with lambda level