Refactor validation builder