Updated validation triggers