Added options for the new controller/engine configuration from Brad.