Merge "Refactored validator implementation"