Updated validation features