Continue validation refactoring