Update to use new strategy pattern