Added new options needed to support LEEP-MB and VP work.