Added capabilities for on-the-fly strategies