Refactored and added physics tuning parameters