Made strategies 'pluginable'