Added more submodes.