Minor fi to support modal options