Added some tuning params