Parameters Updates

Added Strategies Turn On/Off flags
Updated parameters to support points
Refactoring