Tag + Validation Refactoring