Added support for tolerance (raw mode)