Added off-mode charging support