Adding new strategy selector
Adding PHASE2_STRATEGY macros