Added algorithm selection