Validator refactor - using nested arrays