Updated the mode check with all the supported modes