Refactored validation object