Added modify to support off-line mode