Updated strategy handling.