Moved over validation items