Added support for other modes