Modularise more the strategy, so we can replace it.

Andrea